修改bug

packages/app/src/core/libs/models.ts

@@ -682,7 +682,7 @@ export interface UserBasicInfo {
   circle: string
   hobbies: string
   sharingIntent: number
-  createTime: string
+  // createTime: string
   imageNumber: number
   imageUrl: string
   maritalStatus: number
@@ -925,7 +925,7 @@ export interface DesignerBasicInfo {
   circle: string
   hobbies: string
   sharingIntent: number
-  createTime: string
+  // createTime: string
   imageNumber: number
   imageUrl: string
   maritalStatus: number

packages/merchant/src/components/data-render.vue

@@ -3,7 +3,7 @@ import dayjs from 'dayjs'
 
 withDefaults(
   defineProps<{
-    type: 'Original' | 'Date' | 'Avatar' | 'Select'
+    type: 'Original' | 'Date' | 'Avatar' | 'Select' | 'img'
     value?: number | string | Date
     customClass?: string
     options?: { label: string; value: string | number }[]
@@ -16,6 +16,10 @@ withDefaults(
     <span v-if="type === 'Original'">{{ value }}</span>
     <span v-if="type === 'Date'">{{ value && dayjs(value).format('YYYY-MM-DD') }}</span>
     <wd-img v-if="type === 'Avatar'" width="40" height="40" round :src="String(value)" class="" />
+    <div v-if="type === 'img'" v-for="(src, index) in value.split(',')" :key="index">
+      <wd-img width="60" height="50" round :src="src" class="" />
+    </div>
+
     <span v-if="type === 'Select'">{{ options?.find((it) => it.value === value)?.label }}</span>
   </div>
 </template>

packages/merchant/src/core/libs/messages.ts

@@ -34,15 +34,15 @@ export const messages = {
       companyAddress: '公司地址',
       idCardNumber: '身份证号',
       passportNumber: '护照号',
-      householdAddress: '家庭地址',
+      householdAddress: '户籍所在地',
       cooperationTime: '合作时间',
       joinTime: '加入筑巢荟时间',
       circle: '最要好的圈层',
       hobbies: '兴趣爱好',
-      sharingIntent: '个人传播意愿度',
+      sharingIntent: '个人传播意愿',
       createTime: '创建时间',
       imageNumber: '个人照片',
-      imageUrl: '图片URL',
+      imageUrl: '个人照片',
       maritalStatus: '婚姻状态',
       maritalStatusStr: '婚姻状态',
       retryStatus: '绑定关系',

packages/merchant/src/pages/agent/designer/archives/basic-info/index.vue

@@ -44,12 +44,18 @@ const schema = ref<
       | 'circle'
       | 'hobbies'
       | 'sharingIntent'
-      // | 'imageUrl'
+      | 'imageUrl'
       // | 'maritalStatus'
       | 'maritalStatusStr'
     >
   >
 >({
+  employer: {
+    type: 'TextField',
+    label: messages.objects.designerBasiceInfo.employer,
+    labelWidth: 120,
+    props: undefined,
+  },
   companyAddress: {
     type: 'TextField',
     label: messages.objects.designerBasiceInfo.companyAddress,
@@ -90,25 +96,34 @@ const schema = ref<
     labelWidth: 120,
   },
   sharingIntent: {
-    type: 'TextField',
+    // type: 'TextField',
+    // label: messages.objects.designerBasiceInfo.sharingIntent,
+    // labelWidth: 120,
+    type: 'Select',
     label: messages.objects.designerBasiceInfo.sharingIntent,
     labelWidth: 120,
+    props: {
+      columns: [
+        { label: '一般', value: 1 },
+        { label: '强烈', value: 2 },
+      ],
+    },
   },
-  // imageUrl: {
-  //   type: 'ImageUploader',
-  //   label: messages.objects.designerBasiceInfo.imageUrl,
-  // },
-  maritalStatusStr: {
-    type: 'TextField',
-    label: messages.objects.designerBasiceInfo.maritalStatusStr,
+  imageUrl: {
+    type: 'ImageUploader',
+    label: messages.objects.designerBasiceInfo.imageUrl,
+  },
+  maritalStatus: {
+    type: 'Select',
+    label: messages.objects.designerBasiceInfo.maritalStatus,
     labelWidth: 120,
     props: {
-      // columns: [
-      //   { label: '未婚', value: 1 },
-      //   { label: '已婚', value: 2 },
-      //   { label: '离婚', value: 3 },
-      //   { label: '丧偶', value: 4 },
-      // ],
+      columns: [
+        { label: '未婚', value: 1 },
+        { label: '已婚', value: 2 },
+        { label: '离婚', value: 3 },
+        { label: '丧偶', value: 4 },
+      ],
     },
   },
 })

packages/merchant/src/pages/agent/designer/archives/index.vue

@@ -255,7 +255,14 @@ onShow(async () => {
         <div class="bg-white mt-4 flex flex-col gap-5 p-4">
           <template
             v-for="([key, value], index) in Object.entries(
-              omit(basicData, ['id', 'userId', 'maritalStatus', 'imageUrl']),
+              omit(basicData, [
+                'id',
+                'userId',
+                'maritalStatus',
+                'imageNumber',
+                'createTime',
+                'referrerId',
+              ]),
             )"
             :key="index"
           >
@@ -267,7 +274,12 @@ onShow(async () => {
                 <DataRender v-bind="{ type: 'Avatar', value: value }"></DataRender>
               </template>
               <template
-                v-else-if="key === 'birthday' || key === 'cooperationTime' || key === 'createTime'"
+                v-else-if="
+                  key === 'birthday' ||
+                  key === 'cooperationTime' ||
+                  key === 'createTime' ||
+                  key === 'joinTime'
+                "
               >
                 <DataRender v-bind="{ type: 'Date', value: value }"></DataRender>
               </template>
@@ -296,6 +308,39 @@ onShow(async () => {
                   }"
                 ></DataRender>
               </template>
+              <template v-else-if="key === 'imageUrl'">
+                <DataRender
+                  v-bind="{
+                    type: 'img',
+                    value: value,
+                  }"
+                ></DataRender>
+              </template>
+              <template v-else-if="key === 'retryStatus'">
+                <DataRender
+                  v-bind="{
+                    type: 'Select',
+                    value: value,
+                    options: [
+                      { label: '弱绑定', value: 0 },
+                      { label: '强绑定', value: 1 },
+                      { label: '公开', value: 3 },
+                    ],
+                  }"
+                ></DataRender>
+              </template>
+              <template v-else-if="key === 'sharingIntent'">
+                <DataRender
+                  v-bind="{
+                    type: 'Select',
+                    value: value,
+                    options: [
+                      { label: '一般', value: 1 },
+                      { label: '强烈', value: 3 },
+                    ],
+                  }"
+                ></DataRender>
+              </template>
               <template v-else>
                 <DataRender v-bind="{ type: 'Original', value: value }"></DataRender>
               </template>
@@ -336,7 +381,7 @@ onShow(async () => {
                   <SectionHeading
                     title="性别"
                     size="base"
-                    :end-text="item.familySex"
+                    :end-text="item.familySexStr"
                   ></SectionHeading>
                   <SectionHeading
                     title="生日"