Merge branch 'liuin' into uat

src/pages/home/home-page.vue

@@ -53,7 +53,11 @@
             <div slot="content" class="item-content">
               <div class="top">{{ list.product_name }}</div>
               <img src="@/assets/homePage/hot.png" class="hot">
-              <div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?'经销商':'办事处') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?list.agent_name:list.office_name) }}</span></div>
+              <!-- <div class="center"><span class="firsts">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?'经销商':'办事处') }}</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?"-":(list.agent_id?list.agent_name:list.office_name) }}</span></div>
+              <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
+              <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n):(list.agent_id? (list.agent_province === list.agent_city?list.agent_city + list.agent_district:list.agent_province + list.agent_city + list.agent_district):(list.office_province === list.office_city?list.office_city + list.office_district:list.office_province + list.office_city + list.office_district)) }}</span></div>
+               -->
+              <div class="center"><span class="firsts">经销商</span> <span class="seconds">{{ list.bp_name }}</span></div>
               <div class="center"><span class="firsts">产品型号</span> <span class="seconds">{{ list.product_code }}</span></div>
               <div class="center"><span class="firsts">地址</span> <span class="seconds">{{ !list.office_id&&!list.agent_id?( list.province_id_n === list.city_id_n?list.city_id_n + list.district_id_n:list.province_id_n + list.city_id_n + list.district_id_n):(list.agent_id? (list.agent_province === list.agent_city?list.agent_city + list.agent_district:list.agent_province + list.agent_city + list.agent_district):(list.office_province === list.office_city?list.office_city + list.office_district:list.office_province + list.office_city + list.office_district)) }}</span></div>
             </div>
@@ -198,7 +202,17 @@ export default {
             }
           })
         },
-        // 进入产品明细
+        // // 进入产品明细
+        // goProductDetail (list) {
+        //   let bpId = !list.office_id && !list.agent_id ? list.bp_id : (list.agent_id ? list.agent_id : list.office_id)
+        //   this.$router.push({
+        //     name: 'ProDetailed',
+        //     params: {
+        //       product_id: list.product_id,
+        //       bp_id: bpId,
+        //     },
+        //   })
+        // },
         goProductDetail (list) {
           let bpId = !list.office_id && !list.agent_id ? list.bp_id : (list.agent_id ? list.agent_id : list.office_id)
           this.$router.push({
@@ -209,6 +223,7 @@ export default {
             },
           })
         },
+
       },
 }
 </script>