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

assets/scss/mobileCenter.scss

@@ -77,6 +77,7 @@
       }
       span {
         font-size: .28rem;
+        color: #666;
         .text {
           color: #3f84f6;
         }

components/common/upload/upload.vue

@@ -21,7 +21,7 @@
 </template>
 <script>
   export default {
-    props: ['typeData', 'url'],
+    props: ['typeData', 'url', 'NopassThree'],
     data () {
       return {
         qualifications: {
@@ -42,6 +42,13 @@
     methods: {
       update (e) {
         let file = e.target.files[0]
+        if (this.NopassThree) {
+          console.log(file.size)
+          if (file.size > 3 * 1024 * 1024) {
+            this.$message.error('上传文件不得超过3M')
+            return false
+          }
+        }
         let param = new FormData()
         param.append('file', file, file.name)
         param.append('chunk', '0')

components/home/displayCard.vue

@@ -231,7 +231,7 @@
       margin-top: 10px;
       width: 178px;
       height: 536px;
-      background: url('/images/all/countBackground2.png') no-repeat;
+      background: url('/images/all/countBackground1.png') no-repeat;
       div{
         height: 72px;
         width: 158px;

components/mobile/Home.vue

@@ -70,7 +70,7 @@
           <div>商家地址：深圳市南山区英唐大厦1楼</div>
           <!-- <div class="content-line link-url">在线咨询</div>-->
           <div>致电：<a href="tel:4008301818" target="_blank" class="content-line">4008301818</a></div>
-          <div>邮件：<a href="mailto:yrsc@usoftchina.com" target="_blank" class="content-line">yrsc@usoftchina.com</a></div>
+          <div>邮件：<a href="mailto:yrsc@usoftchina.com" target="_blank" class="content-lineUSOFTMALLWECHATINFO">yrsc@usoftchina.com</a></div>
         </div>
       </div>
     </div>
@@ -215,7 +215,8 @@
             window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
             // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd29bbca61728b189&redirect_uri=http://gwzcfb.natappfree.cc&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
           } else if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger') {
-            if (info) {
+            info = info && JSON.parse(info)
+            if (info.openid) {
               this.$store.commit('option/REQUEST_WECHATINFO_STATUS_SUCCESS', JSON.parse(info))
             } else {
               this.$store.dispatch('GerWechatInfo', {code: this.$route.query.code})

components/mobile/MobileFooter.vue

@@ -101,8 +101,8 @@
         this.url = url
         if (this.user.logged) {
           if (isSelf && (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313)) {
-            // this.onRemind('请前往账户中心【我】进行开店申请')
-            this.onRemind('请前往PC端申请开店')
+            this.onRemind('请前往账户中心【我】进行开店申请')
+            // this.onRemind('请前往PC端申请开店')
           } else {
             this.$router.push(url)
           }

components/mobile/common/StatisticsMobile.vue

@@ -32,7 +32,7 @@
     data () {
       return {
         step: 1,
-        nameLeft: ['现货', '品牌', '规格书', '供应商', '店铺'],
+        nameLeft: ['现货', '品牌', '规格书', '平台用户', '店铺'],
         nameRight: ['询价求购', '询价求购', '上年交易', '本年交易'],
         topLeft: 0,
         topRight: 0,

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

@@ -104,7 +104,7 @@
                 </div>
                 <div class="brand-small-upload clearfix" style="margin: 0.1rem 0.25rem 0 0.25rem">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload"></upload>
+                    <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>
@@ -127,7 +127,7 @@
                   <div class="wrap-title"><span class="line"></span>营业执照</div>
                   <div class="clearfix" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image pull-left">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="pull-left infoTextMobile" style="width: 5.1rem;margin-left: 0.2rem">
                       <em style="color: #FF0000;">*</em>如已上传最新版营业执照（三证合一），则其他两证无需上传；仅支持上传JPG、PNG、GIF、PDF格式，每张大小超过3M
@@ -141,7 +141,7 @@
                   <div class="wrap-title"><span class="line"></span>纳税人证明</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   </div>
                 </div>
@@ -149,7 +149,7 @@
                   <div class="wrap-title"><span class="line"></span>税务登记证</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <!--<div class="col-md-5" style="padding: 0;">-->
                       <!--<span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>-->
@@ -188,7 +188,7 @@
                 </div>
                 <div class="brand-small-upload clearfix"  style="margin: 0.1rem 0.25rem 0 0.25rem">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload"></upload>
+                    <upload :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   <div class="file-text">代理资格证/代理授权书</div>
                   <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除"><i class="fa fa-trash"></i></div>
@@ -214,7 +214,7 @@
                   <div class="wrap-title"><span class="line"></span>营业执照</div>
                   <div class="clearfix" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image pull-left">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="pull-left infoTextMobile" style="width: 5.1rem;margin-left: 0.2rem">
                       <em style="color: #FF0000;">*</em>如已上传最新版营业执照（三证合一），则其他两证无需上传；仅支持上传JPG、PNG、GIF、PDF格式，每张大小超过3M
@@ -228,7 +228,7 @@
                   <div class="wrap-title"><span class="line"></span>纳税人证明</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                   </div>
                 </div>
@@ -236,7 +236,7 @@
                   <div class="wrap-title"><span class="line"></span>税务登记证</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <!--<div class="col-md-5" style="padding: 0;">-->
                       <!--<span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>-->
@@ -442,6 +442,7 @@
         e.target.setAttribute('class', '')
       },
       submitApply: function () {
+        // 个人
         if (this.loginData.isSelf) {
           if (!this.registerData.isValidRegister) {
             // this.$message.error('请输入正确的注册信息')
@@ -452,37 +453,41 @@
             this.collectResult = '您还没有勾选相关条款'
             this.timeoutCount++
           } else {
+            // 注册企业，并提交申请
             this.registerSelf()
           }
         } else {
+          // 企业
           if (!this.checkData.checked) {
             // this.$message.error('您还没有勾选相关条款')
             this.collectResult = '您还没有勾选相关条款'
             this.timeoutCount++
           } else {
+            // 提交申请
             this.storeApply(this.loginData.enterprise.uu)
           }
         }
       },
+      // 个人用户，先注册企业，成功后，提交开店申请
       registerSelf: function () {
         this.showLoading = true
         this.$http.post('/basic/enterprise/register?filePath=' + this.registerData.url, this.registerData.enterprise)
           .then(response => {
             if (response.data.success) {
               this.isSelfRegisterSuccess = true
+              // 删除保存的缓存企业信息
               this.$http.delete('basic/user/userCacheEnterprise')
-              this.$http.get('/user/authentication/reflash')
-                .then(() => {
-                  this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
-                    this.$store.dispatch('loadUserInfo')
-                    this.loginData.isSelf = false
-                    this.loginData.enterprise.uu = response.data.data.enuu
-                    this.storeApply(response.data.data.enuu)
+              // 把当前用户登录企业信息切换为注册的企业
+              this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
+                // 重新获取登录用户信息
+                this.$store.dispatch('loadUserInfo')
+                this.loginData.isSelf = false
+                this.loginData.enterprise.uu = response.data.data.enuu
+                // 提交开店申请
+                this.storeApply(response.data.data.enuu)
 //                    window.location.reload()
-                    this.showLoading = false
-                  })
-                }
-              )
+                this.showLoading = false
+              })
             } else {
               this.isSelfRegisterSuccess = false
               this.showLoading = false
@@ -541,6 +546,7 @@
                 tmpBrands.push(item)
               }
             })
+            // 申请开店
             this.$http.post('/store-service/applications', {
               brands: tmpBrands,
               qualifications: qualifications,
@@ -561,20 +567,10 @@
               }
               this.$http.post('/basic/enterprise/openVendor/' + enuu)
                 .then(() => {
-                  this.$http.get('/user/authentication/reflash')
-                    .then(() => {
-                      this.$http.get(`/user/authentication/` + enuu).then(() => {
-                        this.$store.dispatch('loadUserInfo')
-                        setTimeout(() => {
-                          this.$router.push('/mobile/user')
-                        }, 3000)
-                      })
-                    })
+                  setTimeout(() => {
+                    this.$router.push('/mobile/user')
+                  }, 3000)
                 })
-
-              // window.setTimeout(function () {
-                // window.location.href = '/vendor#/store-apply/wait'
-              // }, 3000)
             }, err => {
               console.log(err)
               this.$http.post('/basic/enterprise/openVendorSetRead/' + enuu)
@@ -632,9 +628,13 @@
       goProduct: function (baseUrl) {
         if (this.loginData.isSelf) {
           if (!this.registerData.isValidRegister) {
-            this.$message.error('请输入正确的注册信息')
+            this.collectResult = '请输入正确的注册信息'
+            this.timeoutCount++
+            // this.$message.error('请输入正确的注册信息')
           } else if (!this.checkData.checked) {
-            this.$message.error('您还没有勾选相关条款')
+            this.collectResult = '您还没有勾选相关条款'
+            this.timeoutCount++
+            // this.$message.error('您还没有勾选相关条款')
           } else {
             this.showLoading = true
             this.$http.post('/basic/enterprise/register?filePath=' + this.registerData.url, this.registerData.enterprise)
@@ -645,19 +645,25 @@
                   this.reflashEnterprise(response.data.data.enuu, baseUrl || '/vendor#/vendor_upload')
                 } else {
                   this.isSelfRegisterSuccess = false
-                  this.$message.error(response.data.message || '企业注册失败，请重新填写信息')
+                  this.collectResult = response.data.message || '企业注册失败，请重新填写信息'
+                  this.timeoutCount++
+                  // this.$message.error(response.data.message || '企业注册失败，请重新填写信息')
                 }
                 this.showLoading = false
               }, err => {
                 console.log(err)
                 this.isSelfRegisterSuccess = false
                 this.showLoading = false
-                this.$message.error('企业注册失败，请重新填写信息')
+                this.collectResult = '企业注册失败，请重新填写信息'
+                this.timeoutCount++
+                // this.$message.error('企业注册失败，请重新填写信息')
               })
           }
         } else {
           if (!this.checkData.checked) {
-            this.$message.error('您还没有勾选相关条款')
+            this.collectResult = '您还没有勾选相关条款'
+            this.timeoutCount++
+            // this.$message.error('您还没有勾选相关条款')
           } else {
             this.reflashEnterprise(this.loginData.enterprise.uu, baseUrl || '/vendor#/vendor_upload')
           }

components/register-saler/Register.vue

@@ -75,6 +75,7 @@
       let isSelf = true
       let tempEnterprise = {}
       if (ens && ens.length) {
+        console.log(ens)
         ens.forEach(function (item) {
           if (item.current) {
             isSelf = false

components/register-saler/register/StepFirst.vue

@@ -365,6 +365,7 @@
         this.data.licenceId = val.businessCode || val.licenceId || val.enBussinessCode || ''
         this.data.address = val.address || val.enAddress || ''
       },
+      // 下一步点击，保存企业信息，或者保存缓存企业信息
       sectionChange: function (type) {
         if (!this.isValid) {
           this.$message.error('请填写正确的注册信息')
@@ -511,6 +512,7 @@
 //        this.validUpload.init = false
 //        this.validUpload.isValidUpload = this.data.url !== ''
 //      },
+      // 执照号验证
       licenceCheck: function (num) {
         if ((/^[\S-]{1,255}$/).test(this.data.licenceId)) {
           if (num > 0) {

components/register-saler/register/StepSecond.vue

@@ -1,6 +1,6 @@
 <template>
   <!--阅读服务协议-->
-  <div class="section">
+  <div class="section sectionSeconds">
     <div class="agreement">
       <div class="join_xieyi">
         <div class="article-flag">
@@ -22,9 +22,9 @@
       </label>
     </div>
     <div class="row next-btn step-two-btn" style="margin-top: 20px">
-      <button @click="sectionChange(1)" class="btn">上一步</button>
-      <button @click="sectionChange(3)" class="btn" :style="!checkData.checked ? 'opacity: .65;':''">下一步</button>
-    </div>
+    <button @click="sectionChange(1)" class="btn">上一步</button>
+    <button @click="sectionChange(3)" class="btn" :style="!checkData.checked ? 'opacity: .65;':''">下一步</button>
+  </div>
   </div>
 </template>
 <script>
@@ -52,18 +52,19 @@
           this.$emit('sectionEvent', type)
         }
       },
-      getArticle: function (num) {
+      getArticle: function (num) { // 获取协议内容，通过帮助中心的接口
         this.$http.get('/api/help-service/issues/' + num).then(response => {
           this.article = response.data.article
         })
       },
       onCheck: function () {
         this.checkData.checked = !this.checkData.checked
+        // 个人用户，提交缓存的企业信息
         if (this.loginData.isSelf) {
           this.cacheData.enIsRead = this.checkData.checked
           this.$http.post('/basic/user/userCacheEnterprise', this.cacheData)
-        } else {
-          if (this.checkData.checked) {
+        } else { // 企业用户，设置企业的已读协议
+          if (this.checkData.checked) { // 勾选了
             this.$http.post('/basic/enterprise/openVendorSetRead/' + this.loginData.enterprise.uu)
               .then(() => {
                 this.$http.get('/user/authentication/reflash')
@@ -73,7 +74,7 @@
                     })
                   })
               })
-          } else {
+          } else { // 没勾选
             this.$http.post('/basic/enterprise/openVendorSetNotRead/' + this.loginData.enterprise.uu)
               .then(() => {
                 this.$http.get('/user/authentication/reflash')

components/register-saler/register/StepThird.vue

@@ -41,7 +41,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">营业执照<em style="color: #FF0000;">*</em></span>
@@ -51,7 +51,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">纳税人证明</span>
@@ -61,7 +61,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>
@@ -94,7 +94,7 @@
                 </div>
                 <div class="brand-small-upload col-md-4">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload"></upload>
+                    <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>
@@ -115,7 +115,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">营业执照<em style="color: #FF0000;">*</em></span>
@@ -125,7 +125,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">纳税人证明</span>
@@ -135,7 +135,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>
@@ -167,7 +167,7 @@
                 </div>
                 <div class="brand-small-upload col-md-4">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload"></upload>
+                    <upload :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   <div class="file-text">代理资格证/代理授权书</div>
                   <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除"><i class="fa fa-trash"></i></div>
@@ -188,7 +188,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">营业执照<em style="color: #FF0000;">*</em></span>
@@ -198,7 +198,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">纳税人证明</span>
@@ -208,7 +208,7 @@
                 <div class="col-md-4 custom_col">
                   <div class="row" style="margin: 0;">
                     <div class="col-md-5 col-md-offset-1 show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="col-md-5" style="padding: 0;">
                       <span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>
@@ -398,41 +398,45 @@
         e.target.setAttribute('class', '')
       },
       submitApply: function () {
+        // 个人
         if (this.loginData.isSelf) {
           if (!this.registerData.isValidRegister) {
             this.$message.error('请输入正确的注册信息')
           } else if (!this.checkData.checked) {
             this.$message.error('您还没有勾选相关条款')
           } else {
+            // 注册企业，并提交申请
             this.registerSelf()
           }
-        } else {
+        } else { // 企业
           if (!this.checkData.checked) {
             this.$message.error('您还没有勾选相关条款')
           } else {
+            // 提交申请
             this.storeApply(this.loginData.enterprise.uu)
           }
         }
       },
+      // 个人用户，先注册企业，成功后，提交开店申请
       registerSelf: function () {
         this.showLoading = true
         this.$http.post('/basic/enterprise/register?filePath=' + this.registerData.url, this.registerData.enterprise)
           .then(response => {
             if (response.data.success) {
               this.isSelfRegisterSuccess = true
+              // 删除保存的缓存企业信息
               this.$http.delete('basic/user/userCacheEnterprise')
-              this.$http.get('/user/authentication/reflash')
-                .then(() => {
-                  this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
-                    this.$store.dispatch('loadUserInfo')
-                    this.loginData.isSelf = false
-                    this.loginData.enterprise.uu = response.data.data.enuu
-                    this.storeApply(response.data.data.enuu)
+              // 把当前用户登录企业信息切换为注册的企业
+              this.$http.get(`/user/authentication/` + response.data.data.enuu).then(() => {
+                // 重新获取登录用户信息
+                this.$store.dispatch('loadUserInfo')
+                this.loginData.isSelf = false
+                this.loginData.enterprise.uu = response.data.data.enuu
+                // 提交开店申请
+                this.storeApply(response.data.data.enuu)
 //                    window.location.reload()
-                    this.showLoading = false
-                  })
-                }
-              )
+                this.showLoading = false
+              })
             } else {
               this.isSelfRegisterSuccess = false
               this.showLoading = false
@@ -445,6 +449,7 @@
             this.$message.error('企业注册失败，请重新填写信息')
           })
       },
+      // 提交开店申请
       storeApply: function (enuu) {
         this.showLoading = true
         let validCode = 0
@@ -485,6 +490,7 @@
                 tmpBrands.push(item)
               }
             })
+            // 申请开店
             this.$http.post('/store-service/applications', {
               brands: tmpBrands,
               qualifications: qualifications,
@@ -500,16 +506,16 @@
               }
               this.$http.post('/basic/enterprise/openVendor/' + enuu)
                 .then(() => {
-                  this.$http.get('/user/authentication/reflash')
-                    .then(() => {
-                      this.$http.get(`/user/authentication/` + enuu).then(() => {
-                        this.$store.dispatch('loadUserInfo')
-                      })
-                    })
+//                  this.$http.get('/user/authentication/reflash')
+//                    .then(() => {
+//                      this.$http.get(`/user/authentication/` + enuu).then(() => {
+//                        this.$store.dispatch('loadUserInfo')
+//                      })
+//                    })
+                  window.setTimeout(function () {
+                    window.location.href = '/vendor#/store-apply/wait'
+                  }, 3000)
                 })
-              window.setTimeout(function () {
-                window.location.href = '/vendor#/store-apply/wait'
-              }, 3000)
             }, err => {
               console.log(err)
               this.$http.post('/basic/enterprise/openVendorSetRead/' + enuu)

pages/mobile/center/user/index.vue

@@ -39,7 +39,7 @@
         </nuxt-link>
         <nuxt-link tag="div" to="/mobile/center/user/collect/message" class="content-line" v-if="user.data.enterprise.uu">
           <img src="/images/mobile/center/user/message.png" alt="">
-          <span>消息<span class="text">({{messageCount.count || 0}})</span></span>
+          <span>消息中心<span class="text">({{messageCount.count || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
         </nuxt-link>
       </div>

pages/mobile/center/vendor/index.vue

@@ -51,7 +51,7 @@
         </div>-->
         <nuxt-link tag="div" to="/mobile/center/vendor/message"  class="content-line" v-if="user.data.enterprise.uu">
           <img src="/images/mobile/center/user/message.png" alt="">
-          <span>消息<span class="text">({{messageCount.count || 0}})</span></span>
+          <span>消息中心<span class="text">({{messageCount.count || 0}})</span></span>
           <i class="iconfont icon-xiangyou"></i>
         </nuxt-link>
       </div>

pages/mobile/store/index.vue

@@ -236,7 +236,6 @@
     margin: 0.2rem 0.2rem;
     border-radius: 5px;
     background: #fff;
-    overflow: hidden;
   }
   .mobile-join_xieyi div.article-flag {
     width: 100%;
@@ -268,7 +267,7 @@
   }
 
   .mobile-join_xieyi div.text-area {
-    height: 8rem;
+    max-height: calc(100vh - 0.72rem - 0.4rem - 0.88rem - 0.98rem - 1.85rem);
     overflow: auto;
     word-break: break-all;
     outline: none;

pages/mobile/user/index.vue

@@ -26,20 +26,20 @@
         <span class="l-right">{{currentEnName}}</span>
       </div>
       <!--v-if="storeStatus.uuid"-->
-      <div class="line" @click="go('/mobile/user/storeinfo')" >
+      <div class="line" @click="go('/mobile/user/storeinfo')" v-if="storeStatus.uuid">
         <div class="img-wrap">
           <img src="/images/mobile/user/icon_02.png" alt="">
         </div>
         <span>店铺信息</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
-      <!--<div class="line" @click="go('/mobile/user/storeinfo')" v-else>-->
-        <!--<div class="img-wrap">-->
-          <!--<img src="/images/mobile/user/apply-store.png" alt="">-->
-        <!--</div>-->
-        <!--<span>开店申请</span>-->
-        <!--<i class="iconfont icon-xiangyou"></i>-->
-      <!--</div>-->
+      <div class="line" @click="go('/mobile/user/storeinfo')" v-else>
+        <div class="img-wrap">
+          <img src="/images/mobile/user/apply-store.png" alt="">
+        </div>
+        <span>开店申请</span>
+        <i class="iconfont icon-xiangyou"></i>
+      </div>
       <div class="line block-line" @click="go('/mobile/user/enterpriseinfo')">
         <div class="img-wrap">
           <img src="/images/mobile/user/icon_03.png" alt="">
@@ -160,17 +160,17 @@
           if (this.storeStatus.uuid) {
             this.$router.push(url)
           } else {
-            this.setRemindText('请前往PC端申请开店')
-            // if (this.applyStatus === 'PREPARE') {
-            //   this.setRemindText('您的申请已提交，请耐心工作人员审核（2-3个工作日）')
-            // } else {
-            //   if (!this.$store.state.option.user.data.enterprise.uu) {
-            //     // 进入个人绑定企业页面
-            //     this.$router.push('/mobile/store/register')
-            //   } else {
-            //     this.$router.push('/mobile/store')
-            //   }
-            // }
+            // this.setRemindText('请前往PC端申请开店')
+            if (this.applyStatus === 'PREPARE') {
+              this.setRemindText('您的申请已提交，请耐心工作人员审核（2-3个工作日）')
+            } else {
+              if (!this.$store.state.option.user.data.enterprise.uu) {
+                // 进入个人绑定企业页面
+                this.$router.push('/mobile/store/register')
+              } else {
+                this.$router.push('/mobile/store')
+              }
+            }
           }
         } else if (!this.user.data.enterprise.uu || this.user.data.enterprise.isVendor !== 313) {
           this.setRemindText('请先前往pc端完善企业信息')