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

components/applyPurchase/articleTwo.vue

@@ -41,6 +41,7 @@
     border:1px solid #d2d2d2;
     padding-top:25px;
     margin-bottom:20px;
+    height:388px;
     &:before{
       content: '';
       display:block;
@@ -84,6 +85,7 @@
               &:nth-child(1) {
                 color: #f6682f;
                 font-size: 12px;
+                text-align:left;
                 >div {
                   width: 50px;
                   span {
@@ -105,7 +107,7 @@
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
-                padding: 0 8px;
+                padding: 0 3px;
                 position: relative;
                 height: 30px;
                 i {

components/brandCenter/BrandIndex.vue

@@ -434,6 +434,10 @@
            width: 56px;
            padding-left: 3px;
          }
+        &:last-child a.active{
+           width: 56px;
+           padding-left: 3px;
+         }
       }
     }
     .brand-center-index-list {
@@ -600,6 +604,8 @@
               line-height: 20px;
               color: #323232;
               font-size: 14px;
+              overflow: hidden;
+              text-overflow: ellipsis;
               &:nth-child(2) {
                 font-size: 12px;
               }

components/brandCenter/RecommendBrand.vue

@@ -134,7 +134,7 @@
   .recommend-brand {
     width: 1190px;
     margin: 0 auto;
-    margin-top: 10px;
+    margin-top: 20px;
     .brand-content{
       overflow: hidden;
       .brand-index-tab {
@@ -317,5 +317,7 @@
     background-color: #2496f1;
     border-radius: 2px;
     color: #fff;
+    /*width: 56px;*/
+    /*padding-left: 3px;*/
   }
 </style>

components/provider/HotCommodity.vue

@@ -10,7 +10,7 @@
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(0,2)" class="big">
               <a :href="component.detailsLink" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
                 <span class="name">{{component.metadatas.contExp_abstract}}</span>
                 <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
@@ -21,7 +21,7 @@
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(2,4)" class="big">
               <a :href="component.detailsLink" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
                 <span class="name">{{component.metadatas.contExp_abstract}}</span>
                 <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
@@ -32,7 +32,7 @@
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(4,6)" class="big">
               <a :href="component.detailsLink" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
                 <span class="name">{{component.metadatas.contExp_abstract}}</span>
                 <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
@@ -43,7 +43,7 @@
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(6,8)" class="big">
               <a :href="component.detailsLink" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
                 <span class="name">{{component.metadatas.contExp_abstract}}</span>
                 <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>

components/provider/Suppliers.vue

@@ -66,7 +66,7 @@ export default {
         page: 1,
         count: 10,
         keyword: '',
-        type: this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION',
+        type: 'ORIGINAL_FACTORY',
         field: ''
       }
     }
@@ -95,6 +95,7 @@ export default {
   },
   methods: {
     search (obj) {
+      this.pageParams.type = this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION'
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
       this.pageParams.field = obj.type ? 'similar' : null

components/supplier/articleTwo.vue

@@ -73,7 +73,8 @@
     padding-bottom:5px;
     margin-bottom:15px;
     background: #fff;
-    height:1350px;
+    height:1205px;
+    overflow: hidden;
     .el-dialog{
       width: 290px!important;
       .el-dialog__header{

components/supplier/merchant.vue

@@ -19,7 +19,7 @@
     <ul class="list-inline">
       <li v-for="item in list.content" @click="jumpResource(item.enUU)" class="clearfix">
         <div class="img">
-          <img :src="item.logoUrl || '/images/all/default.png'">
+          <img :src="item.storeLogoUrl || item.logoUrl || '/images/all/default.png'">
           <span class="has_shop" v-if="item.isStore === 1"></span>
         </div>
         <div class="content">
@@ -138,10 +138,8 @@
 
 <style type="text/scss" lang="scss">
 .merchant{
-  padding-bottom:25px;
   border-radius:5px;
   overflow:hidden;
-  background: #fff;
   .el-dialog{
     width: 290px!important;
     .el-dialog__header{
@@ -188,6 +186,7 @@
   }
   .top{
     border-bottom:1px solid #d3d3d3;
+    background: #fff;
     .title{
       background: #2496f1;
       height:35px;
@@ -222,7 +221,6 @@
   }
   .list_info{
     height: 1187px;
-    margin-bottom:50px;
     .empty{
       padding-top:1px;
       text-align: center;
@@ -236,6 +234,7 @@
       }
     }
     > ul{
+      background: #fff;
       margin:0;
       li{
         position:relative;

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: 20}),
+        store.dispatch('supplier/loadRecommend', {size: 19}),
         store.dispatch('loadBanners', {type: 'home'}),
         store.dispatch('loadProductKinds', { id: 0 })
       ])