Merge branch 'ren' into develop

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-18 15:35:42
+ * @LastEditTime: 2019-10-21 15:56:00
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -118,14 +118,20 @@ export default {
       bgc_flag: true,
       collect_flag: false,
       src: require('@/assets/productQuery/collect.png'),
+      // collect_status: window.sessionStorage.getItem('collect_status'),
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+  },
   beforeRouteEnter (to, from, next) {
     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()
@@ -134,7 +140,10 @@ export default {
     next()
   },
   created () {
-
+    console.log('collect........', window.sessionStorage.getItem('collect_status'))
+    if (window.sessionStorage.getItem('collect_status') === 'Y') {
+      this.src = require('@/assets/productQuery/coll-success.png')
+    }
   },
   methods:
  {
@@ -144,6 +153,10 @@ export default {
    },
    // 收藏
    collect () {
+     console.log('collect', window.sessionStorage.getItem('collect_status'))
+     if (window.sessionStorage.getItem('collect_status') === 'Y') {
+       hlsPopup.showLongCenter('该产品已收藏过，请勿重复收藏')
+     } else {
        this.collect_flag = true
        console.log(this.collect_flag)
        let vm = this
@@ -165,6 +178,7 @@ export default {
            hlsPopup.showLongCenter(res.message)
          }
        })
+     }
    },
    // 基本信息查询
    baseMsg () {

src/pages/productQuery/product-list.vue

@@ -38,7 +38,7 @@
             </div>
           </div>
           <div slot="right-icon">
-            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goDetailed(item.product_id)">
+            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goDetailed(item.product_id,item.collect_status)">
           </div>
         </item>
       </list-item>
@@ -82,11 +82,13 @@ export default {
      })
    },
    // val：产品id
-   goDetailed (val) {
+   goDetailed (val, status) {
+     window.sessionStorage.setItem('collect_status', status)
      this.$router.push({
        name: 'ProDetailed',
        params: {
          product_id: val,
+         //  collect_status: status,
        },
      })
    },