登录过程优化

ghsApp/src/mixins/globalMixins.js

@@ -54,7 +54,6 @@ export default {
       let token = uni.getStorageSync('token')
       if(this.$util.isEmpty(token)){
         if(currentRoute == 'admin/home/workbench'){
-          uni.showLoading({mask:true})
           wxMiniLogin(true).then(res => {
 						//用于开启小程序自动登录
 						let currentMiniOpenId = res.data.currentMiniOpenId || ''
@@ -64,7 +63,6 @@ export default {
               getShopInfo(true)
               this.setUserShopAll()
             }
-            uni.hideLoading()
             if (this.init) {
               this.init()
             }
@@ -72,7 +70,6 @@ export default {
         }
       }else{
         let that = this
-        uni.showLoading({mask:true})
         hasTokenAutoLogin().then(subRes=>{
           if(subRes.code != 1){
             return
@@ -85,7 +82,6 @@ export default {
 					})
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
-          uni.hideLoading()
           this.setUserShopAll()
           if (this.init) {
             this.init()

hdApp/src/admin/home/workbench.vue

@@ -3,7 +3,8 @@
   <block v-if="loginStyle  == 0">
     <view style="width:100vw;height:500upx;display:flex;align-items:center;justify-content:center;">
       <button class="admin-button-com big blue" @click="pageTo({url:'/admin/home/login'})">点我登录</button>
-      <view style="position:absolute;top:330upx;font-size:35upx;">请选择<text style="color:red;margin-left:8upx;font-weight:bold;">微信手机号一键登录</text></view>
+      <view style="position:absolute;top:340upx;font-size:35upx;">请选择<text style="color:red;margin-left:8upx;font-weight:bold;">微信手机号一键登录</text></view>
+      <view style="position:absolute;top:420upx;font-size:28upx;">如您的<text style="color:red;font-weight:bold;">伙伴和员工</text>也需要登录，请联系批发店</view>
     </view>
   </block>
   <block v-else>

hdApp/src/mixins/globalMixins.js

@@ -43,7 +43,6 @@ export default {
 			if(this.$util.isEmpty(token)){
 				//首页、花店采购页、欠款单列表页、结账单详情页
 				if(currentRoute == 'admin/home/workbench' || currentRoute == 'pagesPurchase/ghsProduct' || currentRoute == 'pagesPurchase/gathering' || currentRoute == 'admin/clear/info' || currentRoute == 'pagesPurchase/purDetails'){
-					uni.showLoading({mask:true})
 					wxLoginFn(true).then(res => {
 						let token = res.data.token || ''
 						//用于开启小程序自动登录
@@ -53,14 +52,12 @@ export default {
 							getShopInfo(true)
 							this.setUserShopAll()
 						}
-						uni.hideLoading()
 						if (this.init) {
 							this.init()
 						}
 					})
 				}
 			}else{
-				uni.showLoading({mask:true})
 				hasTokenAutoLogin().then(subRes=>{
 				  //有几个地方涉及登陆，需要统一方法，请搜索关键词 uni_login
 				  if(subRes.code == 1){
@@ -77,7 +74,6 @@ export default {
 						uni.setNavigationBarTitle({ title: res.name })
 					})
 					that.setUserShopAll()
-					uni.hideLoading()
 				  }
 				})
 			}

hdApp/src/pagesClient/official/apply.vue

@@ -195,7 +195,7 @@ export default {
           if(res.code == 1){
             if(res.data.has == 1){
                 that.$util.confirmModal({content:'此手机号已注册（可能由批发店添加），您可直接登录',okText:'去登录'},() => {
-                  that.pageTo({url: '/pagesClient/official/toLogin'})
+                  that.pageTo({url: '/admin/home/login'})
                 })
             }
           }

hdApp/src/pagesPurchase/components/wangCg.vue

@@ -1,8 +1,9 @@
 <template>
   <view class="model" v-if="show">
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
-    <view style="margin:30upx 0;color:white;font-size:34upx;">首次下单，请完善门店信息</view>
-    <view class="freeApply" @click="apply">完善</view>
+    <view style="margin:45upx 0;color:white;font-size:34upx;">首次下单，请填写门店信息</view>
+    <view class="freeApply" @click="apply">填写</view>
+    <view style="margin:55upx 0;color:white;font-size:27upx;" @click="goLogin()">我已经填过了，<text style="text-decoration:underline;">去登录</text></view>
   </view>
 </template>
 <script>
@@ -38,6 +39,12 @@ export default {
     },
     rightClick() {
       this.$emit('comfirm', this.experCode)
+    },
+    goLogin(){
+      let that = this
+      that.$util.confirmModal({content:'如您的伙伴和员工也需要登录，请联系批发店添加人员',okText:'知道了'},() => {
+        that.pageTo({url: '/admin/home/login'})
+      })  
     }
   },
 };
@@ -58,7 +65,7 @@ export default {
   & > .noData_img {
     width: 318upx;
     height: 318upx;
-    margin: 250upx auto 0;
+    margin: 150upx auto 0;
   }
   & > .no_data_text {
     font-size: 32upx;
@@ -68,12 +75,13 @@ export default {
   }
   & > .freeApply {
     width: 280upx;
-    height: 80upx;
-    line-height: 88upx;
+    height: 90upx;
+    line-height:90upx;
     background: linear-gradient(90deg, #3385ff, #33b0ff);
     border-radius: 44upx;
     margin: 20upx auto;
-    font-size: 30upx;
+    font-size: 33upx;
+    font-weight:bold;
     color: #ffffff;
     text-align: center;
   }