Merge branch 'master' of https://gitee.com/mickeywaugh/youlai-app

src/pages/mine/account/index.vue

@@ -2,27 +2,10 @@
   <view class="page py-16rpx">
     <wd-card>
       <wd-cell-group border>
-        <wd-cell
-          icon="secured"
-          title="账户密码"
-          value="修改"
-          is-link
-          @click="handleOpenDialog(DialogType.PASSWORD)"
-        />
-        <wd-cell
-          icon="mobile"
-          title="绑定手机"
-          :value="userProfile?.mobile || '未绑定手机号'"
-          is-link
-          @click="handleOpenDialog(DialogType.MOBILE)"
-        />
-        <wd-cell
-          icon="mail"
-          title="绑定邮箱"
-          :value="userProfile?.email ? userProfile.email : '未绑定邮箱'"
-          is-link
-          @click="handleOpenDialog(DialogType.EMAIL)"
-        />
+        <wd-cell icon="secured" title="账户密码" value="修改" is-link @click="handleOpenDialog(DialogType.PASSWORD)" />
+        <wd-cell icon="mobile" title="绑定手机" :value="userProfile?.mobile || '未绑定手机号'" is-link @click="handleOpenDialog(DialogType.MOBILE)" />
+        <wd-cell icon="mail" title="绑定邮箱" :value="userProfile?.email ? userProfile.email : '未绑定邮箱'" is-link
+          @click="handleOpenDialog(DialogType.EMAIL)" />
         <!-- #ifdef MP-WEIXIN -->
         <wd-cell icon="wechat" title="微信" value="解绑" is-link @click="handleUnbindWechat" />
         <!-- #endif -->
@@ -30,84 +13,28 @@
     </wd-card>
 
     <!--用户信息编辑弹出框-->
-    <wd-popup
-      v-model="dialog.visible"
-      position="bottom"
-      custom-style="border-top-left-radius: 24rpx; border-top-right-radius: 24rpx;"
-    >
-      <wd-form
-        v-if="dialog.type === DialogType.PASSWORD"
-        ref="passwordChangeFormRef"
-        :model="passwordChangeForm"
-        custom-class="edit-form"
-      >
+    <wd-popup v-model="dialog.visible" position="bottom" custom-style="border-top-left-radius: 24rpx; border-top-right-radius: 24rpx;">
+      <wd-form v-if="dialog.type === DialogType.PASSWORD" ref="passwordChangeFormRef" :model="passwordChangeForm" custom-class="edit-form">
         <wd-cell-group border>
-          <wd-input
-            v-model="passwordChangeForm.oldPassword"
-            label="原密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请输入原密码"
-            prop="oldPassword"
-            :rules="rules.oldPassword"
-          />
-          <wd-input
-            v-model="passwordChangeForm.newPassword"
-            label="新密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请输入新密码"
-            prop="newPassword"
-            :rules="rules.newPassword"
-          />
-          <wd-input
-            v-model="passwordChangeForm.confirmPassword"
-            label="确认密码"
-            label-width="160rpx"
-            show-password
-            clearable
-            placeholder="请确认新密码"
-            prop="confirmPassword"
-            :rules="rules.confirmPassword"
-          />
+          <wd-input v-model="passwordChangeForm.oldPassword" label="原密码" label-width="160rpx" show-password clearable placeholder="请输入原密码"
+            prop="oldPassword" :rules="rules.oldPassword" />
+          <wd-input v-model="passwordChangeForm.newPassword" label="新密码" label-width="160rpx" show-password clearable placeholder="请输入新密码"
+            prop="newPassword" :rules="rules.newPassword" />
+          <wd-input v-model="passwordChangeForm.confirmPassword" label="确认密码" label-width="160rpx" show-password clearable placeholder="请确认新密码"
+            prop="confirmPassword" :rules="rules.confirmPassword" />
         </wd-cell-group>
         <view class="p-24rpx">
           <wd-button type="primary" size="large" block @click="handleSubmit">提交</wd-button>
         </view>
       </wd-form>
-      <wd-form
-        v-if="dialog.type === DialogType.MOBILE"
-        ref="mobileBindingFormRef"
-        :model="mobileBindingForm"
-        custom-class="edit-form"
-      >
+      <wd-form v-if="dialog.type === DialogType.MOBILE" ref="mobileBindingFormRef" :model="mobileBindingForm" custom-class="edit-form">
         <wd-cell-group border>
-          <wd-input
-            v-model="mobileBindingForm.mobile"
-            label="手机号码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入手机号码"
-            prop="mobile"
-            :rules="rules.mobile"
-          />
-          <wd-input
-            v-model="mobileBindingForm.code"
-            label="验证码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入验证码"
-            prop="code"
-            :rules="rules.code"
-          >
+          <wd-input v-model="mobileBindingForm.mobile" label="手机号码" label-width="160rpx" clearable placeholder="请输入手机号码" prop="mobile"
+            :rules="rules.mobile" />
+          <wd-input v-model="mobileBindingForm.code" label="验证码" label-width="160rpx" clearable placeholder="请输入验证码" prop="code"
+            :rules="rules.code">
             <template #suffix>
-              <wd-button
-                plain
-                :disabled="mobileCountdown > 0"
-                @click="handleSendVerificationCode('MOBILE')"
-              >
+              <wd-button plain :disabled="mobileCountdown > 0" @click="handleSendVerificationCode('MOBILE')">
                 {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
               </wd-button>
             </template>
@@ -117,37 +44,14 @@
           <wd-button type="primary" size="large" block @click="handleSubmit">提交</wd-button>
         </view>
       </wd-form>
-      <wd-form
-        v-if="dialog.type === DialogType.EMAIL"
-        ref="emailBindingFormRef"
-        :model="emailBindingForm"
-        custom-class="edit-form"
-      >
+      <wd-form v-if="dialog.type === DialogType.EMAIL" ref="emailBindingFormRef" :model="emailBindingForm" custom-class="edit-form">
         <wd-cell-group border>
-          <wd-input
-            v-model="emailBindingForm.email"
-            label="邮箱"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入邮箱"
-            prop="email"
-            :rules="rules.email"
-          />
-          <wd-input
-            v-model="emailBindingForm.code"
-            label="验证码"
-            label-width="160rpx"
-            clearable
-            placeholder="请输入验证码"
-            prop="code"
-            :rules="rules.code"
-          >
+          <wd-input v-model="emailBindingForm.email" label="邮箱" label-width="160rpx" clearable placeholder="请输入邮箱" prop="email"
+            :rules="rules.email" />
+          <wd-input v-model="emailBindingForm.code" label="验证码" label-width="160rpx" clearable placeholder="请输入验证码" prop="code"
+            :rules="rules.code">
             <template #suffix>
-              <wd-button
-                plain
-                :disabled="emailCountdown > 0"
-                @click="handleSendVerificationCode('EMAIL')"
-              >
+              <wd-button plain :disabled="emailCountdown > 0" @click="handleSendVerificationCode('EMAIL')">
                 {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
               </wd-button>
             </template>
@@ -228,7 +132,7 @@ const handleUnbindWechat = async () => {
       await confirm({
         title: "提示",
         msg: "确定要解绑微信吗？解绑后将无法使用微信小程序登录",
-      headerImage: "warning",
+        headerImage: "warning"
       });
       await UserAPI.unbindSocial("WECHAT_MINI");
       toast.success("解绑成功");

src/pages/mine/profile/complete-profile.vue

@@ -19,24 +19,18 @@
               <!-- #ifndef MP-WEIXIN -->
               <view class="avatar-picker__trigger" @click="chooseAvatar">
                 <!-- #endif -->
-              <image
-                v-if="profileForm.avatar"
-                :src="profileForm.avatar"
-                class="avatar-picker__img"
-                mode="aspectFill"
-              />
+                <image v-if="profileForm.avatar" :src="profileForm.avatar" class="avatar-picker__img" mode="aspectFill" />
                 <view v-else class="avatar-picker__placeholder">
                   <wd-icon name="camera" size="40" color="var(--color-text-placeholder)" />
                   <text class="avatar-picker__hint">选择头像</text>
                 </view>
-            <!-- #ifdef MP-WEIXIN -->
+              </view> <!-- #ifdef MP-WEIXIN -->
             </button>
             <!-- #endif -->
             <!-- #ifndef MP-WEIXIN -->
           </view>
           <!-- #endif -->
         </view>
-        </view>
 
         <!-- 昵称 -->
         <view class="profile-form__section">
@@ -45,22 +39,11 @@
             <text class="profile-form__required">*</text>
           </view>
           <!-- #ifdef MP-WEIXIN -->
-          <input
-            v-model="profileForm.nickname"
-            type="nickname"
-            class="profile-form__nickname-input"
-            placeholder="请输入昵称"
-            :maxlength="20"
-          />
+          <input v-model="profileForm.nickname" type="nickname" class="profile-form__nickname-input" placeholder="请输入昵称" :maxlength="20" />
           <!-- #endif -->
           <!-- #ifndef MP-WEIXIN -->
-          <wd-input
-            v-model="profileForm.nickname"
-            placeholder="请输入昵称"
-            prop="nickname"
-            :rules="rules.nickname"
-            custom-class="profile-form__nickname-input"
-          />
+          <wd-input v-model="profileForm.nickname" placeholder="请输入昵称" prop="nickname" :rules="rules.nickname"
+            custom-class="profile-form__nickname-input" />
           <!-- #endif -->
         </view>
 
@@ -79,27 +62,15 @@
             手机号
             <text class="profile-form__required">*</text>
           </view>
-          <wd-input
-            v-model="profileForm.mobile"
-            placeholder="请输入手机号"
-            prop="mobile"
-            custom-class="profile-form__nickname-input"
-          />
+          <wd-input v-model="profileForm.mobile" placeholder="请输入手机号" prop="mobile" custom-class="profile-form__nickname-input" />
         </view>
       </wd-form>
     </view>
 
     <!-- 底部 -->
     <view class="profile-footer">
-      <wd-button
-        class="profile-footer__submit"
-        type="primary"
-        size="large"
-        block
-        :disabled="!canComplete || isLoading"
-        :loading="isLoading"
-        @click="handleComplete"
-      >
+      <wd-button class="profile-footer__submit" type="primary" size="large" block :disabled="!canComplete || isLoading" :loading="isLoading"
+        @click="handleComplete">
         完成
       </wd-button>
       <view class="profile-footer__skip" @click="handleSkip">
@@ -108,11 +79,7 @@
     </view>
 
     <!-- 头像裁剪 -->
-    <wd-img-cropper
-      v-model="cropperVisible"
-      :img-src="originalImageSrc"
-      @confirm="handleAvatarConfirm"
-    />
+    <wd-img-cropper v-model="cropperVisible" :img-src="originalImageSrc" @confirm="handleAvatarConfirm" />
 
     <wd-toast />
   </view>