登录界面：账号密码登录

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 芋艿：后续要做调整
+  });
+}

pages/users/login/index.vue

@@ -43,7 +43,9 @@
 					</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="tips">
 				<div v-if="current === 0" @click="current = 1">快速登录</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,37 +281,53 @@
        * 手机 + 密码登录
        */
 			async submit() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
+				if (!this.account) {
+          return this.$util.Tips({
             title: '请填写账号'
           });
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
+        }
+				if (!/^[\w\d]{5,16}$/i.test(this.account)) {
+          return this.$util.Tips({
             title: '请输入正确的账号'
           });
-				if (!that.password) return that.$util.Tips({
+        }
+				if (!this.password) {
+          return this.$util.Tips({
             title: '请填写密码'
           });
-				loginH5({
-						account: that.account,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(({
-						data
-					}) => {
+        }
+        AuthApi.login({
+          mobile: this.account,
+          password: this.password,
+          spread: this.$Cache.get("spread") // TODO 芋艿：后续接入
+        }).then(({ data }) => {
+          debugger
           this.$store.commit("LOGIN", {
-							'token': data.token
+            'token': data.accessToken
           });
-						that.getUserInfo(data);
-					})
-					.catch(e => {
-						that.$util.Tips({
+          this.getUserInfo(data);
+        }).catch(e => {
+          this.$util.Tips({
             title: e
           });
         });
 			},
-			getUserInfo(data){
-				this.$store.commit("SETUID", data.uid);
+			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";
@@ -320,6 +340,7 @@
           })
         }
 			}
+		}
 	};
 </script>
 <style lang="scss" scoped>

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'