Merge remote-tracking branch 'origin/feature-201816-wangcz' into feature-201816-wangcz

assets/scss/common.scss

@@ -870,6 +870,7 @@ img.new-animate{
   color: #fff;
   background-color: #2496f1;
   outline: none;
+  border: none;
 }
 #store-list a .btn {
   width: 110px;

components/provider/HotCommodity.vue

@@ -96,7 +96,6 @@ export default {
       line-height: 34px;
       text-align: center;
       span{
-        font-family: AdobeHeitiStd-Regular;
         font-size: 16px;
         color: #333;
       }

components/provider/RecommendOriginal.vue

@@ -98,6 +98,9 @@ export default {
       &:last-child{
         margin-bottom: 0;
        }
+       &:hover{
+          background: #f4f7fd;
+        }
       }
     }
 	}

components/provider/Suppliers.vue

@@ -251,19 +251,36 @@ export default {
 		font-size: 17px;
 		font-weight: 600;
 		color: #000;
+    div{
+      width: 410px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
 	}
 
 	#store-list table>tbody .store-message {
-    margin-top: 15px;
-    color: #999;
+    margin-top: 5px;
+    color: #666;
     width: 100%;
     overflow: hidden;
     text-overflow: ellipsis;
     display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
+    -webkit-line-clamp: 2;
     line-height: 18px;
 	}
+  #store-list table>tbody tr:hover{
+    box-shadow: 1px 1px 12px rgb(145, 197, 239);
+    -moz-box-shadow: 1px 1px 12px rgb(145, 197, 239);
+    -o-box-shadow: 1px 1px 12px rgb(145, 197, 239);
+    -webkit-box-shadow: 1px 1px 12px rgb(145, 197, 239) ;
+    cursor: pointer;
+  }
+  #store-list table>tbody tr:first-child:hover{
+    box-shadow: none;
+    cursor: default ;
+  }
 	#store-list table>tbody tr td{
 		padding: 15px;
 	}

components/provider/ToggleStore.vue

@@ -35,7 +35,7 @@
       </div>
     </div>
     <!--寄售-->
-    <div class="sale list-item">
+    <div class="sale list-item" @click="open('/store/33069557578d44e69bd91ad12d28a8d4')">
       <div class="header">
         <div class="kind"><span></span>优软寄售</div>
         <a class="enter" @click="open('/store/33069557578d44e69bd91ad12d28a8d4')">进入店铺 <i class="fa fa-angle-right"></i></a>
@@ -71,7 +71,7 @@ export default {
     toggleStore (type) {
       this.$store.commit('provider/stores/SET_STORETYPE', type)
       this.$store.dispatch('loadBanners', {type: type + '_banner_carousel'})
-      this.$store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, types: type === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION' })
+      this.$store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, type: type === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION' })
     },
     // 店铺入驻数量
     formatNumber (num, key) {

pages/provider/shop.vue

@@ -16,9 +16,9 @@ export default {
     return Promise.all([
       store.dispatch('loadBanners', {type: 'factory_banner_carousel'}),
       store.dispatch('provider/loadSalesStore', { isOriginal: true }),
-      store.dispatch('provider/loadNewStores', { types: 'ORIGINAL_FACTORY' }),
+      store.dispatch('provider/loadNewStores', { types: 'ORIGINAL_FACTORY', value: 5 }),
       store.dispatch('provider/loadRecommendOriginal', { types: 'ORIGINAL_FACTORY', num: 5 }),
-      store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, types: 'ORIGINAL_FACTORY' }),
+      store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, type: 'ORIGINAL_FACTORY' }),
       store.dispatch('provider/loadHotComponents'),
       store.dispatch('provider/loadFactoriesCount'),
       store.dispatch('provider/loadAgencyCount'),