Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app 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-21 16:08:13
+ * @LastEditTime: 2019-10-21 16:46:55
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -89,6 +89,7 @@
           <div slot="name" class="font-color">主机厂</div>
           <span slot="content"> {{ confgInfo.factory_bp_name }} </span>
         </item>
+        <div v-html="confgInfo.product_properties"/>
       </list-item>
     </h-content>
     <bottom-tab class="footer-button">

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-17 19:07:02
+ * @LastEditTime: 2019-10-21 16:41:10
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -23,7 +23,7 @@
       </div>
       <div v-for="(item,index) in prolists" :key="index" class="wrap">
 
-        <div class="box">
+        <div class="box" @click="goLists(item.division)">
           <div class="first">
             <img src="@/assets/productQuery/product-query.png" alt="">
             <p class="product-class">产品类别</p>
@@ -34,9 +34,9 @@
             <div class="product">
               <p>{{ item.division_n }}</p>
             </div>
-            <img src="@/assets/productQuery/pull.png" alt="" @click="queryDivision(item.factory_bp_id,index)">
+            <img src="@/assets/productQuery/pull.png" alt="" @click.stop="queryDivision(item.factory_bp_id,index)">
           </div>
-          <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" @click="goLists(item.division)">
+          <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
         </div>
       </div>
     </h-content>