From 5f2df5905aba185f624f73c33f13e4677ba4118d Mon Sep 17 00:00:00 2001
From: LJM12914 <LJM12914@outlook.com>
Date: Sun, 13 Oct 2024 15:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2&=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=A1=A8=E5=8D=95=E9=A1=BA=E5=BA=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/selfPage/newEmailPage/index.json |  2 +-
 pages/selfPage/newEmailPage/index.wxml |  6 +++---
 pages/selfPage/settingsPage/index.wxml | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pages/selfPage/newEmailPage/index.json b/pages/selfPage/newEmailPage/index.json
index b66daf5..639245f 100644
--- a/pages/selfPage/newEmailPage/index.json
+++ b/pages/selfPage/newEmailPage/index.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "绑定邮箱",
+  "navigationBarTitleText": "更换邮箱",
   "usingComponents": {
     "van-field": "@vant/weapp/field/index",
     "van-button": "@vant/weapp/button/index",
diff --git a/pages/selfPage/newEmailPage/index.wxml b/pages/selfPage/newEmailPage/index.wxml
index d03e25a..24b6d24 100644
--- a/pages/selfPage/newEmailPage/index.wxml
+++ b/pages/selfPage/newEmailPage/index.wxml
@@ -1,9 +1,9 @@
 <!--index.wxml-->
 <scroll-view class="scrollview" scroll-y type="list">
   <view class="container">
-    <van-cell-group inset title="绑定邮箱">
-      <van-field required error-message="{{ validEmail ? '' : '邮箱格式错误' }}" center name="email" label="邮箱"
-        placeholder="请输入电子邮箱" clearable value="{{ newEmail }}" border="{{ false }}" bind:change="onEmailChange"
+    <van-cell-group inset title="输入新的邮箱">
+      <van-field required error-message="{{ validEmail ? '' : '邮箱格式错误' }}" center name="email" label="邮箱地址"
+        placeholder="请输入邮箱地址" clearable value="{{ newEmail }}" border="{{ false }}" bind:change="onEmailChange"
         error="{{ !hasEmail }}">
         <view slot="right-icon" class="material-icons"> mail </view>
       </van-field>
diff --git a/pages/selfPage/settingsPage/index.wxml b/pages/selfPage/settingsPage/index.wxml
index 6834ccf..aabeb24 100644
--- a/pages/selfPage/settingsPage/index.wxml
+++ b/pages/selfPage/settingsPage/index.wxml
@@ -7,10 +7,20 @@
       </image>
     </button>
     <van-cell-group inset>
-      <van-field wx:if="{{ loggedin !== 1 }}" disabled center name="phone" type="digit" label="联系方式"
+      <van-field required center name="nickname" type="nickname" label="用户名" placeholder="请输入昵称" clearable
+        value="{{ userInfo.nickname }}" border="{{ false }}" bind:change="onNicknameChange" bind:blur="onNicknameBlur"
+        error="{{ !hasNickname }}">
+        <view class="material-icons" slot="right-icon"> face </view>
+      </van-field>
+      <van-cell required title="所在校区" bind:click="showPopup" data-index="1" is-link
+        value="{{ userInfo.campus === '' ? '请选择' : userInfo.campus }}" arrow-direction="down">
+      </van-cell>
+      <van-field wx:if="{{ loggedin !== 1 }}" disabled center name="phone" type="digit" label="手机号码"
         value="{{ userInfo.phone }}" border="{{ false }}" bind:change="onPhoneChange" error="{{ !hasPhone }}">
         <view class="material-icons" slot="right-icon"> phone </view>
       </van-field>
+      <van-cell wx:if="{{ loggedin !== 1 }}" is-link title="更换手机号码" link-type="navigateTo" url="../newPhonePage/index">
+      </van-cell>
       <van-field wx:if="{{ userInfo.email }}" disabled center name="email" placeholder="请输入电子邮箱" clearable
         value="{{ userInfo.email }}" border="{{ false }}" bind:change="onEmailChange" error="{{ !hasEmail }}">
         <view slot="label">
@@ -19,20 +29,10 @@
         </view>
         <view slot="right-icon" class="material-icons"> mail </view>
       </van-field>
-      <van-field required center name="nickname" type="nickname" label="用户名" placeholder="请输入昵称" clearable
-        value="{{ userInfo.nickname }}" border="{{ false }}" bind:change="onNicknameChange" bind:blur="onNicknameBlur"
-        error="{{ !hasNickname }}">
-        <view class="material-icons" slot="right-icon"> face </view>
-      </van-field>
-      <van-cell required title="所在校区" bind:click="showPopup" data-index="1" is-link
-        value="{{ userInfo.campus === '' ? '请选择' : userInfo.campus }}" arrow-direction="down">
-      </van-cell>
-      <van-cell wx:if="{{ userInfo.email }}" is-link title="跟换绑定邮箱" link-type="navigateTo" url="../newEmailPage/index">
+      <van-cell wx:if="{{ userInfo.email }}" is-link title="更换邮箱" link-type="navigateTo" url="../newEmailPage/index">
       </van-cell>
       <van-cell wx:else is-link title="绑定邮箱" link-type="navigateTo" url="../newEmailPage/index"
-        label="您可以绑定邮箱以接收工单进度通知">
-      </van-cell>
-      <van-cell wx:if="{{ loggedin !== 1 }}" is-link title="手机号换绑" link-type="navigateTo" url="../newPhonePage/index">
+        label="绑定您的邮箱，以接收工单进度通知。">
       </van-cell>
       <van-cell is-link title="删除账号" link-type="navigateTo" url="../signOutPage/index">
       </van-cell>