完善抽奖号、中奖页面#23 工单页增加昵称和设备型号

fyscu · Oct 14, 2024 · 29ea7dd · 29ea7dd
2 parents 2882a8c + 328ffd9
commit 29ea7dd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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>