From 8c1008b3da04ef89f029a6a1cad8704b5b995fd1 Mon Sep 17 00:00:00 2001
From: Aaron <578780649@qq.com>
Date: Tue, 20 Jul 2021 18:10:31 +0800
Subject: [PATCH] =?UTF-8?q?h5=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=20=20=E4=BF=AE=E6=94=B9=EF=BC=88=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=EF=BC=89h5=E5=92=8Capp=E7=9A=84=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                         |  2 +-
 pages/user/ChangePassword/index.vue | 42 ++++++++++++----
 pages/user/Login/index.vue          | 75 +++++++++++++++--------------
 pages/user/PersonalData/index.vue   |  4 +-
 4 files changed, 75 insertions(+), 48 deletions(-)

diff --git a/api/user.js b/api/user.js
index ef7d32a..b9045c3 100644
--- a/api/user.js
+++ b/api/user.js
@@ -63,7 +63,7 @@ export function register(data) {
  */
 export function registerReset(data) {
   return request.post('/register/reset', data, {
-    login: false,
+    login: true,
   })
 }
 
diff --git a/pages/user/ChangePassword/index.vue b/pages/user/ChangePassword/index.vue
index 0d65353..47d7ac9 100644
--- a/pages/user/ChangePassword/index.vue
+++ b/pages/user/ChangePassword/index.vue
@@ -16,7 +16,7 @@
       </view>
       <view class="item acea-row row-between-wrapper">
         <input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
-        <button class="code font-color-red" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
+        <button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
       </view>
     </view>
     <view class="confirmBnt bg-color-red" @click="confirm">确认修改</view>
@@ -82,13 +82,24 @@ export default {
         password: that.password,
       })
         .then(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: 'none',
-            duration: 2000,
-          })
-
-          // that.$yrouter.push({ path: "/pages/user/Login/index" });
+			uni.showToast({
+				title: res.msg,
+				icon: 'none',
+				duration: 2000,
+			})
+			this.$yrouter.replace({
+			  path: "/pages/user/Login/index",
+			  query: {},
+			});
+			// getLogout()
+		 //    .then((res) => {
+		 //      this.$store.commit("logout");
+		 //      this.$yrouter.replace({
+		 //        path: "/pages/user/Login/index",
+		 //        query: {},
+		 //      });
+		 //    })
+		 //    .catch((err) => {});
         })
         .catch(res => {
           uni.showToast({
@@ -134,11 +145,24 @@ export default {
 
 <style scoped lang="less">
 .ChangePassword {
+	.title{
+		margin: 10rpx;
+		line-height: 80rpx;
+	}
 	.list{
 		width: 100%;
+		margin: 0;
 		padding: 0 10%;
 		background-color: #FFFFFF;
-		.code{}
+		.code{
+			width: 30%;
+			text-align: center;
+			color: #FFFFFF;
+			background-color: #f35749;
+			padding: 12rpx;
+			font-size: 28rpx;
+			border-radius: 30rpx;
+		}
 	}
 }
 </style>
diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue
index 8f4aebc..6086581 100644
--- a/pages/user/Login/index.vue
+++ b/pages/user/Login/index.vue
@@ -9,7 +9,7 @@
       <view class="list" :hidden="current !== 0">
         <form @submit.prevent="submit">
           <view class="item getPhoneCode">
-            <view class="acea-row row-between-wrapper">
+            <view class="phoneInput acea-row row-between-wrapper">
               <input type="text" placeholder="输入手机号码"
 			  v-model="account" required/>
             </view>
@@ -34,7 +34,7 @@
         </view>
 		<view class="item">
 		  <view class="acea-row row-between-wrapper">
-		    <input type="text" placeholder="输入密码" v-model="password" />
+		    <input type="password" placeholder="输入密码" v-model="password" />
 		  </view>
 		</view>
         <!-- <view class="item">
@@ -134,8 +134,8 @@
     mixins: [sendVerifyCode],
     data: function () {
       return {
-        // navList: ["手机号登录", "密码登录"],
-		navList: ["手机号登录",],
+        navList: ["手机号登录", "密码登录"],
+		// navList: ["手机号登录",],
         current: 0,
         account: "",
         password: "",
@@ -145,7 +145,7 @@
         type: "login",
 		timer: null,
 		clock: 60,
-		clockText: '获取验证码'
+		clockText: '验证码'
       };
     },
     methods: {
@@ -174,25 +174,33 @@
 			} catch (e) {
 			  return validatorDefaultCatch(e);
 			}
-			loginMobile({
+			const res = await loginMobile({
 				account: that.account,
 				captcha: that.captcha,
 				spread: cookie.get("spread")
 			})
-			.then(res => {
-				var data = res.data;
-				that.$store.commit("login", data.token, dayjs(data.expires_time));
-				that.$store.dispatch('userInfo', true)
+			if (res.status === 200) {
+				this.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
 				handleGetUserInfo();
-			})
-			.catch(err => {
-				console.log(err)
+			} else {
 				uni.showToast({
-				  title: err.msg || err.response.data.msg || err.response.data.message,
-				  icon: "none",
-				  duration: 2000
+					title: res.msg || res.response.data.msg || err.response.data.message,
+					icon: "none",
+					duration: 2000
 				});
-			});
+			}
+			// .then(res => {
+			// 	that.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
+			// 	handleGetUserInfo();
+			// })
+			// .catch(err => {
+			// 	console.log(err)
+			// 	uni.showToast({
+			// 	  title: err.msg || err.response.data.msg || err.response.data.message,
+			// 	  icon: "none",
+			// 	  duration: 2000
+			// 	});
+			// });
 		},
 		async register() {
 			var that = this;
@@ -357,32 +365,21 @@
 			  return validatorDefaultCatch(e);
 			}
 			// 账号密码登录
-			login({
+			const res = await login({
 				username: account,
 				password,
 				spread: cookie.get("spread")
 			})
-			.then(({
-				data
-			}) => {
-				this.$store.commit("login", data.token, dayjs(data.expires_time));
+			if (res.status === 200) {
+				this.$store.commit("login", res.data.token, dayjs(res.data.expires_time));
 				handleGetUserInfo();
-				// let replace=this.$yroute.query.replace
-				// if(replace){
-
-				// }
-				// this.$yrouter.replace({
-				// 	path: this.$yroute.query.replace || '/pages/home/index'
-				// });
-			})
-			.catch(err => {
-				console.log(err);
+			} else {
 				uni.showToast({
-				  title: err.msg || err.response.data.msg || err.response.data.message,
-				  icon: "none",
-				  duration: 2000
+					title: res.msg || res.response.data.msg || err.response.data.message,
+					icon: "none",
+					duration: 2000
 				});
-			});
+			}
 		}
     }
   };
@@ -398,10 +395,16 @@
 .getPhoneCode{
 	display: flex;
 	justify-content: space-between;
+	.phoneInput{
+		width: 70%;
+	}
 	.phoneCode{
+		width: 30%;
+		text-align: center;
 		color: #FFFFFF;
 		background-color: #f35749;
 		padding: 12rpx;
+		font-size: 28rpx;
 		border-radius: 30rpx;
 	}
 }
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index e976475..ce7572a 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -44,13 +44,13 @@
 			  <input type="text" v-else value="未绑定" disabled class="id" />
 			</view>
 		</view>
-        <!-- <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
+        <view class="item acea-row row-between-wrapper" @click="goChangePassword()">
           <view>密码</view>
           <view class="input acea-row row-between-wrapper">
             <text>点击修改密码</text>
             <text class="iconfont icon-suozi"></text>
           </view>
-        </view> -->
+        </view>
     </view>
     <view class="modifyBnt bg-color-red" @click="submit">保存修改</view>
     <!-- #ifndef MP-WEIXIN -->