Merge remote-tracking branch 'origin/release-20170915' into release-20170915

components/supplier/merchant.vue

@@ -7,9 +7,11 @@
         <h2>供应商列表</h2>
         <div class="count">
           <img src="/images/supplier/count.png" alt=""/>
-          <span v-for="(spCount, index) in all" :class="'_c' + index">
+          <div class="count_num">
+            <span v-for="spCount in all">
           {{spCount}}
           </span>
+          </div>
         </div>
       </div>
       <div class="search">
@@ -221,28 +223,14 @@
       }
       div.count{
         position: relative;
-        span {
-          font-size: 28px;
-          color: #4a2f01;
-          position: absolute;
-          top: 5px;
-          &:first-child(1){
-            left: 7px;
-          }
-          &:nth-child(2){
-            left: 7px;
-          }
-          &:nth-child(3){
-            left: 37px;
-          }
-          &:nth-child(4){
-            left: 67px;
-          }
-          &:nth-child(5){
-            left: 97px;
-          }
-          &:nth-child(6){
-            left: 127px;
+        .count_num{
+          position:absolute;
+          top:4px;
+          left:6px;
+          span{
+            margin:0 2.3px;
+            font-size: 28px;
+            color:#4a2f01;
           }
         }
       }