修复重大故障: JwtAuthenticationFilter文件，远程读取用户接口导致的服务器请求数量跑满

pages/user/auth.vue

@@ -4,59 +4,51 @@
       <template #content>
         <span class="text-large font-600 mr-3"> 实名认证 </span>
       </template>
-      <div class="login-layout m-auto mt-10 sm:w-screen-xl w-full">
-        <div class="m-auto flex sm:flex-row flex-col sm:px-0 px-3 ">
-          <!-- 用户菜单 -->
-<!--          <UserMenu :activeIndex="activeIndex" @done="reload"/>-->
-          <div class="flash bg-white rounded-lg w-full">
-            <div class="sm:w-screen-md w-full sm:px-4 sm:py-2">
-              <Auth @done="reload"/>
+      <el-card shadow="hover" class="my-10 px-2">
+        <el-row :gutter="30" justify="space-between">
+          <el-col :span="16">
+            <Auth @done="reload"/>
+          </el-col>
+          <el-col :span="5">
+            <div class="w-full mt-2 text-center" v-if="isCheck">
+              <el-alert type="warning" :closable="false" :title="`扫二维码完成实名认证`" />
+              <el-image :src="config.wxQrcode" shape="square" class="mt-2" />
             </div>
-          </div>
-        </div>
-      </div>
+          </el-col>
+        </el-row>
+      </el-card>
     </el-page-header>
   </div>
 </template>
 <script setup lang="ts">
 import { ArrowLeft,View,Search } from '@element-plus/icons-vue'
-import {useConfigInfo, useWebsite} from "~/composables/configState";
+import {useConfigInfo} from "~/composables/configState";
 import {ref} from 'vue'
-import {useServerRequest} from "~/composables/useServerRequest";
-import type {ApiResult} from "~/api";
-import UserMenu from "./components/UserMenu.vue";
 import Auth from './components/Auth.vue';
-import type {ShopMerchantApply} from "~/api/shop/shopMerchantApply/model";
-import {COMMON_API_URL} from "~/config";
 
 // 配置信息
-const runtimeConfig = useRuntimeConfig();
 const route = useRoute();
 const router = useRouter();
 const activeIndex = ref('');
-const website = useWebsite()
 const config = useConfigInfo();
-const merchantApply = ref<ShopMerchantApply>();
+const isCheck = ref(true);
 
-const reload = async () => {
+const reload = async (status?: boolean) => {
   // 未登录状态(是否强制登录)
   const token = localStorage.getItem('token');
   if (!token || token == '') {
     navigateTo('/passport/login');
     return false;
   }
-  const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>(COMMON_API_URL + '/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
-  if (response.value?.data) {
-    merchantApply.value = response.value.data;
-  }
-  if(config.value){
-    useHead({
-      title: `实名认证 - ${config.value?.siteName}`,
-      meta: [{name: website.value.keywords, content: website.value.comments}]
-    });
-  }
-}
 
+  if(status){
+    isCheck.value = false
+  }
+
+  useHead({
+    title: `实名认证 - ${config.value?.siteName}`
+  });
+}
 
 const goBack = () => {
   router.back(); // 返回上一页

pages/user/components/Auth.vue

@@ -1,197 +1,280 @@
 <template>
   <el-form
-      ref="formRef"
-      v-loading="loading"
-      :model="form"
-      :rules="rules"
-      label-position="top"
-      class="w-full sm:py-2 ml-4 mt-1"
-      size="large"
-      status-icon
+    ref="formRef"
+    v-loading="loading"
+    :model="form"
+    :rules="rules"
+    label-position="top"
+    class="w-full sm:py-2 ml-4 mt-1"
+    size="large"
+    status-icon
   >
-    <el-tabs v-model="form.type" class="flash bg-white ml-0">
-<!--      <el-tab-pane :name="0" label="个人认证"/>-->
-      <el-tab-pane :name="1" label="实名认证"/>
-    </el-tabs>
-    <!-- 已完成认证 -->
-    <template v-if="form.status === 1">
-      <template v-if="form.type == 0">
-        <el-result
+    <el-tabs v-model="form.type">
+      <el-tab-pane :name="0" label="个人认证">
+        <!-- 未完成认证 -->
+        <template v-if="form.status === 0 && form.checkStatus">
+          <el-result
+            icon="warning"
+            title="审核中"
+            :sub-title="`您的申请已提交，请耐心等待工作人员的审核，非常感谢`"
+          >
+          </el-result>
+        </template>
+        <!-- 已完成认证 -->
+        <template v-if="form.status === 1">
+          <el-result
             icon="success"
             title="个人认证已通过"
             :sub-title="`认证完成时间 ${form.completedTime}`"
-        >
-          <template #extra>
-            <el-button type="text" @click="onUpdate">修改认证信息</el-button>
-          </template>
-        </el-result>
-      </template>
-      <template v-else>
-        <el-result
+          >
+            <template #extra>
+              <el-button type="text" @click="onUpdate">修改认证信息</el-button>
+            </template>
+          </el-result>
+        </template>
+        <!-- 申请被驳回 -->
+        <template v-if="form.status === 2">
+          <el-result
+            icon="error"
+            title="您的申请已被驳回"
+            :sub-title="`${form.reason}`"
+          >
+            <template #extra>
+              <el-button type="text" @click="onUpdate">修改认证信息</el-button>
+            </template>
+          </el-result>
+        </template>
+        <!-- 未提交 -->
+        <template v-if="form.status == 0 && !form.checkStatus">
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="form.phone" disabled maxlength="11" placeholder="请输入真实有效的手机号码"/>
+          </el-form-item>
+          <el-form-item label="真实姓名" prop="realName">
+            <el-input v-model="form.realName" placeholder="请输入真实姓名"/>
+          </el-form-item>
+          <el-form-item label="身份证号码" prop="idCard" required>
+            <el-input v-model="form.idCard" placeholder="请输入证件号码"/>
+          </el-form-item>
+          <el-form-item label="身份证">
+            <el-upload
+              v-model:file-list="sfzFile"
+              action="https://server.gxwebosoft.com/api/oss/upload"
+              :headers="{
+                Authorization: token,
+                TenantId: 5,
+              }"
+              :limit="2"
+              list-type="picture-card"
+              :on-preview="handlePictureCardPreview"
+              :on-remove="sfzRemove"
+              :on-success="sfzSuccess"
+            >
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </el-upload>
+          </el-form-item>
+          <el-form-item label="所属行业" prop="category">
+            <el-cascader
+              v-model="industry"
+              :options="industryData"
+              placeholder="请选择所属行业"
+              class="w-full"
+              @change="handleChange"
+            />
+          </el-form-item>
+          <el-form-item label="业务描述" prop="comments">
+            <el-input v-model="form.comments" placeholder="请输入公司业务介绍" :rows="5" type="textarea"/>
+          </el-form-item>
+          <el-form-item label="注册协议">
+            <el-checkbox v-model="isAgree">
+              请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。
+            </el-checkbox>
+          </el-form-item>
+          <el-space class="flex">
+            <el-button type="primary" size="large" :disabled="!isAgree" @click="submitForm(formRef)">
+              {{ isUpdate ? '提交修改' : '提交申请' }}
+            </el-button>
+          </el-space>
+        </template>
+
+      </el-tab-pane>
+      <el-tab-pane :name="1" label="企业认证">
+        <!-- 未完成认证 -->
+        <template v-if="form.status === 0 && form.checkStatus">
+          <el-result
+            icon="warning"
+            title="审核中"
+            :sub-title="`您的申请已提交，请耐心等待工作人员的审核，非常感谢`"
+          >
+          </el-result>
+        </template>
+        <!-- 已完成认证 -->
+        <template v-if="form.status === 1">
+          <el-result
             icon="success"
             title="企业认证已通过"
             :sub-title="`认证完成时间 ${form.completedTime}`"
-        >
-          <template #extra>
-            <el-button type="text" @click="onUpdate">修改认证信息</el-button>
-          </template>
-        </el-result>
-      </template>
-    </template>
-    <!-- 申请被驳回 -->
-    <template v-if="form.status === 2">
-      <el-result
-          icon="error"
-          title="您的申请已被驳回"
-          :sub-title="`${form.reason}`"
-      >
-        <template #extra>
-          <el-button type="text" @click="onUpdate">修改认证信息</el-button>
+          >
+            <template #extra>
+              <el-button type="text" @click="onUpdate">修改认证信息</el-button>
+            </template>
+          </el-result>
         </template>
-      </el-result>
-    </template>
-    <!-- 未完成认证 -->
-    <template v-if="form.status === 0 && form.checkStatus">
-      <el-result
-          icon="warning"
-          title="审核中"
-          :sub-title="`您的申请已提交，请耐心等待工作人员的审核，非常感谢`"
-      >
-      </el-result>
-    </template>
-    <template v-if="form.status === 0 && !form.checkStatus">
-      <template v-if="form.type == 1">
-        <el-form-item label="企业名称" prop="merchantName">
-          <el-input v-model="form.merchantName" placeholder="请输入企业名称"/>
-        </el-form-item>
-        <el-form-item label="社会信用代码" prop="merchantCode">
-          <el-input v-model="form.merchantCode" placeholder="请输入社会信用代码"/>
-        </el-form-item>
-        <el-form-item label="营业执照" required>
-          <el-upload
+        <!-- 申请被驳回 -->
+        <template v-if="form.status === 2">
+          <el-result
+            icon="error"
+            title="您的申请已被驳回"
+            :sub-title="`${form.reason}`"
+          >
+            <template #extra>
+              <el-button type="text" @click="onUpdate">修改认证信息</el-button>
+            </template>
+          </el-result>
+        </template>
+        <!-- 未提交 -->
+        <template v-if="form.status == 0 && !form.checkStatus">
+          <el-form-item label="企业名称" prop="merchantName">
+            <el-input v-model="form.merchantName" placeholder="请输入企业名称"/>
+          </el-form-item>
+          <el-form-item label="社会信用代码" prop="merchantCode">
+            <el-input v-model="form.merchantCode" placeholder="请输入社会信用代码"/>
+          </el-form-item>
+          <el-form-item label="营业执照" required>
+            <el-upload
               v-model:file-list="yyzzFile"
-              action="https://common-api.websoft.top/api/oss/upload"
+              action="https://server.gxwebosoft.com/api/oss/upload"
               :headers="{
                 Authorization: token,
-                TenantId: tenantId,
+                TenantId: 5,
               }"
               :limit="1"
               list-type="picture-card"
               :on-preview="handlePictureCardPreview"
               :on-remove="yyzzRemove"
               :on-success="yyzzOnSuccess"
-          >
-            <el-icon><Plus /></el-icon>
-          </el-upload>
+            >
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </el-upload>
 
-          <el-dialog v-model="dialogVisible">
-            <div class="flex justify-center">
-              <img w-full :src="dialogImageUrl" alt="Preview Image" />
-            </div>
-          </el-dialog>
-        </el-form-item>
-        <el-form-item label="门头照片">
-          <el-upload
+            <el-dialog v-model="dialogVisible">
+              <div class="flex justify-center">
+                <img w-full :src="dialogImageUrl" alt="Preview Image"/>
+              </div>
+            </el-dialog>
+          </el-form-item>
+          <el-form-item label="门头照片">
+            <el-upload
               v-model:file-list="image"
-              action="https://common-api.websoft.top/api/oss/upload"
+              action="https://server.gxwebosoft.com/api/oss/upload"
               :headers="{
                 Authorization: token,
-                TenantId: tenantId,
+                TenantId: 5,
               }"
               :limit="1"
               list-type="picture-card"
               :on-preview="handlePictureCardPreview"
               :on-remove="imageRemove"
               :on-success="imageOnSuccess"
-          >
-            <el-icon><Plus /></el-icon>
-          </el-upload>
+            >
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </el-upload>
 
-          <el-dialog v-model="dialogVisible">
-            <div class="flex justify-center">
-              <img w-full :src="dialogImageUrl" alt="Preview Image" />
-            </div>
-          </el-dialog>
-        </el-form-item>
-        <el-form-item label="其他证件">
-          <el-upload
+            <el-dialog v-model="dialogVisible">
+              <div class="flex justify-center">
+                <img w-full :src="dialogImageUrl" alt="Preview Image"/>
+              </div>
+            </el-dialog>
+          </el-form-item>
+          <el-form-item label="其他证件">
+            <el-upload
               v-model:file-list="files"
-              action="https://common-api.websoft.top/api/oss/upload"
+              action="https://server.gxwebosoft.com/api/oss/upload"
               :headers="{
                 Authorization: token,
-                TenantId: tenantId,
+                TenantId: 5,
               }"
               :limit="9"
               list-type="picture-card"
               :on-preview="handlePictureCardPreview"
               :on-remove="filesRemove"
               :on-success="filesOnSuccess"
-          >
-            <el-icon><Plus /></el-icon>
-          </el-upload>
+            >
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </el-upload>
 
-          <el-dialog v-model="dialogVisible">
-            <div class="flex justify-center">
-              <img w-full :src="dialogImageUrl" alt="Preview Image" />
-            </div>
-          </el-dialog>
-        </el-form-item>
-      </template>
-      <el-form-item label="真实姓名" prop="realName">
-        <el-input v-model="form.realName" placeholder="请输入真实姓名"/>
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phone">
-        <el-input v-model="form.phone" maxlength="11" placeholder="请输入真实有效的手机号码"/>
-      </el-form-item>
-      <el-form-item label="身份证号码" prop="idCard">
-        <el-input v-model="form.idCard" placeholder="请输入证件号码"/>
-      </el-form-item>
-      <el-form-item label="身份证" required>
-        <el-upload
-            v-model:file-list="sfzFile"
-            action="https://common-api.websoft.top/api/oss/upload"
-            :headers="{
+            <el-dialog v-model="dialogVisible">
+              <div class="flex justify-center">
+                <img w-full :src="dialogImageUrl" alt="Preview Image"/>
+              </div>
+            </el-dialog>
+          </el-form-item>
+          <el-form-item label="真实姓名" prop="realName">
+            <el-input v-model="form.realName" placeholder="请输入真实姓名"/>
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="form.phone" disabled maxlength="11" placeholder="请输入真实有效的手机号码"/>
+          </el-form-item>
+          <el-form-item label="身份证号码" prop="idCard" required>
+            <el-input v-model="form.idCard" placeholder="请输入证件号码"/>
+          </el-form-item>
+          <el-form-item label="身份证">
+            <el-upload
+              v-model:file-list="sfzFile"
+              action="https://server.gxwebosoft.com/api/oss/upload"
+              :headers="{
                 Authorization: token,
-                TenantId: tenantId,
+                TenantId: 5,
               }"
-            :limit="2"
-            list-type="picture-card"
-            :on-preview="handlePictureCardPreview"
-            :on-remove="sfzRemove"
-            :on-success="sfzSuccess"
-        >
-          <el-icon><Plus /></el-icon>
-        </el-upload>
-      </el-form-item>
-      <el-form-item label="所属行业" prop="category">
-        <el-cascader
-            v-model="industry"
-            :options="industryData"
-            placeholder="请选择所属行业"
-            class="w-full"
-            @change="handleChange"
-        />
-      </el-form-item>
-      <el-form-item label="业务描述" prop="comments">
-        <el-input v-model="form.comments" placeholder="请输入公司业务介绍" :rows="5" type="textarea" />
-      </el-form-item>
-      <el-form-item label="注册协议">
-        <el-checkbox v-model="isAgree">
-          请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。
-        </el-checkbox>
-      </el-form-item>
-      <el-space class="flex">
-        <el-button type="primary" size="large" :disabled="!isAgree" @click="submitForm(formRef)">
-          {{ isUpdate ? '提交修改' : '提交申请' }}
-        </el-button>
-      </el-space>
-    </template>
+              :limit="2"
+              list-type="picture-card"
+              :on-preview="handlePictureCardPreview"
+              :on-remove="sfzRemove"
+              :on-success="sfzSuccess"
+            >
+              <el-icon>
+                <Plus/>
+              </el-icon>
+            </el-upload>
+          </el-form-item>
+          <el-form-item label="所属行业" prop="category">
+            <el-cascader
+              v-model="industry"
+              :options="industryData"
+              placeholder="请选择所属行业"
+              class="w-full"
+              @change="handleChange"
+            />
+          </el-form-item>
+          <el-form-item label="业务描述" prop="comments">
+            <el-input v-model="form.comments" placeholder="请输入公司业务介绍" :rows="5" type="textarea"/>
+          </el-form-item>
+          <el-form-item label="注册协议">
+            <el-checkbox v-model="isAgree">
+              请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。
+            </el-checkbox>
+          </el-form-item>
+          <el-space class="flex">
+            <el-button type="primary" size="large" :disabled="!isAgree" @click="submitForm(formRef)">
+              {{ isUpdate ? '提交修改' : '提交申请' }}
+            </el-button>
+          </el-space>
+        </template>
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog v-model="dialogVisible">
+      <div class="flex justify-center">
+        <el-image w-full :src="dialogImageUrl" alt="查看证件"/>
+      </div>
+    </el-dialog>
   </el-form>
-  <el-dialog v-model="dialogVisible">
-    <div class="flex justify-center">
-      <el-image w-full :src="dialogImageUrl" alt="查看证件" />
-    </div>
-  </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -200,15 +283,21 @@ import {Plus} from '@element-plus/icons-vue'
 import type {FormInstance, FormRules, UploadProps, UploadUserFile} from 'element-plus'
 import type {ShopMerchantApply} from "~/api/shop/shopMerchantApply/model";
 import industryData from '@/assets/json/industry-data.json';
-import {useClientRequest} from "~/composables/useClientRequest";
-import type {ApiResult} from "~/api";
-import {useServerRequest} from "~/composables/useServerRequest";
-import type {ShopMerchant} from "~/api/shop/shopMerchant/model";
 import useFormData from "~/utils/use-form-data";
-import {COMMON_API_URL} from "~/config";
+import {
+  addShopMerchantApply, getShopMerchantApplyByPhone,
+  getShopMerchantApplyByUserId,
+  updateShopMerchantApply
+} from "~/api/shop/shopMerchantApply";
+import {useUser} from "~/composables/configState";
+
+
+const emit = defineEmits<{
+  (e: 'done', status: boolean): void
+}>()
 
 const token = useToken();
-const tenantId = localStorage.getItem('ServerTenantId')
+const user = useUser();
 const formRef = ref<FormInstance>()
 const yyzzFile = ref<UploadUserFile[]>([])
 const sfzFile = ref<UploadUserFile[]>([])
@@ -230,7 +319,7 @@ const {form, assignFields, resetFields} = useFormData<ShopMerchantApply>({
   merchantName: undefined,
   merchantCode: undefined,
   image: undefined,
-  phone: undefined,
+  phone: user.value.phone,
   realName: undefined,
   idCard: undefined,
   sfz1: undefined,
@@ -293,7 +382,7 @@ const sfzRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
   form.sfz2 = '';
 }
 
-const sfzSuccess = (e:any) => {
+const sfzSuccess = (e: any) => {
   sfzStr.value.push(e.data.downloadUrl)
 }
 
@@ -346,116 +435,130 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
   dialogVisible.value = true
 }
 
-const runtimeConfig = useRuntimeConfig();
 const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      console.log('submit!',valid)
-      if (form.type == 0) {
-        form.shopType = '个人开发者';
-        form.merchantName = form.realName;
-      }
-      if(form.type == 1){
-        form.shopType = '企业开发者';
-        if(form.yyzz == ''){
-          return ElMessage.error('请上营业执照');
-        }
-        if(filesStr.value.length > 0){
-          form.files = JSON.stringify(filesStr.value)
-        }
-      }
-      if(sfzStr.value.length == 1){
-        return ElMessage.error('请上传身份证正反面');
-      }
-      form.sfz1 = sfzStr.value[0];
-      form.sfz2 = sfzStr.value[1];
-      useClientRequest<ApiResult<any>>(`/shop/shop-merchant-apply`, {
-        baseURL: runtimeConfig.public.apiServer,
-        method: isUpdate.value ? 'PUT' : 'POST',
-        body: form
-      }).then(res => {
-        if (res.code == 0) {
-          ElMessage.success(res.message)
-          reload();
-        } else {
-          return ElMessage.error(res.message)
-        }
-      })
-    } else {
-      console.log('error submit!', fields)
-    }
-  })
-}
+  if (!formEl) return;
+
+  await formEl.validate(async (valid) => {
+    if (!valid) return;
+
+    console.log('submit!', valid);
+
+    if (form.type === 0) {
+      form.shopType = '个人开发者';
+      form.merchantName = form.realName;
+    }
+
+    if (form.type === 1) {
+      form.shopType = '企业开发者';
+      if (!form.yyzz) {
+        ElMessage.error('请上传营业执照');
+        return;
+      }
+      if (filesStr.value.length > 0) {
+        form.files = JSON.stringify(filesStr.value);
+      }
+    }
+
+    if (sfzStr.value.length < 2) {
+      ElMessage.error('请上传身份证正反面');
+      return;
+    }
+
+    form.sfz1 = sfzStr.value[0];
+    form.sfz2 = sfzStr.value[1];
+
+    const saveOrUpdate = isUpdate.value ? updateShopMerchantApply : addShopMerchantApply;
+
+    try {
+      const res = await saveOrUpdate({
+        ...form,
+        files: filesStr.value.length ? JSON.stringify(filesStr.value) : undefined,
+        yyzz: form.yyzz || undefined,
+        sfz1: form.sfz1 || undefined,
+        sfz2: form.sfz2 || undefined,
+      });
+      console.log(res);
+      ElMessage.success('提交成功');
+      await reload()
+    } catch (err) {
+      console.log(err)
+    }
+  });
+};
 
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  resetFields();
-}
 
 const reload = async () => {
-  const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>(COMMON_API_URL + '/shop/shop-merchant-apply/getByUserId')
-  if (response.value?.data) {
-    isUpdate.value = true;
-    assignFields(response.value.data)
-    industry.value = []
-    industry.value.push(form.parentId)
-    industry.value.push(form.categoryId)
-    files.value = []
-    filesStr.value = []
-    yyzzFile.value = []
-    sfzFile.value = []
-    sfzStr.value = []
-    image.value = []
-    if(form.sfz1){
-      sfzFile.value.push({
-        uid: 1,
-        url: form.sfz1,
-        name: '身份证正面',
-      })
-    }
-    if(form.sfz2){
-      sfzFile.value.push({
-        uid: 2,
-        url: form.sfz2,
-        name: '身份证反面',
-      })
-    }
-    if(form.yyzz){
-      yyzzFile.value.push({
-        uid: 3,
-        url: form.yyzz,
-        name: '营业执照',
-      })
-    }
-    if(form.image){
-      image.value.push({
-        uid: 4,
-        url: form.image,
-        name: '',
-      })
-    }
-    if (form.files) {
-      const arr = JSON.parse(form.files)
-      let i = 1;
-      arr.map(d => {
-        files.value.push({
-          uid: i++,
-          url: d,
+  getShopMerchantApplyByPhone()
+    .then(data => {
+      assignFields(data)
+      industry.value = []
+      industry.value.push(form.parentId)
+      industry.value.push(form.categoryId)
+      files.value = []
+      filesStr.value = []
+      yyzzFile.value = []
+      sfzFile.value = []
+      sfzStr.value = []
+      image.value = []
+
+      // 赋值
+      if (user.value.phone) {
+        form.phone = user.value.phone;
+      }
+      if (form.sfz1) {
+        sfzFile.value.push({
+          uid: 1,
+          url: form.sfz1,
+          name: '身份证正面',
+        })
+        sfzStr.value.push(form.sfz1)
+      }
+      if (form.sfz2) {
+        sfzFile.value.push({
+          uid: 2,
+          url: form.sfz2,
+          name: '身份证反面',
+        })
+        sfzStr.value.push(form.sfz2)
+      }
+      if (form.yyzz) {
+        yyzzFile.value.push({
+          uid: 3,
+          url: form.yyzz,
+          name: '营业执照',
+        })
+      }
+      if (form.image) {
+        image.value.push({
+          uid: 4,
+          url: form.image,
           name: '',
         })
-        filesStr.value.push(d)
-      })
-    }
-  }
-  loading.value = false
+      }
+      if (form.files) {
+        const arr = JSON.parse(form.files)
+        let i = 1;
+        arr.map((item: any) => {
+          files.value.push({
+            uid: i++,
+            url: item,
+            name: '',
+          })
+          filesStr.value.push(item)
+        })
+      }
+      if(form.status == 1){
+        emit('done',true)
+      }
+      isUpdate.value = true
+    })
+    .catch(() => {
+      resetFields();
+      emit('done',false)
+    })
+    .finally(() => {
+      loading.value = false
+    })
 }
 reload();
 </script>
-<style scoped>
-/* 自定义 el-dialog 的样式 */
-.el-dialog {
-  background: rgba(255, 255, 255, 0.5); /* 设置背景颜色为半透明白色 */
-  backdrop-filter: blur(10px); /* 可选：为背景添加模糊效果 */
-}
-</style>

pages/user/index.vue

@@ -2,7 +2,7 @@
   <div class="xl:w-screen-xl m-auto py-4 my-20">
     <el-page-header :icon="ArrowLeft" @back="goBack">
       <template #content>
-        <span class="text-large font-600 mr-3"> 用户中心 </span>
+        <span class="text-large font-600 mr-3"> 用户中心{{ user?.certification }} </span>
       </template>
       <template #extra>
         <nuxt-link to="/user/modify" class="text-gray-400 text-sm">修改资料</nuxt-link>
@@ -25,8 +25,8 @@
                 <el-descriptions-item label="昵称">{{ user?.nickname }}</el-descriptions-item>
                 <el-descriptions-item label="性别">{{ user?.sexName }}</el-descriptions-item>
                 <el-descriptions-item label="邮箱">{{ user?.email }}</el-descriptions-item>
-                <el-descriptions-item label="所在省份">{{ user?.province }}</el-descriptions-item>
-                <el-descriptions-item label="所在城市">{{ user?.city }}</el-descriptions-item>
+<!--                <el-descriptions-item label="所在省份">{{ user?.province }}</el-descriptions-item>-->
+<!--                <el-descriptions-item label="所在城市">{{ user?.city }}</el-descriptions-item>-->
                 <el-descriptions-item label="可用余额">{{ user?.balance }}</el-descriptions-item>
                 <el-descriptions-item label="可用积分">{{ user?.points }}</el-descriptions-item>
 <!--                <el-descriptions-item :rowspan="1" :span="2" label="生日">{{ user?.birthday }}</el-descriptions-item>-->
@@ -43,18 +43,14 @@
 </template>
 <script setup lang="ts">
 import {ArrowLeft, View, Search} from '@element-plus/icons-vue'
-import {useWebsite} from "~/composables/configState";
 import useFormData from '@/utils/use-form-data';
 import type {User} from '@/api/system/user/model';
 import {ref} from 'vue'
 import {updateUser} from "~/api/layout";
 
-
 // 配置信息
-const runtimeConfig = useRuntimeConfig();
 const route = useRoute();
 const router = useRouter();
-const website = useWebsite()
 const user = useUser();
 const activeIndex = ref('');
 
@@ -76,15 +72,6 @@ const {form, assignFields} = useFormData<User>({
   tenantName: undefined
 });
 
-useHead({
-  title: `用户中心`,
-  meta: [{name: website.value.keywords, content: website.value.comments}]
-});
-
-const onDone = (index: string) => {
-  activeIndex.value = index;
-}
-
 const reload = async () => {
   // 未登录状态(是否强制登录)
   const token = localStorage.getItem('token');

pages/user/modify.vue

@@ -14,7 +14,7 @@
                     <el-form-item label="上传头像" class="px-4">
                       <el-upload
                           v-model:file-list="avatar"
-                          action="https://common-api.websoft.top/api/oss/upload"
+                          action="https://server.gxwebsoft.com/api/oss/upload"
                           :headers="{
                           Authorization: token,
                           TenantId: 5,
@@ -65,21 +65,16 @@
 </template>
 <script setup lang="ts">
 import {ArrowLeft, View, Search, Plus} from '@element-plus/icons-vue'
-import type {FormInstance, FormRules, UploadProps, UploadUserFile} from 'element-plus'
-import {useWebsite} from "~/composables/configState";
+import type {UploadProps, UploadUserFile} from 'element-plus'
 import useFormData from '@/utils/use-form-data';
 import type {User} from '@/api/system/user/model';
 import {ref} from 'vue'
 import {updateUser} from "~/api/layout";
 
-
 // 配置信息
-const runtimeConfig = useRuntimeConfig();
-const tenantId = localStorage.getItem('ServerTenantId')
 const token = useToken();
 const route = useRoute();
 const router = useRouter();
-const website = useWebsite()
 const user = useUser();
 const activeIndex = ref('');
 const avatar = ref<UploadUserFile[]>([])
@@ -107,14 +102,9 @@ const {form, assignFields} = useFormData<User>({
 });
 
 useHead({
-  title: `用户中心`,
-  meta: [{name: website.value.keywords, content: website.value.comments}]
+  title: `用户中心`
 });
 
-const onDone = (index: string) => {
-  activeIndex.value = index;
-}
-
 const reload = async () => {
   // 未登录状态(是否强制登录)
   const token = localStorage.getItem('token');

pages/user/order.vue

@@ -2,7 +2,7 @@
   <div class="xl:w-screen-xl m-auto py-4 my-20">
     <el-page-header :icon="ArrowLeft" @back="goBack">
       <template #content>
-        <span class="text-large font-600 mr-3"> 订单列表 </span>
+        <span class="text-large font-600 mr-3"> 已购插件 </span>
       </template>
       <div class="login-layout m-auto mt-10 sm:w-screen-xl w-full">
         <div class="m-auto flex sm:flex-row flex-col sm:px-0 px-3">
@@ -57,8 +57,7 @@ const { form, assignFields } = useFormData<User>({
 const tableData = ref<any[]>();
 
 useHead({
-  title: `用户中心 - ${config.value?.siteName}`,
-  meta: [{ name: website.value.keywords, content: website.value.comments }]
+  title: `用户中心 - ${config.value?.siteName}`
 });
 
 const onSubmit = async () => {

pages/user/password.vue

@@ -74,8 +74,7 @@ const {form, assignFields} = useFormData<User>({
 });
 
 useHead({
-  title: `用户中心 - ${config.value?.siteName}`,
-  meta: [{name: website.value.keywords, content: website.value.comments}]
+  title: `用户中心 - ${config.value?.siteName}`
 });