From 9904175cc3c7b9449a27d2b0ef7758fef4205438 Mon Sep 17 00:00:00 2001
From: YangWork <yang@xixingwl.cn>
Date: Fri, 10 Feb 2023 18:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=81=E7=BB=AD=E5=AE=8C=E5=96=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: YangWork <yang@xixingwl.cn>
---
 common/ajax.js                               | 42 +++++++++++---------
 components/ywx-auth-model/ywx-auth-model.vue | 34 +++++++++-------
 pages/tabbar/my/my.vue                       | 12 +++---
 store/modules/user.js                        | 11 ++++-
 4 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/common/ajax.js b/common/ajax.js
index fe37d6b..7ddcc38 100644
--- a/common/ajax.js
+++ b/common/ajax.js
@@ -5,32 +5,38 @@ import ajax from '@/uni_modules/u-ajax'
 
 // 创建请求实例
 const instance = ajax.create({
-  // 初始配置
-  baseURL: 'https://dev.xixingwl.cn/api'
+	// 初始配置
+	baseURL: 'https://dev.xixingwl.cn/api'
 })
 
 // 添加请求拦截器
 instance.interceptors.request.use(
-  config => {
-    // 在发送请求前做些什么
-    return config
-  },
-  error => {
-    // 对请求错误做些什么
-    return Promise.reject(error)
-  }
+	config => {
+		// 在发送请求前做些什么
+		return config
+	},
+	error => {
+		// 对请求错误做些什么
+		return Promise.reject(error)
+	}
 )
 
 // 添加响应拦截器
 instance.interceptors.response.use(
-  response => {
-    // 对响应数据做些什么
-    return response.data
-  },
-  error => {
-    // 对响应错误做些什么
-    return Promise.reject(error)
-  }
+	response => {
+		if (response.statusCode == 200) {
+			
+			return response.data
+		}	
+		// 对响应数据做些什么
+		console.log(response)
+		
+		return response.data
+	},
+	error => {
+		// 对响应错误做些什么
+		return Promise.reject(error)
+	}
 )
 
 // 导出 create 创建后的实例
diff --git a/components/ywx-auth-model/ywx-auth-model.vue b/components/ywx-auth-model/ywx-auth-model.vue
index a2badfe..fcd8f61 100644
--- a/components/ywx-auth-model/ywx-auth-model.vue
+++ b/components/ywx-auth-model/ywx-auth-model.vue
@@ -54,22 +54,23 @@
 
 <script>
 	import {
-		mapGetters
+		mapGetters,
+		mapMutations
 	} from 'vuex'
 	export default {
 		name: "ywxAuthModel",
 		computed: {
 			...mapGetters({
-				// 把 `this.doneCount` 映射为 `this.$store.getters.doneTodosCount`
-				sessionKey: 'getSessionKey'
+				sessionKey: 'getSessionKey',
+				openId: 'getOpenId'
 			})
 		},
 		data() {
 			return {
 				// 表单数据
 				formData: {
-					account: 'LiMing',
-					password: 'dcloud@email.com'
+					account: 'xiaoxiao',
+					password: '20mylove'
 				},
 				formDataReg: {
 					nickname: '',
@@ -99,9 +100,9 @@
 						}]
 					}
 				},
-				openid: "",
+
 				loginstate: "0",
-				openid: "",
+
 				userEntity: null,
 				terminal: "",
 				osVersion: "",
@@ -112,6 +113,7 @@
 		},
 		onLoad: function() {},
 		methods: {
+			...mapMutations(["updateUserInfo", "saveUserInfoToStorge"]),
 			onChooseAvatar(e) {
 				console.log(e)
 				const {
@@ -122,16 +124,20 @@
 			},
 			submitLogin(loginform) {
 				let self = this;
+				// #ifdef MP-WEIXIN
+				this.formData.openId = this.openId
+				// #endif
 				this.$refs.loginform.validate().then(res => {
 					console.log('表单数据信息：', res);
 					self.$ajax.post("User/login", self.formData)
-					.then(e => {
-						if(e.code == 0)
-							uni.reLaunch({
-								url: "/pages/tabbar/home/home"
-							})
-
-					});
+						.then(e => {
+							if (e.code == 0) {
+								self.updateUserInfo(e.data.userinfo);
+								uni.reLaunch({
+									url: "/pages/tabbar/home/home"
+								})
+							}
+						});
 				}).catch(err => {
 					console.log('表单错误信息：', err);
 				})
diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue
index 75fccf5..c1f30b8 100644
--- a/pages/tabbar/my/my.vue
+++ b/pages/tabbar/my/my.vue
@@ -1,13 +1,13 @@
 <template>
-	<view>
+	<view> 
 		<page-head title="view"></page-head>
 		<view class="warp" style="margin: 10rpx 15rpx;">
 			<view class="user" style="">
 				<image class="user-avatar" mode="aspectFit" src="../../../static/logo.png"></image>
 				<view class="user-info">
-					<h2> 用户昵称 </h2>
-					<text> UID 1234567897 </text>
-					<text> 用户昵称</text>
+					<h2> {{userInfo.nickname}} </h2>
+					<text> UID {{userInfo.uid}}</text>
+					<text> {{userInfo.account}}</text>
 				</view>
 			</view>
 			<view style="padding: 10rpx;"></view>
@@ -89,13 +89,15 @@
 				timestamp: state => state.moduleB.timestamp
 			}),
 			...mapGetters({
-			  isLogin: 'userIsLogin'
+			  isLogin: 'getuserIsLogin',
+			  userInfo: 'getUserInfo'
 			})
 		},
 		data() {
 			return {}
 		},
 		onLoad(){
+			console.log(this.isLogin);
 			if (! this.isLogin) {
 				uni.redirectTo({
 					url:"/pages/login/login"
diff --git a/store/modules/user.js b/store/modules/user.js
index 966d687..cb4702d 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -21,11 +21,17 @@ export default {
 			var trDay = day < 10 ? '0' + day : day
 			return year + '-' + trMon + '-' + trDay + " " + hours + ":" + minu + ":" + sec;
 		},
-		userIsLogin(state){
+		getuserIsLogin(state){
 			return state.isLogin;
 		},
 		getSessionKey(state){
 			return state.sessionKey;
+		},
+		getOpenId(state){
+			return state.openId;
+		},
+		getUserInfo(state){
+			return state.userinfo;
 		}
 	},
 	mutations: {
@@ -35,11 +41,12 @@ export default {
 		// 更新用户信息
 		updateUserInfo(state, userinfo) {
 			state.userinfo = userinfo
+			state.isLogin  = true;
 			this.commit('saveUserInfoToStorge')
 		},
 		// 将用户信息持久化存储到本地
 		saveUserInfoToStorge(state) {
-			uni.setStorageSync('userinfo', JSON.stringify(state.userinfo))
+			uni.setStorageSync('userinfo', JSON.stringify(state.userinfo)) 
 		},
 		// 更新 token 字符串
 		updateToken(state, token) {