From 61c812935b0e39c38c6acbf68369f0ac9bdc9bf6 Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Tue, 17 Jan 2023 11:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8B=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=BF=94=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json        |  46 +++----
 pages/account/deleteCount.vue |   2 -
 pages/account/deleteOk.vue    |  10 +-
 pages/account/index.vue       |  15 ++-
 pages/login/index.vue         | 242 ++++++++++++++++++++--------------
 pages/order/confirmation.vue  |   1 -
 6 files changed, 180 insertions(+), 136 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 4bbcf3c..f3a5ba7 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-ios"
+        }
     ]
 }
diff --git a/pages/account/deleteCount.vue b/pages/account/deleteCount.vue
index 7fbb624..1751c4e 100644
--- a/pages/account/deleteCount.vue
+++ b/pages/account/deleteCount.vue
@@ -67,7 +67,6 @@
 				})
 			},
 			deleteuserinfo(){
-				
 				uni.showModal({
 					title: 'Confirm Delet?',
 					cancelText: "cancel", // 取消按钮的文字  
@@ -110,7 +109,6 @@
 		},
 		onShow() {
 			let user = uni.getStorageInfoSync('user_info')
-			console.log(user)
 			this.getuserinfo()
 		}
 	}
diff --git a/pages/account/deleteOk.vue b/pages/account/deleteOk.vue
index 2a7ada7..79b65a4 100644
--- a/pages/account/deleteOk.vue
+++ b/pages/account/deleteOk.vue
@@ -1,11 +1,11 @@
 <template>
 	<view>
 		<view class="font">
-			<uni-icons type="closeempty" size="30" @click="back" color="#fff"></uni-icons>
+			<!-- <uni-icons type="closeempty" size="30" @click="back" color="#fff"></uni-icons> -->
 			<text style="margin-left: 30rpx;color: white;">Delete account</text>
 		</view>
 		<view class="icon">
-			<view class="icon_img"><image  mode="" src="../../static/icon/deleteok.png"></image></view>
+			<view class="icon_img"><image mode="" src="../../static/icon/deleteok.png"></image></view>
 		    <view class="icon_text">Delete account</view>
 		</view>
 		
@@ -88,10 +88,10 @@
 		
 		.icon_img{
 			height: 120rpx;
-			width: 110rpx;
-		
-			 margin-left: 250rpx;
+			width: 120rpx;
+			margin-left: 250rpx;
 			image{
+				object-fit: cover;
 				height: 100%;
 				width: 100%;
 			
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 126fcfe..a356fdb 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -19,6 +19,7 @@
 			<view class="info_name" v-else>
 				<navigator class="info_name_a" url="/pages/account/myProfile">
 					Hey.{{user_info.nickname!=''?user_info.nickname:user_info.email}}.>
+					<!-- user_info.nickname -->
 				</navigator>
 			</view>
 
@@ -161,7 +162,7 @@
 				user_info: {
 					isLogin: false,
 				},
-
+				nikname: '',
 				// 获取该分类的其他商品的请求参数
 				catQuery: {
 					_action: 'getgoods',
@@ -330,10 +331,10 @@
 					if (res.error == 0) {
 						this.count = res.data.user_info.user_money
 						this.hb_num = res.data.user_bonus_list.length
+						this.nikname = res.data.user_info.nikname
 						console.log(this.hb_num)
 					}
 				})
-
 			},
 			getImg() {
 				let data = {
@@ -452,6 +453,7 @@
 			},
 		},
 		onLoad(e) {
+			this.getList()
 			let that = this;
 			let s = 0;
 			let time = setInterval(() => {
@@ -484,13 +486,15 @@
 			this.getIndex()
 			// this.getUserInfo()
 			this.getCatList()
-			this.getList()
 			this.getImg()
 
-
-
 		},
 		onShow() {
+			// this.getIndex()
+			// this.getCatList()
+			this.getUserInfo()
+			this.getImg()
+			this.getList()
 			uni.hideTabBar()
 			// uni.showTabBar()
 			this.isLogin = uni.getStorageSync('isLogin')
@@ -498,6 +502,7 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
+			this.getUserInfo()
 			this.isLogin = uni.getStorageSync('isLogin')
 			console.log(this.isLogin)
 			if (this.isLogin == 0) {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index f37e0a2..4c3bf77 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -39,7 +39,7 @@
 						<view class="cellphone-minBox" v-if="cellphone == 2" @click="apple()"> <image src="../../static/img/AppleD.png" mode=""></image></view>
 						 <!-- v-if="cellphone == 2" -->
 						<view class="cellphone-minBox" @click="facebook()"><image src="../../static/img/FacebookD.png" mode=""></image></view>
-						<view class="cellphone-minBox"  @click="google()"> <image src="../../static/img/GoogleD.png" mode=""></image></view>
+						<view class="cellphone-minBox" v-if="cellphone == 1" @click="google()"> <image src="../../static/img/GoogleD.png" mode=""></image></view>
 						 <!-- v-if="cellphone == 1" -->
 					</view>
 				</view>
@@ -274,22 +274,26 @@
 					}  
 					appleOauth.login( function(oauth){  
 						console.log(oauth);
+						uni.navigateBack({
+							delta: 1
+						});
 						// 授权成功，苹果授权返回的信息在 oauth.target.appleInfo 中    
+						// const openid = JSON.parse(oauth.target.appleInfo.identityToken)
+						// console.log(openid);
 						let data = {
 							_action: 'loginbyapple',
 							ap_user_id: oauth.target.appleInfo.user,
-							ap_user_name: oauth.target.appleInfo.familyName+oauth.target.appleInfo.giveName,
+							ap_user_name: oauth.target.appleInfo.familyName,
 							ap_user_first_name: oauth.target.appleInfo.familyName,
 							ap_user_middle_name: oauth.target.appleInfo.givenName,
 							ap_user_last_name: oauth.target.appleInfo.familyName,
 							ap_user_email: oauth.target.appleInfo.email
 						}
+						uni.setStorageSync('user_info', {nickname: oauth.target.appleInfo.familyName})
+						uni.setStorageSync('user_info', {email: oauth.target.appleInfo.email})
 						defaultRequest(data).then(res => {
 							console.info(res)
 							if (res.error == 0) {
-								uni.navigateBack({
-									delta: 1
-								});
 								uni.showToast({
 									title:'Login is successful, please reopen the App to load information',
 									icon:'none',
@@ -297,6 +301,18 @@
 								})
 							}
 						})
+						// defaultRequest(data).then(res => {
+						// 	console.info(res)
+						// 	console.log('====================================');
+						// 	if (res.error == 0) {
+						// 		console.log(openid);
+						// 		uni.showToast({
+						// 			title:'Login is successful, please reopen the App to load information',
+						// 			icon:'none',
+						// 			duration: 2000
+						// 		})
+						// 	}
+						// })
 						
 					}, function(err) {  
 						console.log(err);
@@ -387,17 +403,23 @@
 									fb_user_last_name: '',
 									fb_user_email: info.userInfo.email
 								}
+								uni.setStorageSync('user_info', {nickname: info.userInfo.nickName})
+								uni.setStorageSync('user_info', {email: info.userInfo.email})
+								// uni.setStorageSync('user_info', 'info.userInfo');
 								defaultRequest(data).then(res => {
 									console.info(res)
 									if (res.error == 0) {
+										uni.showLoading({
+										    title: '加载中'
+										});
 										uni.navigateBack({
 											delta: 1
 										});
-										uni.showLoading({
-											title: '脸书用户登录成功',
-											icon: 'none',
-											duration: 2000
-										})
+										// uni.showLoading({
+										// 	title: '脸书用户登录成功',
+										// 	icon: 'none',
+										// 	duration: 2000
+										// })
 									}
 								})
 				            }
@@ -408,110 +430,128 @@
 				        // 登录授权失败  
 				        // err.code是错误码
 						uni.showLoading({
-							title: '脸书用户授权失败',
+							title: err.errMsg + err.errCode + err.code,
 							icon: 'none',
 							duration: 2000
 						})
+						// uni.showLoading({
+						// 	title: '脸书用户授权失败',
+						// 	icon: 'none',
+						// 	duration: 2000
+						// })
 				    }
 				});
 			},
 			// 谷歌
 			google(){
-				// var googleOauth = null;
-				// plus.oauth.getServices(function(services) {
-				// 	for (var i in services) {
-				// 		var service = services[i];
-				// 		// 获取微信登录对象 
-				// 		if (service.id == 'google') {
-				// 			googleOauth = service;
-				// 			break;
-				// 		}
-				// 	}
-				// 	googleOauth.login( function(oauth){
-				// 		// 授权成功，googleOauth.authResult 中保存授权信息  
-				// 		console.log(googleOauth.authResult);
-				// 		let data = {
-				// 			_action: 'loginbygoogle',
-				// 			fb_user_id: googleOauth.authResult.openid,
-				// 			fb_user_name: '',
-				// 			fb_user_first_name: '',
-				// 			fb_user_middle_name: '',
-				// 			fb_user_last_name: '',
-				// 			fb_user_email: googleOauth.authResult.email
-				// 		}
-				// 		defaultRequest(data).then(res => {
-				// 			console.info(res)
-				// 			if (res.error == 0) {
-				// 				uni.navigateBack({
-				// 					delta: 1
-				// 				});
-				// 				uni.showLoading({
-				// 					title: '谷歌用户登录成功',
-				// 					icon: 'none',
-				// 					duration: 2000
-				// 				})
-				// 			}
-				// 		})
-				// 	}, function(err) {
-				// 		console.log(err);
-				// 		uni.showLoading({
-				// 			title: '谷歌用户登录失败',
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		})
-				//     // 登录授权失败  
-				//     // err.code是错误码
-				// 	})
-				// }, function(err) {
-				// 	console.log(err);
-				// 	// 获取 services 失败
-				// })
-				
-				uni.login({
-				    provider: 'google',
-				    success: function (loginRes) {
-				        // 登录成功
-				        uni.getUserInfo({
-				            provider: 'google',
-				            success: function(info) {
-				                // 获取用户信息成功, info.authResult保存用户信息
-								console.log(info);
-										let data = {
-											_action: 'loginbygoogle',
-											fb_user_id: info.authResult.openid,
-											fb_user_name: '',
-											fb_user_first_name: '',
-											fb_user_middle_name: '',
-											fb_user_last_name: '',
-											fb_user_email: info.authResult.email
-										}
-										defaultRequest(data).then(res => {
-											console.info(res)
-											if (res.error == 0) {
-												uni.navigateBack({
-													delta: 1
-												});
-												uni.showLoading({
-													title: '谷歌用户登录成功',
-													icon: 'none',
-													duration: 2000
-												})
-											}
-										})
-				            }
-				        })
-				    },
-				    fail: function (err) {
+				var googleOauth = null;
+				plus.oauth.getServices(function(services) {
+					for (var i in services) {
+						var service = services[i];
+						// 获取微信登录对象 
+						if (service.id == 'google') {
+							googleOauth = service;
+							break;
+						}
+					}
+					googleOauth.login( function(oauth){
+						// 授权成功，googleOauth.authResult 中保存授权信息  
+						console.log(googleOauth.authResult);
+						let data = {
+							_action: 'loginbygoogle',
+							gg_user_id: googleOauth.authResult.openid,
+							gg_user_name: googleOauth.authResult.nickName,
+							gg_user_first_name: '',
+							gg_user_middle_name: '',
+							gg_user_last_name: '',
+							gg_user_email: googleOauth.authResult.email
+						}
+						uni.setStorageSync('user_info', {email: googleOauth.authResult.email})
+						uni.setStorageSync('user_info', {nickname: googleOauth.authResult.nickName})
+						// uni.setStorageSync('user_info.data.nickname', 'googleOauth.authResult.nickName');
+						defaultRequest(data).then(res => {
+							console.info(res)
+							if (res.error == 0) {
+								uni.navigateBack({
+									delta: 1
+								});
+								uni.showLoading({
+									title: '谷歌用户登录成功',
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+					}, function(err) {
 						console.log(err);
 						uni.showLoading({
-							title: '谷歌用户授权失败',
+							title: err.errMsg + err.errCode + err.code,
 							icon: 'none',
 							duration: 2000
 						})
-				        // 登录授权失败  
-				        // err.code是错误码
-				    }
-				});
+						// uni.showLoading({
+						// 	title: '谷歌用户登录失败',
+						// 	icon: 'none',
+						// 	duration: 2000
+						// })
+				    // 登录授权失败  
+				    // err.code是错误码
+					})
+				}, function(err) {
+					console.log(err);
+					uni.showLoading({
+						title: err.errMsg + err.errCode + err.code,
+						icon: 'none',
+						duration: 2000
+					})
+					// 获取 services 失败
+				})
+				
+				// uni.login({
+				//     provider: 'google',
+				//     success: function (loginRes) {
+				//         // 登录成功
+				//         uni.getUserInfo({
+				//             provider: 'google',
+				//             success: function(info) {
+				//                 // 获取用户信息成功, info.authResult保存用户信息
+				// 				console.log(info);
+				// 					let data = {
+				// 						_action: 'loginbygoogle',
+				// 						gg_user_id: info.authResult.openid,
+				// 						gg_user_name: info.authResult.nickName,
+				// 						gg_user_first_name: '',
+				// 						gg_user_middle_name: '',
+				// 						gg_user_last_name: '',
+				// 						gg_user_email: info.authResult.email
+				// 					}
+				// 					defaultRequest(data).then(res => {
+				// 						console.info(res)
+				// 						if (res.error == 0) {
+				// 							uni.navigateBack({
+				// 								delta: 1
+				// 							});
+				// 							uni.showLoading({
+				// 								title: '谷歌用户登录成功',
+				// 								icon: 'none',
+				// 								duration: 2000
+				// 							})
+				// 						}
+				// 					})
+				//             }
+				//         })
+				//     },
+				//     fail: function (err) {
+				// 		console.log(err);
+				// 		uni.showLoading({
+				// 			title: err.errMsg + err.errCode + err.code,
+				// 			icon: 'none',
+				// 			duration: 20000000
+				// 		})
+				//         // 登录授权失败  
+				//         // err.code是错误码
+				//     }
+				// });
 
 			},
 			// 登录
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 4f94c3b..7d21419 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -708,7 +708,6 @@
 					if (res.error == 0) {
 						this.count = res.data.user_info.user_money
 						// this.count = 4.00
-
 					}
 				})
 			},