From 3ec70daafcc2b03342f2fadae0b7df02172e8e50 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 19 Aug 2023 23:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=B8=8B=20login=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=97=A0=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/index.vue               |   1 -
 pages/users/app_login/index.vue    |  17 ---
 pages/users/login/index.vue        | 196 ++++++++---------------------
 pages/users/wechat_login/index.vue |  15 +--
 static/images/logo2.png            | Bin 4822 -> 5742 bytes
 5 files changed, 53 insertions(+), 176 deletions(-)

diff --git a/pages/auth/index.vue b/pages/auth/index.vue
index 95faec24..819dc62a 100644
--- a/pages/auth/index.vue
+++ b/pages/auth/index.vue
@@ -17,7 +17,6 @@
 
 		},
 		onLoad(option) {
-			let that = this
 			const {
 				code,
 				state
diff --git a/pages/users/app_login/index.vue b/pages/users/app_login/index.vue
index bacee33c..e769e640 100644
--- a/pages/users/app_login/index.vue
+++ b/pages/users/app_login/index.vue
@@ -11,21 +11,12 @@
 <script>
 	const app = getApp();
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import Routine from '@/libs/routine';
 	import {
-		loginMobile,
 		registerVerify,
 		getCodeApi,
 		getUserInfo,
 		phoneSilenceAuth,
-		phoneWxSilenceAuth
 	} from "@/api/user";
-	import {
-		bindingPhone
-	} from '@/api/api.js'
-	import {
-		getUserPhone
-	} from '@/api/public';
 	import mobileLogin from '@/components/login_mobile/index.vue'
 	export default {
 		name: 'login_mobile',
@@ -42,16 +33,12 @@
 				isPos: false,
 				platform: '', // 手机平台
 				appleShow: '' //是否是苹果登录
-				
 			}
 		},
 		components: {
 			mobileLogin
 		},
 		mixins: [sendVerifyCode],
-		mounted() {
-			//this.getCode();
-		},
 		onLoad: function(options) {
 			let that = this;
 			// 获取系统信息
@@ -177,7 +164,6 @@
 		}
 	}
 </script>
-
 <style>
 	page {
 		height: 100%;
@@ -199,9 +185,6 @@
 		justify-content: center;
 		width: 100%;
 
-
-
-
 		image {
 			width: 180rpx;
 			height: 180rpx;
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 7b2753eb..036c2194 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -1,16 +1,14 @@
 <template>
 	<div class="login-wrapper">
 		<div class="shading">
-			<!-- <image :src="logoUrl"/> -->
-			<image :src="logoUrl"/>
-			<!-- <image src="/static/images/logo2.png" v-if="!logoUrl" /> -->
+			 <image src="/static/images/logo2.png" />
 		</div>
-		<div class="whiteBg" v-if="formItem === 1">
+		<div class="whiteBg">
 			<div class="list" v-if="current !== 1">
 				<form @submit.prevent="submit">
 					<div class="item">
 						<div class="acea-row row-middle">
-							<image src="/static/images/phone_1.png"  style="width: 24rpx; height: 34rpx;"></image>
+							<image src="/static/images/phone_1.png"  style="width: 24rpx; height: 34rpx;" />
 							<input type="text" class="texts" placeholder="输入手机号码" v-model="account" required/>
 						</div>
 					</div>
@@ -42,63 +40,34 @@
 					<div class="acea-row row-middle">
 						<image src="/static/images/code_2.png" style="width: 28rpx; height: 32rpx;"></image>
 						<input type="text" placeholder="填写验证码" class="codeIput" v-model="codeVal" />
-						<div class="code" @click="again"><img :src="codeUrl" /></div>
 					</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>
-				<div v-if="current==1" @click="current = 0">账号登录</div>
+				<div v-if="current === 0" @click="current = 1">快速登录</div>
+				<div v-if="current === 1" @click="current = 0">账号登录</div>
 			</div>
 		</div>
 		<div class="bottom"></div>
 	</div>
 </template>
 <script>
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
 	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import {
-		loginH5,
-		loginMobile,
-		registerVerify,
-		register,
-		// getCodeApi,
-		getUserInfo
-	} from "@/api/user";
-	import attrs, {
-		required,
-		alpha_num,
-		chs_phone
-	} from "@/utils/validate";
-	import {
-		validatorDefaultCatch
-	} from "@/utils/dialog";
-	import {
-		getLogo, appAuth, appleLogin
-	} from "@/api/public";
-	import {
-		VUE_APP_API_URL
-	} from "@/utils";
-
+	import { loginH5, loginMobile, registerVerify, getUserInfo } from "@/api/user";
+	import { appAuth, appleLogin } from "@/api/public";
 	const BACK_URL = "login_back_url";
-
 	export default {
 		name: "Login",
 		mixins: [sendVerifyCode],
 		data: function() {
 			return {
-				navList: ["快速登录", "账号登录"],
-				current: 1,
+				current: 1, // 1：快速登录；2：账号登录
 				account: "",
 				password: "",
 				captcha: "",
-				formItem: 1,
 				type: "login",
-				logoUrl: "",
-				keyCode: "",
-				codeUrl: "",
 				codeVal: "",
 				isShowCode: false,
 				platform: '',
@@ -109,24 +78,11 @@
 				appleShow: false // 苹果登录版本必须要求ios13以上的
 			};
 		},
-		watch:{
-			formItem:function(nval,oVal){
-				if(nval == 1){
-					this.type = 'login'
-				}else{
-					this.type = 'register'
-				}
-			}
-		},
-		mounted: function() {
-			this.getCode();
-			this.getLogoImage();
-		},
 		onLoad() {
 			let self = this
 			uni.getSystemInfo({
 				success: function(res) {
-					if (res.platform.toLowerCase() == 'ios' && res.system.split(' ')[1] >= 13) {
+					if (res.platform.toLowerCase() === 'ios' && res.system.split(' ')[1] >= 13) {
 						self.appleShow = true
 					}
 				}
@@ -259,28 +215,16 @@
 						});
 				});
 			},
-			again() {
-				this.codeUrl =
-					VUE_APP_API_URL +
-					"/sms_captcha?" +
-					"key=" +
-					this.keyCode +
-					Date.parse(new Date());
-			},
-			getCode() {
-				let that = this
-			},
-			async getLogoImage() {
+      /**
+       * 手机 + 验证码登录
+       */
+      async loginMobile() {
 				let that = this;
-				getLogo().then(res => {
-					that.logoUrl = res.data.logoUrl?res.data.logoUrl:'/static/images/logo2.png';
-				});
-			},
-			async loginMobile() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
+				if (!this.account) {
+          return that.$util.Tips({
+            title: '请填写手机号码'
+          });
+        }
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
 					title: '请输入正确的手机号码'
 				});
@@ -309,44 +253,6 @@
 						});
 					});
 			},
-			async register() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请填写密码'
-				});
-				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-					title: '您输入的密码过于简单'
-				});
-				register({
-						account: that.account,
-						captcha: that.captcha,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res
-						});
-						that.formItem = 1;
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
 			async code() {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -367,9 +273,9 @@
 						});
 					});
 			},
-			navTap: function(index) {
-				this.current = index;
-			},
+      /**
+       * 手机 + 密码登录
+       */
 			async submit() {
 				let that = this;
 				if (!that.account) return that.$util.Tips({
@@ -392,7 +298,7 @@
 						this.$store.commit("LOGIN", {
 							'token': data.token
 						});
-						that.getUserInfo(data);	
+						that.getUserInfo(data);
 					})
 					.catch(e => {
 						that.$util.Tips({
@@ -422,31 +328,31 @@
 	}
 	.appLogin {
 		margin-top: 60rpx;
-	
+
 		.hds {
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			font-size: 24rpx;
 			color: #B4B4B4;
-	
+
 			.line {
 				width: 68rpx;
 				height: 1rpx;
 				background: #CCCCCC;
 			}
-	
+
 			p {
 				margin: 0 20rpx;
 			}
 		}
-	
+
 		.btn-wrapper {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			margin-top: 30rpx;
-	
+
 			.btn {
 				display: flex;
 				align-items: center;
@@ -455,7 +361,7 @@
 				height: 68rpx;
 				border-radius: 50%;
 			}
-	
+
 			.apple-btn {
 				display: flex;
 				align-items: center;
@@ -464,85 +370,85 @@
 				background: #000;
 				border-radius: 34rpx;
 				font-size: 40rpx;
-	
+
 				.icon-s-pingguo {
 					color: #fff;
 					font-size: 40rpx;
 				}
 			}
-	
+
 			.iconfont {
 				font-size: 40rpx;
 				color: #fff;
 			}
-	
+
 			.wx {
 				margin-right: 30rpx;
 				background-color: #61C64F;
 			}
-	
+
 			.mima {
 				background-color: #28B3E9;
 			}
-	
+
 			.yanzheng {
 				background-color: #F89C23;
 			}
-	
+
 		}
 	}
-	
+
 	.code img {
 		width: 100%;
 		height: 100%;
 	}
-	
+
 	.acea-row.row-middle {
 		input {
 			margin-left: 20rpx;
 			display: block;
 		}
 	}
-	
+
 	.login-wrapper {
 		padding: 30rpx;
-	
+
 		.shading {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			width: 100%;
-	
+
 			/* #ifdef APP-VUE */
 			margin-top: 50rpx;
 			/* #endif */
 			/* #ifndef APP-VUE */
-	
+
 			margin-top: 200rpx;
 			/* #endif */
-	
-	
+
+
 			image {
 				width: 180rpx;
 				height: 180rpx;
 			}
 		}
-	
+
 		.whiteBg {
 			margin-top: 100rpx;
-	
+
 			.list {
 				border-radius: 16rpx;
 				overflow: hidden;
-	
+
 				.item {
 					border-bottom: 1px solid #F0F0F0;
 					background: #fff;
-	
+
 					.row-middle {
 						position: relative;
 						padding: 16rpx 45rpx;
-						
+
 						.texts{
 							flex: 1;
 							font-size: 28rpx;
@@ -552,7 +458,7 @@
 							justify-content: center;
 							align-items: center;
 						}
-	
+
 						input {
 							flex: 1;
 							font-size: 28rpx;
@@ -562,7 +468,7 @@
 							justify-content: center;
 							align-items: center;
 						}
-	
+
 						.code {
 							position: absolute;
 							right: 30rpx;
@@ -574,7 +480,7 @@
 					}
 				}
 			}
-	
+
 			.logon {
 				display: flex;
 				align-items: center;
@@ -587,7 +493,7 @@
 				color: #FFFFFF;
 				font-size: 30rpx;
 			}
-	
+
 			.tips {
 				margin: 30rpx;
 				text-align: center;
diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue
index 1e685317..d165c2c7 100644
--- a/pages/users/wechat_login/index.vue
+++ b/pages/users/wechat_login/index.vue
@@ -41,22 +41,11 @@
 	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import mobileLogin from '@/components/login_mobile/index.vue'
 	import routinePhone from '@/components/login_mobile/routine_phone.vue'
-	import {
-		mapGetters
-	} from "vuex";
 	import {
 		getLogo,
 		getUserPhone
 	} from '@/api/public';
-	import {
-		LOGO_URL,
-		EXPIRES_TIME,
-		USER_INFO,
-		STATE_R_KEY
-	} from '@/config/cache';
-	import {
-		getUserInfo
-	} from '@/api/user.js'
+	import { getUserInfo } from '@/api/user.js'
 	import Routine from '@/libs/routine';
 	import wechat from "@/libs/wechat";
 	export default {
@@ -347,7 +336,7 @@
 		background: #fff;
 		height: 100%;
 	}
-    
+
 	.page {
 		background: #fff;
 		height: 100%;
diff --git a/static/images/logo2.png b/static/images/logo2.png
index 36046f74d91ac0aaee1b9c4b993f6818e80b996f..0c09e1993fd153850832e7da0776d6d1ba7f4e55 100644
GIT binary patch
literal 5742
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

literal 4822
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%0ASA^W_rJC0ZAm*dRfrwyfBMYYmd`
z4fSKEv%GI^cfR>{Kav?DgMUS;NwNtiGPQ04f|K<}V_tzCl8qF0^zcX`gPA0Yo_Gy4
z$c(ZxeNn`JOQG;NlZoEtLhkBh+bIyciJ;UmCmX7>@GV3OJ8YTTvFg)7ms}?aHQ+pF
zMe@=;3<(fVntQg_s1WEAoyA4+y6Cqs{{B;F&&1`<PkYH5uxA!YuRM0YP%`xK4p>7W
zV~yL}NkkXUTo-MOBRWsvXTJO~v}NsP?)VH%hpRw`S0c<8tukyR<#+xNAZkR;P4Q7o
z=!g&kefD@wrzF<TIXT%aLVB3Z=WsImUWY^V7uP?{_%-Uw4BcC??-gvBNv@!n!@@jB
zXP4ibY4Pr-?;I|`na@we@k)j;2<aP3tQoskl=rHW+Lw1#0bcwuUz}`vf7gfhz0gFH
zw#MmgG)-OJM%M%kEhs5sz)@I09n6tXy=dNyi!u7sw|5C?uKh#(GfW20BvD>laK#b8
dfQ2NAc~F+1KdnLQ^zWYn1FWK>T%%|k{eO+l83zCW