From 6188192b00d97ea8aac27f0d1ba3dd3a8764c46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 15 Sep 2021 14:29:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/my/center.vue         | 134 +++++++++++++++++++++++++++++--
 pages/user/my/setting.vue        |   5 +-
 pages/user/register/register.vue |  62 +++++---------
 3 files changed, 149 insertions(+), 52 deletions(-)

diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index ba3f040..d9670c9 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -6,12 +6,13 @@
 			<view class="bg-right"></view>
 			<view class="ocupy"></view>
 			<view class="lf-flex lf-p-32 lf-row-between">
-				<view class="lf-row-between" @click="$url('/pages/user/my/setting')">
-					<view>
-						<image src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" class="center-img"></image>
+				<view class="lf-row-between">
+					<view @click="clickAvatar">
+						<image :src="userInfo.avatar" mode="aspectFill" class="center-img" v-if="userInfo.avatar"></image>
+						<image src="../../../static/images/empty.png" mode="aspectFill" class="center-img" v-else></image>
 					</view>
-					<view class="lf-row-center">
-						<view class="lf-color-white lf-font-36 lf-m-l-20">182****5380 </view>
+					<view class="lf-row-center" @click="clickMobile">
+						<view class="lf-color-white lf-font-36 lf-m-l-20">{{ userInfo.mobile_replace || '未登录，点此登录' }}</view>
 						<view class="lf-iconfont icon-xiangyou lf-font-20 lf-m-l-10 lf-color-white"></view>
 					</view>
 				</view>
@@ -99,6 +100,7 @@
 
 <script>
 	import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue'
+	import { getUrl } from '@/common/js/utils.js';
 	export default {
 		components: {
 			lfTabbar
@@ -147,9 +149,37 @@
 					name: '商家中心',
 					icon: 'icon-Group-',
 					path: '/pages/business/center/center'
-				}]
+				}],
+				userInfo: {mobile_replace: '正在获取'}, // 用户信息
+				token: '', // 用户token
+				code: ''
 			}
 		},
+		onShow(){
+			var userInfo = this.$cookieStorage.get('user_info');
+			console.log("userInfo", userInfo);
+			this.userInfo = userInfo || {};
+		},
+		onLoad(){
+			var token = this.$cookieStorage.get('user_token');
+			this.token = token;
+			if (token) {
+				// #ifdef MP-WEIXIN
+				if (this.code) {
+					uni.checkSession({
+						success: res => {
+							if (res.errMsg != 'checkSession:ok') {
+								this.getCode();
+							}
+						}
+					});
+				} else {
+					this.getCode();
+				}
+				// #endif
+			}
+			// this.getUserInfo();
+		},
 		// 页面滚动
 		onPageScroll(event){
 			if(event.scrollTop >= 50){
@@ -158,6 +188,98 @@
 				this.nav_bg_color = 'transparent';
 			}
 		},
+		methods: {
+			// 接口获取用户信息
+			getUserInfo(){
+				this.$http.get({
+					api: 'api/user',
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					console.log("1111", res)
+					this.userInfo = res.data;
+					this.$cookieStorage.set('user_info', res.data);
+				})
+			},
+			// 用户点击了自己的头像，此时做判断，已有头像就跳转到设置页，没有则授权获取用户微信信息
+			clickAvatar(){
+				if(this.token && this.userInfo.avatar){
+					this.$url('/pages/user/my/setting');
+				}else{
+					uni.getUserProfile({
+						desc: '获取你的昵称、头像、地区及性别',
+						lang: 'zh_CN',
+						complete: result => {
+							console.log("result", result)
+							if(result.errMsg == 'getUserProfile:ok'){
+								let options = {
+									iv: result.iv,
+									encryptedData: result.encryptedData,
+									code: this.code
+								};
+								this.updateUserInfo(options);
+							}
+						}
+					})
+				}
+			},
+			// 点击手机号，如果没有登录，则跳转到登录
+			clickMobile(){
+				if(this.token){
+					this.$url('/pages/user/my/setting');
+				}else{
+					let url = getUrl();
+					this.$url('/pages/user/register/register?url=' + url);
+				}
+			},
+			// 静默登录获取code
+			getCode(){
+				uni.login({
+					success: res => {
+						if (res.code) {
+							this.code = res.code;
+						}
+					}
+				});
+			},
+			// 更新用户信息
+			updateUserInfo(data){
+				uni.showLoading({
+					title: '完善信息中',
+					mask: true
+				});
+				this.$http.get({
+					api: 'api/user/bindUserMiniInfo',
+					data: data,
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+						res = res.data;
+						if (res.status) {
+							// #ifdef MP-WEIXIN
+							this.getUserInfo();
+							// #endif 
+							uni.hideLoading();
+						} else {
+							uni.showModal({
+								content: res.message || '请求失败',
+								showCancel: false
+							});
+							this.getCode();
+							uni.hideLoading();
+						}
+						uni.hideLoading();
+				}).catch(rej=>{
+					uni.showModal({
+						content: rej.message || '请求失败',
+						showCancel: false
+					});
+					uni.hideLoading();
+				});
+			}
+		}
 	}
 </script>
 
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index fc7ae0e..2edc5a6 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -95,10 +95,7 @@
 	export default {
 		methods: {
 			signOut(){
-				// TODO 借用该按钮进入登录页，对接逻辑时删除
-				// pages/user/register/register  微信
-				// pages/user/loginType/loginType 手机号
-				this.$url('/pages/user/register/register');
+				this.$msg('敬请期待')
 			}
 		}
 	}
diff --git a/pages/user/register/register.vue b/pages/user/register/register.vue
index 2f9f924..7672f55 100644
--- a/pages/user/register/register.vue
+++ b/pages/user/register/register.vue
@@ -132,23 +132,7 @@
 							var access_token = res.data.token_type + ' ' + res.data.access_token;
 							var expires_in = res.data.expires_in || 315360000;
 							this.$cookieStorage.set("user_token", access_token, expires_in);
-							
-							if (this.url) {
-								uni.redirectTo({
-									url: "/" + this.url,
-									// fail: () => {
-									// 	uni.switchTab({
-									// 		url: "/" + this.url
-									// 	});
-									// }
-								})
-			
-							} else {
-								// uni.switchTab({
-								// 	url: '/pages/user/personal/personal'
-								// });
-								this.$url('/pages/user/my/center', {type: 'launch'})
-							}
+							this.getUserInfo(access_token);
 						} else {
 							uni.hideLoading();
 						}
@@ -215,33 +199,9 @@
 						if (res.data.access_token) {
 							var access_token = res.data.token_type + ' ' + res.data.access_token;
 							var expires_in = res.data.expires_in || 315360000; // debugger;
-			
+							this.getUserInfo(access_token);
 							this.$cookieStorage.set("user_token", access_token, expires_in); // this.$cookieStorage.set("user_token",access_token,expires_in);
 							// uni.setStorageSync("user_token",access_token);
-			
-							if (this.url) {
-			// 					var path = ['pages/entity/store/store', 'pages/index/index/index',
-			// 						'pages/index/classification/classification', 'pages/store/tabCart/tabCart', 'pages/user/personal/personal',
-			// 						'pages/travels/index/index', 'pages/user/collar/collar'
-			// 					];
-			// 					var pathIndex = path.indexOf(this.url);
-			
-			// 					if (pathIndex == -1) {
-			// 						uni.redirectTo({
-			// 							url: "/" + this.url
-			// 						});
-			// 					} else {
-			// 						uni.switchTab({
-			// 							url: "/" + this.url
-			// 						});
-			// 					}
-								this.$url("/" + this.url, {type: 'redirect'});
-							} else {
-								// uni.switchTab({
-								// 	url: '/pages/user/personal/personal'
-								// });
-								this.$url('/pages/user/my/center', {type: 'launch'})
-							}
 						} else {
 							uni.showModal({
 								content: res.message || '请求失败，请重试',
@@ -264,6 +224,24 @@
 					});
 				});
 			},
+			// 接口获取用户信息
+			getUserInfo(token){
+				this.$http.get({
+					api: 'api/user',
+					header: {
+						Authorization: token
+					}
+				}).then(res => {
+					// console.log("1111", res)
+					// this.userInfo = res.data;
+					this.$cookieStorage.set('user_info', res.data);
+					if (this.url) {
+						this.$url("/" + this.url, {type: 'redirect'});
+					} else {
+						this.$url('/pages/user/my/center', {type: 'launch'})
+					}
+				})
+			},
 			// 跳转到手机号验证码登录
 			toPhoneLogin(){
 				if (this.url) {

From fe1f13eea924299ed94e001a402826bad89bc0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 15 Sep 2021 16:07:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/seckillList.vue | 10 ++++++--
 pages/user/my/center.vue   | 49 ++++++++++++++++++++++++++------------
 pages/user/my/editname.vue |  2 +-
 pages/user/my/setting.vue  | 14 +++++++++--
 4 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue
index 5dc574d..b33c65d 100644
--- a/pages/shop/seckillList.vue
+++ b/pages/shop/seckillList.vue
@@ -34,10 +34,16 @@
 			}
 		},
 		onLoad(){
-			
+			this.getSeckillList();
 		},
 		methods: {
-			
+			getSeckillList(){
+				this.$http.get({
+					api: 'api/seckill/all'
+				}).then(res => {
+					console.log("----", res);
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index d9670c9..76f1336 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -23,15 +23,15 @@
 			</view>
 			<view class="lf-flex lf-row-between center-tag">
 				<view class="lf-row-center lf-flex-column" @click="$url('/pages/point/detail/detail')">
-					<view class="lf-font-36 lf-color-white">0</view>
+					<view class="lf-font-36 lf-color-white">{{centerInfo.point || 0}}</view>
 					<view class="lf-font-24 lf-color-white">积分</view>
 				</view>
 				<view class="lf-row-center lf-flex-column" @click="$url('/pages/recharge/balance/balance')">
-					<view class="lf-font-36 lf-color-white">0.00</view>
+					<view class="lf-font-36 lf-color-white">{{centerInfo.balance || 0}}</view>
 					<view class="lf-font-24 lf-color-white">余额(元)</view>
 				</view>
 				<view class="lf-row-center lf-flex-column" @click="$url('/pages/coupon/index/index')">
-					<view class="lf-font-36 lf-color-white">0</view>
+					<view class="lf-font-36 lf-color-white">{{centerInfo.coupon || 0}}</view>
 					<view class="lf-font-24 lf-color-white">优惠券</view>
 				</view>
 			</view>
@@ -152,14 +152,10 @@
 				}],
 				userInfo: {mobile_replace: '正在获取'}, // 用户信息
 				token: '', // 用户token
-				code: ''
+				code: '',
+				centerInfo: {}
 			}
 		},
-		onShow(){
-			var userInfo = this.$cookieStorage.get('user_info');
-			console.log("userInfo", userInfo);
-			this.userInfo = userInfo || {};
-		},
 		onLoad(){
 			var token = this.$cookieStorage.get('user_token');
 			this.token = token;
@@ -178,7 +174,8 @@
 				}
 				// #endif
 			}
-			// this.getUserInfo();
+			this.getMeInfo();
+			this.getUcenter();
 		},
 		// 页面滚动
 		onPageScroll(event){
@@ -189,16 +186,38 @@
 			}
 		},
 		methods: {
-			// 接口获取用户信息
-			getUserInfo(){
+			// 获取页面信息
+			getMeInfo(){
+				this.$http.get({
+					api: 'api/me',
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					console.log("---", res);
+					this.userInfo = res.data.data;
+				})
+			},
+			// 获取积分等信息
+			getUcenter(){
+				this.$http.get({
+					api: 'api/users/ucenter',
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					console.log("getUcenter", res);
+					this.centerInfo = res.data.data;
+				})
+			},
+			// 接口获取更新后的用户信息
+			getUpdateUserInfo(){
 				this.$http.get({
 					api: 'api/user',
 					header: {
 						Authorization: this.token
 					}
 				}).then(res => {
-					console.log("1111", res)
-					this.userInfo = res.data;
 					this.$cookieStorage.set('user_info', res.data);
 				})
 			},
@@ -259,7 +278,7 @@
 						res = res.data;
 						if (res.status) {
 							// #ifdef MP-WEIXIN
-							this.getUserInfo();
+							this.getUpdateUserInfo();
 							// #endif 
 							uni.hideLoading();
 						} else {
diff --git a/pages/user/my/editname.vue b/pages/user/my/editname.vue
index a39d5b9..2f9df64 100644
--- a/pages/user/my/editname.vue
+++ b/pages/user/my/editname.vue
@@ -7,7 +7,7 @@
 		<view class="lf-p-l-32 lf-p-r-32">
 			<view class="set-tag lf-border-bottom">
 				<view class="lf-font-28 lf-color-black">
-					<input type="text" placeholder="182****5380" />
+					<input type="text" placeholder="输入新的昵称" />
 				</view>
 				<view class="lf-flex">
 					<text class="lf-iconfont icon-cuo lf-font-24 lf-m-l-10 lf-color-777"></text>
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index 2edc5a6..880b02c 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -7,7 +7,7 @@
 					昵称
 				</view>
 				<view class="lf-flex">
-					<view class="lf-font-28 lf-color-555">182****5380</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
+					<view class="lf-font-28 lf-color-555">{{ userInfo.mobile_replace }}</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
 				</view>
 			</view>
 		</view>
@@ -18,7 +18,8 @@
 				</view>
 				<view class="lf-flex">
 					<view class="lf-row-center">
-						<image src="https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png" mode="aspectFill" class="set-img"></image>
+						<image :src="userInfo.avatar" mode="aspectFill" class="set-img" v-if="userInfo.avatar"></image>
+						<image src="../../../static/images/empty.png" mode="aspectFill" class="set-img" v-else></image>
 					</view>
 					<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
 				</view>
@@ -93,6 +94,15 @@
 
 <script>
 	export default {
+		data(){
+			return {
+				userInfo: {}
+			}
+		},
+		onLoad(){
+			var userInfo = this.$cookieStorage.get('user_info');
+			this.userInfo = userInfo || {};
+		},
 		methods: {
 			signOut(){
 				this.$msg('敬请期待')