Merge branch 'feature-201815-wangcz' into dev

components/mobile/common/LoginBox.vue

@@ -4,7 +4,7 @@
       <div class="mobile-modal-header">请登录后再操作<i @click="close" class="icon-guanbi iconfont"></i></div>
       <div class="mobile-modal-content">
         <span @click="onRegisterClick">立即注册</span><span @click="goLogin">马上登录</span>
-        <p><i>*</i>目前手机端暂不支持开店功能，完成注册后请前往PC端操作</p>
+        <!--<p><i>*</i>目前手机端暂不支持开店功能，完成注册后请前往PC端操作</p>-->
       </div>
     </div>
   </div>

components/mobile/register-saler/Register.vue

@@ -103,7 +103,7 @@
       } else { // 是个人
         this.$http.get('/basic/user/userCacheEnterprise')
           .then(response => {
-            if (!response.data) {
+            if (!response.data.name) {
               this.section = 1
               this.checkData.checked = false
             } else if (!response.data.enIsRead) {

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

@@ -44,7 +44,7 @@
             <i class="glyphicon glyphicon-ok x-icon-left"></i>
           </div>
         </div>
-        <div class="mobile-modal mobile-fiexd-modal" v-show="showAddressBox">
+        <div class="mobile-modal mobile-fiexd-modal" v-show="showAddressBox" @click.stop="">
           <div @mouseenter="isInAddressBox = true"
                @mouseleave="isInAddressBox = false"
                style="display: block;"
@@ -59,30 +59,30 @@
                 <li v-for="province in cityData.province"
                     :class="province == address.currentProvince ? 'active' : ''"
                     v-text="province"
-                    @click="getCity(province)"></li>
+                    @click.stop="getCity(province)"></li>
               </ul>
               <ul class="mobile-list-unstyled">
                 <li v-for="city in cityData.city"
                     :class="city == address.currentCity ? 'active' : ''"
                     v-text="city"
-                    @click="getDistrict(city)"></li>
+                    @click.stop="getDistrict(city)"></li>
               </ul>
               <ul class="mobile-list-unstyled">
                 <li v-for="district in cityData.district"
                     v-text="district"
                     :class="district == address.currentDistrict ? 'active' : ''"
-                    @click="chooseDistrict(district)"></li>
+                    @click.stop="chooseDistrict(district)"></li>
               </ul>
             </div>
             <div class="mobile-x-item-ext2">详细地址</div>
             <div class="mobile-x-item-ext">
               <div class="form-group">
                 <div class="col-sm-12">
-                   <textarea id="street" name="street" rows="4" v-model="address.detail" @input="onDetailAddressInput" class="form-control x-input" placeholder="xx路xx大厦xx栋xx楼xx室"></textarea>
+                   <textarea id="street" name="street" rows="4" v-model="address.detail" @input.stop="onDetailAddressInput" class="form-control x-input" placeholder="xx路xx大厦xx栋xx楼xx室"></textarea>
                 </div>
               </div>
               <div class="text-right">
-                <a class="register-btn btn-submit" @click="submitAddress">确定</a> <a @click="showAddressBox = false" class="register-btn btn-console">取消</a>
+                <a class="register-btn btn-submit" @click.stop="submitAddress">确定</a> <a @click="showAddressBox = false" class="register-btn btn-console">取消</a>
               </div>
             </div>
           </div>
@@ -739,7 +739,7 @@
       border-radius: 0;
       border: 0;
       overflow-y: auto;
-      max-height: 10rem;
+      max-height: 8rem;
       padding-bottom: 0.4rem;
       .mobile-x-union-header {
         font-size: 0.24rem;

components/product/KindBox.vue

@@ -297,7 +297,7 @@
   .box-first .box-kind {
     height: 100px;
     font-size: 14px;
-    background-color: #f1f4fb;
+    /*background-color: #f1f4fb;*/
   }
   #letter-nav ul, #letter-nav li {
     list-style-type: none;
@@ -313,6 +313,7 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     text-align: center;
+    background-color: #f1f4fb;
     &:hover{
       border-bottom: 1px solid #5079cb !important;
       background-color: #fff;

components/register-saler/Register.vue

@@ -95,7 +95,7 @@
       } else { // 是个人
         this.$http.get('/basic/user/userCacheEnterprise')
           .then(response => {
-            if (!response.data) {
+            if (!response.data.name) {
               this.section = 1
               this.checkData.checked = false
             } else if (!response.data.enIsRead) {

pages/mobile/user/index.vue

@@ -135,7 +135,7 @@
             this.$store.dispatch('loadStoreStatus', {op: 'check'})
             this.$http.get('/store-service/applications?status=normal').then(res => {
               if (res.data.success) {
-                this.applyStatus = res.data.data.status
+                this.applyStatus = res.data.data ? res.data.data.status : ''
               } else {
                 this.applyStatus = 'error'
               }
@@ -190,7 +190,7 @@
     created() {
       if (!this.storeStatus) {
         this.$http.get('/store-service/applications?status=normal').then(res => {
-          this.applyStatus = res.data.data.status
+          this.applyStatus = res.data.data ? res.data.data.status : ''
         })
       }
     }