Merge branch 'liuin' into develop

src/pages/home/home-page.vue

@@ -47,7 +47,8 @@
         <list-item :item-height="120">
           <item>
             <div slot="name" class="item-pic">
-              <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
+              <!-- <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt=""> -->
+              <img :src="list.url">
             </div>
             <div slot="content" class="item-content">
               <div class="top">{{ list.product_name }}</div>
@@ -65,7 +66,7 @@
 </template>
 <script>
 import functionState from './functionState'
-
+import noImg from '../../assets/productQuery/none.png'
 export default {
   name: 'HomePage',
   data () {
@@ -180,6 +181,9 @@ export default {
             vm.hlsPopup.hideLoading()
             if (res.result === 'S') {
               vm.guessingList = res.lists
+              vm.guessingList.forEach(item => {
+                item['url'] = item.product_attachment_id ? process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token : noImg
+              })
             } else {
               hlsPopup.showLongCenter(res.message)
             }
@@ -369,10 +373,12 @@ export default {
     .item-pic {
       width: 110px;
       height: 110px;
-
+      display: flex;
+      justify-content: center;
+      align-items: center;
       img {
         width: 100%;
-        height: 100%;
+        // height: 100%;
       }
     }