优化开店申请

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

@@ -1,6 +1,6 @@
 <template>
   <!--最后一步-->
-  <div class="section" style="height: calc(100vh - 0.98rem - 0.88rem);overflow-y: auto;">
+  <div class="section" style="overflow-y: auto;position: absolute;height: 100%;">
     <div class="step-last">
 <!--      <h4 class="h4">免费开店</h4>
       <p class="title">申请开店完全免费，一个企业只能开一家店，申请到正式开通预计需1-3个工作日。了解更多请看《开店规则》</p>-->
@@ -107,7 +107,7 @@
                     <upload :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   <div class="file-text">品牌logo/商标注册原件/授权说明书</div>
-                  <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除"><i class="fa fa-trash"></i></div>
+                  <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除" style="float: right;text-align: center;line-height: 1.09rem;height: 1.09rem;padding-top: 0.36rem;"><i class="fa fa-trash"></i></div>
                   <!--<div class="col-md-12"><em v-if="index == 0">*</em>仅支持JPG、PNG、GIF、PDF格式，大小不超过3M</div>-->
                 </div>
               </div>
@@ -476,7 +476,7 @@
             if (response.data.success) {
               this.isSelfRegisterSuccess = true
               // 删除保存的缓存企业信息
-              this.$http.delete('basic/user/userCacheEnterprise')
+              this.$http.delete('/basic/user/userCacheEnterprise')
               // 把当前用户登录企业信息切换为注册的企业
               this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
                 // 重新获取登录用户信息
@@ -568,8 +568,9 @@
               this.$http.post('/basic/enterprise/openVendor/' + enuu)
                 .then(() => {
                   setTimeout(() => {
-                    this.$router.push('/mobile/user')
-                  }, 3000)
+                    window.location.href = '/mobile/user'
+                    // this.$router.push('/mobile/user')
+                  }, 1500)
                 })
             }, err => {
               console.log(err)
@@ -641,7 +642,7 @@
               .then(response => {
                 if (response.data.success) {
                   this.isSelfRegisterSuccess = true
-                  this.$http.delete('basic/user/userCacheEnterprise')
+                  this.$http.delete('/basic/user/userCacheEnterprise')
                   this.reflashEnterprise(response.data.data.enuu, baseUrl || '/vendor#/vendor_upload')
                 } else {
                   this.isSelfRegisterSuccess = false

components/register-saler/register/StepFirst.vue

@@ -27,7 +27,7 @@
       <div class="row">
         <label class="col-sm-2 x-required">营业执照号：</label>
         <div class="col-sm-5">
-          <input type="text" :class="!validLicence.isValidLicence?'form-control error-box-border':'form-control x-input'" :disabled="!loginData.isSelf" @input="validLicence.init=false" @change="licenceCheck(3)" v-model="data.licenceId" name="name" required="" placeholder="请填写营业执照上的注册号">
+          <input type="text" maxlength="20" :class="!validLicence.isValidLicence?'form-control error-box-border':'form-control x-input'" :disabled="!loginData.isSelf" @input="validLicence.init=false" @change="licenceCheck(3)" v-model="data.licenceId" name="name" required="" placeholder="请填写营业执照上的注册号">
         </div>
         <div class="x-text-help" v-show="validLicence.isValidLicence && !validLicence.init">
           <i class="glyphicon glyphicon-ok x-icon-left"></i>

components/register-saler/register/StepThird.vue

@@ -425,7 +425,7 @@
             if (response.data.success) {
               this.isSelfRegisterSuccess = true
               // 删除保存的缓存企业信息
-              this.$http.delete('basic/user/userCacheEnterprise')
+              this.$http.delete('/basic/user/userCacheEnterprise')
               // 把当前用户登录企业信息切换为注册的企业
               this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
                 // 重新获取登录用户信息
@@ -575,7 +575,7 @@
               .then(response => {
                 if (response.data.success) {
                   this.isSelfRegisterSuccess = true
-                  this.$http.delete('basic/user/userCacheEnterprise')
+                  this.$http.delete('/basic/user/userCacheEnterprise')
                   this.reflashEnterprise(response.data.data.enuu, baseUrl || '/vendor#/vendor_upload')
                 } else {
                   this.isSelfRegisterSuccess = false

pages/mobile/center/vendor/index.vue

@@ -93,7 +93,7 @@
         if (this.storeInfo.uuid) {
           this.$router.push(`/mobile/shop/${this.storeInfo.uuid}`)
         } else {
-          this.onRemind('请先前往pc端开通店铺')
+          this.onRemind('请前往账户中心【我】进行开店申请')
         }
       },
       onRemind: function (str) {

pages/mobile/store/index.vue

@@ -36,7 +36,7 @@
     width: 100%;
     background: #F5F5F5;
     margin: 0 auto;
-    height: 100%;
+    /*height: 100%;*/
     position: fixed;
     top: 0.88rem;
     left: 0;
@@ -267,7 +267,7 @@
   }
 
   .mobile-join_xieyi div.text-area {
-    max-height: calc(100vh - 0.72rem - 0.4rem - 0.88rem - 0.98rem - 1.85rem);
+    max-height: calc(100vh - 0.72rem - 0.4rem - 0.88rem - 0.98rem - 1.85rem - 0.8rem);
     overflow: auto;
     word-break: break-all;
     outline: none;
@@ -369,6 +369,7 @@
   .mobile-tab-list div.mobile-vendor_store_apply .custom_col img.previewImage {
     width: 100%;
     cursor: pointer;
+    height: 1.09rem;
     /*padding: 0 30px;*/
   }
 
@@ -430,7 +431,7 @@
   .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area {
     height: 1.09rem;
     position: relative;
-    overflow: hidden;
+    /*overflow: hidden;*/
     width: 1.09rem;
     border: #dcdcdc 1px solid;
     padding: 0;
@@ -472,30 +473,33 @@
   }
   .mobile-tab-list .hover-show .delete{
     padding: 0;
-    width: 30px;
-    height: 30px;
+    width: 0.3rem;
+    height: 0.3rem;
     float: right;
     text-align: center;
+    position: absolute;
+    right: -0.15rem;
+    top: -0.15rem;
   }
   .mobile-tab-list .hover-show .delete:hover{
     cursor: pointer;
   }
   .mobile-tab-list .hover-show .delete i{
-    color: #fff;
-    font-size: 18px;
+    color: red;
+    font-size: 14px;
   }
   .mobile-tab-list .hover-show a{
     display: inline-block;
     width: 100%;
-    height: 60px;
+    height: 1.09rem;
     font-size: 14px;
     color: #fff;
     text-align: center;
-    line-height: 60px;
+    line-height: 1.09rem;
   }
   .mobile-tab-list .hover-show a i{
-    margin-right: 5px;
-    font-size: 16px;
+    margin-right: 0.05rem;
+    font-size: 14px;
   }
   .mobile-tab-list .brand-type{
     line-height: 34px;
@@ -531,13 +535,14 @@
     width: auto;
   }
   .mobile-tab-list .brand-small-upload .delete{
-    float: right;
-    text-align: center;
-    line-height: 1.09rem;
+    /*float: right;*/
+    /*text-align: center;*/
+    /*line-height: 1.09rem;*/
   }
   .mobile-tab-list .brand-small-upload .delete i{
-    font-size: 18px;
+    font-size: 14px;
     color: #5078cb;
+    float: left
   }
   .mobile-tab-list .brand-small-upload .delete:hover{
     cursor: pointer;
@@ -554,12 +559,12 @@
     color: red;
   }
   .mobile-tab-list .brand-small-upload .brand-small-img .hover-show span.delete{
-    line-height: 30px;
-    padding: 0;
-    right: -0.35rem;
-    position: absolute;
-    display: inline-block;
-    margin-top: -0.25rem;
+    /*line-height: 30px;*/
+    /*padding: 0;*/
+    /*right: -0.35rem;*/
+    /*position: absolute;*/
+    /*display: inline-block;*/
+    /*margin-top: -0.25rem;*/
   }
   .mobile-tab-list #image-box,.mobile-tab-list  .image-box{
     display: table;
@@ -581,7 +586,7 @@
   .mobile-tab-list .brand-small-upload .brand-small-img .hover-show a{
     /*line-height: 30px;*/
     /*height: 30px;*/
-    margin-top: -0.2rem;
+    /*margin-top: -0.2rem;*/
   }
   .mobile-tab-list .mobile-tab-content .com_row .col-md-12{
     color: #999;

pages/mobile/user/bindEnterprise.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mobile-fix-content mobile-center" v-if="!showInfo">
+  <div class="mobile-fix-content mobile-center">
     <div class="block-wrap seek-operation">
       <div class="block-wrap_moreinfo">抱歉，您的账户未绑定企业，暂无卖家权限</div>
       <div class="block-wrap_morelist" @click="setShowApplyRecord(true)">查看申请记录</div>
@@ -27,10 +27,10 @@
         <p>管理员审核通过后成功绑定</p>
       </template>
       <template v-if="showSearchResultStatus === 2">
-        <a>开设新店铺</a>
+        <nuxt-link class="pull-left-btn" tag="a" to="/mobile/store">开设新店铺</nuxt-link>
       </template>
     </div>
-    <div class="block-wrap seek-operation" v-if="!showInfo">
+    <div class="block-wrap seek-operation" v-show="!showInfo">
       <p><i></i>所属企业未开店</p>
       <div class="clearfix block-storeinfo">
         <div class="pull-left">

pages/mobile/user/index.vue

@@ -134,7 +134,11 @@
             this.showLogin = false
             this.$store.dispatch('loadStoreStatus', {op: 'check'})
             this.$http.get('/store-service/applications?status=normal').then(res => {
-              this.applyStatus = res.data.data.status || ''
+              if (res.data.success) {
+                this.applyStatus = res.data.data.status
+              } else {
+                this.applyStatus = 'error'
+              }
             })
           })
         })