Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/myProductCollection/my-product-list.Vue

 <!--
  * @Author: your name
  * @Date: 2019-10-22 20:26:28
- * @LastEditTime: 2019-10-24 12:28:54
+ * @LastEditTime: 2019-10-25 16:02:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
@@ -27,7 +27,7 @@
         </div>
       </div>
       <list-item v-for="item in productList" :key="item.product_id">
-        <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status)">
+        <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
           <div slot="name" class="item-pic">
             <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
           </div>
@@ -71,9 +71,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'MyInfo') {
-        vm.getList()
-      }
+      // if (from.name === 'MyInfo') {
+      vm.getList()
+      // }
     })
   },
   methods: {
@@ -92,12 +92,13 @@ export default {
       })
     },
     // val：产品id, status: 收藏状态
-    goDetailed (val, status) { // 进入产品查询功能明细页面
+    goDetailed (val, status, bp_id) { // 进入产品查询功能明细页面
       window.sessionStorage.setItem('collect_status', status)
       this.$router.push({
         name: 'ProDetailed',
         params: {
           product_id: val,
+          bp_id: bp_id,
           //  collect_status: status,
         },
       })