shish 4 年 前
コミット
fa6fa73df1

+ 7 - 0
ghsApp/src/admin/home/login.vue

@@ -155,6 +155,7 @@ export default {
 						that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 						that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 						getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 						getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 						that.setUserShopAll()
 						that.setUserShopAll()
+
 						// #ifdef APP-PLUS
 						// #ifdef APP-PLUS
 						//保存安卓的clientId
 						//保存安卓的clientId
 						let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
 						let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
@@ -164,6 +165,12 @@ export default {
 							replaceClientId({id:currentClientId})
 							replaceClientId({id:currentClientId})
 						}
 						}
 						// #endif
 						// #endif
+
+						if(subRes.data.admin && that.$util.isEmpty(subRes.data.admin.miniOpenId)){
+							that.$util.pageTo({url: "/admin/staff/miniAutoLogin",type: 2})
+							return
+						}
+
 						uni.navigateBack()
 						uni.navigateBack()
 					}
 					}
 				});
 				});

+ 2 - 1
ghsApp/src/admin/staff/miniAutoLogin.vue

@@ -3,8 +3,9 @@
     <form>
     <form>
       <view class="module-com input-line-wrap">
       <view class="module-com input-line-wrap">
         <view class="btn-wrap">
         <view class="btn-wrap">
-          <view style="padding:30upx 0 30upx 0;font-size:30upx;">绑定微信,下次打开小程序自动登录后台</view>
+          <view style="padding:30upx 0 30upx 0;font-size:35upx;">绑定微信,下次打开小程序自动登录</view>
           <button class="admin-button-com blue big" @click="autoLogin()">授权并绑定</button>
           <button class="admin-button-com blue big" @click="autoLogin()">授权并绑定</button>
+          <view style="padding:30upx 0 30upx 0;font-size:25upx;color:#666666;">授权绑定成功,微信支付才能正常使用</view>
         </view>
         </view>
       </view>
       </view>
     </form>
     </form>

+ 10 - 1
hdApp/src/admin/home/login.vue

@@ -119,18 +119,21 @@ export default {
 			if (e.detail.errMsg === "getPhoneNumber:ok") {
 			if (e.detail.errMsg === "getPhoneNumber:ok") {
 				wxMobileLogin({ iv: e.detail.iv, encryptedData: e.detail.encryptedData,miniOpenId:currentMiniOpenId }).then(subRes => {
 				wxMobileLogin({ iv: e.detail.iv, encryptedData: e.detail.encryptedData,miniOpenId:currentMiniOpenId }).then(subRes => {
 					uni.hideLoading()
 					uni.hideLoading()
-					if(subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId ==1){
+					if(subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId == 1){
 						that.$util.confirmModal({content:'网络异常,请重试一次'},() => {
 						that.$util.confirmModal({content:'网络异常,请重试一次'},() => {
+
 							// #ifdef MP-WEIXIN
 							// #ifdef MP-WEIXIN
 							uni.clearStorage()
 							uni.clearStorage()
 							that.$store.commit("setLoginInfo", {})
 							that.$store.commit("setLoginInfo", {})
 							that.$util.pageTo({url: "/admin/home/workbench",type: 3})
 							that.$util.pageTo({url: "/admin/home/workbench",type: 3})
 							// #endif
 							// #endif
+
 							// #ifdef APP-PLUS
 							// #ifdef APP-PLUS
 							uni.clearStorage()
 							uni.clearStorage()
 							that.$store.commit("setLoginInfo", {})
 							that.$store.commit("setLoginInfo", {})
 							plus.runtime.restart()
 							plus.runtime.restart()
 							// #endif
 							// #endif
+
 						})
 						})
 						return false
 						return false
 					}
 					}
@@ -156,6 +159,7 @@ export default {
 						that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 						that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 						getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 						getShopInfo(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 						that.setUserShopAll()
 						that.setUserShopAll()
+
 						// #ifdef APP-PLUS
 						// #ifdef APP-PLUS
 						//保存安卓的clientId
 						//保存安卓的clientId
 						let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
 						let hasClientId = !that.$util.isEmpty(subRes.data.admin.clientId) ? subRes.data.admin.clientId : ''
@@ -165,6 +169,11 @@ export default {
 							replaceClientId({id:currentClientId})
 							replaceClientId({id:currentClientId})
 						}
 						}
 						// #endif
 						// #endif
+						if(subRes.data.admin && that.$util.isEmpty(subRes.data.admin.miniOpenId)){
+							that.$util.pageTo({url: "/admin/staff/miniAutoLogin",type: 2})
+							return
+						}
+
 						uni.navigateBack()
 						uni.navigateBack()
 					}
 					}
 				});
 				});

+ 3 - 2
hdApp/src/admin/staff/miniAutoLogin.vue

@@ -3,8 +3,9 @@
     <form>
     <form>
       <view class="module-com input-line-wrap">
       <view class="module-com input-line-wrap">
         <view class="btn-wrap">
         <view class="btn-wrap">
-          <view style="padding:30upx 0 30upx 0;font-size:30upx;">绑定微信,下次打开小程序自动登录后台</view>
-          <button class="admin-button-com blue big" @click="autoLogin()">授权并绑定</button>
+          <view style="padding:30upx 0 30upx 0;font-size:35upx;">绑定微信,下次打开小程序自动登录</view>
+          <view style="text-align:center;"> <button class="admin-button-com blue big" style="width:50vw;margin:0 auto;" @click="autoLogin()">授权并绑定</button> </view>
+          <view style="padding:30upx 0 30upx 0;font-size:25upx;color:#666666;">授权绑定成功,微信支付才能正常使用</view>
         </view>
         </view>
       </view>
       </view>
     </form>
     </form>