修复：用户资料及认证提交页面，需求定制页面

pages/user/auth.vue

@@ -7,7 +7,7 @@
       <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"/>
+<!--          <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"/>
@@ -27,6 +27,7 @@ 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();
@@ -44,7 +45,7 @@ const reload = async () => {
     navigateTo('/passport/login');
     return false;
   }
-  const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>('/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
+  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;
   }

pages/user/components/Auth.vue

@@ -10,8 +10,8 @@
       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-tab-pane :name="0" label="个人认证"/>-->
+      <el-tab-pane :name="1" label="实名认证"/>
     </el-tabs>
     <!-- 已完成认证 -->
     <template v-if="form.status === 1">
@@ -205,9 +205,10 @@ 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";
 
 const token = useToken();
-const tenantId = localStorage.getItem('TID_ADMIN')
+const tenantId = localStorage.getItem('ServerTenantId')
 const formRef = ref<FormInstance>()
 const yyzzFile = ref<UploadUserFile[]>([])
 const sfzFile = ref<UploadUserFile[]>([])
@@ -393,7 +394,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 
 const reload = async () => {
-  const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>('/shop/shop-merchant-apply/getByUserId')
+  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)

pages/user/components/Base.vue

@@ -39,6 +39,15 @@ withDefaults(
     }>(),
     {}
 );
+
+const emit = defineEmits<{
+  (e: 'done', where: any): void
+}>()
+
+const onSubmit = () => {
+  emit('done')
+}
+
 </script>
 
 <style scoped lang="less">

pages/user/components/UserMenu.vue

@@ -29,11 +29,11 @@ const activities = [
     name: '账号信息',
     path: '/user'
   },
-  {
-    icon: Lock,
-    name: '密码修改',
-    path: '/user/password'
-  },
+  // {
+  //   icon: Lock,
+  //   name: '密码修改',
+  //   path: '/user/password'
+  // },
   {
     icon: Postcard,
     name: '实名认证',

pages/user/index.vue

@@ -7,11 +7,23 @@
       <div class="login-layout 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="onDone" class="sm:flex hidden"/>
+<!--          <UserMenu :activeIndex="activeIndex" @done="onDone" class="sm:flex hidden"/>-->
           <div class="flash bg-white rounded-lg w-full">
             <div class="title text-xl text-gray-700 md:px-8 p-4 md:mt-3 font-500">账号信息</div>
-            <div class="sm:w-screen-md w-full sm:px-4 sm:py-2">
-              <Base :form="form"/>
+            <div class="lg:w-screen-lg w-full sm:px-4 sm:py-4 mb-10">
+              <el-descriptions class="px-4" :column="2" border>
+                <el-descriptions-item label="用户ID">{{user?.userId}}</el-descriptions-item>
+                <el-descriptions-item label="手机号码">{{user?.mobile}}</el-descriptions-item>
+                <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?.birthday}}</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 label="个人简介">{{user?.introduction}}</el-descriptions-item>
+              </el-descriptions>
             </div>
           </div>
         </div>
@@ -25,20 +37,19 @@ 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 {useServerRequest} from "~/composables/useServerRequest";
-import type {ApiResult} from "~/api";
 import UserMenu from "./components/UserMenu.vue";
-import Base from './components/Base.vue';
+import {updateUser} from "~/api/layout";
+import {openUrl} from "~/utils/common";
+
 
 // 配置信息
 const runtimeConfig = useRuntimeConfig();
 const route = useRoute();
 const router = useRouter();
 const website = useWebsite()
-const userInfo = ref<User>();
+const user = useUser();
 const activeIndex = ref('');
 
-
 // 配置信息
 const {form, assignFields} = useFormData<User>({
   userId: undefined,
@@ -67,17 +78,6 @@ const onDone = (index: string) => {
   activeIndex.value = index;
 }
 
-const onSubmit = async () => {
-  const {data: modify} = await useServerRequest<ApiResult<User>>('/auth/user', {
-    baseURL: runtimeConfig.public.apiServer,
-    method: 'put',
-    body: form
-  })
-  if (modify.value?.code == 0) {
-    ElMessage.success('修改成功')
-  }
-}
-
 const reload = async () => {
   // 未登录状态(是否强制登录)
   const token = localStorage.getItem('token');
@@ -85,10 +85,14 @@ const reload = async () => {
       navigateTo('/passport/login');
       return false;
   }
-  const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
-  if (response.value?.data) {
-    userInfo.value = response.value?.data;
-    assignFields(response.value?.data);
+  if(user.value){
+    form.userId = user.value.userId;
+    form.nickname = user.value.nickname;
+    form.realName = user.value.realName;
+    form.mobile = user.value.mobile;
+    form.email = user.value.email;
+    form.sex = user.value.sex;
+    form.comments = user.value.comments;
   }
 }
 
@@ -100,7 +104,6 @@ watch(
     () => route.path,
     (path) => {
       activeIndex.value = path;
-      console.log(path, '=>Path')
       reload();
     },
     {immediate: true}