Merge remote-tracking branch 'origin/release-201816-wcz' into release-201816-wcz

assets/scss/common.scss

@@ -850,6 +850,7 @@ img.new-animate{
   position: relative;
   float: left;
   padding-left: 558px;
+  width: auto;
 }
 #store-list table .search-content-pc .form-control{
   width: 190px;

components/applyPurchase/ApplyInfo.vue

@@ -380,7 +380,7 @@ export default {
         height: 33px;
         line-height: 33px;
         color: #fff;
-        background: #3975f4;
+        background: #2496f1;
         font-size: 16px;
         text-align: center;
         border: {
@@ -412,7 +412,7 @@ export default {
           display: inline-block;
           width: 69px;
           color: #fff;
-          background: #3975f4;
+          background: #2496f1;
           text-align: center;
           margin: 0 6px 0 -1px;
           /*vertical-align: middle;*/
@@ -448,7 +448,7 @@ export default {
             display: inline-block;
             width: 69px;
             color: #fff;
-            background: #3975f4;
+            background: #2496f1;
             text-align: center;
             margin: 0 6px 0 -1px;
             height: 33px;
@@ -505,7 +505,7 @@ export default {
           .fa {
             color: #333;
             &.active {
-              color: #5078cb;
+              color: #2496f1;
             }
           }
           &:nth-child(1) {
@@ -810,7 +810,7 @@ export default {
       min-height: auto;
       border-radius: 2px;
       .title {
-        background-color: #4290f7;
+        background-color: #2496f1;
         height: 22px;
         line-height: 22px;
         margin-bottom: 20px;
@@ -820,7 +820,7 @@ export default {
           line-height: 20px;
           padding-top: 0;
           i {
-            color: #4290f7;
+            color: #2496f1;
             margin-right: 4px;
           }
           span {
@@ -830,7 +830,7 @@ export default {
         div {
           a {
             width: 78px;
-            background: #4290f7;
+            background: #2496f1;
             margin: 18px 0 13px 0;
             border-radius: 2px;
           }

components/applyPurchase/articleThree.vue

@@ -92,7 +92,7 @@
           height:30px;
           line-height: 30px;
           color:#eee;
-          background: #3b7cf4;
+          background: #2496f1;
           border-radius:5px;
           text-align: center;
         }

components/common/page/pageComponent.vue

@@ -155,7 +155,7 @@
   }
   .page-wrap{
     float: right;
-    margin: 30px 0;
+    margin: 30px 15px;
   }
   .page-wrap ul, .page-wrap div {
     display: inline-block;

components/provider/HotCommodity.vue

@@ -4,48 +4,48 @@
       <span>产品推荐</span>
       <img src="/images/original/line.png" alt=""/>
     </div>
-    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents || hotComponents.length>0">
+    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents.metadatas || hotComponents.length>0">
       <div class="swiper-wrapper">
         <div class="swiper-slide" v-if="hotComponents.length>0">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(0,2)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
+              <a :href="component.detailsLink" target="_blank">
                 <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=2">
+        <div class="swiper-slide" v-if="hotComponents.length>2">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(2,4)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
+              <a :href="component.detailsLink" target="_blank">
                 <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=4">
+        <div class="swiper-slide" v-if="hotComponents.length>4">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(4,6)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
+              <a :href="component.detailsLink" target="_blank">
                 <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=6">
+        <div class="swiper-slide" v-if="hotComponents.length>6">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(6,8)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
+              <a :href="component.detailsLink" target="_blank">
                 <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
@@ -61,7 +61,7 @@ export default {
   name: 'hot-commodity',
   computed: {
     hotComponents () {
-      return this.$store.state.provider.storeCms.hotComponents.data
+      return this.$store.state.provider.storeCms.hotComponents.data.data
     },
     // 产品推荐轮播
     swiperOption () {

components/provider/Suppliers.vue

@@ -3,12 +3,12 @@
     <div id="store-list">
       <table class="table">
         <thead>
-        <tr data-v-12978a78="">
+        <tr>
           <td width="120"><span v-text="storeType === 'factory' ? '原 厂' : '代理经销'">原厂</span></td>
-          <td width="100" data-v-12978a78=""></td>
-          <td width="450" data-v-12978a78=""></td>
-          <td width="150" style="vertical-align: middle" data-v-12978a78=""></td>
-          <td width="120" style="vertical-align: middle;" data-v-12978a78=""></td>
+          <td width="100"></td>
+          <td width="460"></td>
+          <td width="150" style="vertical-align: middle"></td>
+          <td width="120" style="vertical-align: middle;"></td>
         </tr>
         </thead>
         <tbody>

components/store/home/RecommendList.vue

@@ -33,7 +33,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=3">
+          <div class="swiper-slide" v-if="commodities.length>3">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(3,6)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
@@ -50,7 +50,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=6">
+          <div class="swiper-slide" v-if="commodities.length>6">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(6,9)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
@@ -67,7 +67,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=9">
+          <div class="swiper-slide" v-if="commodities.length>9">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(9,12)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">

components/supplier/articleOne.vue

@@ -77,6 +77,7 @@
       background: #4290f7;
       line-height: 40px;
       padding: 0 20px 0;
+      display:block;
       .el-dialog__title{
         color:#fff;
       }

components/supplier/articleTwo.vue

@@ -3,8 +3,13 @@
     <div class="title">
       <span>供应商推荐</span>
     </div>
+    <div class="empty" v-if="!list.content || list.content.length === 0">
+      <div class="supplier-empty-info">
+        <p>暂无供应商推荐信息</p>
+      </div>
+    </div>
     <ul class="list-unstyled">
-      <li v-for="item in list.content" @click="jumpResource(item.enUU)">
+      <li v-for="item in list.content" @click="jumpResource(item.uu)">
         <div class="img">
           <img :src="item.enLogoUrl || '/images/all/default.png'">
         </div>
@@ -33,6 +38,7 @@
     },
     computed: {
       list () {
+        console.log('12', this.$store.state.supplier.merchant.recommend.data)
         return this.$store.state.supplier.merchant.recommend.data
       }
     },
@@ -67,13 +73,14 @@
     padding-bottom:5px;
     margin-bottom:15px;
     background: #fff;
-    min-height:300px;
+    height:1350px;
     .el-dialog{
       width: 290px!important;
       .el-dialog__header{
         background: #4290f7;
         line-height: 40px;
         padding: 0 20px 0;
+        display:block;
         .el-dialog__title{
           color:#fff;
         }
@@ -122,7 +129,14 @@
         color:#fff;
       }
     }
-    ul{
+    .empty{
+      padding-top:30px;
+      text-align: center;
+      .supplier-empty-info{
+       font-size: 14px;
+      }
+    }
+    > ul{
       li{
         position:relative;
         padding: 0 10px;

components/supplier/merchant.vue

@@ -148,6 +148,7 @@
       background: #4290f7;
       line-height: 40px;
       padding: 0 20px 0;
+      display:block;
       .el-dialog__title{
         color:#fff;
       }
@@ -203,6 +204,11 @@
       width:370px;
       padding-top:7px;
       margin-right:10px;
+      .search-content-pc > ul{
+        left:0;
+        top:100%;
+        width:100%;
+      }
       .btn{
         width:68px;
         background: #2496f1;
@@ -215,12 +221,10 @@
     }
   }
   .list_info{
+    height: 1187px;
     margin-bottom:50px;
     .empty{
-      height:418px;
-      border:15px solid #c4e9f9;
-      background: #eef9fd;
-      padding-top:165px;
+      padding-top:1px;
       text-align: center;
       img{
         vertical-align: top;

pages/supplier/index.vue

@@ -27,7 +27,7 @@
         store.dispatch('supplier/loadVendorList', {page: 1, size: 10}),
         store.dispatch('supplier/loadVendorAll', {page: 1, size: 20}),
         store.dispatch('supplier/loadNewMerchant', {filter: 'page', size: 10}),
-        store.dispatch('supplier/loadRecommend', {size: 10}),
+        store.dispatch('supplier/loadRecommend', {size: 20}),
         store.dispatch('loadBanners', {type: 'home'}),
         store.dispatch('loadProductKinds', { id: 0 })
       ])

store/provider.js

@@ -104,7 +104,7 @@ export const actions = {
   },
   loadHotComponents ({ commit }) {
     commit('storeCms/REQUEST_HOT_COMPONENTS')
-    return axios.get('/api/cms-service/storeCms/inventory')
+    return axios.get('/cmsApi?method=queryContentPage&module=recommended&orderBy=order_number%20ASC')
       .then(response => {
         commit('storeCms/GET_HOT_COMPONENTS_SUCCESS', response.data)
       }, err => {