Merge remote-tracking branch 'origin/master'

components/home/Carousel.vue

@@ -6,9 +6,12 @@
         <div v-swiper:mySwiper="swiperOption">
           <div class="swiper-wrapper">
             <div class="swiper-slide" v-for="banner in banners.data">
-              <a :href="banner.hrefUrl" target="_blank">
+              <a :href="banner.hrefUrl" target="_blank" v-if="banner.hrefUrl">
                 <img :src="banner.pictureUrl"/>
               </a>
+              <span v-if="!banner.hrefUrl">
+                <img :src="banner.pictureUrl"/>
+              </span>
             </div>
             <div class="swiper-button-prev"><i class="iconfont icon-arrow-left"></i></div>
             <div class="swiper-button-next"><i class="iconfont icon-arrow-right"></i></div>
@@ -83,6 +86,9 @@
             display: block;
             height: $carousel_height;
           }
+          a[href='']:hover{
+            cursor: default;
+          }
         }
       }
     }

components/home/KindCategory.vue

@@ -172,6 +172,9 @@
                 text-overflow: ellipsis;
                 white-space: nowrap;
               }
+              i{
+                font-size: 12px;
+              }
             }
 
             dd {

components/home/floor/Floor.vue

@@ -74,8 +74,8 @@
         }
       }
       &.medium {
-        width: 389px;
-        height: 199px;
+        width: 390px;
+        height: 200px;
 
         img {
           position: absolute;
@@ -116,8 +116,8 @@
         }
       }
       &.small {
-        width: 219px;
-        height: 199px;
+        width: 220px;
+        height: 200px;
 
         img {
           margin-top: 15px;

components/provider/Suppliers.vue

@@ -6,7 +6,7 @@
         <td width="175"></td>
         <td width="auto"></td>
         <td width="200">
-          <div class="input-group">
+          <div class="input-group" style="display: table;">
             <input class="form-control" type="search" v-model="keyword" placeholder="请输入商家名称" @search="search()" />
             <span class="input-group-btn">
 							<button type="button" class="btn btn-default" @click="search()"><i class="iconfont">&#xe6fc;</i></button>