修改登录逻辑

manifest.json

@@ -90,8 +90,8 @@
                 // 自行修改下方的 /web
                 "/gateway" : {
                     // "secure": false,
-                    // "target": "https://api.gdjbp.com"
-                    "target" : "https://api.hebeiyhc.com"
+                    "target": "https://api.gdjbp.com"
+                    // "target" : "https://api.hebeiyhc.com"
                 },
                 // "target": "http://8.141.0.149:9000",
                 // "target": "https://app.bjtdba.com"

pages/cashier/index.vue

@@ -62,7 +62,7 @@
 			<view class="cashier-list-tbot">
 				<view class="yis">
 					<view class="sgjd">
-						¥{{dataList.orderLineOrderSun.orderLine==undefined?0:dataList.orderLineOrderSun.orderLine}}
+						¥{{dataList.orderLineOrderSun ? dataList.orderLineOrderSun.orderLine || 0 :  0}}
 					</view>
 					<view class="sf">
 						线上营收
@@ -70,7 +70,7 @@
 				</view>
 				<view class="yis">
 					<view class="sgjd">
-						¥{{dataList.belowTheLineSum.belowTheLine==undefined?0:dataList.belowTheLineSum.belowTheLine}}
+						¥{{dataList.belowTheLineSum ?  dataList.belowTheLineSum.belowTheLine || 0:0}}
 					</view>
 					<view class="sf">
 						线下营收
@@ -198,11 +198,12 @@
 			})
 			}
 		},
-		onShow() {
+		onShow() {
 			let authorization = uni.getStorageSync('authorization')
 			let userinfo = uni.getStorageSync('userinfo')
 			let selectmerchant = uni.getStorageSync('selectmerchant')
-			let uid = userinfo.uid
+			let uid = userinfo.uid
+			console.log(authorization, uid)
 			if (authorization && uid) {
 				if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
 					uni.redirectTo({

pages/user/login/index.vue

@@ -2,7 +2,7 @@
 	<view class="login">
 		<view class="login_header">
 			<view class="login_header_top">
-				<image src="https://cdn.bjtdba.com/vod/image/2024-04-12/20240412151953641.png" mode="widthFix"></image>
+				<image src="https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png" mode="widthFix"></image>
 			</view>
 			<!-- <view class="login_header_botom">
 				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809135451815.png" mode="widthFix"></image>
@@ -37,20 +37,20 @@
 			</view>
 			<view class="bottom-index-ri">
 				我已经阅读并同意<span style="color: #1f7cff" @click="xieyi()">《注册协议》</span >、<span style="color: #1f7cff" @click="yincang()">《隐私协议》</span>、<span style="color: #1f7cff" @click="ruzhuxieyi()">《商家入驻协议》</span>
-			</view>
-		</view>
-		
-		<view class="unLogin-singn" @click="unLogin">
-			<view class="login-singn-text">
-				暂不登录
-			</view>
-		</view>
-		
-		
-		<!-- #ifdef MP-WEIXIN -->
-			<ws-wx-privacy id="privacy-popup"></ws-wx-privacy>
-		<!-- #endif -->
-
+			</view>
+		</view>
+		
+		<view class="unLogin-singn" @click="unLogin">
+			<view class="login-singn-text">
+				暂不登录
+			</view>
+		</view>
+		
+		
+		<!-- #ifdef MP-WEIXIN -->
+			<ws-wx-privacy id="privacy-popup"></ws-wx-privacy>
+		<!-- #endif -->
+
 
 	</view>
 
@@ -63,11 +63,11 @@
 		selectMerchant,
 		queryStoreBranch,
 		getImUser
-	} from '@/commit/api.js'
+	} from '@/commit/api.js'
 	import emHandleReconnect from '@/EaseIM/utils/emHandleReconnect'; 
 	import { emConnect,emUserInfos } from '@/EaseIM/emApis';
 	const { updateUserInfosFromServer } = emUserInfos();
-	const { loginWithPassword } = emConnect();
+	const { loginWithPassword } = emConnect();
 	import wxPrivacy from '@/uni_modules/ws-wx-privacy/components/ws-wx-privacy/ws-wx-privacy.vue'
 	export default {
 		data() {
@@ -81,42 +81,42 @@
 					phone: uni.getStorageSync("user_phone").length == 0?'':uni.getStorageSync("user_phone"),
 					sms_code: '',
 					type: '1'
-				},
-				
+				},
+				
 				type: ''
 			}
 		},
 		onLoad(options) {
-			//#ifdef MP-WEIXIN        
-			wx.requirePrivacyAuthorize({            
-			  success: () => {                
-			    console.log('点击同意');            
-			 },            
-			  fail: () => {                
-			    console.log('点击拒绝');                            
-			 },             
-			  complete: () => {                
-			    console.log('用户已点击');            
-			 }       
-			})
-			//#endif
-			
-			this.type = options.type
-			console.log(options.type)
+			//#ifdef MP-WEIXIN        
+			wx.requirePrivacyAuthorize({            
+			  success: () => {                
+			    console.log('点击同意');            
+			 },            
+			  fail: () => {                
+			    console.log('点击拒绝');                            
+			 },             
+			  complete: () => {                
+			    console.log('用户已点击');            
+			 }       
+			})
+			//#endif
+			
+			this.type = options.type
+			console.log(options.type)
 			console.log(this.type)
-		},
-		components: {
-			wxPrivacy
+		},
+		components: {
+			wxPrivacy
 		},
 		methods: {
-			
-			handleDisagree() {
-			    // 处理用户不同意隐私协议的逻辑
-			},
-			handleAgree() {
-			    // 处理用户同意隐私协议的逻辑
-		    },
-			
+			
+			handleDisagree() {
+			    // 处理用户不同意隐私协议的逻辑
+			},
+			handleAgree() {
+			    // 处理用户同意隐私协议的逻辑
+		    },
+			
 			
 			getCode() {
 				var mobileReg = /^1[3456789]\d{9}$/;
@@ -130,8 +130,8 @@
 						title: "手机号格式有误",
 						icon: "none"
 					})
-				} else {
-					// 点击获取验证码后 保存手机号
+				} else {
+					// 点击获取验证码后 保存手机号
 					uni.setStorageSync('user_phone',this.form.phone);
 					const TIME_COUNT = 60;
 					if (!this.timer) {
@@ -190,25 +190,25 @@
 					this.form.sms_code = o.value.replace(inputRule, '');
 				})
 			},
-			xieyi() {
-				
-				uni.setStorageSync('agreementType','2')
+			xieyi() {
+				
+				uni.setStorageSync('agreementType','2')
 				
 				uni.navigateTo({
 					url: "/pages/index/bottombat?type=2" 
 				})
 			},
-			yincang() {
+			yincang() {
 				uni.setStorageSync('agreementType','1')
 				uni.navigateTo({
 					url: "/pages/index/bottombat?type=1"
 				})
-			},
-			ruzhuxieyi() {
-				uni.setStorageSync('agreementType','6')
-				uni.navigateTo({
-					url: "/pages/index/bottombat?type=6" 
-				})
+			},
+			ruzhuxieyi() {
+				uni.setStorageSync('agreementType','6')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=6" 
+				})
 			},
 			gou() {
 				if (this.is_wei == true) {
@@ -218,16 +218,16 @@
 					this.is_wei = true;
 					this.is_yes = false;
 				}
-			},
-			// 暂不登录
-			unLogin() {
-				setTimeout(function() {
-					uni.switchTab({
-						url: '../../my/index'
-					});
-				}, 300);
 			},
-			//lww
+			// 暂不登录
+			unLogin() {
+				setTimeout(function() {
+					uni.switchTab({
+						url: '../../my/index'
+					});
+				}, 300);
+			},
+			//lww
 			// loginWithUserId (){
 			// 	try {
 			// 	  uni.setStorage({
@@ -315,8 +315,7 @@
 					return;
 				} else {
 					// 登录注册
-					userPhoneLogOn(this.form).then(res => {
-						console.log(res)
+					userPhoneLogOn(this.form).then(res => {
 						if (res.data.status == 200 && JSON.stringify(res.data.data) != "{}") {
 							uni.setStorageSync('userinfo', res.data.data.user);
 							uni.setStorageSync('authorization', res.data.data.x_token);
@@ -325,47 +324,8 @@
 							selectMerchant({
 								uid: res.data.data.user.uid
 							}).then(data => {
-								uni.setStorage({
-								  key: 'myUsername',
-								  data: JSON.stringify(uni.getStorageSync('userinfo').uid),
-								});
-								uni.setStorage({
-								  key: 'mer_id',
-								  data: data.data.data.merchantIntention.mer_id,
-								});
-								
 								if (data.data.status == 200) {
 									uni.setStorageSync('selectmerchant', data.data.data);
-									//lww
-									
-									getImUser({
-										mer_id:	uni.getStorageSync('mer_id'),
-									}).then(data=>{
-										console.log('getImUser======',data.data.data);
-										// actionEMReconnect();
-										 // this.loginWithUserId()
-										const { loginWithPassword } = emConnect();
-										uni.setStorage({
-											key: 'im_userid',
-											data:data.data.data.im_userid
-										})
-										uni.setStorage({
-											key: 'im_pass',
-											data:data.data.data.im_pass
-										})
-										uni.setStorage({
-											key: 'im_uuid',
-											data:data.data.data.im_uuid
-										})
-										//环信注册成功 登录
-										if(data.data.status==200){
-											console.log('>>>>>>>>环信注册成功 登录')
-											this.loginWithUserId()
-											//更新环信的用户信息 头像，昵称
-											
-										}
-									})
-									//lww
 									let storeStaff = uni.getStorageSync('storeStaff')
 									if (storeStaff != null) {
 										queryStoreBranch({
@@ -381,23 +341,12 @@
 									uni.showToast({
 										title: res.data.message,
 										icon: "none"
-									})
-									
-									console.log(this.type, 'this.type')
-									
-									if (this.type == 1) {
-										
-										console.log('返回上一页')
-										uni.navigateBack({
-											delta: 1
-										})
-									} else {
-										setTimeout(function() {
-											uni.switchTab({
-												url: '../../cashier/index'
-											});
-										}, 700);
-									}
+									})
+									setTimeout(function() {
+										uni.switchTab({
+											url: '../../cashier/index'
+										});
+									}, 700);
 								}
 							}, fail => {
 								uni.showToast({
@@ -409,7 +358,7 @@
 							})
 						} else {
 							uni.showToast({
-								title: res.data.message,
+								title: "信息异常请联系客服...",
 								icon: "none"
 							})
 						}
@@ -509,9 +458,9 @@
 			align-items: center;
 			color: #333333;
 		}
-
-		.unLogin-singn {
-			margin-top: 88rpx;
+
+		.unLogin-singn {
+			margin-top: 88rpx;
 		}
 		.bottom-index {
 			width: 658rpx;
@@ -524,13 +473,13 @@
 			.bottom-index-in {
 				width: 32rpx;
 				height: 32rpx;
-				line-height: 33rpx;
+				line-height: 33rpx;
 				transform: sale(2);
 				image {
 					width: 100%;
 					height: 100%;
-				}
-				margin-right: 20rpx;
+				}
+				margin-right: 20rpx;
 				// position: relative;
 			}
 
@@ -540,4 +489,4 @@
 			}
 		}
 	}
-</style>
+</style>