From 236b90ae3fe91262c7f40c7c8b46fee4ce578fe4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 16 Dec 2023 22:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=9A=E7=A7=BB=E9=99=A4=20username=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=A8=20app=20=E4=B8=80=E8=88=AC=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E8=BF=99=E5=9D=97=E4=BA=86=EF=BC=8C=E9=83=BD=E6=98=AF=E5=9F=BA?=
 =?UTF-8?q?=E4=BA=8E=E6=89=8B=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/info.vue                           | 27 ++-----
 .../components/change-username.vue            | 72 -------------------
 .../components/s-auth-modal/s-auth-modal.vue  |  4 --
 3 files changed, 5 insertions(+), 98 deletions(-)
 delete mode 100644 sheep/components/s-auth-modal/components/change-username.vue

diff --git a/pages/user/info.vue b/pages/user/info.vue
index 717074cf..255a9b3f 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -8,13 +8,14 @@
       border
       class="form-box"
     >
+      <!-- 头像 -->
       <view class="ss-flex ss-row-center ss-col-center ss-p-t-60 ss-p-b-0 bg-white">
         <view class="header-box-content">
           <su-image
             class="content-img"
             isPreview
             :current="0"
-            :src="sheep.$url.cdn(state.model.avatar)"
+            :src="state.model.avatar"
             :height="160"
             :width="160"
             :radius="80"
@@ -25,9 +26,9 @@
             <button
               class="ss-reset-button avatar-action-btn"
               open-type="chooseAvatar"
-              @chooseavatar="onChooseAvatar"
-              >修改</button
-            >
+              @chooseavatar="onChooseAvatar">
+              修改
+            </button>
             <!-- #endif -->
             <!-- #ifndef MP -->
             <button class="ss-reset-button avatar-action-btn" @tap="onChangeAvatar">修改</button>
@@ -37,24 +38,6 @@
       </view>
 
       <view class="bg-white ss-p-x-30">
-      <!--  <uni-forms-item name="username" label="用户名" @tap="onChangeUsername" class="label-box">
-          <uni-easyinput
-            v-model="userInfo.username"
-            disabled
-            :inputBorder="false"
-            :styles="{ disableColor: '#fff' }"
-            placeholder="设置用户名"
-            :clearable="false"
-            :placeholderStyle="placeholderStyle"
-          >
-            <template v-slot:right>
-              <su-radio class="ss-flex" v-if="userInfo.verification?.username" :modelValue="true" />
-              <button v-else class="ss-reset-button">
-                <text class="_icon-forward" style="color: #bbbbbb; font-size: 26rpx"></text>
-              </button>
-            </template>
-          </uni-easyinput>
-        </uni-forms-item> -->
 
         <uni-forms-item name="nickname" label="昵称">
           <uni-easyinput
diff --git a/sheep/components/s-auth-modal/components/change-username.vue b/sheep/components/s-auth-modal/components/change-username.vue
deleted file mode 100644
index 82d3de95..00000000
--- a/sheep/components/s-auth-modal/components/change-username.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<!-- 修改用户名 changeUsername  -->
-<template>
-  <view>
-    <!-- 标题栏 -->
-    <view class="head-box ss-m-b-60">
-      <view class="head-title ss-m-b-20">修改用户名</view>
-      <view class="head-subtitle">用户名仅限修改一次</view>
-    </view>
-
-    <!-- 表单项 -->
-    <uni-forms
-      ref="formRef"
-      v-model="state.model"
-      :rules="state.rules"
-      validateTrigger="bind"
-      labelWidth="140"
-      labelAlign="center"
-    >
-      <uni-forms-item name="username" label="用户名">
-        <uni-easyinput
-          placeholder="请输入用户名"
-          v-model="state.model.username"
-          :inputBorder="false"
-        ></uni-easyinput>
-      </uni-forms-item>
-
-      <view class="editPwd-btn-box ss-m-t-80">
-        <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="changeUsernameSubmit">
-          保存
-        </button>
-      </view>
-    </uni-forms>
-  </view>
-</template>
-
-<script setup>
-  import { computed, watch, ref, reactive, unref } from 'vue';
-  import sheep from '@/sheep';
-  import { username } from '@/sheep/validate/form';
-  import { showAuthModal, closeAuthModal } from '@/sheep/hooks/useModal';
-  const formRef = ref(null);
-
-  // 数据
-  const state = reactive({
-    model: {
-      username: '',
-    },
-    rules: {
-      username,
-    },
-  });
-
-  // 7.修改用户名
-  async function changeUsernameSubmit() {
-    const validate = await unref(formRef)
-      .validate()
-      .catch((error) => {
-        console.log('error: ', error);
-      });
-    if (!validate) return;
-    sheep.$api.user.changeUsername(state.model).then((res) => {
-      if (res.error === 0) {
-        sheep.$store('user').getInfo();
-        closeAuthModal();
-      }
-    });
-  }
-</script>
-
-<style lang="scss" scoped>
-  @import '../index.scss';
-</style>
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index ab3ef690..608cb202 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -28,9 +28,6 @@
       <!-- 6.修改密码 changePassword-->
       <change-passwrod v-if="authType === 'changePassword'" />
 
-      <!-- 7.修改用户名 changeUsername-->
-      <change-username v-if="authType === 'changeUsername'" />
-
       <!-- 8.微信小程序授权 changeUsername-->
       <mp-authorization v-if="authType === 'mpAuthorization'" />
 
@@ -130,7 +127,6 @@
   import resetPassword from './components/reset-password.vue';
   import changeMobile from './components/change-mobile.vue';
   import changePasswrod from './components/change-password.vue';
-  import changeUsername from './components/change-username.vue';
   import mpAuthorization from './components/mp-authorization.vue';
   import { closeAuthModal, showAuthModal } from '@/sheep/hooks/useModal';