修复已知问题

api/shop/shopMerchantApply/model/index.ts

@@ -7,7 +7,7 @@ export interface ShopMerchantApply {
   // ID
   applyId?: number;
   // 认证类型
-  type?: string;
+  type?: number;
   // 商户名称
   merchantName?: string;
   // 社会信用代码

api/system/company/model/index.ts

@@ -1,6 +1,7 @@
 import type { PageParam } from '@/api';
 import type {CompanyParameter} from "~/api/system/companyParameter/model";
 import type {CompanyUrl} from "~/api/system/companyUrl/model";
+import type {CompanyGit} from "~/api/system/companyGit/model";
 
 /**
  * 企业信息
@@ -90,6 +91,7 @@ export interface Company {
   installed?: boolean;
   parameters?: CompanyParameter[];
   links?: CompanyUrl[];
+  gits?: CompanyGit[];
 }
 
 /**

api/system/companyComment/model/index.ts

@@ -13,7 +13,7 @@ export interface CompanyComment {
   // 企业ID
   companyId?: number;
   // 评分
-  rate?: string;
+  rate?: number;
   // 排序(数字越小越靠前)
   sortNumber?: number;
   // 评论内容
@@ -22,8 +22,14 @@ export interface CompanyComment {
   status?: number;
   // 租户id
   tenantId?: number;
+  // 租户名称
+  tenantName?: string;
+  // 企业
+  logo?: string;
   // 创建时间
   createTime?: string;
+  // 子列表
+  children?: CompanyComment[];
 }
 
 /**
@@ -31,5 +37,7 @@ export interface CompanyComment {
  */
 export interface CompanyCommentParam extends PageParam {
   id?: number;
+  userId?: number;
+  tenantId?: number;
   keywords?: string;
 }

api/system/companyGit/index.ts

@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { CompanyGit, CompanyGitParam } from './model';
+import { SERVER_API_URL } from '@/config/index';
+
+/**
+ * 分页查询代码仓库
+ */
+export async function pageCompanyGit(params: CompanyGitParam) {
+  const res = await request.get<ApiResult<PageResult<CompanyGit>>>(
+    SERVER_API_URL + '/system/company-git/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询代码仓库列表
+ */
+export async function listCompanyGit(params?: CompanyGitParam) {
+  const res = await request.get<ApiResult<CompanyGit[]>>(
+    SERVER_API_URL + '/system/company-git',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加代码仓库
+ */
+export async function addCompanyGit(data: CompanyGit) {
+  const res = await request.post<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company-git',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改代码仓库
+ */
+export async function updateCompanyGit(data: CompanyGit) {
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company-git',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除代码仓库
+ */
+export async function removeCompanyGit(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company-git/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除代码仓库
+ */
+export async function removeBatchCompanyGit(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    SERVER_API_URL + '/system/company-git/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询代码仓库
+ */
+export async function getCompanyGit(id: number) {
+  const res = await request.get<ApiResult<CompanyGit>>(
+    SERVER_API_URL + '/system/company-git/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

api/system/companyGit/model/index.ts

@@ -0,0 +1,41 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 代码仓库
+ */
+export interface CompanyGit {
+  // 自增ID
+  id?: number;
+  // 仓库名称
+  title?: string;
+  // 厂商 0私有仓库 1github 2gitee 3其他
+  brand?: string;
+  // 语言
+  language?: string;
+  // 企业ID
+  companyId?: number;
+  // 仓库地址
+  domain?: string;
+  // 账号
+  account?: string;
+  // 密码
+  password?: string;
+  // 仓库描述
+  comments?: string;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 状态, 0正常, 1待确认
+  status?: number;
+  // 创建时间
+  createTime?: string;
+  // 租户id
+  tenantId?: number;
+}
+
+/**
+ * 代码仓库搜索条件
+ */
+export interface CompanyGitParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}

api/system/user/model/index.ts

@@ -120,8 +120,11 @@ export interface User {
   platform?: string;
   // 排序
   sortNumber?: number;
-
   deleted?: number;
+  // 实名认证状态
+  certification?: boolean;
+  // 实名认证类型
+  certificationType?: number;
 }
 
 /**

components/AppHeader.vue

@@ -45,11 +45,16 @@
                 </el-sub-menu>
                 <el-menu-item v-else :index="`${item.path}`"><h3 @click="openSpmUrl(`${item.path}`,item,item.navigationId)">{{ item.title }}</h3></el-menu-item>
               </template>
-<!--              <el-menu-item>-->
-<!--                <el-space @click="loginDeveloperCenterByToken">-->
-<!--                  <h3>开发者中心</h3>-->
-<!--                </el-space>-->
-<!--              </el-menu-item>-->
+              <el-menu-item v-if="user?.certification">
+                <el-space @click="loginDeveloperCenterByToken">
+                  <h3>开发者中心</h3>
+                </el-space>
+              </el-menu-item>
+              <el-menu-item v-else>
+                <el-space @click="openSpmUrl(`/user/auth`)">
+                  <h3>开发者中心</h3>
+                </el-space>
+              </el-menu-item>
             </el-menu>
           </div>
         </div>

composables/configState.ts

@@ -56,6 +56,7 @@ export const useUser = () =>
             nickname: '',
             gradeId: 0,
             gradeName: '',
+            certification: false,
             tenantId: 0,
             tenantName: '',
         };

pages/developer/index.vue

@@ -82,6 +82,7 @@ import {useWebsite} from "~/composables/configState";
 import type {Navigation} from "~/api/cms/navigation/model";
 import type {CompanyParam} from "~/api/system/company/model";
 import type {Article} from "~/api/cms/article/model";
+import type {ShopMerchant} from "~/api/shop/shopMerchant/model";
 
 const route = useRoute();
 // 页面信息
@@ -129,16 +130,12 @@ const reload = async (path: string) => {
   }
 }
 
-// const { data: nav } = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath',{query: {path: route.path}})
-// console.log(nav.value?.data)
-// if(nav.value?.data){
-//   form.value = nav.value?.data;
-//   console.log(form.value,'form...')
-// }
-// // 页面布局
-// if(form.value?.layout){
-//   layout.value = JSON.parse(form.value?.layout)
-// }
+const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>('/shop/shop-merchant-apply/getByUserId')
+if (response.value?.data) {
+  if (response.value.data.status == 2) {
+    loginDeveloperCenterByToken();
+  }
+}
 
 useHead({
   title: `开发者中心 - ${website.value?.websiteName}`,

pages/item/components/Comments.vue

@@ -26,19 +26,19 @@
                  style="border-bottom:1px solid #f3f3f3">
               <el-space class="user-info flex items-start" style="align-items:normal">
                 <div class="avatar">
-                  <el-avatar :src="item.avatar"/>
+                  <el-avatar :src="item.logo"/>
                 </div>
                 <div class="nickname flex flex-col">
                   <el-space class="text-sm text-gray-900">
-                    <span class="font-bold">{{ item.nickname }}</span>
-                    <el-rate v-model="item.rate" size="small"/>
+                    <span class="font-bold">{{ item.tenantName }}</span>
+                    <el-rate v-model="item.rate" disabled size="small"/>
                   </el-space>
                   <span class="text-xs text-gray-400">{{ item.createTime }}</span>
                   <div class="comments py-2" v-html="item.comments"></div>
                   <template v-if="item.children" v-for="(sub,index2) in item.children" :key="index2">
                     <el-space class="text-sm text-gray-900">
-                      <el-avatar :src="sub.avatar" size="small"/>
-                      <span class="font-bold">{{ sub.nickname }}</span>
+                      <el-avatar :src="sub.logo" size="small"/>
+                      <span class="font-bold">{{ sub.tenantName }}</span>
                       <span class="text-xs text-gray-400">{{ sub.createTime }}</span>
                     </el-space>
                     <div class="comments py-2" v-html="sub.comments"></div>
@@ -65,7 +65,7 @@
         :before-close="() => visible = false"
     >
       <el-form-item prop="rate">
-        <el-rate v-model="form.rate" size="large"/>
+        <el-rate v-model="form.rate" size="large" />
       </el-form-item>
       <el-form-item prop="comments">
         <el-input v-model="form.comments" :rows="5" type="textarea"
@@ -116,18 +116,18 @@
 <script setup lang="ts">
 import {FullScreen} from '@element-plus/icons-vue'
 import type {ApiResult} from "~/api";
-import type {CmsProductComment} from "~/api/cms/cmsProductComment/model";
 import type {FormInstance, FormRules} from "element-plus";
 import {useClientRequest} from "~/composables/useClientRequest";
 import {reactive, ref} from "vue";
 import useFormData from "~/utils/use-form-data";
+import type {CompanyComment} from "~/api/system/companyComment/model";
 
 
 const props = withDefaults(
     defineProps<{
       title?: string;
-      productId?: number;
-      comments?: CmsProductComment[];
+      companyId?: number;
+      comments?: CompanyComment[];
       count?: number;
     }>(),
     {}
@@ -144,22 +144,18 @@ const emit = defineEmits<{
 }>()
 
 // 配置信息
-const {form, resetFields} = useFormData<CmsProductComment>({
+const {form, resetFields} = useFormData<CompanyComment>({
   id: undefined,
-  productId: undefined,
+  parentId: undefined,
   userId: undefined,
-  nickname: undefined,
-  avatar: undefined,
-  image: undefined,
-  rate: 0,
-  tenantId: undefined,
-  createTime: undefined,
-  status: 0,
-  comments: '',
-  sortNumber: 100
+  companyId: undefined,
+  rate: undefined,
+  sortNumber: undefined,
+  comments: undefined,
+  status: undefined,
 });
 
-const rules = reactive<FormRules<CmsProductComment>>({
+const rules = reactive<FormRules<any>>({
   rate: [
     {required: true, message: '请输入评分', trigger: 'blur'},
   ],
@@ -187,8 +183,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
     ElMessage.error('还没有评分哦!')
     return false;
   }
-  form.productId = props.productId;
-  useClientRequest<ApiResult<any>>(`/cms/cms-product-comment/`, {
+  form.companyId = Number(getIdBySpm(5));
+  useClientRequest<ApiResult<any>>(`/system/company-comment`, {
     method: 'POST',
     body: form
   }).then(res => {
@@ -196,7 +192,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       ElMessage.success(res.message)
       visible.value = false
       resetFields();
-      emit('done',1)
+      emit('done',0)
     } else {
       return ElMessage.error(res.message)
     }

pages/item/components/PageBanner.vue

@@ -44,7 +44,7 @@
                 <!--                <a class="company-name text-sm my-1">-->
                 <!--                  {{ form.companyName || 'WebSoft Inc.' }}-->
                 <!--                </a>-->
-                <el-rate v-model="form.rate"/>
+                <el-rate v-model="form.rate" disabled />
                 <div class="btn">
                   <el-space class="mt-4">
 

pages/item/index.vue

@@ -5,16 +5,6 @@
   <div class="page-main md:w-screen-xl m-auto p-3">
     <el-row :gutter="24">
       <el-col :span="18" :xs="24">
-        <el-card shadow="hover" class="hover:border-green-50 hover:border-2 mb-5">
-          <template #header>
-            <div class="card-header font-bold text-xl">
-              <span>产品参数</span>
-            </div>
-          </template>
-          <el-descriptions :column="2" border>
-            <el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item>
-          </el-descriptions>
-        </el-card>
         <el-card shadow="hover" class="hover:border-green-50 hover:border-2 mb-5">
           <template #header>
             <div class="card-header font-bold text-xl">
@@ -34,14 +24,24 @@
               />
             </template>
           </div>
-
         </el-card>
         <el-card shadow="hover" class="hover:border-green-50 hover:border-2 mb-5">
           <template #header>
             <div class="card-header font-bold text-xl">
-              <span>说明</span>
+              <span>应用介绍</span>
             </div>
           </template>
+          <el-descriptions title="应用参数" :column="2" border>
+            <el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item>
+          </el-descriptions>
+          <div class="h-[24px]"></div>
+          <el-descriptions title="代码仓库" :column="1" border>
+            <el-descriptions-item v-for="(item,index) in form.gits" :key="index" :label="item.title">
+              <el-input  v-model="item.domain" />
+            </el-descriptions-item>
+          </el-descriptions>
+          <div class="h-[24px]"></div>
+          <el-descriptions title="安装说明" />
           <p v-html="form.content"></p>
         </el-card>
         <!-- 产品评论 -->
@@ -85,15 +85,14 @@ import {getIdBySpm} from "~/utils/common";
 import useFormData from "~/utils/use-form-data";
 import PageBanner from './components/PageBanner.vue';
 import Comments from './components/Comments.vue';
-import type {CmsProductComment} from "~/api/cms/cmsProductComment/model";
 import type {Company} from "~/api/system/company/model";
-import type {CompanyParameter} from "~/api/system/companyParameter/model";
+import type {CompanyComment} from "~/api/system/companyComment/model";
 
 // 引入状态管理
 const route = useRoute();
 const website = useWebsite();
 const breadcrumb = ref<BreadcrumbItem>();
-const comments = ref<CmsProductComment[]>([]);
+const comments = ref<CompanyComment[]>([]);
 const commentsTotal = ref(0);
 const commentsPage = ref(1);
 const activeName = ref();
@@ -183,6 +182,7 @@ const {form, assignFields} = useFormData<Company>({
   categoryName: undefined,
   parameters: undefined,
   links: undefined,
+  gits: undefined
 });
 const doComments = async (page: any) => {
   commentsPage.value = page;
@@ -192,11 +192,11 @@ const doComments = async (page: any) => {
 
 // 加载评论
 const reloadComments = async () => {
-  const {data: commentsResponse} = await useServerRequest<ApiResult<PageResult<CmsProductComment>>>('/cms/cms-product-comment/page', {
+  const {data: commentsResponse} = await useServerRequest<ApiResult<PageResult<CompanyComment>>>('/system/company-comment/page', {
     params: {
-      productId: getIdBySpm(5),
+      companyId: getIdBySpm(5),
       page: commentsPage.value,
-      status: 1
+      // status: 1
     }
   })
   if(commentsResponse.value && commentsResponse.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 label="个人认证"/>
-      <el-tab-pane label="企业认证"/>
+      <el-tab-pane :name="0" label="个人认证"/>
+      <el-tab-pane :name="1" label="企业认证"/>
     </el-tabs>
     <!-- 已完成认证 -->
     <template v-if="form.status === 1">
@@ -60,50 +60,81 @@
       </el-result>
     </template>
     <template v-if="form.status === 0 && !form.checkStatus">
-      <template v-if="form.type == '1'">
+      <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="所属行业" prop="category">
-          <el-cascader
-              v-model="industry"
-              :options="industryData"
-              placeholder="请选择所属行业"
-              class="w-full"
-              @change="handleChange"
-          />
-        </el-form-item>
-        <el-form-item label="LOGO">
+        <el-form-item label="营业执照" required>
           <el-upload
-              v-model:file-list="fileList"
+              v-model:file-list="yyzzFile"
+              action="https://common-api.websoft.top/api/oss/upload"
+              :headers="{
+                Authorization: token,
+                TenantId: tenantId,
+              }"
               :limit="1"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              list-type="picture"
+              list-type="picture-card"
+              :on-preview="handlePictureCardPreview"
+              :on-remove="yyzzRemove"
+              :on-success="yyzzOnSuccess"
           >
-            <el-button size="default">上传文件</el-button>
+            <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="业务描述" prop="comments">
-          <el-input v-model="form.comments" :rows="5" type="textarea" />
-        </el-form-item>
-        <el-form-item label="营业执照">
+        <el-form-item label="门头照片">
           <el-upload
-              v-model:file-list="fileList"
+              v-model:file-list="image"
+              action="https://common-api.websoft.top/api/oss/upload"
+              :headers="{
+                Authorization: token,
+                TenantId: tenantId,
+              }"
               :limit="1"
-              class="upload-demo"
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              list-type="picture"
+              list-type="picture-card"
+              :on-preview="handlePictureCardPreview"
+              :on-remove="imageRemove"
+              :on-success="imageOnSuccess"
           >
-            <el-button size="default">上传文件</el-button>
+            <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
+              v-model:file-list="files"
+              action="https://common-api.websoft.top/api/oss/upload"
+              :headers="{
+                Authorization: token,
+                TenantId: tenantId,
+              }"
+              :limit="9"
+              list-type="picture-card"
+              :on-preview="handlePictureCardPreview"
+              :on-remove="filesRemove"
+              :on-success="filesOnSuccess"
+          >
+            <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">
@@ -112,9 +143,38 @@
       <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-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="{
+                Authorization: token,
+                TenantId: tenantId,
+              }"
+            :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">
           请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。
@@ -127,12 +187,17 @@
       </el-space>
     </template>
   </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>
 import {reactive, ref} from 'vue'
-import {UploadFilled} from '@element-plus/icons-vue'
-import type {ComponentSize, FormInstance, FormRules, UploadProps, UploadUserFile} from 'element-plus'
+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";
@@ -141,17 +206,26 @@ import {useServerRequest} from "~/composables/useServerRequest";
 import type {ShopMerchant} from "~/api/shop/shopMerchant/model";
 import useFormData from "~/utils/use-form-data";
 
+const token = useToken();
+const tenantId = localStorage.getItem('TID_ADMIN')
 const formRef = ref<FormInstance>()
-const fileList = ref<UploadUserFile[]>([])
+const yyzzFile = ref<UploadUserFile[]>([])
+const sfzFile = ref<UploadUserFile[]>([])
+const sfzStr = ref<string[]>([]);
+const files = ref<UploadUserFile[]>([])
+const filesStr = ref<string[]>([])
+const image = ref<UploadUserFile[]>([])
 const industry = ref<any[]>([])
 const loading = ref<boolean>(true)
 const isUpdate = ref<boolean>(false)
-const showEdit = ref<boolean>(false)
 const isAgree = ref<boolean>(false)
 
+const dialogImageUrl = ref('')
+const dialogVisible = ref(false)
+
 const {form, assignFields, resetFields} = useFormData<ShopMerchantApply>({
   applyId: undefined,
-  type: '0',
+  type: 0,
   merchantName: undefined,
   merchantCode: undefined,
   image: undefined,
@@ -178,9 +252,7 @@ const {form, assignFields, resetFields} = useFormData<ShopMerchantApply>({
   reason: undefined,
   checkStatus: undefined,
   status: 0,
-  sortNumber: undefined,
-  tenantId: undefined,
-  createTime: undefined
+  sortNumber: undefined
 })
 
 const rules = reactive<FormRules<ShopMerchantApply>>({
@@ -196,39 +268,49 @@ const rules = reactive<FormRules<ShopMerchantApply>>({
     {required: true, message: '请输入证件号码', trigger: 'blur'},
     {min: 18, max: 18, message: '证件号码长度应为18位', trigger: 'blur'},
   ],
-  sfz1: [
-    {required: true, message: '请上传身份证正面', trigger: 'change'}
-  ],
-  sfz2: [
-    {required: true, message: '请上传身份证反面', trigger: 'change'}
-  ],
   merchantName: [
     {required: true, message: '请输入企业名称', trigger: 'blur'}
   ],
   merchantCode: [
     {required: true, message: '请输入社会信用代码', trigger: 'blur'}
   ],
-  yyzz: [
-    {required: true, message: '请上传营业执照', trigger: 'change'}
-  ],
   category: [
     {required: true, message: '请选择所属行业', trigger: 'change'}
   ]
 })
 
-const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
-  console.log(uploadFile, uploadFiles)
+const yyzzRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  form.yyzz = '';
+}
+
+const yyzzOnSuccess = (e: any) => {
+  form.yyzz = e.data.downloadUrl
 }
 
-const handlePreview: UploadProps['onPreview'] = (file) => {
-  console.log(file)
+const sfzRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  form.sfz1 = '';
+  form.sfz2 = '';
 }
 
-const handleClick = (index: number) => {
-  // form.type = index
+const sfzSuccess = (e:any) => {
+  sfzStr.value.push(e.data.downloadUrl)
 }
-const props = {
-  expandTrigger: 'hover' as const,
+
+const imageOnSuccess = (e: any) => {
+  form.image = e.data.downloadUrl
+}
+
+const imageRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  form.image = '';
+}
+
+const filesRemove: UploadProps['onRemove'] = (uploadFile) => {
+  const index = filesStr.value.findIndex(f => f == uploadFile.url);
+  filesStr.value.splice(index, 1)
+}
+
+const filesOnSuccess = (e: any) => {
+  filesStr.value.push(e.data.downloadUrl)
 }
 
 // 所属行业
@@ -257,8 +339,10 @@ const onUpdate = () => {
   form.checkStatus = false
 }
 
-const onEdit = () => {
-  showEdit.value = !showEdit.value;
+
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  dialogImageUrl.value = uploadFile.url!
+  dialogVisible.value = true
 }
 
 const runtimeConfig = useRuntimeConfig();
@@ -266,13 +350,25 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate((valid, fields) => {
     if (valid) {
-      console.log('submit!')
-      if (form.type == '0') {
+      console.log('submit!',valid)
+      if (form.type == 0) {
         form.shopType = '个人开发者';
+        form.merchantName = form.realName;
       }
-      if(form.type == '1'){
+      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',
@@ -297,15 +393,68 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 
 const reload = async () => {
-  const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>('/shop/shop-merchant-apply/getByPhone')
+  const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>('/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,
+          name: '',
+        })
+        filesStr.value.push(d)
+      })
+    }
   }
   loading.value = false
 }
 reload();
 </script>
+<style scoped>
+/* 自定义 el-dialog 的样式 */
+.el-dialog {
+  background: rgba(255, 255, 255, 0.5); /* 设置背景颜色为半透明白色 */
+  backdrop-filter: blur(10px); /* 可选：为背景添加模糊效果 */
+}
+</style>