From 67ab1c59738248104e953dcc7f5e954889d67bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= <xl376837995@163.com>
Date: Fri, 19 Jan 2024 09:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/peanut/mine.vue   |   3 +-
 pages/user/login.vue    | 172 +++++++++++++++++++++-------------------
 pages/user/persData.vue |   6 +-
 3 files changed, 94 insertions(+), 87 deletions(-)

diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue
index 8a330e0..b67ed89 100644
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -10,7 +10,8 @@
 				<text class="name" v-if="userMes.nickname!=null">{{userMes.nickname}}</text>
 				<text class="name" v-if="userMes.nickname==null">未设置</text>
 				<!-- <image v-if="userMes.vip==1" src="../../static/icon/mine_v.png" alt="" class="per_user_img"></image> -->
-				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;">({{userMes.tel}})</text>
+				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;" v-if="userMes.tel">({{userMes.tel}})</text>
+				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;" v-else>({{userMes.email}})</text>
 
 				<!-- <text class="tong">累计读书5本
 					<span style="margin: 0 20upx;">|</span> 今日读50分钟
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 639035e..0ae4507 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -9,6 +9,9 @@
 			<image src="../../static/icon/login_icon_2.png" mode="aspectFit" class="icon_hua_2"></image>
 		</view>
 		<view class="register_page">
+
+
+
 			<view class="login_method">
 				<view class="title" :class="{ active: type == 2000 }" v-if="type == 2000">验证码登录/注册</view>
 				<view class="title" :class="{ active: type == 1000 }" v-if="type == 1000">密码登录</view>
@@ -16,108 +19,111 @@
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
 
-			<!-- 验证码登录 -->
-			<view v-if="type == 2000">
-				<view class="flexbox" style=" margin-top: 50rpx;">
-					<view class="input_tit emaPho" style="margin-top: 0; margin-right: 20rpx;">
-						<view @click="brand=3000" :class="{ active: brand == 3000 }">手机号</view>
-						<span>/</span>
-						<view @click="brand=4000" :class="{ active: brand == 4000 }">邮箱</view>
+				<!-- 验证码登录 -->
+				<view v-if="type == 2000">
+					<view class="flexbox" style=" margin-top: 50rpx;">
+						<view class="input_tit emaPho" style="margin-top: 0; margin-right: 20rpx;">
+							<view @click="brand=3000" :class="{ active: brand == 3000 }">手机号</view>
+							<span>/</span>
+							<view @click="brand=4000" :class="{ active: brand == 4000 }">邮箱</view>
+						</view>
 					</view>
-				</view>
-				<!-- 带区号手机号 -->
-				<view class="flexbox" v-if="brand == 3000" style="margin:36rpx 0; justify-content: space-between;">
-					<!-- <view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
+					<!-- 带区号手机号 -->
+					<view class="flexbox" v-if="brand == 3000" style="margin:36rpx 0; justify-content: space-between;">
+						<!-- <view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
 						<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
 						
 					</view> -->
-					<view class="quhao">
-						<uni-data-select class="myselect" placeholder="请选择区号" v-model="quCode" :localdata="quCodeList"
-							style="height: 30rpx !important;" @change="quChange"></uni-data-select>
+						<view class="quhao">
+							<uni-data-select class="myselect" placeholder="请选择区号" v-model="quCode"
+								:localdata="quCodeList" style="height: 30rpx !important;"
+								@change="quChange"></uni-data-select>
+						</view>
+						<view class="triangle borderBottom phoneNumberInput"
+							:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+							<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
+								placeholder-class="grey" />
+						</view>
 					</view>
-					<view class="triangle borderBottom phoneNumberInput"
-						:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
-						<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
-							placeholder-class="grey" />
-					</view>
-				</view>
 
-				<!-- 不带区号 -->
-				<!-- <view class="triangle borderBottom phoneNumberInput input_box"
+					<!-- 不带区号 -->
+					<!-- <view class="triangle borderBottom phoneNumberInput input_box"
 					:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
 					<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
 				</view> -->
 
-				<!-- 邮箱 -->
-				<view class="input_box" v-if="brand == 4000">
-					<input v-model="email" placeholder="请输入您的邮箱" placeholder-class="grey" @input="onInput" />
+					<!-- 邮箱 -->
+					<view class="input_box" v-if="brand == 4000">
+						<input v-model="email" placeholder="请输入您的邮箱" placeholder-class="grey" @input="onInput" />
+					</view>
+					<view class="input_tit">验证码</view>
+					<view class="input_box">
+						<input v-model="code" placeholder="请输入您的验证码" placeholder-class="grey" @input="onInput"
+							maxlength="6" @confirm="onSubmit" />
+						<button class="active" @click="onSetCode">{{ codeText }}</button>
+					</view>
 				</view>
-				<view class="input_tit">验证码</view>
-				<view class="input_box">
-					<input v-model="code" placeholder="请输入您的验证码" placeholder-class="grey" @input="onInput" maxlength="6"
-						@confirm="onSubmit" />
-					<button class="active" @click="onSetCode">{{ codeText }}</button>
-				</view>
-			</view>
 
-			<!-- 密码登录 -->
-			<view v-if="type == 1000">
-				<!-- 手机号/邮箱 -->
-				<view class="input_tit" style=" margin-top: 80rpx;">手机号 / 邮箱</view>
-				<view class="input_box">
-					<input v-model="phoneEmail" placeholder="请输入您的手机号或者邮箱" placeholder-class="grey" @input="onInput" />
+				<!-- 密码登录 -->
+				<view v-if="type == 1000">
+					<!-- 手机号/邮箱 -->
+					<view class="input_tit" style=" margin-top: 80rpx;">手机号 / 邮箱</view>
+					<view class="input_box">
+						<input v-model="phoneEmail" placeholder="请输入您的手机号或者邮箱" placeholder-class="grey"
+							@input="onInput" />
+					</view>
+					<view class="input_tit">密码</view>
+					<view class="input_box">
+						<input class="input_item" v-model="password" @input="onInput" :password="!isSee"
+							placeholder="请输入密码" placeholder-class="grey" @confirm="onSubmit" />
+						<image v-if="isSee" src="../../static/icon/ic_logon_display.png" mode="aspectFit"
+							@click="isSee = false">
+						</image>
+						<image v-else-if="!isSee" src="../../static/icon/ic_logon_hide.png" mode="aspectFit"
+							@click="isSee = true">
+						</image>
+					</view>
 				</view>
-				<view class="input_tit">密码</view>
-				<view class="input_box">
-					<input class="input_item" v-model="password" @input="onInput" :password="!isSee" placeholder="请输入密码"
-						placeholder-class="grey" @confirm="onSubmit" />
-					<image v-if="isSee" src="../../static/icon/ic_logon_display.png" mode="aspectFit"
-						@click="isSee = false">
-					</image>
-					<image v-else-if="!isSee" src="../../static/icon/ic_logon_hide.png" mode="aspectFit"
-						@click="isSee = true">
-					</image>
-				</view>
-			</view>
 
-			<view class="protocol_box">
-				<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
-				我已同意
-				<!-- <text @click="plus.runtime.openURL('https://main.nuttyreading.com/agreement.html')">《用户协议》</text> -->
-				<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
-				<span class="highlight" @click="yhxyShow=true">《用户协议》</span>
-				和
-				<span class="highlight" @click="yszcShow=true">《隐私协议》</span>
-				<!-- <text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>-->
-			</view>
-			<view class="btn_box">
-				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
-				<button v-else>登 录</button>
-			</view>
-			<!-- <view class="password_register" style="margin: 0 auto; text-align: center; display: block;">
+				<view class="protocol_box">
+					<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
+					我已同意
+					<!-- <text @click="plus.runtime.openURL('https://main.nuttyreading.com/agreement.html')">《用户协议》</text> -->
+					<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
+					<span class="highlight" @click="yhxyShow=true">《用户协议》</span>
+					和
+					<span class="highlight" @click="yszcShow=true">《隐私协议》</span>
+					<!-- <text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>-->
+				</view>
+				<view class="btn_box">
+					<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
+					<button v-else>登 录</button>
+				</view>
+				<!-- <view class="password_register" style="margin: 0 auto; text-align: center; display: block;">
 				<button @click="onPageJump('/pages/user/register')">注册账号</button>
 				<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
 			</view> -->
-			<view class="third_party_login_box">
-				<view class="third_party_title"><text>第三方登录</text></view>
-				<view class="third_party_content">
-					<image src="../../static/icon/ic_login_health.png" @click="onHealthLogin" mode="aspectFit"></image>
+				<view class="third_party_login_box">
+					<view class="third_party_title"><text>第三方登录</text></view>
+					<view class="third_party_content">
+						<image src="../../static/icon/ic_login_health.png" @click="onHealthLogin" mode="aspectFit">
+						</image>
+					</view>
 				</view>
-			</view>
 
-			<view class="qie_huan" style="display: flex; justify-content: center;">
-				<view style="width: 30%;" @click="type = 1000" v-if="type == 2000">密码登录</view>
-				<view style="width:50%; display: flex; justify-content:space-between;" v-if="type == 1000">
-					<text @click="type = 2000">验证码登录</text>
-					<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
-					<!-- <text @click="resetPassWord()">忘记密码</text> -->
+				<view class="qie_huan" style="display: flex; justify-content: center;">
+					<view style="width: 30%;" @click="type = 1000" v-if="type == 2000">密码登录</view>
+					<view style="width:50%; display: flex; justify-content:space-between;" v-if="type == 1000">
+						<text @click="type = 2000">验证码登录</text>
+						<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
+						<!-- <text @click="resetPassWord()">忘记密码</text> -->
+					</view>
 				</view>
-			</view>
-
-			<view class="youKeL">
-				<view @click="onPageJump('/pages/user/visitor')">免登陆体验</view>
-			</view>
 
+				<view class="youKeL" style="margin-bottom: 80rpx;">
+					<view @click="onPageJump('/pages/user/visitor')">免登陆体验</view>
+				</view>
+	
 
 			<z-popup v-model="HealthOpen" type="center" :hideOnBlur="false">
 				<view class="popup_box">
@@ -302,7 +308,7 @@
 						this.yszcText = res.privacy
 						this.yszcText.content = this.yszcText.content.replace(/<h5>/g,
 							'<view style="font-weight: bold;font-size: 32rpx;margin-top: 20rpx;margin-bottom: 20rpx;">'
-							);
+						);
 						this.yszcText.content = this.yszcText.content.replace(/<\/h5>/g, '</view>');
 
 					}).catch((e) => {
@@ -314,7 +320,7 @@
 						this.yhxyText = res.user
 						this.yhxyText.content = this.yhxyText.content.replace(/<h5>/g,
 							'<view style="font-weight: bold;font-size: 32rpx;margin-top: 20rpx;margin-bottom: 20rpx;">'
-							);
+						);
 						this.yhxyText.content = this.yhxyText.content.replace(/<\/h5>/g, '</view>');
 					}).catch((e) => {
 						console.log(e, 'e')
diff --git a/pages/user/persData.vue b/pages/user/persData.vue
index 2086677..1c0dc6f 100644
--- a/pages/user/persData.vue
+++ b/pages/user/persData.vue
@@ -7,13 +7,13 @@
 			<view class="per_list">
 				<text class="biaoti">手机号</text>
 				<text class="neirong">{{userMsage.tel}}</text>
-				<text class="marPer" v-if="userMsage.tel==''" @click="phoneShow = true;OpenClear()"
+				<text class="marPer" v-if="!userMsage.tel" @click="phoneShow = true;OpenClear()"
 					style="background-color: #ed901d;">点击绑定</text>
 			</view>
 			<view class="per_list">
 				<text class="biaoti">邮箱</text>
 				<text class="neirong">{{userMsage.email}}</text>
-				<text class="marPer" v-if="userMsage.email==''" @click="emailShow = true;OpenClear()"
+				<text class="marPer" v-if="!userMsage.email" @click="emailShow = true;OpenClear()"
 					style="background-color: #ed901d;">点击绑定</text>
 			</view>
 			<view class="per_list per_list_arrow" @click="avatarShow = true">
@@ -310,7 +310,6 @@
 							that.userMes.avatar = res.user.avatar
 							that.userMes.oldName = that.userMes.nickname
 							that.userMes.id = res.user.id
-
 							that.userMsage.age = res.user.age
 							that.userMsage.email = res.user.email
 							that.userMsage.sex = res.user.sex
@@ -491,6 +490,7 @@
 
 			// 邮箱
 			choseEmail(e) {
+
 				this.userMes.code = this.userMes.emailcode
 				if (this.userMes.email == '') {
 					uni.showToast({