登录

ghsApp/src/admin/home/login.vue

@@ -3,7 +3,7 @@
 		<view class="model">
 			<view class="experFrame">
 			<view>
-				<view style="text-align:center;margin-bottom:20upx;">
+				<view style="text-align:center;margin-bottom:10upx;">
 				<image :src="`${constant.imgUrl}/logo3.png`" class="logo" mode="widthFix"></image> 
 				</view>
 				<view style="color:#666666;text-align:center;margin-bottom:50upx;font-size:35upx;">销花宝</view>
@@ -27,7 +27,7 @@
 				<button class="admin-button-com small blue buttonText" @click="mobileLogin()">本机号码一键登录</button>
 				</view>
 				<!-- #endif -->
-				<view style="color:#999999;font-size:25upx;margin-top:30upx;">
+				<view style="color:#999999;font-size:25upx;margin-top:55upx;">
 					<radio-group @change="agreeItem">
 						<label>
 							<radio value="1" style="width:6upx;transform:scale(0.8)" />
@@ -181,7 +181,6 @@ export default {
 		mobileLogin(){
 			let that = this
 
-
 			if(this.agree == 0){
 				this.$msg('请同意并勾选服务协议和隐私政策')
 				return false				
@@ -191,6 +190,7 @@ export default {
 			uni.preLogin({
 				provider: 'univerify',
 				success:()=>{
+					uni.hideLoading() 
 					uni.login({
 						provider: 'univerify',
 						// 自定义登录框样式
@@ -207,7 +207,6 @@ export default {
 							let access_token = res.authResult.access_token
 							phoneLogin({openid,access_token}).then(subRes=>{
 								let token = subRes.data.token || ''
-								uni.hideLoading()
 								if (that.$util.isEmpty(token)) {
 									that.$msg('请先注册')
 									return false
@@ -243,7 +242,7 @@ export default {
 							})
 						},
 						fail(res){
-							uni.showToast({title:'登录失败了哦', duration: 3000, icon:'none'})
+							uni.showToast({title:'已取消', duration: 3000, icon:'none'})
 							//关闭一键登录弹出窗口
 							uni.closeAuthView()
 							console.log(res)

hdApp/src/admin/home/login.vue

@@ -188,10 +188,11 @@ export default {
 				return false
 			}
 
-			//uni.showLoading({mask:true})
+			uni.showLoading({mask:true})
 			uni.preLogin({
 				provider: 'univerify',
 				success:()=>{
+					uni.hideLoading()
 					uni.login({
 						provider: 'univerify',
 						// 自定义登录框样式
@@ -208,7 +209,6 @@ export default {
 							let access_token = res.authResult.access_token
 							phoneLogin({openid,access_token}).then(subRes=>{
 								let token = subRes.data.token || ''
-								//uni.hideLoading()
 								if (that.$util.isEmpty(token)) {
 									that.$msg('请先注册')
 									return false
@@ -246,13 +246,13 @@ export default {
 							})
 						},
 						fail(res){
-							uni.showToast({title:'登录失败了哦', duration: 3000, icon:'none'})
+							uni.showToast({title:'已取消', duration: 3000, icon:'none'})
 							//关闭一键登录弹出窗口
 							uni.closeAuthView()
 							console.log(res)
 						},
 						complete: (res) => {
-							//uni.hideLoading()
+							uni.hideLoading()
 							uni.closeAuthView()
 						}
 					})