Merge remote-tracking branch 'origin/release-201815-wangcz' into release-201815-wangcz

components/mobile/register-saler/register/StepThird.vue

@@ -74,7 +74,7 @@
                 <!--<div class="col-md-12"><em>* </em>如已上传最新版营业执照（三证合一），则其他两证无需上传 ； 仅支持JPG、PNG、GIF、PDF格式，每张大小不超过3M</div>-->
               </div>
               <!--增加品牌-->
-              <div class="custom_col brand-type" v-for="(brand, index) in brands">
+              <div class="custom_col brand-type" v-for="(brand, index) in brands" style="margin-top: 0px">
                 <div class="wrap-title"><span class="line"></span>品牌{{index+1}}</div>
                 <!--<div class="col-md-1">品牌{{index+1}}<em v-if="index == 0">*</em></div>-->
                 <div class="" style="margin: 0px 0.25rem;position: relative">
@@ -159,7 +159,7 @@
                 <!--<div class=""><em>* </em>如已上传最新版营业执照（三证合一），则其他两证无需上传 ； 仅支持JPG、PNG、GIF、PDF格式，每张大小不超过3M</div>-->
               </div>
               <!--增加品牌-->
-              <div class="custom_col brand-type" v-for="(brand, index) in brands">
+              <div class="custom_col brand-type" v-for="(brand, index) in brands" style="margin-top: 0px">
                 <!--<div class="col-md-1">品牌{{index+1}}<em>*</em></div>-->
                 <div class="wrap-title"><span class="line"></span>品牌{{index+1}}</div>
                 <div class="" style="margin: 0px 0.25rem;position: relative">

pages/mobile/store/index.vue

@@ -731,7 +731,7 @@
     text-decoration: none;
   }
   .mobile-tab-list .btn-area {
-    margin-top: 0.1rem;
+    margin-top: 0.2rem;
     text-align: center;
   }
   .mobile-tab-list .btn-area span {

pages/mobile/user/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
-      <p>个人中心
+      <p>账户中心
         <span @click="showLogout = true">退出</span>
       </p>
     </div>