Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-21 14:00:54
+ * @LastEditTime: 2019-10-21 18:03:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-21 16:46:55
+ * @LastEditTime: 2019-10-21 18:30:14
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -118,8 +118,6 @@ export default {
       confgInfo: {},
       bgc_flag: true,
       collect_flag: false,
-      src: require('@/assets/productQuery/collect.png'),
-      // collect_status: window.sessionStorage.getItem('collect_status'),
     }
   },
   computed: {},
@@ -129,16 +127,15 @@ export default {
     if (from.name === 'ProductList') {
       next(vm => {
         vm.product_id = vm.$route.params.product_id
-        // vm.collect_status = vm.$route.params.collect_status
-        // if (vm.$route.params.collect_status === 'Y') {
-        //   vm.src = require('@/assets/productQuery/coll-success.png')
-        // }
         vm.baseMsg()
         vm.detailMsg()
         vm.confgMsg()
       })
     }
     next()
+  },
+  created () {
+
   },
   activated () {
     console.log('collect........', window.sessionStorage.getItem('collect_status'))

src/pages/productQuery/product-list.vue

@@ -81,7 +81,7 @@ export default {
        }
      })
    },
-   // val：产品id
+   // val：产品id, status: 收藏状态
    goDetailed (val, status) {
      window.sessionStorage.setItem('collect_status', status)
      this.$router.push({