Sfoglia il codice sorgente

fix(app): 活动列表, 活动报名

EvilDragon 4 mesi fa
parent
commit
46dfd72722
77 ha cambiato i file con 546 aggiunte e 508 eliminazioni
  1. 1 1
      packages/app/env/.env.development
  2. 0 6
      packages/app/src/assets/svgs/material-dealers.svg
  3. 2 2
      packages/app/src/components/card-menu.vue
  4. 7 7
      packages/app/src/components/hot-activity-item.vue
  5. 1 1
      packages/app/src/components/page-helper.vue
  6. 1 1
      packages/app/src/components/section-heading.vue
  7. 1 1
      packages/app/src/components/tilted-button.vue
  8. 0 2
      packages/app/src/core/libs/svgs.ts
  9. 4 0
      packages/app/src/core/models/moment.ts
  10. 6 0
      packages/app/src/core/utils/common.ts
  11. 3 3
      packages/app/src/layouts/tabbar.vue
  12. 20 20
      packages/app/src/pages/home/activity/detail/index.vue
  13. 4 4
      packages/app/src/pages/home/components/article.vue
  14. 4 4
      packages/app/src/pages/home/components/class-item.vue
  15. 4 4
      packages/app/src/pages/home/components/comment-item.vue
  16. 5 5
      packages/app/src/pages/home/components/elegant-info-card.vue
  17. 2 2
      packages/app/src/pages/home/components/info-card.vue
  18. 6 6
      packages/app/src/pages/home/components/offline-activity-item.vue
  19. 78 54
      packages/app/src/pages/home/components/register-card.vue
  20. 4 4
      packages/app/src/pages/home/components/schedule-card.vue
  21. 1 1
      packages/app/src/pages/home/index.vue
  22. 3 3
      packages/app/src/pages/home/mall/components/product.vue
  23. 9 9
      packages/app/src/pages/home/mall/confirm-order/index.vue
  24. 12 12
      packages/app/src/pages/home/mall/detail/index.vue
  25. 2 2
      packages/app/src/pages/home/mall/index.vue
  26. 5 5
      packages/app/src/pages/home/mall/shopping-cart/index.vue
  27. 9 9
      packages/app/src/pages/home/moment/index.vue
  28. 16 4
      packages/app/src/pages/home/offline-activity/index.vue
  29. 6 6
      packages/app/src/pages/home/offline-activity/list/index.vue
  30. 11 11
      packages/app/src/pages/home/schedule/index.vue
  31. 3 3
      packages/app/src/pages/home/spread/case-shooting/index.vue
  32. 4 4
      packages/app/src/pages/home/spread/case-shooting/photographer/index.vue
  33. 1 1
      packages/app/src/pages/home/spread/index.vue
  34. 3 3
      packages/app/src/pages/home/spread/wx-agent-operation/index.vue
  35. 11 11
      packages/app/src/pages/home/study-tour/components/study-tour-card.vue
  36. 2 2
      packages/app/src/pages/home/study-tour/components/time-line.vue
  37. 13 13
      packages/app/src/pages/home/study-tour/detail.vue
  38. 9 9
      packages/app/src/pages/home/study-tour/index.vue
  39. 1 1
      packages/app/src/pages/home/study-tour/list.vue
  40. 3 3
      packages/app/src/pages/login/index.vue
  41. 3 3
      packages/app/src/pages/material/calculator/index.vue
  42. 12 12
      packages/app/src/pages/material/detail/index.vue
  43. 7 7
      packages/app/src/pages/material/index.vue
  44. 1 1
      packages/app/src/pages/material/recommend/index.vue
  45. 4 4
      packages/app/src/pages/messages/index.vue
  46. 2 2
      packages/app/src/pages/mine/agents/index.vue
  47. 2 2
      packages/app/src/pages/mine/authentication/submit/success/index.vue
  48. 5 5
      packages/app/src/pages/mine/components/tasks-card.vue
  49. 3 3
      packages/app/src/pages/mine/coupons/index.vue
  50. 2 2
      packages/app/src/pages/mine/homepage/consult/index.vue
  51. 6 6
      packages/app/src/pages/mine/homepage/edit/index.vue
  52. 2 2
      packages/app/src/pages/mine/homepage/index.vue
  53. 15 15
      packages/app/src/pages/mine/index.vue
  54. 3 3
      packages/app/src/pages/mine/levels/index.vue
  55. 5 5
      packages/app/src/pages/mine/orders/detail/index.vue
  56. 4 4
      packages/app/src/pages/mine/orders/index.vue
  57. 2 2
      packages/app/src/pages/mine/points/index.vue
  58. 1 1
      packages/app/src/pages/mine/setting/index.vue
  59. 1 1
      packages/app/src/pages/publish/moment/index.vue
  60. 2 2
      packages/merchant/src/components/card-menu.vue
  61. 1 1
      packages/merchant/src/components/data-form.vue
  62. 7 7
      packages/merchant/src/components/hot-activity-item.vue
  63. 1 1
      packages/merchant/src/components/tilted-button.vue
  64. 24 24
      packages/merchant/src/pages/designer/detail.vue
  65. 23 23
      packages/merchant/src/pages/designer/homepage.vue
  66. 11 11
      packages/merchant/src/pages/designer/index.vue
  67. 4 4
      packages/merchant/src/pages/designer/points_details/index.vue
  68. 8 8
      packages/merchant/src/pages/home/index.vue
  69. 7 7
      packages/merchant/src/pages/home/merchant/mine.vue
  70. 6 6
      packages/merchant/src/pages/home/merchant/settlement.vue
  71. 21 21
      packages/merchant/src/pages/home/tasks/detail/index.vue
  72. 11 11
      packages/merchant/src/pages/home/tasks/index.vue
  73. 5 5
      packages/merchant/src/pages/login/index.vue
  74. 5 5
      packages/merchant/src/pages/mine/components/tasks-card.vue
  75. 20 20
      packages/merchant/src/pages/mine/index.vue
  76. 11 11
      packages/merchant/src/pages/mine/merchant/merchant_settings.vue
  77. 22 22
      packages/merchant/src/pages/mine/merchant/order_detail.vue

+ 1 - 1
packages/app/env/.env.development

@@ -7,4 +7,4 @@ VITE_SHOW_SOURCEMAP = true
 
 VITE_SERVER_BASEURL = 'https://www.zhuchaohui.com'
 # VITE_SERVER_BASEURL = 'http://39.106.91.179:48080'
-# VITE_SERVER_BASEURL = 'http://192.168.0.157:48080'
+# VITE_SERVER_BASEURL = 'http://192.168.2.34:48080'

File diff suppressed because it is too large
+ 0 - 6
packages/app/src/assets/svgs/material-dealers.svg


+ 2 - 2
packages/app/src/components/card-menu.vue

@@ -46,10 +46,10 @@ const handleCilck = async ({ path }: any) => {
           "
         >
           <div class="my-3.5 flex flex-col justify-start h-full">
-            <div class="text-black/80 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/80 text-base font-normal font-['PingFang_SC'] leading-[10.18px]">
               {{ it.title }}
             </div>
-            <div class="mt-1 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="mt-1 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
               {{ it.desc }}
             </div>
           </div>

+ 7 - 7
packages/app/src/components/hot-activity-item.vue

@@ -26,7 +26,7 @@ import TiltedButton from './tilted-button.vue'
         <div class="w-[321px] h-[88px] relative">
           <div class="w-[94px] h-3 left-[185px] top-[64px] absolute">
             <div
-              class="left-0 top-0 absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+              class="left-0 top-0 absolute text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
             >
               07.15 08.10
             </div>
@@ -37,26 +37,26 @@ import TiltedButton from './tilted-button.vue'
             mode="scaleToFill"
           />
           <div
-            class="w-[202px] left-[119px] top-0 absolute text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
+            class="w-[202px] left-[119px] top-0 absolute text-black text-base font-normal font-['PingFang_SC'] leading-relaxed"
           >
             活动预告 | 日本研学·东京艺术大学设计游学
           </div>
           <div
-            class="left-[119px] top-[64px] absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            class="left-[119px] top-[64px] absolute text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
           >
             游学时间:
           </div>
         </div>
         <view class="flex items-center justify-between mb-1.5">
           <view
-            class="flex items-center text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            class="flex items-center text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
           >
             距结束还剩
             <view
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <view
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </view>
@@ -66,7 +66,7 @@ import TiltedButton from './tilted-button.vue'
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <div
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </div>
@@ -76,7 +76,7 @@ import TiltedButton from './tilted-button.vue'
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <div
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </div>

+ 1 - 1
packages/app/src/components/page-helper.vue

@@ -3,7 +3,7 @@ import { NetImages } from '../core/libs/net-images'
 
 const props = defineProps<{
   request: (query: any) => Promise<IResData<T>>
-  query: any
+  query: Partial<T['list'][0]>
   customClass?: string
 }>()
 const slot = defineSlots<{

+ 1 - 1
packages/app/src/components/section-heading.vue

@@ -59,7 +59,7 @@ const handleMore = async () => {
     >
       {{ title }}
     </div>
-    <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+    <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
       {{ subtitle }}
     </div>
     <div class="overflow-hidden flex-1">

+ 1 - 1
packages/app/src/components/tilted-button.vue

@@ -37,7 +37,7 @@ defineProps({
 }
 .white {
   border-image-source: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE1IiBoZWlnaHQ9IjQ0IiB2aWV3Qm94PSIwIDAgMTE1IDQ0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBpZD0iUmVjdGFuZ2xlIDEzNTAiIGQ9Ik0xNS4xNjQ0IDUuMzcyMzhDMTYuODg4MSAyLjA3MDMyIDIwLjMwNDMgMCAyNC4wMjkyIDBIMTA1QzExMC41MjMgMCAxMTUgNC40NzcxNSAxMTUgMTBWMzRDMTE1IDM5LjUyMjggMTEwLjUyMyA0NCAxMDUgNDRIOS44NTA2NUMzLjA5MTM5IDQ0IC0xLjI1NTYyIDM2LjgyNzEgMS44NzIzMSAzMC44MzUxTDE1LjE2NDQgNS4zNzIzOFoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=');
-  @apply text-black text-base font-normal font-['PingFang SC'] leading-tight;
+  @apply text-black text-base font-normal font-['PingFang_SC'] leading-tight;
 }
 .large {
   @apply h-11;

+ 0 - 2
packages/app/src/core/libs/svgs.ts

@@ -26,7 +26,6 @@ import mine from '@/assets/svgs/mine.svg'
 import publish from '@/assets/svgs/publish.svg'
 import order from '@/assets/svgs/order.svg'
 import close from '@/assets/svgs/close.svg'
-import materialDealers from '@/assets/svgs/material-dealers.svg'
 import memberIconV1 from '@/assets/svgs/member-icon-v1.svg'
 import memberIconV2 from '@/assets/svgs/member-icon-v2.svg'
 import memberIconV3 from '@/assets/svgs/member-icon-v3.svg'
@@ -70,7 +69,6 @@ export {
   publish,
   order,
   close,
-  materialDealers,
   phone,
   route,
   system,

+ 4 - 0
packages/app/src/core/models/moment.ts

@@ -317,6 +317,10 @@ export interface Activity {
    */
   viewCount: number
   createTime: string
+  /**
+   * 已报名
+   */
+  ifSingnUp: boolean
 }
 export interface Banner {
   id: number

+ 6 - 0
packages/app/src/core/utils/common.ts

@@ -44,3 +44,9 @@ export const getActivityStatus = (startAt: string | number, endAt: string | numb
     return 'overdue'
   }
 }
+export const getActivityStatusText = (startAt: string | number, endAt: string | number) =>
+  ({ running: '报名中', waiting: '未开始', overdue: '已结束' })[getActivityStatus(startAt, endAt)]
+export const getActivityStatusButtonText = (startAt: string | number, endAt: string | number) =>
+  ({ running: '立即报名', waiting: '查看详情', overdue: '查看详情' })[
+    getActivityStatus(startAt, endAt)
+  ]

+ 3 - 3
packages/app/src/layouts/tabbar.vue

@@ -84,7 +84,7 @@ const toPublishCase = () => {
       class="bg-white/80 backdrop-blur-[100px] fixed top-0 left-0 right-0 bottom-0 z-2"
     >
       <div class="w-full h-full flex flex-col justify-around px-7 box-border">
-        <div class="text-black/40 text-3xl font-normal font-['PingFang SC'] leading-[45px]">
+        <div class="text-black/40 text-3xl font-normal font-['PingFang_SC'] leading-[45px]">
           发布记录,
           <br />
           成为更好的自己!
@@ -93,13 +93,13 @@ const toPublishCase = () => {
           <div class="flex justify-around">
             <div class="flex flex-col items-center" @click="toPublishMoment">
               <wd-img :src="iconCamera" width="66" mode="widthFix"></wd-img>
-              <div class="text-black text-sm font-normal font-['PingFang SC'] leading-[21px]">
+              <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-[21px]">
                 个人动态
               </div>
             </div>
             <div class="flex flex-col items-center" @click="toPublishCase">
               <wd-img :src="iconWallet" width="66" mode="widthFix"></wd-img>
-              <div class="text-black text-sm font-normal font-['PingFang SC'] leading-[21px]">
+              <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-[21px]">
                 设计案例
               </div>
             </div>

+ 20 - 20
packages/app/src/pages/home/activity/detail/index.vue

@@ -21,6 +21,7 @@ import { calendar, clock, funnel, location, user } from '@designer-hub/assets/sr
 import { signupSuccessDialogBg } from '@designer-hub/assets/src/bgs'
 import { NetImages } from '../../../../core/libs/net-images'
 import signupListDialogBg from '@designer-hub/assets/src/libs/assets/signupListDialogBg'
+import { getActivityStatusText } from '../../../../core/utils/common'
 
 const themeVars = ref<ConfigProviderThemeVars>({
   tableBorderColor: 'white',
@@ -38,7 +39,7 @@ const { data: signups, run: setSignups } = useRequest(
 )
 const show = ref(false)
 const successShow = ref(false)
-const listShow = ref(true)
+const listShow = ref(false)
 const isActivity = computed(() => type.value === 'activity')
 const isStudyTour = computed(() => type.value === 'studyTour')
 const infos = computed(() => [
@@ -75,7 +76,7 @@ const infos = computed(() => [
   {
     icon: funnel,
     title: `等级限制`,
-    content: ['白银以上等级'],
+    content: [data.value.memberLevel.join('、')],
     visable: true,
   },
 ])
@@ -111,7 +112,7 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
           class="bg-white/20 rounded-[20px] backdrop-blur-[6px] px-3.5 py-1 flex gap-2.5"
         >
           <wd-img width="20" height="20" :src="bell"></wd-img>
-          <div class="text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal">
             白金会员王凯峰已报名
           </div>
           <div class="w-6 bg-black aspect-square rounded-full flex items-center justify-center">
@@ -124,7 +125,7 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
             :width="40"
             :height="40"
           ></AvatarGroupCasual>
-          <div class="text-white/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
+          <div class="text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
             {{ signups.total }}人已报名
           </div>
         </div>
@@ -133,21 +134,21 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
     <div class="h-9">
       <div v-if="type === 'studyTour'" class="flex">
         <wd-img width="18" height="18" :src="map"></wd-img>
-        <div class="text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal">
           第一站
         </div>
       </div>
     </div>
     <div
-      class="w-[347px] text-white text-[26px] font-normal font-['PingFang SC'] leading-[44px] flex items-center gap-4"
+      class="w-[347px] text-white text-[26px] font-normal font-['PingFang_SC'] leading-[44px] flex items-center gap-4"
     >
       <!-- 日本研学·东京艺术大学设计游学 -->
       <div class="inline-block">{{ data?.name }}</div>
       <div class="inline-block py-1.5 px-4 bg-white rounded-[20px] backdrop-blur-[15px]">
         <div
-          class="w-[42px] h-[21px] text-[#a60707] text-sm font-normal font-['PingFang SC'] leading-relaxed"
+          class="w-[42px] h-[21px] text-[#a60707] text-sm font-normal font-['PingFang_SC'] leading-relaxed"
         >
-          报名中
+          {{ getActivityStatusText(data?.applyStartTime, data?.applyEndTime) }}
         </div>
       </div>
     </div>
@@ -159,14 +160,14 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
         <div class="flex items-center gap-1.5">
           <wd-img width="16" height="16" :src="it.icon"></wd-img>
           <div
-            class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal"
+            class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal"
           >
             {{ it.title }}
           </div>
           <div class="w-3"></div>
 
           <div
-            class="flex items-center text-white text-base font-normal font-['PingFang SC'] leading-[34px]"
+            class="flex items-center text-white text-base font-normal font-['PingFang_SC'] leading-[34px]"
           >
             <template v-if="it.content.length === 2">
               <div class="w-22 text-center">{{ it.content[0] }}</div>
@@ -190,10 +191,9 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
 
     <div class="mt-5 mx-3.5">
       <div
-        class="text-justify text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="text-justify text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
-        东京艺术大学(英文:Tokyo University of the
-        Arts;日文平假名:とうきょうげいじゅつだいがく),简称东京艺大、艺大(とうきょうげいだい、げいだい),是一所校本部位于东京都台东区上野公园内的艺术类日本国立大学。其是超级国际化大学计划、亚洲校园 成员。其前身是于1887年分别创立的东京美术学校和东京音乐学校,1949年两校合并成为新制东京艺术大学。东京艺术大学的主要目的为培养美术和音乐领域的艺术家,其中音乐学部已培养了许多著名作曲家、演奏家、指挥家,美术学部也诞生了许多著名画家、艺术家、建筑家。
+        {{ data.activityDesc }}
       </div>
     </div>
     <BottomAppBar fixed placeholder transparent>
@@ -203,12 +203,12 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
         <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN Exp'] leading-normal">
           {{ data.needPointsCount }}
         </div>
-        <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
           积分
         </div>
         <div class="flex-1"></div>
         <div @click="show = true">
-          <TiltedButton size="large">立即报名</TiltedButton>
+          <TiltedButton size="large">{{ data?.ifSingnUp ? '已报名' : '立即报名' }}</TiltedButton>
         </div>
       </div>
     </BottomAppBar>
@@ -219,15 +219,15 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
             <wd-img width="100%" height="100%" :src="data.thumbnailUrl"></wd-img>
           </div>
           <div class="flex flex-col justify-between flex-1">
-            <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
               {{ data.name }}
             </div>
             <div class="flex items-end gap-1">
               <div class="text-[#ef4343] text-[22px] font-normal leading-[22px]">
                 {{ data.needPointsCount }}
               </div>
-              <div class="text-black/40 text-sm font-normal font-['PingFang SC']">积分</div>
-              <div class="ml-1 text-black/40 text-xs font-normal font-['PingFang SC']">
+              <div class="text-black/40 text-sm font-normal font-['PingFang_SC']">积分</div>
+              <div class="ml-1 text-black/40 text-xs font-normal font-['PingFang_SC']">
                 剩余:{{ data.activityAllowCount }}
               </div>
               <div class="flex-1"></div>
@@ -289,13 +289,13 @@ onLoad(async (query: { id: string; type: 'activity' }) => {
               <div class="flex gap-1.5">
                 <wd-icon name="error-circle" size="22px"></wd-icon>
                 <div
-                  class="w-[151px] h-[21px] text-justify text-black text-base font-normal font-['PingFang SC'] leading-[21px]"
+                  class="w-[151px] h-[21px] text-justify text-black text-base font-normal font-['PingFang_SC'] leading-[21px]"
                 >
                   请准时参加活动!
                 </div>
               </div>
               <div
-                class="w-[237px] h-[60px] text-justify text-black/60 text-base font-normal font-['PingFang SC'] leading-normal"
+                class="w-[237px] h-[60px] text-justify text-black/60 text-base font-normal font-['PingFang_SC'] leading-normal"
               >
                 如有问题可咨询官方客服或您的专属经纪人!
               </div>

+ 4 - 4
packages/app/src/pages/home/components/article.vue

@@ -27,7 +27,7 @@ defineProps({
 </script>
 <template>
   <div class="px-3.5 bg-white flex-grow">
-    <div class="text-black text-xl font-normal font-['PingFang SC'] leading-loose">
+    <div class="text-black text-xl font-normal font-['PingFang_SC'] leading-loose">
       {{ title }}
     </div>
     <div class="flex items-center my-5">
@@ -35,17 +35,17 @@ defineProps({
         <slot name="avatar"></slot>
       </div>
       <div class="flex-1 ml-1">
-        <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           {{ author.name }}
         </div>
-        <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
           编辑于
           {{ dayjs(createdAt).format('YYYY/MM/DD') }}
         </div>
       </div>
       <div class="flex items-center">
         <slot name="viewLeft"></slot>
-        <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
           {{ viewNum }}
         </div>
       </div>

+ 4 - 4
packages/app/src/pages/home/components/class-item.vue

@@ -38,7 +38,7 @@ const router = useRouter()
       <div
         class="absolute left-2.5 bottom-2.5 px-2 py-1 bg-black/30 rounded-[20px] backdrop-blur-[10px]"
       >
-        <div class="text-white text-[10px] font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-relaxed">
           <!-- 米兰2班 -->
           {{ options.classGrade }}
         </div>
@@ -47,13 +47,13 @@ const router = useRouter()
     <div
       class="w-full h-[145px] pl-39 pt-6 pr-6 pb-6 flex flex-col box-border bg-white rounded-2xl shadow"
     >
-      <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
         <!-- 2024届米兰国际家具展 -->
         {{ options.title }}
       </div>
 
       <view
-        class="flex items-center justify-between text-black/60 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+        class="flex items-center justify-between text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
       >
         <wd-img width="18" height="18" :src="frame"></wd-img>
         <div class="">{{ dayjs(options.studyStartDate).format('MM-DD') }}</div>
@@ -65,7 +65,7 @@ const router = useRouter()
       </view>
       <view class="flex-1"></view>
       <view
-        class="flex justify-between text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+        class="flex justify-between text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
       >
         <div class="">班长:{{ options.studyMonitor }}</div>
         <div class="">领队:{{ options.studyLeader }}</div>

+ 4 - 4
packages/app/src/pages/home/components/comment-item.vue

@@ -75,14 +75,14 @@ onMounted(async () => {
       :src="options.userAvatar"
     />
     <view class="col-start-2 row-start-1">
-      <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
         {{ options.userName }}
       </div>
-      <div class="my-3 text-black/90 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="my-3 text-black/90 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
         {{ options.reviewContent }}
       </div>
       <view class="flex items-center mt--4 gap-3">
-        <div class="text-black/30 text-[10px] font-normal font-['PingFang SC']">
+        <div class="text-black/30 text-[10px] font-normal font-['PingFang_SC']">
           {{ dayjs(options.reviewTime).format('YYYY/MM/DD') }}
         </div>
         <view class="">
@@ -98,7 +98,7 @@ onMounted(async () => {
         <wd-img :src="options.upvote ? thumbsUpActive : thumbsUp" width="18" height="18"></wd-img>
       </div>
       <div
-        class="mt-1.5 text-black/40 text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+        class="mt-1.5 text-black/40 text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
       >
         {{ options.upvoteCount || 0 }}
       </div>

+ 5 - 5
packages/app/src/pages/home/components/elegant-info-card.vue

@@ -38,7 +38,7 @@ const router = useRouter()
       <!-- <div
         class="absolute left-2.5 bottom-2.5 px-2 py-1 bg-black/30 rounded-[20px] backdrop-blur-[10px]"
       >
-        <div class="text-white text-[10px] font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-relaxed">
           米兰2班
         </div>
       </div> -->
@@ -46,12 +46,12 @@ const router = useRouter()
     <div
       class="w-full h-[145px] pl-39 pt-6 pr-6 pb-6 flex flex-col box-border bg-white rounded-2xl shadow"
     >
-      <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
         {{ options.title }}
       </div>
 
       <view
-        class="mt-2.5 flex items-center justify-between text-black/60 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+        class="mt-2.5 flex items-center justify-between text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
       >
         <!-- <wd-img width="18" height="18" :src="frame"></wd-img>
         <div class="">07.15</div>
@@ -60,12 +60,12 @@ const router = useRouter()
         <view class="flex-1"></view>
         <wd-img :src="peoples" width="16" height="16"></wd-img>
         <div class="ml-1">45</div> -->
-        <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[34px]">
           {{ dayjs(options.createTime).format('YYYY/MM/DD') }}
         </div>
       </view>
       <view class="flex-1"></view>
-      <view class="flex text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+      <view class="flex text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
         <!-- <div class="">班长:李威</div>
         <div class="">领队:王艺臻</div> -->
         <div

+ 2 - 2
packages/app/src/pages/home/components/info-card.vue

@@ -8,11 +8,11 @@ const props = defineProps<{
 </script>
 <template>
   <card custom-class="my-6">
-    <div class="my-7.5 text-black text-xl font-normal font-['PingFang SC'] leading-[10.18px]">
+    <div class="my-7.5 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
       {{ props.title }}
     </div>
     <div
-      class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang SC'] leading-relaxed"
+      class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
     >
       {{ props.desc }}
     </div>

+ 6 - 6
packages/app/src/pages/home/components/offline-activity-item.vue

@@ -27,26 +27,26 @@ const router = useRouter()
           :src="options.bannerUrl"
         />
         <div class="absolute top-4 right-4 px-2.5 bg-black/30 rounded-[20px] backdrop-blur-[15px]">
-          <div class="text-white text-xs font-normal font-['PingFang SC'] leading-relaxed">
+          <div class="text-white text-xs font-normal font-['PingFang_SC'] leading-relaxed">
             已结束
           </div>
         </div>
         <div
           class="absolute top-4 left-4 px-2.5 rounded-md border border-solid border-white justify-center items-center gap-2.5 inline-flex"
         >
-          <div class="text-white text-xs font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-white text-xs font-normal font-['PingFang_SC'] leading-normal">
             第18期
           </div>
         </div>
       </view>
       <div class="p-5 bg-white rounded-bl-[20px] rounded-br-[20px] shadow">
-        <div class="w-[244px] text-black text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="w-[244px] text-black text-base font-normal font-['PingFang_SC'] leading-normal">
           {{ options.title }}
         </div>
         <view class="mt-1.5 flex items-center mb-4">
           <wd-img custom-class="vertical-bottom" :src="frame" width="20" height="20"></wd-img>
           <div
-            class="flex items-center text-black/60 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            class="flex items-center text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
           >
             <div class="">{{ dayjs(options.studyStartDate).format('MM-DD') }}</div>
             <wd-img custom-class="mx-1" width="5" height="5" :src="polygon16" />
@@ -57,7 +57,7 @@ const router = useRouter()
           <div
             class="inline-block px-2.5 rounded-md border border-solid border-black/30 backdrop-blur-[6px] flex justify-center items-center"
           >
-            <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-normal">
               举办方:筑巢荟
             </div>
           </div>
@@ -65,7 +65,7 @@ const router = useRouter()
             v-if="options.supportBrand"
             class="inline-block px-2.5 rounded-md border border-solid border-black/30 backdrop-blur-[6px] flex justify-center items-center"
           >
-            <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-normal">
               {{ options.supportBrand }}
             </div>
           </div>

+ 78 - 54
packages/app/src/pages/home/components/register-card.vue

@@ -1,69 +1,93 @@
 <script lang="ts" setup>
 import Card from '@/components/card.vue'
+import { Activity } from '../../../core/models/moment'
+import dayjs from 'dayjs'
+import TiltedButton from '@/components/tilted-button.vue'
+import { getActivitySignups } from '../../../core/libs/requests'
+import { NetImages } from '../../../core/libs/net-images'
+import { useRouter } from '../../../core/utils/router'
+import { getActivityStatusButtonText, getActivityStatusText } from '../../../core/utils/common'
 
-defineProps({
-  customClass: {
-    type: String,
-    default: () => '',
-  },
+const props = defineProps<{ customClass?: string; options?: Activity }>()
+const router = useRouter()
+const { data: signups, run: setSignups } = useRequest(
+  () => getActivitySignups({ activityId: props.options!.id.toString() }),
+  { initialData: { list: [], total: 0 } },
+)
+onMounted(async () => {
+  await setSignups()
 })
 </script>
 <template>
-  <card custom-class="p-0!">
-    <view class="relative">
-      <wd-img
-        custom-class="vertical-bottom"
-        width="100%"
-        height="275"
-        src="https://via.placeholder.com/347x464"
-      ></wd-img>
+  <div @click="router.push(`/pages/home/activity/detail/index?id=${options?.id}&type=activity`)">
+    <Card custom-class="w-full p-0! relative aspect-[0.75/1]">
+      <div class="absolute left-0 top-0 right-0 bottom-0">
+        <wd-img
+          custom-class="vertical-bottom"
+          width="100%"
+          height="100%"
+          :src="options?.bannerUrl[0]"
+        ></wd-img>
+      </div>
       <div
         class="w-[63px] h-[29px] bg-black/60 rounded-[20px] backdrop-blur-[15px] absolute top-5 right-3.5 flex items-center justify-center"
       >
-        <div class="text-white text-sm font-normal font-['PingFang SC'] leading-relaxed">
-          报名中
-        </div>
-      </div>
-      <view class="absolute left-3.5 bottom-2.5 flex items-center">
-        <avatar-group-casual
-          :show-number="3"
-          :urls="[
-            'https://via.placeholder.com/20x20',
-            'https://via.placeholder.com/20x20',
-            'https://via.placeholder.com/20x20',
-          ]"
-        ></avatar-group-casual>
-        <div class="ml-1 text-white/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
-          40人已报名
+        <div class="text-white text-sm font-normal font-['PingFang_SC'] leading-relaxed">
+          {{ getActivityStatusText(options?.applyStartTime, options?.activityEndTime) }}
         </div>
-      </view>
-    </view>
-    <div class="bg-[#27130d]/50 rounded-bl-2xl rounded-br-2xl backdrop-blur-[20px] p-3.5">
-      <div class="w-[293px] text-white text-xl font-normal font-['PingFang SC'] leading-relaxed">
-        日本研学·东京艺术大学设计游学
       </div>
-      <view class="flex items-center">
-        <div class="text-white/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
-          游学时间:
-        </div>
-        <div class="text-white/60 text-base font-normal font-['PingFang SC'] leading-[34px]">
-          07.15 08.10
-        </div>
-      </view>
-      <div
-        class="text-justify text-white/60 text-sm font-normal font-['PingFang SC'] leading-relaxed"
-      >
-        等级限制:黄金会员以上
-      </div>
-      <view class="flex items-center justify-between">
-        <view class="flex items-end">
-          <div class="text-white text-3xl font-bold font-['D-DIN Exp'] leading-normal">16000</div>
-          <div class="ml-1 text-white/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
-            积分
+      <view class="absolute bottom-0 left-0 right-0">
+        <view class="flex items-center mx-4 my-2.5 gap-1">
+          <avatar-group-casual
+            :show-number="3"
+            :urls="signups.list.map((it) => it.avatar || NetImages.DefaultAvatar)"
+          ></avatar-group-casual>
+          <div
+            class="ml-1 text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
+          >
+            {{ signups.total }}人已报名
           </div>
         </view>
-        <tilted-button custom-class="" size="large" color="white">立即报名</tilted-button>
+        <div class="bg-[#27130d]/50 rounded-bl-2xl rounded-br-2xl backdrop-blur-[20px] p-3.5">
+          <div
+            class="w-[293px] text-white text-xl font-normal font-['PingFang_SC'] leading-relaxed"
+          >
+            {{ options?.name }}
+          </div>
+          <view class="flex items-center">
+            <div class="text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
+              游学时间:
+            </div>
+            <div
+              class="text-white/60 text-base font-normal font-['PingFang_SC'] leading-[34px] flex items-center gap-1"
+            >
+              <div class="text-center">
+                {{ dayjs(options?.activityStartTime).format('MM.DD') }}
+              </div>
+              <wd-icon name="play" size="22px"></wd-icon>
+              <div class="text-center">
+                {{ dayjs(options?.activityStartTime).format('MM.DD') }}
+              </div>
+            </div>
+          </view>
+          <div
+            class="text-justify text-white/60 text-sm font-normal font-['PingFang_SC'] leading-relaxed"
+          >
+            等级限制:{{ options?.memberLevel }}
+          </div>
+          <view class="flex items-center justify-between">
+            <view class="flex items-end">
+              <div class="text-white text-3xl font-bold font-['D-DIN_Exp']">
+                {{ options?.needPointsCount }}
+              </div>
+              <div class="ml-1 text-white/60 text-sm font-normal font-['PingFang_SC']">积分</div>
+            </view>
+            <tilted-button custom-class="" size="large" color="white">
+              {{ getActivityStatusButtonText(options?.applyStartTime, options?.activityEndTime) }}
+            </tilted-button>
+          </view>
+        </div>
       </view>
-    </div>
-  </card>
+    </Card>
+  </div>
 </template>

+ 4 - 4
packages/app/src/pages/home/components/schedule-card.vue

@@ -36,7 +36,7 @@ onMounted(() => {
   <view class="flex flex-col items-center" :class="[customClass]">
     <SectionHeading title="我的游学日程" custom-class="w-full"></SectionHeading>
     <div
-      class="w-full my-3.5 text-[#acacac] text-sm font-normal font-['PingFang SC'] leading-normal"
+      class="w-full my-3.5 text-[#acacac] text-sm font-normal font-['PingFang_SC'] leading-normal"
     >
       6月26日 第二天
     </div>
@@ -49,15 +49,15 @@ onMounted(() => {
             <div class="w-2 h-2 left-0 top-0 rounded-full border-2 border-solid border-white"></div>
 
             <div
-              class="w-12 ml-3.5 text-white text-base font-normal font-['PingFang SC'] leading-normal"
+              class="w-12 ml-3.5 text-white text-base font-normal font-['PingFang_SC'] leading-normal"
             >
               9:00
             </div>
-            <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal">
               早稻田大学课程
             </div>
           </view>
-          <div class="ml-6.5 text-white/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+          <div class="ml-6.5 text-white/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
             学习灯光设计师课程
           </div>
           <div

+ 1 - 1
packages/app/src/pages/home/index.vue

@@ -105,7 +105,7 @@ onShareAppMessage(() => ({}))
         <Card>
           <div class="flex items-center gap-2">
             <wd-img width="28" height="28" :src="logo"></wd-img>
-            <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]">
               1分钟快速了解筑巢荟
             </div>
             <div class="flex-1"></div>

+ 3 - 3
packages/app/src/pages/home/mall/components/product.vue

@@ -27,13 +27,13 @@ const router = useRouter()
       ></wd-img>
     </div>
     <div class="flex">
-      <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
         <!-- 阿芙佳朵 -->
         {{ options.prodcutName }}
       </div>
       <div class="flex-1"></div>
       <div
-        class="w-[26px] text-black/30 text-xs font-normal font-['PingFang SC'] line-through leading-normal"
+        class="w-[26px] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
       >
         <!-- ¥60 -->
         ¥{{ options.productPrice }}
@@ -45,7 +45,7 @@ const router = useRouter()
           <!-- 1000 -->
           {{ options.points }}
         </div>
-        <div class="text-black/60 text-sm font-normal font-['PingFang SC']">积分</div>
+        <div class="text-black/60 text-sm font-normal font-['PingFang_SC']">积分</div>
       </div>
       <div class="flex-1"></div>
       <div class="">

+ 9 - 9
packages/app/src/pages/home/mall/confirm-order/index.vue

@@ -30,15 +30,15 @@ const a = ref(1)
           <div class="flex gap-3">
             <div class="w-16 h-16 bg-[#f6f6f6] rounded-lg"></div>
             <div class="flex flex-col justify-between flex-1">
-              <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-normal">
                 焦糖玛奇朵
               </div>
-              <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
                 1000积分
               </div>
             </div>
             <div>
-              <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
+              <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
                 ×1
               </div>
             </div>
@@ -60,17 +60,17 @@ const a = ref(1)
         <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN Exp'] leading-normal">
           1280
         </div>
-        <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
           积分
         </div>
       </div>
       <div class="" @click="show = true">
         <TrapeziumButton size="large">
           <div
-            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
           >
             <div
-              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
             >
               确认兑换
             </div>
@@ -88,13 +88,13 @@ const a = ref(1)
           <div class="bg-white rounded-2xl p-3.5 flex gap-2.5">
             <div class="w-[94px] h-[94px] bg-[#f6f6f6] rounded-[10px]"></div>
             <div class="flex flex-col justify-around flex-1">
-              <div class="text-black text-sm font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal">
                 GELATO咖啡兑换券
               </div>
-              <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
                 2024/04/01-2024/05/30
               </div>
-              <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
                 使用说明
               </div>
             </div>

+ 12 - 12
packages/app/src/pages/home/mall/detail/index.vue

@@ -43,33 +43,33 @@ onLoad(async (query: { id: string }) => {
           <!-- 1000 -->
           {{ data?.points }}
         </div>
-        <div class="text-black/60 text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-[34px]">
           积分
         </div>
         <div
-          class="w-[66px] text-black/30 text-xs font-normal font-['PingFang SC'] line-through leading-normal"
+          class="w-[66px] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
         >
           <!-- ¥60 -->
           ¥{{ data?.productPrice }}
         </div>
         <div class="flex-1"></div>
-        <div class="text-[#999999] text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+        <div class="text-[#999999] text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
           <!-- 已售5件 -->
           已售{{ data?.exchangeCount || 0 }}件
         </div>
       </div>
       <div
-        class="w-[90px] h-4 text-black text-xl font-normal font-['PingFang SC'] leading-[10.18px]"
+        class="w-[90px] h-4 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]"
       >
         <!-- 阿芙佳朵 -->
         {{ data?.prodcutName }}
       </div>
       <div class="h-0.25 bg-[#f6f6f6]"></div>
-      <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
         积分兑换说明:
       </div>
       <div
-        class="w-[346px] h-[95px] text-black/40 text-xs font-normal font-['PingFang SC'] leading-[23px]"
+        class="w-[346px] h-[95px] text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[23px]"
       >
         · 不限制兑换个数
         <br />
@@ -82,7 +82,7 @@ onLoad(async (query: { id: string }) => {
       <div class="mx--4 h-2.5 bg-neutral-100"></div>
       <wd-divider>
         <div
-          class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+          class="text-center text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
         >
           商品详情
         </div>
@@ -93,7 +93,7 @@ onLoad(async (query: { id: string }) => {
       <div @click="show = true">
         <InvertedTrapezoidButton>
           <div
-            class="w-20 h-[22px] text-black text-base font-normal font-['PingFang SC'] leading-tight"
+            class="w-20 h-[22px] text-black text-base font-normal font-['PingFang_SC'] leading-tight"
           >
             加入购物车
           </div>
@@ -102,10 +102,10 @@ onLoad(async (query: { id: string }) => {
       <div class="" @click="show = true">
         <TrapeziumButton size="large">
           <div
-            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
           >
             <div
-              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
             >
               立即兑换
             </div>
@@ -118,14 +118,14 @@ onLoad(async (query: { id: string }) => {
         <div class="flex gap-3 mb-13.5">
           <div class="w-[110px] h-[110px] bg-[#f6f6f6] rounded-2xl"></div>
           <div class="flex flex-col justify-between flex-1">
-            <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-normal">
               阿芙佳朵
             </div>
             <div class="flex items-center">
               <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
                 1000
               </div>
-              <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+              <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
                 积分
               </div>
               <div class="flex-1"></div>

+ 2 - 2
packages/app/src/pages/home/mall/index.vue

@@ -107,11 +107,11 @@ onMounted(async () => {
           <div @click="router.push('/pages/home/mall/shopping-cart/index')">
             <TiltedButton custom-class="text-center! items-center">
               <span
-                class="h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+                class="h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
               >
                 购物车
               </span>
-              <span class="h-[22px] text-white text-sm font-normal font-['PingFang SC']">
+              <span class="h-[22px] text-white text-sm font-normal font-['PingFang_SC']">
                 (已选2件)
               </span>
             </TiltedButton>

+ 5 - 5
packages/app/src/pages/home/mall/shopping-cart/index.vue

@@ -27,14 +27,14 @@ const a = ref(1)
         </div>
         <div class="w-[110px] h-[110px] bg-[#f6f6f6] rounded-2xl"></div>
         <div class="flex flex-col justify-between flex-1">
-          <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-normal">
             阿芙佳朵
           </div>
           <div class="flex items-center">
             <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
               1000
             </div>
-            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+            <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               积分
             </div>
             <div class="flex-1"></div>
@@ -48,17 +48,17 @@ const a = ref(1)
         <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN Exp'] leading-normal">
           1360
         </div>
-        <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
           积分
         </div>
       </div>
       <div class="">
         <TiltedButton size="large">
           <div
-            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+            class="w-[49px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
           >
             <div
-              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang SC'] leading-tight"
+              class="w-[65px] h-[22px] text-white text-base font-normal font-['PingFang_SC'] leading-tight"
             >
               去结算
             </div>

+ 9 - 9
packages/app/src/pages/home/moment/index.vue

@@ -94,7 +94,7 @@ onShareAppMessage(async () => {
 </script>
 <template>
   <view class="bg-white flex-grow">
-    <!-- <div class="my-4 text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
+    <!-- <div class="my-4 text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]">
       {{ data?.content }}
     </div> -->
     <template v-if="swiperSizes && !isVideo">
@@ -119,7 +119,7 @@ onShareAppMessage(async () => {
       imageMode="widthFix"
     ></wd-swiper> -->
     <view class="m-3.5">
-      <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]">
         {{ data?.circleDesc }}
       </div>
       <view class="my-5.5 flex gap-3.5 flex-wrap">
@@ -130,7 +130,7 @@ onShareAppMessage(async () => {
           </template>
         </template>
       </view>
-      <div class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
         {{ dayjs(data.createTime).format('YYYY-MM-DD HH:mm') }}
       </div>
       <!-- <view class="flex items-center my-4">
@@ -144,7 +144,7 @@ onShareAppMessage(async () => {
             ]"
           ></avatar-group-casual>
           <div
-            class="ml-1 text-black/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+            class="ml-1 text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
           >
             {{ circleUpvotes.total }}人赞过
           </div>
@@ -156,15 +156,15 @@ onShareAppMessage(async () => {
       <SectionHeading :title="`评论`" size="base">
         <template #append>
           <view v-if="reviews?.list" class="flex">
-            <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
               按热度
             </div>
             <div
-              class="mx-2 text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+              class="mx-2 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
             >
               |
             </div>
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
               按时间
             </div>
           </view>
@@ -187,11 +187,11 @@ onShareAppMessage(async () => {
         </template>
         <template v-else>
           <view class="flex items-center justify-center mt-26 mb-36">
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
               这里空空的
             </div>
             <div
-              class="ml-1.5 text-[#2f4471]/90 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+              class="ml-1.5 text-[#2f4471]/90 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
             >
               点击评论~
             </div>

+ 16 - 4
packages/app/src/pages/home/offline-activity/index.vue

@@ -11,9 +11,11 @@
 import SectionHeading from '@/components/section-heading.vue'
 import Card from '@/components/card.vue'
 import OfflineActivityItem from '../components/offline-activity-item.vue'
-import { getAllCategories, getContents } from '../../../core/libs/requests'
+import { getAllCategories, getContents, getActivities } from '../../../core/libs/requests'
 import { strip, leaderboardText } from '@designer-hub/assets/src/assets/svgs'
 import { NetImages } from '../../../core/libs/net-images'
+import RegisterCard from '../components/register-card.vue'
+import PageHelper from '@/components/page-helper.vue'
 
 const { data: categories, run: setCategories } = useRequest(() => getAllCategories(), {
   initialData: [],
@@ -52,13 +54,23 @@ onMounted(async () => {
       path="/pages/home/offline-activity/list/index"
       end-text="查看全部"
     ></section-heading>
-    <!-- <register-card></register-card> -->
+    <PageHelper :request="getActivities" :query="{ headRecommend: 1 }">
+      <template #default="{ source }">
+        <swiper class="aspect-[0.75/1] rounded-[20px] overflow-hidden">
+          <template v-for="(it, i) in source.list" :key="i">
+            <swiper-item>
+              <RegisterCard :options="it"></RegisterCard>
+            </swiper-item>
+          </template>
+        </swiper>
+      </template>
+    </PageHelper>
     <card custom-class="">
-      <div class="my-7.5 text-black text-xl font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="my-7.5 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
         筑巢荟-活动营
       </div>
       <div
-        class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
         我们为您精心打造了一个独特且极具价值的活动营。这个项目的核心旨在全方位提升您作为设计师的能力。
         在这里,您将拥有无比优质的游学资源。我们与全球知名的设计学府、顶尖设计工作室以及具有代表性的经典建筑和室内空间建立了紧密合作。您将有机会深入这些卓越的场所,亲身体验最前沿的设计理念和实践。

+ 6 - 6
packages/app/src/pages/home/offline-activity/list/index.vue

@@ -53,18 +53,18 @@ onMounted(async () => {
                     ></wd-img>
                     <div class="flex flex-col justify-between">
                       <div
-                        class="w-[168px] text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
+                        class="w-[168px] text-black text-base font-normal font-['PingFang_SC'] leading-relaxed"
                       >
                         {{ it.name }}
                       </div>
                       <div class="flex">
                         <div
-                          class="w-[70px] text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+                          class="w-[70px] text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
                         >
                           活动时间:
                         </div>
                         <div
-                          class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px] flex items-center"
+                          class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px] flex items-center"
                         >
                           {{ dayjs(it.activityStartTime).format('MM.DD') }}
                           <wd-icon name="play" size="22px"></wd-icon>
@@ -73,21 +73,21 @@ onMounted(async () => {
                       </div>
                       <div class="flex items-end">
                         <div
-                          class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+                          class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
                         >
                           兑换积分:
                         </div>
                         <div
                           class="text-[#ef4343] text-xl font-normal font-['D-DIN Exp'] leading-[34px]"
                         >
-                          0
+                          {{ it.needPointsCount }}
                         </div>
                       </div>
                     </div>
                   </div>
                   <view class="flex items-center justify-between mb-1.5">
                     <view
-                      class="flex items-center text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+                      class="flex items-center text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
                     >
                       <!-- <wd-count-down
                         :time="dayjs(it.applyStartTime).diff(new Date(), 'millisecond')"

+ 11 - 11
packages/app/src/pages/home/schedule/index.vue

@@ -32,7 +32,7 @@ onMounted(() => {
     </view>
     <view class="bg-white relative bottom-4 rounded-t-2xl p-6.5">
       <view class="border-b border-black/10 border-b-solid pb-5">
-        <div class="text-black/90 text-2xl font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/90 text-2xl font-normal font-['PingFang_SC'] leading-normal">
           {{ data?.name }}
         </div>
         <view class="flex mt-5">
@@ -42,10 +42,10 @@ onMounted(() => {
             height="22"
             :src="userInfo?.avatar"
           />
-          <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-normal">
             {{ userInfo?.nickname }}
           </div>
-          <div class="flex text-black/40 text-base font-normal font-['PingFang SC'] leading-normal">
+          <div class="flex text-black/40 text-base font-normal font-['PingFang_SC'] leading-normal">
             <view class="mx-3.5">|</view>
             6月26日 第二天
           </div>
@@ -62,34 +62,34 @@ onMounted(() => {
           </view>
           <view class="col-start-2 row-start-1 flex">
             <div
-              class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal mr-5"
+              class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal mr-5"
             >
               {{ it.time }}
             </div>
-            <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
               {{ it.title }}
             </div>
           </view>
           <view class="col-start-2 row-start-2 border-b border-black/10 border-b-solid pb-5">
             <div class="">
-              <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-[23px]">
+              <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[23px]">
                 行程介绍:
               </span>
-              <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[23px]">
+              <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[23px]">
                 {{ it.content }}
               </span>
             </div>
             <view class="flex items-center my-4">
               <wd-img width="16" height="16" :src="camera"></wd-img>
               <div
-                class="ml-1 text-black/90 text-xs font-normal font-['PingFang SC'] leading-normal"
+                class="ml-1 text-black/90 text-xs font-normal font-['PingFang_SC'] leading-normal"
               >
                 打卡示例
               </div>
             </view>
             <img class="w-[285px] h-[157px] rounded-lg" :src="it.momentExample" />
             <div
-              class="mt-2.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+              class="mt-2.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
             >
               {{ it.monentHint }}
             </div>
@@ -100,13 +100,13 @@ onMounted(() => {
     <div
       class="mx-3.5 p-3.5 bg-white/90 rounded-2xl backdrop-blur-[20px] fixed bottom-4 left-0 right-0 flex items-center justify-between"
     >
-      <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+      <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
         发布圈子可得
       </div>
       <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
         16000
       </div>
-      <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">积分</div>
+      <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">积分</div>
       <view class="flex-1"></view>
       <view>
         <TiltedButton size="large" custom-class="">

+ 3 - 3
packages/app/src/pages/home/spread/case-shooting/index.vue

@@ -33,7 +33,7 @@ const router = useRouter()
                 <div
                   class="w-full h-[39px] bg-gradient-to-t from-black to-black/0 rounded-bl-2xl rounded-br-2xl absolute bottom-0 flex items-center justify-center"
                 >
-                  <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal">
+                  <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal">
                     <!-- 方晓峰 -->
                     {{ it.prodcutName }}
                   </div>
@@ -46,12 +46,12 @@ const router = useRouter()
                   <!-- 1600 -->
                   {{ it.points }}
                 </div>
-                <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+                <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
                   积分
                 </div>
                 <div class="flex-1"></div>
                 <div
-                  class="w-[53px] text-black/30 text-xs font-normal font-['PingFang SC'] line-through leading-normal"
+                  class="w-[53px] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
                 >
                   2000积分
                 </div>

+ 4 - 4
packages/app/src/pages/home/spread/case-shooting/photographer/index.vue

@@ -14,17 +14,17 @@ const data = ref([{}, {}, {}, {}, {}])
     </div>
     <div class="relative flex-1 bg-white p-7 flex flex-col gap-6 rounded-tl-2xl rounded-tr-2xl">
       <div class="flex">
-        <div class="w-[67px] text-black text-xl font-normal font-['PingFang SC'] leading-[10.18px]">
+        <div class="w-[67px] text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
           方晓峰
         </div>
         <div
-          class="w-[67px] text-black/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+          class="w-[67px] text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
         >
           实景摄影
         </div>
       </div>
       <div
-        class="text-justify text-black/40 text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="text-justify text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
         极具才华和创造力的摄影师,以其独特的视角和精湛的技艺在摄影领域独树一帜。
         他/她对摄影的热爱源于,多年来一直致力于用镜头捕捉生活中那些稍纵即逝的美好瞬间。无论是壮丽的自然风光、生动的人物肖像,还是充满故事性的街头场景,在他/她的镜头下都能展现出别样的魅力。
@@ -35,7 +35,7 @@ const data = ref([{}, {}, {}, {}, {}])
       class="bg-white/90 backdrop-blur-[20px] flex px-10 py-2.5 border-t-1 border-t-solid border-t-[#ececec]"
     >
       <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN Exp'] leading-normal">0</div>
-      <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-[34px]">
+      <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
         积分
       </div>
       <div class="flex-1"></div>

+ 1 - 1
packages/app/src/pages/home/spread/index.vue

@@ -75,7 +75,7 @@ onMounted(async () => {
         <div :class="it.class" @click="router.push(it.path)">
           <card :custom-class="['w-full h-full flex justify-between items-center']">
             <div
-              class="my-3.5 text-black/40 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+              class="my-3.5 text-black/40 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
             >
               {{ it.title }}
             </div>

+ 3 - 3
packages/app/src/pages/home/spread/wx-agent-operation/index.vue

@@ -32,7 +32,7 @@ const router = useRouter()
               <div
                 class="w-full h-[39px] bg-gradient-to-t from-black to-black/0 rounded-bl-2xl rounded-br-2xl absolute bottom-0 flex items-center justify-center"
               >
-                <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal">
+                <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal">
                   <!-- 方晓峰 -->
                   {{ it.prodcutName }}
                 </div>
@@ -43,12 +43,12 @@ const router = useRouter()
                 <!-- 1600 -->
                 {{ it.points }}
               </div>
-              <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+              <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
                 积分
               </div>
               <div class="flex-1"></div>
               <div
-                class="w-[53px] text-black/30 text-xs font-normal font-['PingFang SC'] line-through leading-normal"
+                class="w-[53px] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
               >
                 2000积分
               </div>

+ 11 - 11
packages/app/src/pages/home/study-tour/components/study-tour-card.vue

@@ -33,12 +33,12 @@ const toDetail = () => {
     <div class="flex flex-col pt-2.25 px-6 gap-6">
       <div class="flex gap-1">
         <wd-img width="23" height="23" :src="map"></wd-img>
-        <div class="text-white text-base font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="text-white text-base font-normal font-['PingFang_SC'] leading-relaxed">
           第二站
         </div>
         <div class="flex-1"></div>
         <div class="bg-[#f3f3f3] rounded-[20px] backdrop-blur-[15px] px-4 py-1.5">
-          <div class="text-black/40 text-sm font-normal font-['PingFang SC']">未开始</div>
+          <div class="text-black/40 text-sm font-normal font-['PingFang_SC']">未开始</div>
         </div>
       </div>
       <div class="flex gap-4 pt-2">
@@ -50,14 +50,14 @@ const toDetail = () => {
           mode="scaleToFill"
         />
         <div class="flex flex-col justify-around">
-          <div class="text-black text-base font-normal font-['PingFang SC'] leading-relaxed">
+          <div class="text-black text-base font-normal font-['PingFang_SC'] leading-relaxed">
             {{ options.title }}
           </div>
           <div class="flex">
-            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+            <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               游学时间:
             </div>
-            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+            <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               {{
                 (dayjs(options.studyStartDate).format('MM.DD'),
                 dayjs(options.studyEndDate).format('MM.DD'))
@@ -65,7 +65,7 @@ const toDetail = () => {
             </div>
           </div>
           <div class="flex">
-            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+            <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               兑换积分:
             </div>
             <div class="text-[#ef4343] text-xl font-normal font-['D-DIN Exp'] leading-[34px]">
@@ -77,13 +77,13 @@ const toDetail = () => {
       </div>
       <div class="flex justify-between">
         <view
-          class="flex items-center text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+          class="flex items-center text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
         >
           距结束还剩
           <view
             class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
           >
-            <view class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]">
+            <view class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]">
               05
             </view>
           </view>
@@ -91,7 +91,7 @@ const toDetail = () => {
           <div
             class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
           >
-            <div class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]">
               05
             </div>
           </div>
@@ -99,7 +99,7 @@ const toDetail = () => {
           <div
             class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
           >
-            <div class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]">
               05
             </div>
           </div>
@@ -110,7 +110,7 @@ const toDetail = () => {
       <div class="flex justify-between border-t-solid border-t-[#f2f2f2] border-t-1 py-4">
         <div></div>
         <div
-          class="text-justify text-black/40 text-xs font-normal font-['PingFang SC'] leading-relaxed"
+          class="text-justify text-black/40 text-xs font-normal font-['PingFang_SC'] leading-relaxed"
         >
           黄金会员以上等级可报名
         </div>

+ 2 - 2
packages/app/src/pages/home/study-tour/components/time-line.vue

@@ -15,7 +15,7 @@ const current = ref(0)
     >
       <template #append>
         <div class="flex items-center">
-          <div class="text-right text-white text-xs font-normal font-['PingFang SC']">查看全部</div>
+          <div class="text-right text-white text-xs font-normal font-['PingFang_SC']">查看全部</div>
           <wd-icon name="arrow-right" color="#ffffff" size="12"></wd-icon>
         </div>
       </template>
@@ -24,7 +24,7 @@ const current = ref(0)
       <template v-for="(it, i) in data" :key="i">
         <div class="inline-block w-[calc(25%-0rpx)] box-border">
           <div class="flex flex-col gap-2 items-center">
-            <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
               3月
             </div>
             <div class="w-full flex items-center">

+ 13 - 13
packages/app/src/pages/home/study-tour/detail.vue

@@ -29,15 +29,15 @@ onLoad(async (query: { id: string }) => {
     </div>
     <div class="flex">
       <wd-img width="18" height="18" :src="map"></wd-img>
-      <div class="text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal">
         第一站
       </div>
     </div>
-    <div class="w-[347px] text-white text-[26px] font-normal font-['PingFang SC'] leading-[44px]">
+    <div class="w-[347px] text-white text-[26px] font-normal font-['PingFang_SC'] leading-[44px]">
       日本研学·东京艺术大学设计游学
       <div class="inline-block py-1.5 px-4 bg-white rounded-[20px] backdrop-blur-[15px]">
         <div
-          class="w-[42px] h-[21px] text-[#a60707] text-sm font-normal font-['PingFang SC'] leading-relaxed"
+          class="w-[42px] h-[21px] text-[#a60707] text-sm font-normal font-['PingFang_SC'] leading-relaxed"
         >
           报名中
         </div>
@@ -47,48 +47,48 @@ onLoad(async (query: { id: string }) => {
       <div class="flex items-center">
         <wd-img width="16" height="16"></wd-img>
         <div
-          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal"
+          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal"
         >
           报名时间
         </div>
         <div class="w-4"></div>
-        <div class="text-white text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-white text-base font-normal font-['PingFang_SC'] leading-[34px]">
           2024.12.15 2025.01.15
         </div>
       </div>
       <div class="flex items-center">
         <wd-img width="16" height="16"></wd-img>
         <div
-          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal"
+          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal"
         >
           游学时间
         </div>
         <div class="w-4"></div>
-        <div class="text-white text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-white text-base font-normal font-['PingFang_SC'] leading-[34px]">
           2024.12.15 2025.01.15
         </div>
       </div>
       <div class="flex items-center">
         <wd-img width="16" height="16"></wd-img>
         <div
-          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal"
+          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal"
         >
           游学名额
         </div>
         <div class="w-4"></div>
-        <div class="text-white text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-white text-base font-normal font-['PingFang_SC'] leading-[34px]">
           40人/剩余10人
         </div>
       </div>
       <div class="flex items-center">
         <wd-img width="16" height="16"></wd-img>
         <div
-          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-normal"
+          class="w-[70px] text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal"
         >
           等级限制
         </div>
         <div class="w-4"></div>
-        <div class="text-white text-base font-normal font-['PingFang SC'] leading-[34px]">
+        <div class="text-white text-base font-normal font-['PingFang_SC'] leading-[34px]">
           黄金以上等级
         </div>
       </div>
@@ -99,7 +99,7 @@ onLoad(async (query: { id: string }) => {
     </wd-tabs>
     <div class="mt-5">
       <div
-        class="text-justify text-[#c1c1c1] text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="text-justify text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
         东京艺术大学(英文:Tokyo University of the
         Arts;日文平假名:とうきょうげいじゅつだいがく),简称东京艺大、艺大(とうきょうげいだい、げいだい),是一所校本部位于东京都台东区上野公园内的艺术类日本国立大学。其是超级国际化大学计划、亚洲校园 成员。其前身是于1887年分别创立的东京美术学校和东京音乐学校,1949年两校合并成为新制东京艺术大学。东京艺术大学的主要目的为培养美术和音乐领域的艺术家,其中音乐学部已培养了许多著名作曲家、演奏家、指挥家,美术学部也诞生了许多著名画家、艺术家、建筑家。
@@ -109,7 +109,7 @@ onLoad(async (query: { id: string }) => {
       class="fixed bottom-4 w-[347px] h-[63px] bg-white/90 rounded-2xl backdrop-blur-[20px] flex items-center px-4 box-border"
     >
       <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN Exp'] leading-normal">16000</div>
-      <div class="text-black/40 text-base font-normal font-['PingFang SC'] leading-[34px]">
+      <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
         积分
       </div>
       <div class="flex-1"></div>

+ 9 - 9
packages/app/src/pages/home/study-tour/index.vue

@@ -59,7 +59,7 @@ onMounted(async () => {
         <div
           class="w-[63px] h-[29px] bg-black/60 rounded-[20px] backdrop-blur-[15px] absolute top-5 right-3.5 flex items-center justify-center"
         >
-          <div class="text-white text-sm font-normal font-['PingFang SC'] leading-relaxed">
+          <div class="text-white text-sm font-normal font-['PingFang_SC'] leading-relaxed">
             报名中
           </div>
         </div>
@@ -73,33 +73,33 @@ onMounted(async () => {
             ]"
           ></avatar-group-casual>
           <div
-            class="ml-1 text-white/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+            class="ml-1 text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
           >
             40人已报名
           </div>
         </view>
       </view>
       <div class="bg-[#27130d]/50 rounded-bl-2xl rounded-br-2xl backdrop-blur-[20px] p-3.5">
-        <div class="w-[293px] text-white text-xl font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="w-[293px] text-white text-xl font-normal font-['PingFang_SC'] leading-relaxed">
           日本研学·东京艺术大学设计游学
         </div>
         <view class="flex items-center">
-          <div class="text-white/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+          <div class="text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
             游学时间:
           </div>
-          <div class="text-white/60 text-base font-normal font-['PingFang SC'] leading-[34px]">
+          <div class="text-white/60 text-base font-normal font-['PingFang_SC'] leading-[34px]">
             07.15 08.10
           </div>
         </view>
         <div
-          class="text-justify text-white/60 text-sm font-normal font-['PingFang SC'] leading-relaxed"
+          class="text-justify text-white/60 text-sm font-normal font-['PingFang_SC'] leading-relaxed"
         >
           等级限制:黄金会员以上
         </div>
         <view class="flex items-center justify-between">
           <view class="flex items-end">
             <div class="text-white text-3xl font-bold font-['D-DIN Exp'] leading-normal">16000</div>
-            <div class="ml-1 text-white/60 text-sm font-normal font-['PingFang SC'] leading-[34px]">
+            <div class="ml-1 text-white/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
               积分
             </div>
           </view>
@@ -108,11 +108,11 @@ onMounted(async () => {
       </div>
     </card> -->
     <card custom-class="">
-      <div class="my-7.5 text-black text-xl font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="my-7.5 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
         筑巢荟-设计游学
       </div>
       <div
-        class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="w-[319px] h-[264px] text-justify text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
         我们为您精心打造了一个独特且极具价值的游学项目。这个项目的核心旨在全方位提升您作为设计师的能力。
         在这里,您将拥有无比优质的游学资源。我们与全球知名的设计学府、顶尖设计工作室以及具有代表性的经典建筑和室内空间建立了紧密合作。您将有机会深入这些卓越的场所,亲身体验最前沿的设计理念和实践。

+ 1 - 1
packages/app/src/pages/home/study-tour/list.vue

@@ -27,7 +27,7 @@ onMounted(async () => {
   <div class="flex flex-col gap-6 p-3.5">
     <SectionHeading custom-class="" :title="title"></SectionHeading>
     <div
-      class="mx-3.5 relative top--4 text-justify text-black/40 text-sm font-normal font-['PingFang SC'] leading-relaxed"
+      class="mx-3.5 relative top--4 text-justify text-black/40 text-sm font-normal font-['PingFang_SC'] leading-relaxed"
     >
       *我们为您精心打造了一个独特且极具价值的游学项目。这个项目的核心旨在全方位提升
     </div>

+ 3 - 3
packages/app/src/pages/login/index.vue

@@ -37,7 +37,7 @@ const getTestCode = async ({ detail }) => {
   <div class="flex-grow flex flex-col items-center justify-around px-3.5">
     <div>
       <wd-img :src="logo" width="78" height="78"></wd-img>
-      <div class="text-black text-2xl font-normal font-['PingFang SC'] leading-[10.18px]">
+      <div class="text-black text-2xl font-normal font-['PingFang_SC'] leading-[10.18px]">
         筑巢荟
       </div>
     </div>
@@ -54,10 +54,10 @@ const getTestCode = async ({ detail }) => {
         手机号一键登录
       </button>
       <div class="w-[318px] mt-8">
-        <span class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-tight">
+        <span class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-tight">
           如您点击授权,您将同意并授权
         </span>
-        <span class="text-[#0cbe7c] text-xs font-normal font-['PingFang SC'] leading-tight">
+        <span class="text-[#0cbe7c] text-xs font-normal font-['PingFang_SC'] leading-tight">
           《筑巢荟用户服务协议》、《隐私政策》、《注册协议》
         </span>
       </div>

+ 3 - 3
packages/app/src/pages/material/calculator/index.vue

@@ -21,7 +21,7 @@ import { back } from '../../../core/utils/router'
       积分计算器
     </div>
     <div
-      class="mx-4.5 mb-3 text-start text-white text-base font-normal font-['PingFang SC'] leading-relaxed"
+      class="mx-4.5 mb-3 text-start text-white text-base font-normal font-['PingFang_SC'] leading-relaxed"
     >
       获取积分小帮手
     </div>
@@ -32,7 +32,7 @@ import { back } from '../../../core/utils/router'
         16000
       </div>
       <div
-        class="text-center text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
+        class="text-center text-black text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
         积分
       </div>
@@ -50,7 +50,7 @@ import { back } from '../../../core/utils/router'
       <wd-input></wd-input>
       <wd-button :round="false" block custom-class="my-4">开始计算</wd-button>
       <div
-        class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-relaxed"
+        class="text-center text-black/40 text-xs font-normal font-['PingFang_SC'] leading-relaxed"
       >
         积分 = 订单金额 x 20% x 10 x 材料商兑换积分比例
       </div>

+ 12 - 12
packages/app/src/pages/material/detail/index.vue

@@ -67,7 +67,7 @@ onLoad(async (query: { id: number }) => {
             <div class="flex flex-col gap-2.5">
               <div class="flex gap-2 items-center">
                 <div
-                  class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]"
+                  class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]"
                 >
                   <!-- IMOLA瓷砖 -->
                   {{ data?.materialsName }}
@@ -76,7 +76,7 @@ onLoad(async (query: { id: number }) => {
                   class="w-[52px] h-[17px] px-2 bg-[#ef4343] rounded-[3px] justify-center items-center gap-2.5 inline-flex"
                 >
                   <div
-                    class="text-white text-[10px] font-normal font-['PingFang SC'] leading-normal"
+                    class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-normal"
                   >
                     <!-- 自营品牌 -->
                     {{
@@ -86,7 +86,7 @@ onLoad(async (query: { id: number }) => {
                   </div>
                 </div>
               </div>
-              <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]">
+              <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
                 {{
                   materialBrandTypes.find(({ value }) => value === String(data?.brandType))?.label
                 }}
@@ -98,12 +98,12 @@ onLoad(async (query: { id: number }) => {
               </div>
               <div>
                 <span
-                  class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+                  class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
                 >
                   经营品牌:
                 </span>
                 <span
-                  class="text-black/40 text-xs font-normal font-['PingFang SC'] uppercase leading-[10.18px]"
+                  class="text-black/40 text-xs font-normal font-['PingFang_SC'] uppercase leading-[10.18px]"
                 >
                   <!-- imola / chedit -->
                   {{
@@ -117,7 +117,7 @@ onLoad(async (query: { id: number }) => {
                   class="w-[77px] h-5 px-2 py-px bg-neutral-100 rounded-[3px] justify-center items-center gap-2.5 inline-flex"
                 >
                   <div
-                    class="text-black/60 text-[10px] font-normal font-['PingFang SC'] leading-normal"
+                    class="text-black/60 text-[10px] font-normal font-['PingFang_SC'] leading-normal"
                   >
                     积分比例:{{ data?.pointsExchangeRate }}%
                   </div>
@@ -126,7 +126,7 @@ onLoad(async (query: { id: number }) => {
                   class="w-[92px] h-5 px-2 py-px bg-neutral-100 rounded-[3px] justify-center items-center gap-2.5 inline-flex"
                 >
                   <div
-                    class="text-black/60 text-[10px] font-normal font-['PingFang SC'] leading-normal"
+                    class="text-black/60 text-[10px] font-normal font-['PingFang_SC'] leading-normal"
                   >
                     门店打卡:{{ data?.clockPoints }}积分
                   </div>
@@ -140,13 +140,13 @@ onLoad(async (query: { id: number }) => {
           >
             <div class="bg-neutral-50 rounded-2.5 p-3.5 flex items-center">
               <div class="text-black/40 flex-1 border-r-2 border-r-[#f6f6f6] border-r-solid">
-                <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-normal">
+                <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-normal">
                   {{ shopName }}
                 </div>
                 <div>
                   <wd-icon name="location" size="15"></wd-icon>
                   <span
-                    class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+                    class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
                   >
                     {{ shopAddr }}
                   </span>
@@ -169,7 +169,7 @@ onLoad(async (query: { id: number }) => {
       </Card>
       <Card>
         <div class="flex flex-col gap-4">
-          <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
+          <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]">
             品牌介绍
           </div>
           <div class="rounded-2xl overflow-hidden">
@@ -181,14 +181,14 @@ onLoad(async (query: { id: number }) => {
               custom-class="aspect-[1.72/1]"
             ></wd-img>
           </div>
-          <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+          <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]">
             <!-- {{ materialHomePageData. }} -->
             {{
               materialsManageBrands.find(({ value }) => value === String(data?.manageBrand))?.label
             }}
           </div>
           <div
-            class="text-justify text-black/60 text-sm font-normal font-['PingFang SC'] leading-[25px]"
+            class="text-justify text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[25px]"
           >
             {{ materialHomePageData.brandAdvantageDesc }}
           </div>

+ 7 - 7
packages/app/src/pages/material/index.vue

@@ -134,12 +134,12 @@ onMounted(async () => {
               </view>
               <div class="flex-1 flex flex-col justify-around h-full">
                 <div
-                  class="text-black/80 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+                  class="text-black/80 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
                 >
                   {{ it.title }}
                 </div>
                 <div
-                  class="mt-1 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+                  class="mt-1 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
                 >
                   {{ it.desc }}
                 </div>
@@ -182,12 +182,12 @@ onMounted(async () => {
                     :src="it.logoUrl"
                   ></wd-img>
                   <div
-                    class="my-4 text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+                    class="my-4 text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
                   >
                     {{ it.materialsName }}
                   </div>
                   <div
-                    class="mb-4 text-black/60 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+                    class="mb-4 text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
                   >
                     <!-- 进口品牌 -->
                     {{
@@ -210,7 +210,7 @@ onMounted(async () => {
                     </wd-button>
                   </div>
                   <div
-                    class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+                    class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
                   >
                     {{ it.virtualArrival || 0 }}次到店打卡
                   </div>
@@ -246,14 +246,14 @@ onMounted(async () => {
               <div class="bg-white rounded-2.5 p-3.5 flex items-center">
                 <div class="text-black/40 flex-1 border-r-2 border-r-[#f6f6f6] border-r-solid">
                   <div
-                    class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-normal"
+                    class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-normal"
                   >
                     {{ shopName }}
                   </div>
                   <div>
                     <wd-icon name="location" size="15"></wd-icon>
                     <span
-                      class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+                      class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
                     >
                       {{ shopAddr }}
                     </span>

+ 1 - 1
packages/app/src/pages/material/recommend/index.vue

@@ -59,7 +59,7 @@ onMounted(() => {})
       @submit="handleSubmit"
     ></DataForm>
     <div
-      class="w-[319px] h-[43px] text-center text-black/30 text-xs font-normal font-['PingFang SC'] leading-normal"
+      class="w-[319px] h-[43px] text-center text-black/30 text-xs font-normal font-['PingFang_SC'] leading-normal"
     >
       为满足筑巢荟设计师设计需求,各位设计师可向平台推荐优质服务材料商/施工队,平台优先进行洽谈和考核
     </div>

+ 4 - 4
packages/app/src/pages/messages/index.vue

@@ -69,18 +69,18 @@ const msgs = ref({
               </div>
             </div>
             <div class="row-start-1 col-start-2 text-start">
-              <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[30px]">
+              <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[30px]">
                 {{ title }}
               </div>
             </div>
             <div class="row-start-1 col-start-3 text-end">
-              <div class="text-black/30 text-sm font-normal font-['PingFang SC'] leading-[10.18px]">
+              <div class="text-black/30 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
                 {{ beforeNow(dayjs(createdAt).toDate()) }}
               </div>
             </div>
             <div class="row-start-2 col-start-2 col-end-4">
               <div
-                class="my-3 text-black/40 text-sm font-normal font-['PingFang SC'] leading-[25px]"
+                class="my-3 text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[25px]"
               >
                 {{ content }}
               </div>
@@ -92,7 +92,7 @@ const msgs = ref({
               <div v-if="!img" class="bg-[#dadada] w-full h-[1px]"></div>
             </div>
             <div class="row-start-5 col-start-2 col-end-4">
-              <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-[25px]">
+              <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-[25px]">
                 查看详情
               </div>
             </div>

+ 2 - 2
packages/app/src/pages/mine/agents/index.vue

@@ -27,11 +27,11 @@ const handleCall = (phone: string) => {
             />
             <div class="flex flex-col flex-1 justify-around">
               <div
-                class="text-start text-black/40 text-lg font-normal font-['PingFang SC'] leading-normal"
+                class="text-start text-black/40 text-lg font-normal font-['PingFang_SC'] leading-normal"
               >
                 王玉辉
               </div>
-              <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
                 平台客服
               </div>
             </div>

+ 2 - 2
packages/app/src/pages/mine/authentication/submit/success/index.vue

@@ -8,11 +8,11 @@ import { success } from '@/core/libs/svgs'
 <template>
   <div class="flex-grow flex flex-col justify-center items-center">
     <wd-img width="60" height="60" :src="success" custom-class="mb-4.5"></wd-img>
-    <div class="mb-10 text-black/90 text-xl font-normal font-['PingFang SC'] leading-none">
+    <div class="mb-10 text-black/90 text-xl font-normal font-['PingFang_SC'] leading-none">
       提交成功
     </div>
     <div
-      class="text-center text-black/40 text-base font-normal font-['PingFang SC'] leading-relaxed"
+      class="text-center text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
     >
       我们会有专属客户与您联系
       <br />

+ 5 - 5
packages/app/src/pages/mine/components/tasks-card.vue

@@ -32,17 +32,17 @@ const styles = ref({
     </view>
     <view class="absolute left-0 right-0 top-1 bottom-6 z-1 p-3.5">
       <view class="w-full h-full flex flex-col justify-between">
-        <div class="text-start text-black text-lg font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-start text-black text-lg font-normal font-['PingFang_SC'] leading-normal">
           任务中心
         </div>
         <div class="flex-grow mt-4 overflow-auto">
           <template v-for="({ taskKey, taskValue, status }, i) in items" :key="i">
             <div class="flex items-center my-6">
-              <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
                 {{ taskKey }}
               </div>
               <div
-                class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang SC'] leading-normal"
+                class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang_SC'] leading-normal"
               >
                 +{{ taskValue }}积分
               </div>
@@ -59,10 +59,10 @@ const styles = ref({
     <div :style="styles.content" class="p-3.5">
       <template v-for="({ title, score }, i) in items" :key="i">
         <div class="flex items-center my-6">
-          <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
             {{ title }}
           </div>
-          <div class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang SC'] leading-normal">
+          <div class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang_SC'] leading-normal">
             +{{ score }}积分
           </div>
           <div class="flex-1"></div>

+ 3 - 3
packages/app/src/pages/mine/coupons/index.vue

@@ -20,15 +20,15 @@ const data = ref([{}])
         <div class="flex gap-3">
           <div class="w-[94px] h-[94px] bg-[#f6f6f6] rounded-[10px]"></div>
           <div class="flex flex-col justify-around">
-            <div class="text-black text-sm font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal">
               GELATO咖啡兑换券
             </div>
             <div
-              class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
             >
               有效期:2024/04/01-2024/05/30
             </div>
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
               使用说明
             </div>
           </div>

+ 2 - 2
packages/app/src/pages/mine/homepage/consult/index.vue

@@ -75,7 +75,7 @@ defineExpose({
       <div class="mt-13 flex gap-3 border-b-1 border-b-solid border-b-[#e1e1e1] pb-3">
         <div class="px-4 py-0.5 bg-[#2b2725] rounded justify-center items-center gap-2.5 flex">
           <div
-            class="text-center text-white text-base font-normal font-['PingFang SC'] tracking-wide"
+            class="text-center text-white text-base font-normal font-['PingFang_SC'] tracking-wide"
           >
             姓名
           </div>
@@ -88,7 +88,7 @@ defineExpose({
       <div class="mt-13 flex gap-3 border-b-1 border-b-solid border-b-[#e1e1e1] pb-3">
         <div class="px-4 py-0.5 bg-[#2b2725] rounded justify-center items-center gap-2.5 flex">
           <div
-            class="text-center text-white text-base font-normal font-['PingFang SC'] tracking-wide"
+            class="text-center text-white text-base font-normal font-['PingFang_SC'] tracking-wide"
           >
             电话
           </div>

+ 6 - 6
packages/app/src/pages/mine/homepage/edit/index.vue

@@ -19,7 +19,7 @@ const handleChange = () => {}
       <div>
         <SectionHeading title="主页封面图"></SectionHeading>
         <div
-          class="mt-4.5 mb-2.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug"
+          class="mt-4.5 mb-2.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug"
         >
           用于主页形象封面图,请上传体现个人艺术设计风格的图片,建议竖图尺寸750x1920,也可上传自己的视频介绍
         </div>
@@ -35,7 +35,7 @@ const handleChange = () => {}
       <div>
         <SectionHeading title="分享封面图"></SectionHeading>
         <div
-          class="mt-4.5 mb-2.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug"
+          class="mt-4.5 mb-2.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug"
         >
           用于分享到微信好友的卡片封面图,尺寸1920x1080;
         </div>
@@ -52,13 +52,13 @@ const handleChange = () => {}
       <div>
         <SectionHeading title="设计理念" subtitle="请输入设计理念"></SectionHeading>
         <div
-          class="mt-4.5 mx--3.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug"
+          class="mt-4.5 mx--3.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug"
         >
           <wd-textarea
             placeholder="例:设计没有风格,设计是对生活的一种诠释,不是所谓的造型与装饰!"
           />
         </div>
-        <div class="text-end text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug">
+        <div class="text-end text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug">
           0/100
         </div>
       </div>
@@ -67,13 +67,13 @@ const handleChange = () => {}
       <div>
         <SectionHeading title="个人信息" subtitle="请输入关于自己身份体现"></SectionHeading>
         <div
-          class="mt-4.5 mx--3.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug"
+          class="mt-4.5 mx--3.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug"
         >
           <wd-textarea
             placeholder="例:中国室内装饰协会会员、 xxx 空间设计事务所创始人、筑巢奖金奖设计师等等"
           />
         </div>
-        <div class="text-end text-black/40 text-xs font-normal font-['PingFang SC'] leading-snug">
+        <div class="text-end text-black/40 text-xs font-normal font-['PingFang_SC'] leading-snug">
           0/100
         </div>
       </div>

+ 2 - 2
packages/app/src/pages/mine/homepage/index.vue

@@ -86,7 +86,7 @@ defineExpose({
               <wd-img width="100%" height="100%" :src="userInfo?.avatar"></wd-img>
             </div>
             <div>
-              <div class="text-white text-2xl font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-white text-2xl font-normal font-['PingFang_SC'] leading-normal">
                 {{ userInfo?.nickname }}
               </div>
               <div>
@@ -94,7 +94,7 @@ defineExpose({
                   class="h-6 px-2 bg-black/10 rounded-[30px] border border-white/60 justify-center items-center gap-2.5 inline-flex"
                 >
                   <div
-                    class="text-center text-white text-[10px] font-normal font-['PingFang SC'] leading-normal"
+                    class="text-center text-white text-[10px] font-normal font-['PingFang_SC'] leading-normal"
                   >
                     创设空间事务所创始人
                   </div>

+ 15 - 15
packages/app/src/pages/mine/index.vue

@@ -137,7 +137,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         <img class="w-[72px] h-[72px] rounded-full border border-white" :src="avatar" />
         <div class="ms-3.5 ml-3.5">
           <div
-            class="text-white text-xl font-normal font-['PingFang SC'] leading-normal"
+            class="text-white text-xl font-normal font-['PingFang_SC'] leading-normal"
             @click="nickNameClickHandle"
           >
             {{ !isLogined ? '请点击登录' : userInfo?.nickname }}
@@ -147,7 +147,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             class="mt-2 w-[63px] h-[26px] bg-black/10 rounded-[20px] border border-white/60 flex items-center justify-center"
           >
             <div
-              class="text-center text-white text-xs font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-white text-xs font-normal font-['PingFang_SC'] leading-normal"
             >
               未认证
             </div>
@@ -158,7 +158,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             @click="handleToHomepage"
           >
             <div
-              class="text-center text-white text-sm font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-white text-sm font-normal font-['PingFang_SC'] leading-normal"
             >
               个人主页
             </div>
@@ -168,11 +168,11 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
       </div>
       <div class="px-3.5 flex items-center">
         <div class="flex items-center">
-          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+          <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal mr-1">
             0
           </div>
           <div
-            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang_SC'] leading-normal"
           >
             分享
           </div>
@@ -181,11 +181,11 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         <div class="h-4 w-[2px] mx-4 bg-[#e9e7e4]"></div>
 
         <div class="flex items-center">
-          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+          <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal mr-1">
             0
           </div>
           <div
-            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang_SC'] leading-normal"
           >
             获客
           </div>
@@ -194,11 +194,11 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         <div class="h-4 w-[2px] mx-4 bg-[#e9e7e4]"></div>
 
         <div class="flex items-center">
-          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+          <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal mr-1">
             0
           </div>
           <div
-            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang_SC'] leading-normal"
           >
             浏览
           </div>
@@ -213,7 +213,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         <div class="flex items-center">
           <wd-img custom-class="vertical-bottom" :src="vip" width="35" mode="widthFix"></wd-img>
           <div
-            class="ml-2 text-center text-[#faeac6] text-sm font-normal font-['PingFang SC'] leading-normal"
+            class="ml-2 text-center text-[#faeac6] text-sm font-normal font-['PingFang_SC'] leading-normal"
           >
             查看会员等级权益
           </div>
@@ -223,7 +223,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             @click="handleToAuthentication()"
           >
             <div
-              class="text-[#9e5934] text-[13px] font-normal font-['PingFang SC'] leading-relaxed"
+              class="text-[#9e5934] text-[13px] font-normal font-['PingFang_SC'] leading-relaxed"
             >
               去认证
             </div>
@@ -247,7 +247,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
               class="h-[22px] bg-gradient-to-r from-[#333333] to-[#20201e] rounded-tl-[20px] rounded-bl-[20px] mr--3.5 px-2 mt-3"
               @click="router.push('/pages/mine/levels/index')"
             >
-              <div class="text-xs font-normal font-['PingFang SC'] leading-relaxed color-[#f3f3f3]">
+              <div class="text-xs font-normal font-['PingFang_SC'] leading-relaxed color-[#f3f3f3]">
                 更多等级权益
               </div>
             </div>
@@ -257,10 +257,10 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
               <span class="text-4xl font-normal font-['D-DIN Exp'] mr-1">
                 {{ userInfo.level.point }}
               </span>
-              <span class="text-center text-xs font-normal font-['PingFang SC']">积分</span>
+              <span class="text-center text-xs font-normal font-['PingFang_SC']">积分</span>
             </div>
             <div class="flex-1"></div>
-            <div class="text-sm font-normal font-['PingFang SC']">
+            <div class="text-sm font-normal font-['PingFang_SC']">
               会员号:{{ userInfo.level.cardCode }}
             </div>
           </div>
@@ -283,7 +283,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
               <wd-img :src="icon" width="24" height="24" custom-class="vertical-bottom"></wd-img>
             </div>
             <div
-              class="mt-2 text-black/90 text-[12.86px] font-normal font-['PingFang SC'] leading-relaxed"
+              class="mt-2 text-black/90 text-[12.86px] font-normal font-['PingFang_SC'] leading-relaxed"
             >
               {{ title }}
             </div>

+ 3 - 3
packages/app/src/pages/mine/levels/index.vue

@@ -43,7 +43,7 @@ const items = ref([
     ></wd-navbar>
     <div class="flex gap-2 bg-gradient-to-r from-[#292331] to-[#35303b] rounded-md px-5 py-1">
       <wd-img width="22" height="22" :src="notify"></wd-img>
-      <div class="text-[#f1d2c5] text-sm font-normal font-['PingFang SC'] leading-normal">
+      <div class="text-[#f1d2c5] text-sm font-normal font-['PingFang_SC'] leading-normal">
         会员成长等级保级规则通知
       </div>
     </div>
@@ -67,10 +67,10 @@ const items = ref([
       >
         <wd-img width="50" height="50" :src="icon"></wd-img>
         <div class="flex flex-col justify-between flex-1">
-          <div class="text-[#f1d2c5] text-base font-normal font-['PingFang SC']">
+          <div class="text-[#f1d2c5] text-base font-normal font-['PingFang_SC']">
             {{ title }}
           </div>
-          <div class="text-white/40 text-xs font-normal font-['PingFang SC']">
+          <div class="text-white/40 text-xs font-normal font-['PingFang_SC']">
             {{ subTitle }}
           </div>
         </div>

+ 5 - 5
packages/app/src/pages/mine/orders/detail/index.vue

@@ -9,7 +9,7 @@ const data = ref([{}, {}, {}])
   <div class="flex-grow flex flex-col gap-4 px-3.5 bg-white">
     <div class="h-8.5 flex items-center justify-center mx--3.5 box-border bg-[#ffecec]">
       <div
-        class="text-right text-[#ef4343] text-sm font-normal font-['PingFang SC'] leading-normal"
+        class="text-right text-[#ef4343] text-sm font-normal font-['PingFang_SC'] leading-normal"
       >
         已完成
       </div>
@@ -22,23 +22,23 @@ const data = ref([{}, {}, {}])
         src="https://via.placeholder.com/94x94"
       />
       <div class="flex flex-col flex-1">
-        <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
           方晓峰
         </div>
         <div
-          class="text-start text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal"
+          class="text-start text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal"
         >
           x1
         </div>
         <div class="flex-1"></div>
         <div
-          class="text-start text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal"
+          class="text-start text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal"
         >
           1600积分
         </div>
       </div>
       <div>
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
           已完成
         </div>
       </div>

+ 4 - 4
packages/app/src/pages/mine/orders/index.vue

@@ -22,23 +22,23 @@ const handleClick = () => {
               src="https://via.placeholder.com/94x94"
             />
             <div class="flex flex-col flex-1">
-              <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
                 方晓峰
               </div>
               <div
-                class="text-start text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal"
+                class="text-start text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal"
               >
                 x1
               </div>
               <div class="flex-1"></div>
               <div
-                class="text-start text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal"
+                class="text-start text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal"
               >
                 1600积分
               </div>
             </div>
             <div>
-              <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
                 已完成
               </div>
             </div>

+ 2 - 2
packages/app/src/pages/mine/points/index.vue

@@ -39,7 +39,7 @@ import Card from '@/components/card.vue'
     </div>
     <div class="relative px-3.5">
       <div class="flex items-end px-3.5 mb-5">
-        <div class="text-white text-sm font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="text-white text-sm font-normal font-['PingFang_SC'] leading-relaxed">
           当前积分
         </div>
         <div>
@@ -47,7 +47,7 @@ import Card from '@/components/card.vue'
         </div>
         <div class="flex-1"></div>
         <div></div>
-        <div class="text-[#b6b6b6] text-sm font-normal font-['PingFang SC'] leading-relaxed">
+        <div class="text-[#b6b6b6] text-sm font-normal font-['PingFang_SC'] leading-relaxed">
           2024
         </div>
       </div>

+ 1 - 1
packages/app/src/pages/mine/setting/index.vue

@@ -56,7 +56,7 @@ const handleChooseAvatar = async ({ detail: { avatarUrl } }) => {
           custom-class="border border-white border-solid"
         ></wd-img>
       </button>
-      <div class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-none">
+      <div class="text-center text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
         更换头像
       </div>
     </div>

+ 1 - 1
packages/app/src/pages/publish/moment/index.vue

@@ -121,7 +121,7 @@ onLoad(async (query: { circleType: '1' | '2' }) => {
                 class="h-6 px-2 py-0.5 bg-[#f3f3f3] rounded-[3px] justify-center items-center gap-2 inline-flex"
               >
                 <div
-                  class="text-center text-black/90 text-xs font-normal font-['PingFang SC'] leading-tight"
+                  class="text-center text-black/90 text-xs font-normal font-['PingFang_SC'] leading-tight"
                 >
                   #{{ it }}
                 </div>

+ 2 - 2
packages/merchant/src/components/card-menu.vue

@@ -42,10 +42,10 @@ defineProps({
           "
         >
           <div class="my-3.5 flex flex-col justify-start h-full">
-            <div class="text-black/80 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/80 text-base font-normal font-['PingFang_SC'] leading-[10.18px]">
               {{ it.title }}
             </div>
-            <div class="mt-1 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="mt-1 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
               {{ it.desc }}
             </div>
           </div>

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

@@ -49,7 +49,7 @@ const defaultProps = {
         <div class="grid mb-4">
           <label
             v-if="type !== 'Submit' && direction === 'vertical'"
-            class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-relaxed mb-1"
+            class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-relaxed mb-1"
             :for="prop"
           >
             {{ label || prop }}

+ 7 - 7
packages/merchant/src/components/hot-activity-item.vue

@@ -26,7 +26,7 @@ import TiltedButton from './tilted-button.vue'
         <div class="w-[321px] h-[88px] relative">
           <div class="w-[94px] h-3 left-[185px] top-[64px] absolute">
             <div
-              class="left-0 top-0 absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+              class="left-0 top-0 absolute text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
             >
               07.15 08.10
             </div>
@@ -37,26 +37,26 @@ import TiltedButton from './tilted-button.vue'
             mode="scaleToFill"
           />
           <div
-            class="w-[202px] left-[119px] top-0 absolute text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
+            class="w-[202px] left-[119px] top-0 absolute text-black text-base font-normal font-['PingFang_SC'] leading-relaxed"
           >
             活动预告 | 日本研学·东京艺术大学设计游学
           </div>
           <div
-            class="left-[119px] top-[64px] absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            class="left-[119px] top-[64px] absolute text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
           >
             游学时间:
           </div>
         </div>
         <view class="flex items-center justify-between mb-1.5">
           <view
-            class="flex items-center text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            class="flex items-center text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"
           >
             距结束还剩
             <view
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <view
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </view>
@@ -66,7 +66,7 @@ import TiltedButton from './tilted-button.vue'
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <div
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </div>
@@ -76,7 +76,7 @@ import TiltedButton from './tilted-button.vue'
               class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
             >
               <div
-                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+                class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"
               >
                 05
               </div>

+ 1 - 1
packages/merchant/src/components/tilted-button.vue

@@ -37,7 +37,7 @@ defineProps({
 }
 .white {
   border-image-source: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE1IiBoZWlnaHQ9IjQ0IiB2aWV3Qm94PSIwIDAgMTE1IDQ0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBpZD0iUmVjdGFuZ2xlIDEzNTAiIGQ9Ik0xNS4xNjQ0IDUuMzcyMzhDMTYuODg4MSAyLjA3MDMyIDIwLjMwNDMgMCAyNC4wMjkyIDBIMTA1QzExMC41MjMgMCAxMTUgNC40NzcxNSAxMTUgMTBWMzRDMTE1IDM5LjUyMjggMTEwLjUyMyA0NCAxMDUgNDRIOS44NTA2NUMzLjA5MTM5IDQ0IC0xLjI1NTYyIDM2LjgyNzEgMS44NzIzMSAzMC44MzUxTDE1LjE2NDQgNS4zNzIzOFoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=');
-  @apply text-black text-base font-normal font-['PingFang SC'] leading-tight;
+  @apply text-black text-base font-normal font-['PingFang_SC'] leading-tight;
 }
 .large {
   @apply h-11;

+ 24 - 24
packages/merchant/src/pages/designer/detail.vue

@@ -44,7 +44,7 @@ const toPointsDetails = () => {
             <div class="flex-row flex items-center justify-between w-full">
               <div class="flex-row flex items-center">
                 <div
-                  class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+                  class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
                 >
                   苏小萌
                 </div>
@@ -55,14 +55,14 @@ const toPointsDetails = () => {
                   <wd-img width="17" height="17" :src="vipIcon"></wd-img>
 
                   <div
-                    class="text-black/40 text-[10px] font-normal font-['PingFang SC'] px-[7px] leading-none"
+                    class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] px-[7px] leading-none"
                   >
                     白银会员
                   </div>
                 </div>
               </div>
               <div
-                class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-snug flex items-center"
+                class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-snug flex items-center"
                 @click="toHomePage"
               >
                 <div>个人主页</div>
@@ -71,7 +71,7 @@ const toPointsDetails = () => {
             </div>
           </div>
           <div class="mt-[20px] flex items-center">
-            <div class="text-[#2357e9] text-xs font-normal font-['PingFang SC'] leading-none">
+            <div class="text-[#2357e9] text-xs font-normal font-['PingFang_SC'] leading-none">
               个人信息
             </div>
             <wd-img width="13" height="13" :src="rightArrowIcon"></wd-img>
@@ -86,12 +86,12 @@ const toPointsDetails = () => {
                 <div class="bg-white rounded-2xl shadow pa-[15px]">
                   <div class="flex items-center justify-between">
                     <div
-                      class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed"
+                      class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed"
                     >
                       积分动态
                     </div>
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none"
                       @click="toPointsDetails"
                     >
                       积分明细
@@ -111,7 +111,7 @@ const toPointsDetails = () => {
                     >
                       <div class="rounded-lg aspect-[1/1] flex flex-col justify-around p-2.5">
                         <div
-                          class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none"
+                          class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none"
                         >
                           {{ name }}
                         </div>
@@ -122,7 +122,7 @@ const toPointsDetails = () => {
                         </div>
                         <div class="flex items-center gap-1">
                           <div
-                            class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-none"
+                            class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none"
                           >
                             年新增
                           </div>
@@ -139,7 +139,7 @@ const toPointsDetails = () => {
                 <div class="bg-white rounded-2xl shadow pa-[15px] mt-[20px]">
                   <div class="flex items-center justify-between">
                     <div
-                      class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed"
+                      class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed"
                     >
                       使用动态
                     </div>
@@ -158,7 +158,7 @@ const toPointsDetails = () => {
                     >
                       <div class="rounded-lg aspect-[1/1] flex flex-col justify-around p-2.5">
                         <div
-                          class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none"
+                          class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none"
                         >
                           {{ name }}
                         </div>
@@ -169,7 +169,7 @@ const toPointsDetails = () => {
                         </div>
                         <div class="flex items-center gap-1">
                           <div
-                            class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-none"
+                            class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none"
                           >
                             年新增
                           </div>
@@ -186,19 +186,19 @@ const toPointsDetails = () => {
                 <div class="bg-white rounded-2xl shadow pa-[15px] mt-[20px]">
                   <div class="flex items-center justify-between">
                     <div
-                      class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed"
+                      class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed"
                     >
                       最近动态
                     </div>
                   </div>
                   <div class="mt-3">
                     <div
-                      class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-none"
                     >
                       苏小萌报名了早稻田深度设计游学
                     </div>
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-none mt-[10px]"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none mt-[10px]"
                     >
                       2024-09-08 14:12
                     </div>
@@ -211,19 +211,19 @@ const toPointsDetails = () => {
                 >
                   <div class="flex items-center justify-between">
                     <div
-                      class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed"
+                      class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed"
                     >
                       2024-09-02 9:20
                     </div>
                     <div
-                      class="text-white text-xs font-normal font-['PingFang SC'] leading-none bg-[#2357E9] pa-[8px]"
+                      class="text-white text-xs font-normal font-['PingFang_SC'] leading-none bg-[#2357E9] pa-[8px]"
                       style="border-top-left-radius: 15px; border-bottom-left-radius: 5px"
                     >
                       线下拜访
                     </div>
                   </div>
                   <div
-                    class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal mr-[15px] mt-[29px]"
+                    class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal mr-[15px] mt-[29px]"
                   >
                     和周老师在工作碰了环球项目,选了瓷砖款式,后天客户交定金,订单金额初步为 304958
                   </div>
@@ -240,13 +240,13 @@ const toPointsDetails = () => {
                       <wd-img width="15px" height="15px" :src="locationIcon"></wd-img>
 
                       <div
-                        class="text-black/40 text-[10px] font-normal font-['PingFang SC'] leading-[25px]"
+                        class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] leading-[25px]"
                       >
                         一间空间设计工作室
                       </div>
                     </div>
                     <div
-                      class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-relaxed mr-[15px]"
+                      class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-relaxed mr-[15px]"
                     >
                       渠道:李薇
                     </div>
@@ -258,7 +258,7 @@ const toPointsDetails = () => {
                   <div class="flex-row flex items-center justify-between w-full">
                     <div class="flex-row flex items-center">
                       <div
-                        class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+                        class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
                       >
                         苏小萌
                       </div>
@@ -269,14 +269,14 @@ const toPointsDetails = () => {
                         <wd-img width="17" height="17" :src="vipIcon"></wd-img>
 
                         <div
-                          class="text-black/40 text-[10px] font-normal font-['PingFang SC'] px-[7px] leading-none"
+                          class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] px-[7px] leading-none"
                         >
                           白银会员
                         </div>
                       </div>
                     </div>
                     <div
-                      class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+                      class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
                     >
                       4小时前
                     </div>
@@ -288,7 +288,7 @@ const toPointsDetails = () => {
                     />
                   </div>
                   <div
-                    class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px] mt-[29px]"
+                    class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px] mt-[29px]"
                   >
                     用心做好设计,为客户创造美好家居环境
                   </div>
@@ -298,7 +298,7 @@ const toPointsDetails = () => {
                     <wd-img width="17" height="17" :src="yinyongIcon"></wd-img>
 
                     <div
-                      class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none"
                     >
                       意大利游学设计班
                     </div>

+ 23 - 23
packages/merchant/src/pages/designer/homepage.vue

@@ -37,7 +37,7 @@ const tabs = ref([
           <div class="flex flex-col w-[100%]">
             <div class="flex-row flex items-center justify-between w-full">
               <div class="flex-row flex items-center">
-                <div class="text-white text-2xl font-normal font-['PingFang SC'] leading-normal">
+                <div class="text-white text-2xl font-normal font-['PingFang_SC'] leading-normal">
                   苏小萌
                 </div>
 
@@ -47,7 +47,7 @@ const tabs = ref([
                   <wd-img width="17" height="17" :src="vipIcon"></wd-img>
 
                   <div
-                    class="text-black/40 text-[10px] font-normal font-['PingFang SC'] px-[7px] leading-none"
+                    class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] px-[7px] leading-none"
                   >
                     白银会员
                   </div>
@@ -57,7 +57,7 @@ const tabs = ref([
           </div>
           <div class="mt-[12px] flex items-center">
             <div
-              class="text-center text-white text-[10px] font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-white text-[10px] font-normal font-['PingFang_SC'] leading-normal"
             >
               创设空间事务所创始人
             </div>
@@ -66,22 +66,22 @@ const tabs = ref([
       </div>
       <div class="bg-white rounded-tl-2xl rounded-tr-2xl border-2 pa-[11px]">
         <div class="flex items-center justify-start gap-[6px]">
-          <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[26.98px]">
+          <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[26.98px]">
             10
           </div>
-          <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[26.98px]">
+          <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[26.98px]">
             从业年限
           </div>
           <div style="width: 1px; height: 10px; background-color: black"></div>
-          <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[26.98px]">
+          <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[26.98px]">
             10
           </div>
-          <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[26.98px]">
+          <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[26.98px]">
             客户
           </div>
         </div>
         <div
-          class="w-[347px] h-10 text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal mt-[21px]"
+          class="w-[347px] h-10 text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal mt-[21px]"
         >
           “设计没有风格,设计是对生活的一种诠释,不是所谓的造型与装饰!”
         </div>
@@ -90,7 +90,7 @@ const tabs = ref([
             class="h-7 px-3 py-0.5 bg-[#e6e6e6]/40 rounded-[30px] justify-center items-center gap-2.5 inline-flex"
           >
             <div
-              class="text-center text-black/60 text-xs font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-black/60 text-xs font-normal font-['PingFang_SC'] leading-normal"
             >
               日本设计游学
             </div>
@@ -110,19 +110,19 @@ const tabs = ref([
                         src="https://via.placeholder.com/35x35"
                       />
                       <div
-                        class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px] ml-[11px]"
+                        class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px] ml-[11px]"
                       >
                         苏小萌
                       </div>
                     </div>
                     <div
-                      class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+                      class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
                     >
                       4小时前
                     </div>
                   </div>
                   <div
-                    class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal mr-[15px] mt-[29px]"
+                    class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal mr-[15px] mt-[29px]"
                   >
                     和周老师在工作碰了环球项目,选了瓷砖款式,后天客户交定金,订单金额初步为 304958
                   </div>
@@ -133,12 +133,12 @@ const tabs = ref([
                     />
                   </div>
                   <div
-                    class="text-black text-lg font-normal font-['PingFang SC'] leading-[10.18px] mt-[20px]"
+                    class="text-black text-lg font-normal font-['PingFang_SC'] leading-[10.18px] mt-[20px]"
                   >
                     现代 | 日星花园
                   </div>
                   <div
-                    class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[10.18px] mt-[18px]"
+                    class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[10.18px] mt-[18px]"
                   >
                     龙湖狮山天街生活广场三期·780 m²·全案定制
                   </div>
@@ -168,7 +168,7 @@ const tabs = ref([
                       </div>
                     </div>
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
                     >
                       删除x
                     </div>
@@ -184,7 +184,7 @@ const tabs = ref([
                         src="https://via.placeholder.com/35x35"
                       />
                       <div
-                        class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px] ml-[11px]"
+                        class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px] ml-[11px]"
                       >
                         苏小萌
                       </div>
@@ -194,14 +194,14 @@ const tabs = ref([
                         <wd-img width="17" height="17" :src="vipIcon"></wd-img>
 
                         <div
-                          class="text-black/40 text-[10px] font-normal font-['PingFang SC'] px-[7px] leading-none"
+                          class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] px-[7px] leading-none"
                         >
                           白银会员
                         </div>
                       </div>
                     </div>
                     <div
-                      class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-[10.18px]"
+                      class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[10.18px]"
                     >
                       4小时前
                     </div>
@@ -214,7 +214,7 @@ const tabs = ref([
                     />
                   </div>
                   <div
-                    class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px] mt-[30px]"
+                    class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px] mt-[30px]"
                   >
                     用心做好设计,为客户创造美好家居环境
                   </div>
@@ -225,7 +225,7 @@ const tabs = ref([
                     <wd-img width="17" height="17" :src="yinyongIcon"></wd-img>
 
                     <div
-                      class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none"
                     >
                       意大利游学设计班
                     </div>
@@ -256,7 +256,7 @@ const tabs = ref([
                       </div>
                     </div>
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-[10.18px]"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
                     >
                       删除x
                     </div>
@@ -275,11 +275,11 @@ const tabs = ref([
                         <wd-img width="17" height="17" :src="videoPlayIcon"></wd-img>
                       </div>
                       <div
-                        style="position: absolute; bottom: 10px; right: 10px"
+                        style="position: absolute; right: 10px; bottom: 10px"
                         class="flex items-center gap-[2px]"
                       >
                         <div
-                          class="text-[#cacaca] text-xs font-normal font-['PingFang SC'] leading-normal"
+                          class="text-[#cacaca] text-xs font-normal font-['PingFang_SC'] leading-normal"
                         >
                           315
                         </div>

+ 11 - 11
packages/merchant/src/pages/designer/index.vue

@@ -109,7 +109,7 @@ const filterData = () => {
                   <div class="flex-row flex items-center justify-between w-full">
                     <div class="flex-row flex items-center">
                       <div
-                        class="text-black/90 text-base font-normal font-['PingFang SC'] leading-[10.18px]"
+                        class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-[10.18px]"
                       >
                         苏小萌
                       </div>
@@ -120,14 +120,14 @@ const filterData = () => {
                         <wd-img width="17" height="17" :src="vipIcon"></wd-img>
 
                         <div
-                          class="text-black/40 text-[10px] font-normal font-['PingFang SC'] px-[7px] leading-none"
+                          class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] px-[7px] leading-none"
                         >
                           白银会员
                         </div>
                       </div>
                     </div>
                     <div
-                      class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-snug flex items-center"
+                      class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-snug flex items-center"
                       @click="toDetail"
                     >
                       <div>分享主页</div>
@@ -136,13 +136,13 @@ const filterData = () => {
                   </div>
                   <div class="flex items-center gap-2 mt-[18px]">
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none"
                     >
                       2天前访问
                     </div>
                     <div class="bg-[#eeeeee] w-[2px] h-[10px]"></div>
                     <div
-                      class="text-black/30 text-xs font-normal font-['PingFang SC'] leading-none"
+                      class="text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none"
                     >
                       积分:0
                     </div>
@@ -155,19 +155,19 @@ const filterData = () => {
               <div class="flex items-center justify-between w-full mt-[20px]">
                 <div class="flex items-center">
                   <div class="w-2 h-2 bg-[#89f4e2] rounded-full mr-[7px]"></div>
-                  <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-snug">
+                  <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-snug">
                     30天未跟进
                   </div>
                 </div>
                 <div class="flex items-center">
                   <div class="w-2 h-2 bg-[#ffb96a] rounded-full mr-[7px]"></div>
-                  <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-snug">
+                  <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-snug">
                     60天未产生积分
                   </div>
                 </div>
                 <div class="flex items-center">
                   <div class="w-2 h-2 bg-[#c493ff] rounded-full mr-[7px]"></div>
-                  <div class="text-black/90 text-xs font-normal font-['PingFang SC'] leading-snug">
+                  <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-snug">
                     60天未消耗积分
                   </div>
                 </div>
@@ -181,7 +181,7 @@ const filterData = () => {
                 style="border: 1px solid #ff2d2d"
               >
                 <span style="color: #ff2d2d" class="flex items-center">+</span>
-                <div class="text-[#ff2d2d] text-xs font-normal font-['PingFang SC'] leading-none">
+                <div class="text-[#ff2d2d] text-xs font-normal font-['PingFang_SC'] leading-none">
                   重点跟进
                 </div>
               </div>
@@ -190,7 +190,7 @@ const filterData = () => {
                 @click="callPhone('13700000000')"
               >
                 <div
-                  class="text-center text-[#2357e9] text-sm font-normal font-['PingFang SC'] leading-normal"
+                  class="text-center text-[#2357e9] text-sm font-normal font-['PingFang_SC'] leading-normal"
                 >
                   打电话
                 </div>
@@ -199,7 +199,7 @@ const filterData = () => {
                 class="px-5 py-1 bg-[#0052d9] rounded-[30px] justify-center items-center gap-1 inline-flex"
               >
                 <div
-                  class="text-center text-white text-sm font-normal font-['PingFang SC'] leading-normal"
+                  class="text-center text-white text-sm font-normal font-['PingFang_SC'] leading-normal"
                   @click="publishState = true"
                 >
                   写跟进

+ 4 - 4
packages/merchant/src/pages/designer/points_details/index.vue

@@ -22,7 +22,7 @@ const tabs = ref([
     <div class="flex flex-col relative mt-[27px] p-[16px]">
       <div class="flex items-center justify-between">
         <div class="flex items-center">
-          <div class="text-white text-sm font-['PingFang SC'] leading-relaxed mr-[10px]">
+          <div class="text-white text-sm font-['PingFang_SC'] leading-relaxed mr-[10px]">
             当前积分
           </div>
           <div>
@@ -33,16 +33,16 @@ const tabs = ref([
             </span>
           </div>
         </div>
-        <div class="text-white text-sm font-normal font-['PingFang SC'] leading-relaxed">2024</div>
+        <div class="text-white text-sm font-normal font-['PingFang_SC'] leading-relaxed">2024</div>
       </div>
       <div class="bg-white rounded-lg backdrop-blur-[60px] p-[16px] mt-[29px]">
         <div class="flex items-center justify-between flex-row mb-[16px]">
           <div>
-            <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed">
+            <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed">
               Imola材料商
             </div>
             <div
-              class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-relaxed mt-[5px]"
+              class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-relaxed mt-[5px]"
             >
               2024/08/10 14:21:54
             </div>

+ 8 - 8
packages/merchant/src/pages/home/index.vue

@@ -132,7 +132,7 @@ onShareAppMessage(() => ({}))
       <wd-navbar custom-class="bg-transparent!" safe-area-inset-top :bordered="false">
         <template #left>
           <div
-            class="ml-1 text-center text-white text-lg font-normal font-['PingFang SC'] leading-relaxed"
+            class="ml-1 text-center text-white text-lg font-normal font-['PingFang_SC'] leading-relaxed"
           >
             今日待办
           </div>
@@ -194,11 +194,11 @@ onShareAppMessage(() => ({}))
               :key="title"
             >
               <Card>
-                <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-none">
+                <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-none">
                   {{ title }}
                 </div>
                 <div
-                  class="mt-3 text-black/30 text-xs font-normal font-['PingFang SC'] leading-none"
+                  class="mt-3 text-black/30 text-xs font-normal font-['PingFang_SC'] leading-none"
                 >
                   {{ dayjs(date).format('YYYY-MM-DD hh:mm') }}
                 </div>
@@ -220,7 +220,7 @@ onShareAppMessage(() => ({}))
         <div class="w-full mt-[45px]">
           <wd-button block :round="false">
             <div
-              class="text-center text-white text-base font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-white text-base font-normal font-['PingFang_SC'] leading-normal"
             >
               扫码验券
             </div>
@@ -237,7 +237,7 @@ onShareAppMessage(() => ({}))
         </div>
         <div class="w-full flex items-center mt-[40px]">
           <div
-            class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed width-[96px]"
+            class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed width-[96px]"
           >
             输入订单金额
           </div>
@@ -247,12 +247,12 @@ onShareAppMessage(() => ({}))
         </div>
         <div class="w-full flex items-center mt-[20px]">
           <div
-            class="text-black/90 text-base font-normal font-['PingFang SC'] leading-relaxed width-[96px]"
+            class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-relaxed width-[96px]"
           >
             需支付积分
           </div>
           <div
-            class="text-[#ff2d2d] text-base font-normal font-['PingFang SC'] leading-relaxed ml-[20px]"
+            class="text-[#ff2d2d] text-base font-normal font-['PingFang_SC'] leading-relaxed ml-[20px]"
           >
             3400 积分
           </div>
@@ -260,7 +260,7 @@ onShareAppMessage(() => ({}))
         <div class="w-full mt-[45px]">
           <wd-button block :round="false" @click="toSettlement">
             <div
-              class="text-center text-white text-base font-normal font-['PingFang SC'] leading-normal"
+              class="text-center text-white text-base font-normal font-['PingFang_SC'] leading-normal"
             >
               积分结账
             </div>

+ 7 - 7
packages/merchant/src/pages/home/merchant/mine.vue

@@ -18,13 +18,13 @@ import { desinTopBg } from '@designer-hub/assets/src/svgs'
     >
       <div><img class="w-16 h-16 rounded-full" src="https://via.placeholder.com/64x64" /></div>
       <div class="ml-[10px]">
-        <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
+        <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]">
           商家:GELATO
         </div>
         <div
           class="h-6 px-1.5 py-1 bg-[#f5f6fa] rounded justify-center items-center gap-2.5 inline-flex mt-[17px]"
         >
-          <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang SC'] leading-none">
+          <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang_SC'] leading-none">
             ID:1201451200
           </div>
         </div>
@@ -32,29 +32,29 @@ import { desinTopBg } from '@designer-hub/assets/src/svgs'
     </div>
     <div class="flex items-center mt-[20px]">
       <div class="w-1 h-[19px] bg-[#2357e9] rounded-md"></div>
-      <div class="text-black text-lg font-normal font-['PingFang SC'] leading-normal ml-[8px]">
+      <div class="text-black text-lg font-normal font-['PingFang_SC'] leading-normal ml-[8px]">
         记录
       </div>
     </div>
     <div class="mt-[16px]">
       <div class="bg-white rounded-2xl p-[16px] flex flex-col">
-        <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           完成时间:2024-10-20 10:00
         </div>
 
         <div class="flex mt-[19px] items-center">
           <div class="w-[86px] h-[86px] bg-[#f6f6f6] rounded-[10px]"></div>
           <div class="ml-[16px]">
-            <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
               阿芙佳朵
             </div>
             <div
-              class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+              class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
             >
               数量x2
             </div>
             <div
-              class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+              class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
             >
               600积分
             </div>

+ 6 - 6
packages/merchant/src/pages/home/merchant/settlement.vue

@@ -23,18 +23,18 @@ generateQR('121')
         <img class="w-[199px] h-[199px]" :src="codeImageSrc" />
       </div>
       <div class="flex items-center justify-between px-[16px] mb-[15px]">
-        <div class="text-black/60 text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-normal">
           订单金额
         </div>
-        <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
           ¥326
         </div>
       </div>
       <div class="flex items-center justify-between px-[16px]">
-        <div class="text-black/60 text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-normal">
           积分
         </div>
-        <div class="text-black/90 text-base font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
           1250
         </div>
       </div>
@@ -44,13 +44,13 @@ generateQR('121')
         <div class="flex items-center">
           <img class="w-[29px] h-[29px] rounded-full" src="https://via.placeholder.com/29x29" />
           <div
-            class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal ml-[10px]"
+            class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal ml-[10px]"
           >
             李梦诗
           </div>
         </div>
         <div
-          class="text-center text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal"
+          class="text-center text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal"
         >
           扫码支付中...
         </div>

+ 21 - 21
packages/merchant/src/pages/home/tasks/detail/index.vue

@@ -17,14 +17,14 @@ const type = ref(1)
   <view class="flex-grow flex flex-col p-4 gap-4">
     <Card :custom-class="[types[type].bgClass, 'p-0']">
       <div class="flex p-4 items-center">
-        <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-none">
+        <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-none">
           目标{{ types[type].title }}(30)量
         </div>
         <div class="flex-1"></div>
         <div
           class="w-[47px] h-[23px] px-1 bg-[#2357e9] rounded border justify-center items-center gap-2.5 inline-flex"
         >
-          <div class="text-right text-white text-xs font-normal font-['PingFang SC'] leading-tight">
+          <div class="text-right text-white text-xs font-normal font-['PingFang_SC'] leading-tight">
             进行中
           </div>
         </div>
@@ -34,17 +34,17 @@ const type = ref(1)
           class="grid grid-cols-[2fr_2fr_3fr] items-center border-b border-b-solid border-b-[#efefef] pb-1.5"
         >
           <div class="flex items-center">
-            <div class="text-black/90 text-sm font-normal font-['PingFang SC']">目标</div>
+            <div class="text-black/90 text-sm font-normal font-['PingFang_SC']">目标</div>
             <div class="ml-2 text-black/90 text-lg font-medium font-['DIN'] leading-normal">30</div>
           </div>
           <div class="flex items-center justify-center">
-            <div class="text-[#2357e9] text-sm font-normal font-['PingFang SC']">完成</div>
+            <div class="text-[#2357e9] text-sm font-normal font-['PingFang_SC']">完成</div>
             <div class="ml-2 text-[#2357e9] text-lg font-medium font-['DIN'] leading-normal">
               22
             </div>
           </div>
           <div class="flex items-center justify-end">
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-none">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
               奖励积分
             </div>
             <div class="ml-2 text-[#ff2e2e] text-[22px] font-medium font-['DIN'] leading-none">
@@ -53,42 +53,42 @@ const type = ref(1)
           </div>
         </div>
         <div>
-          <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
             材料商:
           </span>
-          <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
             imola
           </span>
         </div>
         <div>
-          <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
             品牌:
           </span>
-          <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
             imola瓷砖
           </span>
         </div>
         <div>
-          <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
             任务时间:
           </span>
-          <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
             2024/06/07-2024/09/16
           </span>
         </div>
         <div>
-          <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
             提前结束时间:
           </span>
-          <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+          <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
             2024/06/07 10:20
           </span>
         </div>
         <div class="w-[310px] h-[42px]">
-          <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-normal">
+          <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
             备注说明:
           </span>
-          <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal">
+          <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal">
             平台统计预计在本月底进行截止请注意时间
           </span>
         </div>
@@ -103,15 +103,15 @@ const type = ref(1)
         <div class="flex gap-2.5 p-3.5 bg-[#f7fbff] items-center rounded-[10px]">
           <img class="w-11 h-11 rounded-full" src="https://via.placeholder.com/44x44" />
           <div class="flex-1 flex flex-col gap-2">
-            <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal">
               王一博
             </div>
-            <div class="text-black/30 text-sm font-normal font-['PingFang SC'] leading-none">
+            <div class="text-black/30 text-sm font-normal font-['PingFang_SC'] leading-none">
               打卡imola瓷砖
             </div>
           </div>
           <div class="flex items-start h-full">
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
               2024/04/01 11:25
             </div>
           </div>
@@ -119,15 +119,15 @@ const type = ref(1)
         <div class="flex gap-2.5 p-3.5 bg-[#f7fbff] items-center rounded-[10px]">
           <img class="w-11 h-11 rounded-full" src="https://via.placeholder.com/44x44" />
           <div class="flex-1 flex flex-col gap-2">
-            <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal">
               王一博
             </div>
-            <div class="text-black/30 text-sm font-normal font-['PingFang SC'] leading-none">
+            <div class="text-black/30 text-sm font-normal font-['PingFang_SC'] leading-none">
               打卡imola瓷砖
             </div>
           </div>
           <div class="h-full flex items-start">
-            <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">
               2024/04/01 11:25
             </div>
           </div>

+ 11 - 11
packages/merchant/src/pages/home/tasks/index.vue

@@ -56,51 +56,51 @@ const toDetail = async () => {
               class="w-[47px] h-[23px] px-1 bg-[#2357e9] rounded border justify-center items-center gap-2.5 inline-flex"
             >
               <div
-                class="text-right text-white text-xs font-normal font-['PingFang SC'] leading-tight"
+                class="text-right text-white text-xs font-normal font-['PingFang_SC'] leading-tight"
               >
                 进行中
               </div>
             </div>
-            <div class="mx-2.5 text-black/90 text-lg font-normal font-['PingFang SC'] leading-none">
+            <div class="mx-2.5 text-black/90 text-lg font-normal font-['PingFang_SC'] leading-none">
               {{ types[type].title }}量
             </div>
             <div class="flex-1"></div>
-            <div class="mx-1.5 text-black/40 text-xs font-normal font-['PingFang SC'] leading-none">
+            <div class="mx-1.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
               奖励积分
             </div>
             <div class="text-[#ff2e2e] text-[22px] font-medium font-['DIN'] leading-none">2000</div>
           </div>
           <div class="flex flex-col gap-4 bg-white p-5 rounded-2xl">
             <div>
-              <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
                 材料商:
               </span>
-              <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
                 imola
               </span>
             </div>
             <div>
-              <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
                 品牌:
               </span>
-              <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
                 imola瓷砖
               </span>
             </div>
             <div>
-              <span class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
                 任务时间:
               </span>
-              <span class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+              <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
                 2024/06/07-2024/09/16
               </span>
             </div>
             <div class="flex items-center border-t border-t-solid border-t-[#efefef] pt-1.5">
-              <div class="text-black/90 text-sm font-normal font-['PingFang SC']">目标</div>
+              <div class="text-black/90 text-sm font-normal font-['PingFang_SC']">目标</div>
               <div class="ml-2 text-black/90 text-lg font-medium font-['DIN'] leading-normal">
                 30
               </div>
-              <div class="ml-12 text-[#2357e9] text-sm font-normal font-['PingFang SC']">完成</div>
+              <div class="ml-12 text-[#2357e9] text-sm font-normal font-['PingFang_SC']">完成</div>
               <div class="ml-2 text-[#2357e9] text-lg font-medium font-['DIN'] leading-normal">
                 22
               </div>

+ 5 - 5
packages/merchant/src/pages/login/index.vue

@@ -39,8 +39,8 @@ onLoad(() => {
   <div class="flex-grow flex flex-col items-center justify-start px-7.5 bg-[#ffffff] pt-[100px]">
     <template v-if="!(isLogined ?? true)">
       <div class="flex flex-col justify-start mb-[57px] title">
-        <div class="text-black text-2xl font-normal font-['PingFang SC']">你好!</div>
-        <div class="text-black text-2xl font-normal font-['PingFang SC'] mt-[9px]">
+        <div class="text-black text-2xl font-normal font-['PingFang_SC']">你好!</div>
+        <div class="text-black text-2xl font-normal font-['PingFang_SC'] mt-[9px]">
           欢迎来到筑巢荟
         </div>
       </div>
@@ -68,16 +68,16 @@ onLoad(() => {
       </div>
       <div class="w-full flex items-center justify-between mt-[19px]">
         <wd-checkbox :modelValue="true" shape="square">记住密码</wd-checkbox>
-        <div class="text-[#2357e9] text-xs font-normal font-['PingFang SC']">忘记密码?</div>
+        <div class="text-[#2357e9] text-xs font-normal font-['PingFang_SC']">忘记密码?</div>
       </div>
       <div class="w-full mt-[50px]">
         <wd-button block :round="false" @click="handleLogin">登录</wd-button>
       </div>
       <div class="mt-8">
-        <span class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-tight">
+        <span class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-tight">
           登录即代表您已阅读并同意筑巢荟的
         </span>
-        <span class="text-[#2357e9] text-xs font-normal font-['PingFang SC'] leading-tight">
+        <span class="text-[#2357e9] text-xs font-normal font-['PingFang_SC'] leading-tight">
           《服务使用协议》
         </span>
       </div>

+ 5 - 5
packages/merchant/src/pages/mine/components/tasks-card.vue

@@ -32,17 +32,17 @@ const styles = ref({
     </view>
     <view class="absolute left-0 right-0 top-1 bottom-6 z-1 p-3.5">
       <view class="w-full h-full flex flex-col justify-between">
-        <div class="text-start text-black text-lg font-normal font-['PingFang SC'] leading-normal">
+        <div class="text-start text-black text-lg font-normal font-['PingFang_SC'] leading-normal">
           任务中心
         </div>
         <div class="flex-grow mt-4 overflow-auto">
           <template v-for="({ taskKey, taskValue, status }, i) in items" :key="i">
             <div class="flex items-center my-6">
-              <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+              <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
                 {{ taskKey }}
               </div>
               <div
-                class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang SC'] leading-normal"
+                class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang_SC'] leading-normal"
               >
                 +{{ taskValue }}积分
               </div>
@@ -59,10 +59,10 @@ const styles = ref({
     <div :style="styles.content" class="p-3.5">
       <template v-for="({ title, score }, i) in items" :key="i">
         <div class="flex items-center my-6">
-          <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
             {{ title }}
           </div>
-          <div class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang SC'] leading-normal">
+          <div class="ml-1 text-[#dc753a] text-xs font-normal font-['PingFang_SC'] leading-normal">
             +{{ score }}积分
           </div>
           <div class="flex-1"></div>

+ 20 - 20
packages/merchant/src/pages/mine/index.vue

@@ -83,16 +83,16 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             src="https://via.placeholder.com/56x56"
           />
           <div class="mx-4 flex-1">
-            <div class="text-white text-lg font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-white text-lg font-normal font-['PingFang_SC'] leading-normal">
               李晓东
             </div>
-            <div class="text-white text-xs font-normal font-['PingFang SC'] leading-relaxed">
+            <div class="text-white text-xs font-normal font-['PingFang_SC'] leading-relaxed">
               ID:1023621
             </div>
           </div>
           <div>
             <div class="w-[29px] h-[29px] relative bg-[#ff523f]"></div>
-            <div class="text-white text-[10px] font-normal font-['PingFang SC'] leading-relaxed">
+            <div class="text-white text-[10px] font-normal font-['PingFang_SC'] leading-relaxed">
               邀请码
             </div>
           </div>
@@ -118,17 +118,17 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
                   ></div>
                 </div>
                 <div class="flex-1">
-                  <div class="text-black/60 text-xs font-normal font-['PingFang SC']">
+                  <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">
                     {{ name }}
                   </div>
                   <div class="flex items-center gap-1">
                     <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
                       6000
                     </div>
-                    <div class="text-black text-xs font-normal font-['PingFang SC']">万</div>
+                    <div class="text-black text-xs font-normal font-['PingFang_SC']">万</div>
                   </div>
                   <div class="flex items-center gap-1">
-                    <div class="text-black/60 text-xs font-normal font-['PingFang SC']">差值</div>
+                    <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">差值</div>
                     <div class="text-[#ff2d2d] text-xs font-medium font-['DIN'] leading-normal">
                       3000
                     </div>
@@ -138,15 +138,15 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
                   </div>
                 </div>
                 <div class="">
-                  <div class="text-black/60 text-xs font-normal font-['PingFang SC']">当年完成</div>
+                  <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">当年完成</div>
                   <div class="flex items-center gap-1">
                     <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
                       6000
                     </div>
-                    <div class="text-black text-xs font-normal font-['PingFang SC']">万</div>
+                    <div class="text-black text-xs font-normal font-['PingFang_SC']">万</div>
                   </div>
                   <div class="flex items-center gap-1">
-                    <div class="text-black/60 text-xs font-normal font-['PingFang SC']">本月</div>
+                    <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">本月</div>
                     <div class="text-[#0FC187] text-xs font-medium font-['DIN'] leading-normal">
                       3000
                     </div>
@@ -174,14 +174,14 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
               :key="name"
             >
               <div class="bg-[#f6f7ff] rounded-lg aspect-[1/1] flex flex-col justify-around p-2.5">
-                <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none">
+                <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none">
                   {{ name }}
                 </div>
                 <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
                   {{ value }}
                 </div>
                 <div class="flex items-center gap-1">
-                  <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-none">
+                  <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
                     年新增
                   </div>
                   <div class="text-[#ff2d2d] text-xs font-normal font-['D-DIN Exp'] leading-normal">
@@ -204,14 +204,14 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
               :key="name"
             >
               <div class="bg-[#f6f7ff] rounded-lg aspect-[1/1] flex flex-col justify-around p-2.5">
-                <div class="text-black/60 text-xs font-normal font-['PingFang SC'] leading-none">
+                <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none">
                   {{ name }}
                 </div>
                 <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
                   {{ value }}
                 </div>
                 <div class="flex items-center gap-1">
-                  <div class="text-black/40 text-xs font-normal font-['PingFang SC'] leading-none">
+                  <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
                     年新增
                   </div>
                   <div class="text-[#ff2d2d] text-xs font-normal font-['D-DIN Exp'] leading-normal">
@@ -235,13 +235,13 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         >
           <div><img class="w-16 h-16 rounded-full" src="https://via.placeholder.com/64x64" /></div>
           <div class="ml-[10px]">
-            <div class="text-black/90 text-lg font-normal font-['PingFang SC'] leading-[10.18px]">
+            <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]">
               商家:GELATO
             </div>
             <div
               class="h-6 px-1.5 py-1 bg-[#f5f6fa] rounded justify-center items-center gap-2.5 inline-flex mt-[17px]"
             >
-              <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang SC'] leading-none">
+              <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang_SC'] leading-none">
                 ID:1201451200
               </div>
             </div>
@@ -249,29 +249,29 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
         </div>
         <div class="flex items-center mt-[20px]">
           <div class="w-1 h-[19px] bg-[#2357e9] rounded-md"></div>
-          <div class="text-black text-lg font-normal font-['PingFang SC'] leading-normal ml-[8px]">
+          <div class="text-black text-lg font-normal font-['PingFang_SC'] leading-normal ml-[8px]">
             记录
           </div>
         </div>
         <div class="mt-[16px]">
           <div class="bg-white rounded-2xl p-[16px] flex flex-col" @click="toorderDetail">
-            <div class="text-black/90 text-sm font-normal font-['PingFang SC'] leading-normal">
+            <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
               完成时间:2024-10-20 10:00
             </div>
 
             <div class="flex mt-[19px] items-center">
               <div class="w-[86px] h-[86px] bg-[#f6f6f6] rounded-[10px]"></div>
               <div class="ml-[16px]">
-                <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+                <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
                   阿芙佳朵
                 </div>
                 <div
-                  class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+                  class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
                 >
                   数量x2
                 </div>
                 <div
-                  class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+                  class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
                 >
                   600积分
                 </div>

+ 11 - 11
packages/merchant/src/pages/mine/merchant/merchant_settings.vue

@@ -23,47 +23,47 @@ const logout = () => {
   <view class="bg-white p-[16px] flex-grow flex flex-col">
     <div class="flex-1">
       <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">头像</div>
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">头像</div>
         <img class="w-7 h-7 rounded-full" src="https://via.placeholder.com/28x28" />
       </div>
       <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">名称</div>
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">名称</div>
         <div
-          class="text-right text-[#999999] text-sm font-normal font-['PingFang SC'] leading-none"
+          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"
         >
           GELATO
         </div>
       </div>
       <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">ID</div>
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">ID</div>
         <div
-          class="text-right text-[#999999] text-sm font-normal font-['PingFang SC'] leading-none"
+          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"
         >
           1254022
         </div>
       </div>
       <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
           登录用户
         </div>
         <div
-          class="text-right text-[#999999] text-sm font-normal font-['PingFang SC'] leading-none"
+          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"
         >
           李晓东
         </div>
       </div>
       <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
           登录用户手机
         </div>
         <div
-          class="text-right text-[#999999] text-sm font-normal font-['PingFang SC'] leading-none"
+          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"
         >
           132****1452
         </div>
       </div>
       <div class="flex justify-between items-center">
-        <div class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-none">
+        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
           修改密码
         </div>
         <wd-img width="15px" height="15px" :src="rightArrowIcon"></wd-img>
@@ -72,7 +72,7 @@ const logout = () => {
     <div class="w-full mt-[50px]">
       <wd-button block :round="false" @click="logout">
         <div
-          class="text-center text-white text-base font-normal font-['PingFang SC'] leading-normal"
+          class="text-center text-white text-base font-normal font-['PingFang_SC'] leading-normal"
         >
           退出登录
         </div>

+ 22 - 22
packages/merchant/src/pages/mine/merchant/order_detail.vue

@@ -13,16 +13,16 @@ const collapseValue = ref<string[]>(['item1'])
       <div class="flex mt-[19px] items-center">
         <div class="w-[86px] h-[86px] bg-[#f6f6f6] rounded-[10px]"></div>
         <div class="ml-[16px]">
-          <div class="text-black text-base font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
             阿芙佳朵
           </div>
           <div
-            class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+            class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
           >
             数量x2
           </div>
           <div
-            class="text-left text-black/30 text-sm font-normal font-['PingFang SC'] leading-normal"
+            class="text-left text-black/30 text-sm font-normal font-['PingFang_SC'] leading-normal"
           >
             600积分
           </div>
@@ -30,18 +30,18 @@ const collapseValue = ref<string[]>(['item1'])
       </div>
       <div style="height: 1px; background-color: #f2f2f2" class="mt-[16px]"></div>
       <div class="flex mt-[24px] items-center justify-between">
-        <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-normal">
+        <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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           600积分
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           -600积分
         </div>
       </div>
@@ -49,67 +49,67 @@ const collapseValue = ref<string[]>(['item1'])
         <img class="w-[43px] h-[34px]" src="https://via.placeholder.com/43x34" />
 
         <div class="ml-[20px]">
-          <div class="text-black text-sm font-normal font-['PingFang SC'] leading-normal">
+          <div class="text-black text-sm font-normal font-['PingFang_SC'] leading-normal">
             GELATO咖啡兑换券
           </div>
           <div
-            class="text-center text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal mt-[5px]"
+            class="text-center text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal mt-[5px]"
           >
             2024/04/01-2024/05/30
           </div>
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           0积分
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           1245100000012
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           2024-10-10 10:02
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           积分支付
         </div>
       </div>
       <div style="height: 1px; background-color: #f2f2f2" class="mt-[16px]"></div>
       <div
-        class="text-left text-black text-base font-normal font-['PingFang SC'] leading-normal mt-[24px]"
+        class="text-left text-black text-base font-normal font-['PingFang_SC'] leading-normal mt-[24px]"
       >
         完成记录
       </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           2024-10-10 10:02
         </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 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">
+        <div class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal">
           李书福
         </div>
       </div>

Some files were not shown because too many files changed in this diff