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

components/mobile/MobileFooter.vue

@@ -101,7 +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('请前往账户中心【我】进行开店申请')
+            this.onRemind('请前往PC端申请开店')
           } else {
             this.$router.push(url)
           }

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

@@ -565,9 +565,9 @@
                     .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)
                       })
                     })
                 })

components/mobile/user/Info.vue

@@ -15,15 +15,19 @@
         <span><i class="iconfont icon-yonghuming"></i>用户名：</span>
         <span class="describe">{{info.userName}}</span>
       </div>
-      <div class="line" @click="jumpSet('email')">
+      <!--<div class="line" @click="jumpSet('email')">-->
+      <div class="line">
         <span><i class="iconfont icon-youxiang"></i>邮箱：</span>
         <span class="describe">{{info.userEmail}}
-        <i class="iconfont icon-xiangyou"></i></span>
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        </span>
       </div>
-      <div class="line" @click="jumpSet('mobile')">
+      <!--<div class="line" @click="jumpSet('mobile')">-->
+      <div class="line">
         <span><i class="iconfont icon-shouji"></i>手机：</span>
         <span class="describe">{{info.userTel}}
-        <i class="iconfont icon-xiangyou"></i></span>
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        </span>
       </div>
     </div>
   </div>
@@ -72,14 +76,14 @@
               }
             })
         }
-      },
-      jumpSet (info) {
-        if (info === 'email') {
-          window.location.herf = decodeURIComponent(this.getEmail)
-        } else if (info === 'mobile') {
-          window.location.herf = decodeURIComponent(this.getMobile)
-        }
       }
+      // jumpSet (info) {
+      //   if (info === 'email') {
+      //     window.location.herf = decodeURIComponent(this.getEmail)
+      //   } else if (info === 'mobile') {
+      //     window.location.herf = decodeURIComponent(this.getMobile)
+      //   }
+      // }
     }
   }
 </script>

pages/mobile/center/vendor/index.vue

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

pages/mobile/user/index.vue

@@ -25,20 +25,21 @@
         <i class="iconfont icon-xiangyou"></i>
         <span class="l-right">{{currentEnName}}</span>
       </div>
-      <div class="line" @click="go('/mobile/user/storeinfo')" v-if="storeStatus.uuid">
+      <!--v-if="storeStatus.uuid"-->
+      <div class="line" @click="go('/mobile/user/storeinfo')" >
         <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="">
@@ -133,7 +134,7 @@
             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
+              this.applyStatus = res.data.data.status || ''
             })
           })
         })
@@ -155,16 +156,17 @@
           if (this.storeStatus.uuid) {
             this.$router.push(url)
           } else {
-            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端完善企业信息')