From 02ce643f5757cd21dc17414bab206214d9ffc853 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 28 Aug 2023 19:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/member/auth.js              |   7 +++
 pages/users/login/index.vue     | 105 +++++++++++++++++++-------------
 pages/users/user_info/index.vue |   4 +-
 3 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/api/member/auth.js b/api/member/auth.js
index 4a33d850..807b26d7 100644
--- a/api/member/auth.js
+++ b/api/member/auth.js
@@ -23,3 +23,10 @@ export function validateSmsCode(mobile, scene, code) {
 export function logout() {
   return request.post('app-api/member/auth/logout');
 }
+
+// 使用手机 + 密码登录
+export function login(data) {
+  return request.post('app-api/member/auth/login', data, {
+    noAuth: true // TODO 芋艿：后续要做调整
+  });
+}
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 036c2194..0293fa7c 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -43,8 +43,10 @@
 					</div>
 				</div>
 			</div>
+      <!-- 登录方式一：验证码登录 -->
 			<div class="logon" @click="loginMobile" v-if="current !== 0">登录</div>
-			<div class="logon" @click="submit" v-if="current === 0">登录</div>
+      <!-- 登录方式二：密码登录 -->
+      <div class="logon" @click="submit" v-if="current === 0">登录</div>
 			<div class="tips">
 				<div v-if="current === 0" @click="current = 1">快速登录</div>
 				<div v-if="current === 1" @click="current = 0">账号登录</div>
@@ -55,7 +57,9 @@
 </template>
 <script>
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import { loginH5, loginMobile, registerVerify, getUserInfo } from "@/api/user";
+	import { loginMobile, registerVerify, getUserInfo } from "@/api/user";
+	import * as AuthApi from "@/api/member/auth";
+	import * as UserApi from "@/api/member/user";
 	import { appAuth, appleLogin } from "@/api/public";
 	const BACK_URL = "login_back_url";
 	export default {
@@ -277,47 +281,64 @@
        * 手机 + 密码登录
        */
 			async submit() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写账号'
-				});
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的账号'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				loginH5({
-						account: that.account,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(({
-						data
-					}) => {
-						this.$store.commit("LOGIN", {
-							'token': data.token
-						});
-						that.getUserInfo(data);
-					})
-					.catch(e => {
-						that.$util.Tips({
-							title: e
-						});
-					});
+				if (!this.account) {
+          return this.$util.Tips({
+            title: '请填写账号'
+          });
+        }
+				if (!/^[\w\d]{5,16}$/i.test(this.account)) {
+          return this.$util.Tips({
+            title: '请输入正确的账号'
+          });
+        }
+				if (!this.password) {
+          return this.$util.Tips({
+            title: '请填写密码'
+          });
+        }
+        AuthApi.login({
+          mobile: this.account,
+          password: this.password,
+          spread: this.$Cache.get("spread") // TODO 芋艿：后续接入
+        }).then(({ data }) => {
+          debugger
+          this.$store.commit("LOGIN", {
+            'token': data.accessToken
+          });
+          this.getUserInfo(data);
+        }).catch(e => {
+          this.$util.Tips({
+            title: e
+          });
+        });
 			},
-			getUserInfo(data){
-				this.$store.commit("SETUID", data.uid);
-				getUserInfo().then(res => {
-					this.$store.commit("UPDATE_USERINFO", res.data);
-					let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
-					if (backUrl.indexOf('/pages/users/login/index') !== -1) {
-						backUrl = '/pages/index/index';
-					}
-					uni.reLaunch({
-						url: backUrl
-					});
-				})
+			getUserInfo(data) {
+        this.$store.commit("SETUID", data.userId);
+        // TODO 芋艿：换成自己的先
+        if (true) {
+          UserApi.getUserInfo().then(res => {
+            this.$store.commit("UPDATE_USERINFO", res.data);
+            // 调回登录前页面
+            let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
+            if (backUrl.indexOf('/pages/users/login/index') !== -1) {
+              backUrl = '/pages/index/index';
+            }
+            uni.reLaunch({
+              url: backUrl
+            });
+          })
+        } else {
+          getUserInfo().then(res => {
+            this.$store.commit("UPDATE_USERINFO", res.data);
+            let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
+            if (backUrl.indexOf('/pages/users/login/index') !== -1) {
+              backUrl = '/pages/index/index';
+            }
+            uni.reLaunch({
+              url: backUrl
+            });
+          })
+        }
 			}
 		}
 	};
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index b4764613..55dc961b 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -58,7 +58,7 @@
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
   import * as UserApi from '@/api/member/user.js';
-  import * as AuthUtil from '@/api/member/auth.js';
+  import * as AuthApi from '@/api/member/auth.js';
   export default {
 		components: {},
 		data() {
@@ -98,7 +98,7 @@
                 console.log('用户点击取消');
                 return
               }
-              AuthUtil.logout().then(res => {
+              AuthApi.logout().then(res => {
                 this.$store.commit("LOGOUT");
                 uni.reLaunch({
                   url: '/pages/index/index'