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

components/brandCenter/BrandIndex.vue

@@ -364,6 +364,7 @@
         height: 229px;
         border-radius: 5px;
         background: #fff;
+        margin-bottom: 120px;
         /*border: solid 1px rgba(210, 210, 210, 0.8);*/
         .item {
           overflow: hidden;
@@ -669,6 +670,8 @@
         >div.empty-remind{
           text-align: center;
           margin: 20px 0;
+          margin-top: 495px;
+          font-size: 20px;
         }
       }
       .page-wrap {

components/provider/RecommendStoreShow.vue

@@ -38,6 +38,7 @@ export default {
       float: left;
       margin-right: 15px;
       width: 220px;
+      margin-bottom: 80px;
     }
     .search {
       width: 955px;

components/provider/Suppliers.vue

@@ -36,8 +36,8 @@
             <a :href="'/store/' + store.uuid" target="_blank"><button class="btn btn-primary">进入店铺</button></a>
           </td>
         </tr>
-        <tr v-if="!stores.content || stores.content.length == 0">
-          <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;">
+        <tr v-if="!stores.content || stores.content.length == 0" class="no-content">
+          <td colspan="10" class="text-center" style="line-height: 1125px; font-size: 20px;">
             <i class="fa fa-smile-o fa-lg"></i> 暂无店铺信息
           </td>
         </tr>
@@ -284,6 +284,10 @@ export default {
   #store-list table>tbody tr:first-child:hover{
     box-shadow: none;
     cursor: default ;
+  }
+  #store-list table>tbody tr.no-content:hover{
+    box-shadow: none;
+    cursor: default ;
   }
 	#store-list table>tbody tr td{
 		padding: 15px;

components/supplier/articleTwo.vue

@@ -38,7 +38,6 @@
     },
     computed: {
       list () {
-        console.log('12', this.$store.state.supplier.merchant.recommend.data)
         return this.$store.state.supplier.merchant.recommend.data
       }
     },

components/supplier/merchant.vue

@@ -38,11 +38,11 @@
         <div class="select_btn" v-html="isInFrame ? '+ 添加为供应商' : '+ 查看更多'" @mouseleave="hasJump = false" @mouseenter="hasJump = true" @click="addResource(item.enUU)"></div>
       </li>
     </ul>
-    <div style="float: right;">
-      <page :total="list.totalElements" :page-size="pageParams.count"
-            :current="pageParams.page" v-on:childEvent="handleCurrentChange">
-      </page>
-    </div>
+  </div>
+  <div style="float: right;">
+    <page :total="list.totalElements" :page-size="pageParams.count"
+          :current="pageParams.page" v-on:childEvent="handleCurrentChange">
+    </page>
   </div>
   <el-dialog
     title="提示"
@@ -221,9 +221,10 @@
     }
   }
   .list_info{
-    height: 1187px;
+    height: 1120px;
+    background: #fff;
     .empty{
-      padding-top:1px;
+      padding-top:600px;
       text-align: center;
       img{
         vertical-align: top;
@@ -235,7 +236,6 @@
       }
     }
     > ul{
-      background: #fff;
       margin:0;
       li{
         position:relative;