From af3b0bf434d8219edc4e198f09e5a67eefa0cd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98=E2=80=98?= <kun.cheng@funi.com>
Date: Fri, 24 Mar 2023 11:22:15 +0800
Subject: [PATCH] =?UTF-8?q?feature-hub-1.0:=E6=96=B0=E5=A2=9E=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue | 75 +++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index bb51828..408e205 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -32,17 +32,19 @@
 					<uni-easyinput type="password" v-model="formData.password" placeholder="请输入密码" :inputBorder="false" />
 				</uni-forms-item>
 				
-				<uni-forms-item prop="code" v-if="captchaOnOff">
-					<uni-easyinput
-						v-model="formData.code"
-						auto-complete="off"
-						placeholder="验证码"
-						style="width: 63%"
-						@keyup.enter.native="handleLogin">
-						<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-					</uni-easyinput>
-					<div class="login-code">
-						<img :src="codeUrl" @click="getCode" class="login-code-img"/>
+				<uni-forms-item required name="code">
+					<template #label>
+						<div class="form-label l-code">
+							<uni-icons type="map-pin-ellipse" size="18" color="#FFFFFF"></uni-icons>
+						</div> 
+					</template>
+					<div class="login-code-item">
+						<uni-easyinput type="text" v-model="formData.code" placeholder="请输入验证码" :inputBorder="false"/>
+						<template>
+							<div>
+								<image :src="codeUrl" @click="getCode" class="login-code-img"/>
+							</div>
+						</template>
 					</div>
 				</uni-forms-item>
 			</uni-forms>
@@ -67,12 +69,12 @@
 				noClick:true, //防止重复提交
 				// 验证码开关
 				captchaOnOff: true,
-				codeUrl: "",
+				codeUrl: '',
 				formData: {
 					phone: '',
 					password: '',
-					code: "",
-					uuid: ""
+					code: '',
+					uuid: ''
 				},
 				
 				rules: {
@@ -95,10 +97,12 @@
 							}
 						}]
 					},
-					code: [{
-						required: true,
-						errorMessage: '请输入验证码'
-					}],
+					code: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入验证码'
+						}]
+					}, 
 					phone: {
 						rules: [{
 								required: true,
@@ -138,32 +142,29 @@
 			//获取验证码
 			 getCode() {
 			      getCodeImg().then(res => {
-			        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+			        this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
 			        if (this.captchaOnOff) {
-			          this.codeUrl = "data:image/gif;base64," + res.img;
-			          this.formData.uuid = res.uuid;
+			          this.codeUrl = "data:image/gif;base64," + res.data.img;
+			          this.formData.uuid = res.data.uuid;
 			        }
 			      });
 			    },
 			login(e) {
 				// console.log(e)
 				let that = this
-				// console.log('that.phoneFlag', that.phoneFlag)
-				// console.log('that.passwordFlag', that.passwordFlag)
 				if (that.phoneFlag === true && that.passwordFlag === true) {
-					// console.log('全部达成')
 					uni.showLoading({
 						title: '艺术家登录中!',
 					})
           let pwd = md5(that.formData.password)
           const param = {
             phone: that.formData.phone,
-            password: pwd
+            password: pwd,
+			code: that.formData.code,
+			uuid: that.formData.uuid
           }
-          // console.log('form', param)
           login(param).then(response => {
             if (response.data.code === 200) {
-              // console.log('response',response)
               //登录成功，设置token、艺术家信息，页面跳转到主页
               uni.setStorage({
                 key: 'userInfo',
@@ -260,6 +261,11 @@
 			background: $uni-bg-base-color;
 		}
 		
+		.l-code {
+			background: $uni-bg-base-color;
+		}
+		
+		
 	}
 	
 	.login-btn {
@@ -298,4 +304,19 @@
     border-radius: 0 24rpx 24rpx 0;
 	}
 }
+
+.login-code-item{
+	display: flex;
+	width: 540rpx;
+	height: 100rpx;
+	
+	.login-code-img {
+	  margin-left: 50rpx;
+	  height: 90rpx;
+	  width: 260rpx;
+	  border-radius: 24rpx 24rpx 24rpx 24rpx;
+	}
+	
+}
+
 </style>