Browse Source

修改bug

任重 2 months ago
parent
commit
bf958b0bd0

+ 2 - 2
packages/app/src/components/page-helper-evo.vue

@@ -109,9 +109,9 @@ defineExpose({
       <div v-if="items.length" class="flex-grow flex flex-col">
         <slot :source="{ list: items }"></slot>
       </div>
-      <template v-if="nomore">
+      <!-- <template v-if="nomore">
         <div class="my-4"><wd-divider>没有更多了</wd-divider></div>
-      </template>
+      </template> -->
     </div>
   </div>
 </template>

+ 1 - 0
packages/app/src/core/libs/messages.ts

@@ -1,6 +1,7 @@
 export const messages = {
   home: { shareTitle: '筑巢荟' },
   moment: { imageNotExist: '请上传图片' },
+  publish: { successTitle: '发布成功' },
   messages: {
     pointNotice: '确认后,积分即刻到账,如有问题请驳回,联系材料商/平台客服,修改后再次确认',
   },

+ 1 - 1
packages/app/src/pages/home/components/menus.vue

@@ -12,7 +12,7 @@ const items = [
   {
     id: 2,
     title: '线下活动',
-    desc: '骑行俱乐部',
+    desc: '成长关爱',
     path: '/pages/home/offline-activity/index',
     icon: '/static/svgs/iconly-glass-star.svg',
   },

+ 1 - 0
packages/app/src/typings.ts

@@ -33,6 +33,7 @@ type IUserInfo = {
   userAuthStatus?: 0 | 1 | 2
   mobile?: string
   birthday?: number
+  homePageUrl?: string
 }
 
 enum TestEnum {

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

@@ -17,7 +17,7 @@ withDefaults(
     <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="" />
+      <wd-img width="60" height="50" :src="src" :enable-preview="true" class="" />
     </div>
 
     <span v-if="type === 'Select'">{{ options?.find((it) => it.value === value)?.label }}</span>

+ 1 - 1
packages/merchant/src/pages/agent/designer/archives/award/photos/index.vue

@@ -12,7 +12,7 @@ onLoad((query?: Record<string | 'id', string>) => {
 <template>
   <div class="flex-grow bg-white grid grid-cols-2 gap-4 p-4">
     <template v-for="(it, index) in urls" :key="index">
-      <div><wd-img width="100%" mode="widthFix" :src="it"></wd-img></div>
+      <div><wd-img width="100%" mode="widthFix" :src="it" :enable-preview="true"></wd-img></div>
     </template>
   </div>
 </template>

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

@@ -117,7 +117,7 @@ const schema = ref<
     type: 'Select',
     label: messages.objects.designerBasiceInfo.maritalStatus,
     labelWidth: 120,
-    props: {  
+    props: {
       columns: [
         { label: '未婚', value: 1 },
         { label: '已婚', value: 2 },

+ 8 - 0
packages/merchant/src/pages/mine/merchant/orders/detail/index.vue

@@ -114,6 +114,14 @@ onLoad(async (query: { id: string }) => {
           积分支付
         </div>
       </div>
+      <div class="flex mt-[20px] items-center justify-between">
+        <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal">
+          兑换人
+        </div>
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
+          {{ data?.stylistName }}
+        </div>
+      </div>
 
       <template v-if="String(data?.orderStatus) === '3'">
         <div class="flex mt-[20px] items-center justify-between">