Browse Source

refactor(app): 优化路由回退逻辑并统一字体样式

- 修改购买成功页面的路由回退逻辑,使用 router.back(2) 替代跳转到首页- 统一使用 PingFang_SC 字体样式,替换原有的 PingFang SC
- 优化多个组件中的字体样式和日期格式显示
- 更新路由工具类,增加 delta 参数支持自定义回退层数
EvilDragon 3 months ago
parent
commit
bed6095882

+ 2 - 2
packages/app/src/core/utils/router.ts

@@ -29,8 +29,8 @@ export const useRouter = () => {
   const replace = async (path: string) => {
     uni.redirectTo({ url: path })
   }
-  const back = () => {
-    uni.navigateBack()
+  const back = (delta = 1) => {
+    uni.navigateBack({ delta }).then()
   }
   return { push, replace, back }
 }

+ 5 - 1
packages/app/src/pages/home/mall/purchased/success/index.vue

@@ -17,8 +17,12 @@ const handle2Orders = () => {
   router.replace('/pages/mine/orders/index')
 }
 const handle2Mall = () => {
-  router.replace('/pages/home/mall/index')
+  // router.replace('/pages/home/mall/index')
+  router.back(2)
 }
+onLoad(() => {
+  console.log(getCurrentPages())
+})
 </script>
 <template>
   <div class="flex-grow flex flex-col px-3.5 justify-center items-center gap-7 bg-white">

+ 2 - 2
packages/merchant/src/pages/agent/designer/archives/activity/others/index.vue

@@ -102,13 +102,13 @@ onLoad((query?: Record<string | 'id', string>) => {
             <template v-for="(it, index) in source?.list" :key="index">
               <div>
                 <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"
                 >
                   {{ it.name }}
                 </div>
                 <div class="flex items-center justify-between">
                   <div
-                    class="text-black/40 text-sm font-normal font-['PingFang SC'] leading-relaxed"
+                    class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-relaxed"
                   >
                     参加日期:
                     {{ dayjs(it.applyTime).format('YYYY/MM/DD') }}

+ 3 - 3
packages/merchant/src/pages/agent/designer/archives/sale-info/index.vue

@@ -91,16 +91,16 @@ onLoad(async (query?: Record<string | 'id', string>) => {
                   ]"
                   :key="i"
                 >
-                  <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">
                     {{ item.label }}
                   </div>
-                  <div class="text-black/60 text-sm font-normal font-['PingFang SC'] leading-none">
+                  <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none">
                     {{ item.value }}
                   </div>
                 </template>
               </div>
               <div class="bg-[#f4f4f4] h-.25 my-4"></div>
-              <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">
                 {{ dayjs(it.createTime).format('YYYY-MM-DD HH:mm') }}
               </div>
             </Card>

+ 1 - 1
packages/merchant/src/pages/agent/tasks/detail/index.vue

@@ -324,7 +324,7 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
             </div>
             <template v-if="String(item.status) === '2'">
               <div class="bg-[#e6e8f1] my-4 border-[0.5px] border-solid border-[#e6e8f1]"></div>
-              <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">
                 原因:{{ item.reason }}
               </div>
             </template>

+ 1 - 1
packages/merchant/src/pages/mine/agent/invite/index.vue

@@ -85,7 +85,7 @@ onLoad(async () => {
 
     // canvas.FillText(data.value.brokerName, '#000000D9', 18, 149, 228, 'center')
     canvas.FillTexts(
-      [{ text: data.value?.brokerName ?? '', font: '18px PingFang SC', color: '#000000D9' }],
+      [{ text: data.value?.brokerName ?? '', font: '18px PingFang_SC', color: '#000000D9' }],
       228,
     )
 

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

@@ -119,7 +119,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
                           {{ dayjs(it.completeTime).format('YYYY-MM-DD hh:mm') }}
                         </div>
                         <div
-                          class="text-xs font-normal font-['PingFang SC'] leading-normal"
+                          class="text-xs font-normal font-['PingFang_SC'] leading-normal"
                           :class="
                             ['2', '4'].includes(it.orderStatus) ? 'text-[#ff2d2d]' : 'text-black/30'
                           "