Ver código fonte

style(font): 更新字体样式并统一使用 D-DIN-PRO

- 将所有使用 'DIN' 字体的地方替换为 'D-DIN-PRO'
- 更新 fonts.css 文件,添加新的 D-DIN-PRO 字体并移除旧的 D-DIN_Exp
-调整部分样式以适应新字体,如行高、字体粗细等
EvilDragon 1 mês atrás
pai
commit
d0e89d0ed6

+ 2 - 2
packages/app/src/pages/home/offline-activity/cycling-rankings/index.vue

@@ -136,7 +136,7 @@ onShareTimeline(() => ({
             <template v-for="(it, i) in source.list" :key="i">
               <div v-if="i > 2" class="flex items-center gap-2 px-7">
                 <div
-                  class="text-center w-8 text-black/40 text-base font-bold font-['DIN'] leading-relaxed"
+                  class="text-center w-8 text-black/40 text-base font-bold font-['D-DIN-PRO'] leading-relaxed"
                 >
                   {{ i < 9 ? '0' + (i + 1) : i + 1 }}
                 </div>
@@ -171,7 +171,7 @@ onShareTimeline(() => ({
           <div class="bg-gradient-to-b from-neutral-100 to-white shadow-inner">
             <div class="py-3 flex items-center gap-2 px-7">
               <div
-                class="text-center w-8 text-black/40 text-base font-bold font-['DIN'] leading-relaxed"
+                class="text-center w-8 text-black/40 text-base font-bold font-['D-DIN-PRO'] leading-relaxed"
               >
                 <!--            {{ i < 9 ? '0' + (i + 1) : i + 1 }}-->
                 {{

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

@@ -94,7 +94,7 @@ onMounted(async () => {
         <template v-for="(it, i) in info" :key="i">
           <div class="flex-1 flex flex-col items-center gap-2">
             <div class="flex items-end gap-0.5">
-              <div class="text-black text-2xl font-medium font-['DIN'] leading-6">
+              <div class="text-black text-2xl font-medium font-['D-DIN-PRO'] leading-6">
                 {{ it.value }}
               </div>
               <div class="text-[#333333] text-sm font-normal font-['PingFang_SC']">

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

@@ -92,7 +92,7 @@ onLoad(async (query?: Record<string | 'active' | 'id' | 'isShared', string>) =>
                 {{ it.label }}
               </div>
               <div class="flex items-end gap-1">
-                <div class="text-center text-white text-2xl font-medium font-['DIN'] leading-6">
+                <div class="text-center text-white text-2xl font-medium font-['D-DIN-PRO'] leading-6">
                   {{ it.value }}
                 </div>
                 <div

+ 11 - 7
packages/app/src/pages/mine/scan/result/index.vue

@@ -39,7 +39,7 @@ const handleSubmit = async () => {
       }),
     )
     if (code === 0) {
-      router.replace(`/pages/common/status/success/index?title=支付成功`)
+      await router.replace(`/pages/common/status/success/index?title=支付成功`)
     }
   }
 }
@@ -80,6 +80,7 @@ onLoad(async (query: { result: string }) => {
           class="rounded-full"
           width="45"
           height="45"
+          round
           custom-class="border border-[#f2f2f2] border-solid"
           :src="data?.avatar ? 'https://' + data?.avatar : NetImages.DefaultAvatar"
         />
@@ -87,15 +88,18 @@ onLoad(async (query: { result: string }) => {
           {{ data?.name }}
         </div>
       </div>
-      <div class="flex items-end">
-        <div class="text-black/90 text-3xl font-normal font-['PingFang_SC'] leading-none">¥</div>
-        <div class="text-black/90 text-[50px] font-medium font-['DIN'] leading-none">
-          {{ data?.amount }}
+      <div class="mt-8 flex items-end gap-1">
+        <div class="text-black/60 text-lg font-normal font-['PingFang_SC'] leading-none invisible">
+          积分
         </div>
+        <div class="text-black/90 text-[50px] font-medium font-['D-DIN-PRO'] leading-[36px]">
+          {{ data?.points }}
+        </div>
+        <div class="text-black/60 text-lg font-normal font-['PingFang_SC'] leading-none">积分</div>
       </div>
-      <div class="mt-8">
+      <div class="mt-4">
         <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-none">
-          积分:{{ data?.points }}
+          ¥{{ data?.amount }}
         </div>
       </div>
       <div class="flex-1"></div>

BIN
packages/app/src/static/font-faces/subset-D-DIN-PRO-Medium.woff


BIN
packages/app/src/static/font-faces/subset-D-DIN-PRO-Medium.woff2


+ 13 - 5
packages/app/src/style/fonts.css

@@ -7,12 +7,20 @@
     url('/static/font-faces/subset-AlimamaShuHeiTi-Bold.woff') format('woff');
   font-display: swap;
 }
+/*@font-face {*/
+/*  font-family: 'D-DIN_Exp';*/
+/*  font-style: normal;*/
+/*  font-weight: normal;*/
+/*  src:*/
+/*    url('/static/font-faces/subset-D-DINExp.woff2') format('woff2'),*/
+/*    url('/static/font-faces/subset-D-DINExp.woff') format('woff');*/
+/*  font-display: swap;*/
+/*}*/
 @font-face {
-  font-family: 'D-DIN_Exp';
+  font-family: 'D-DIN-PRO';
+  src: url('/static/font-faces/subset-D-DIN-PRO-Medium.woff2') format('woff2'),
+  url('/static/font-faces/subset-D-DIN-PRO-Medium.woff') format('woff');
+  font-weight: 500;
   font-style: normal;
-  font-weight: normal;
-  src:
-    url('/static/font-faces/subset-D-DINExp.woff2') format('woff2'),
-    url('/static/font-faces/subset-D-DINExp.woff') format('woff');
   font-display: swap;
 }

+ 1 - 1
packages/merchant/src/pages/agent/components/task-card.vue

@@ -99,7 +99,7 @@ const toDetail = () =>
         <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">
+        <div class="text-[#ff2e2e] text-[22px] font-medium font-['D-DIN-PRO'] leading-none">
           {{ options.pointsReward }}
         </div>
       </div>

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

@@ -60,7 +60,7 @@ onLoad(async (query?: Record<string | 'id', string>) => {
         <template v-for="(it, i) in info" :key="i">
           <div class="flex-1 flex flex-col items-center gap-2">
             <div class="flex items-end flex-row-reverse gap-0.5">
-              <div class="text-black text-2xl font-medium font-['DIN'] leading-6">
+              <div class="text-black text-2xl font-medium font-['D-DIN-PRO'] leading-6">
                 {{ it.value }}
               </div>
               <div class="text-[#333333] text-sm font-normal font-['PingFang_SC']">

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

@@ -158,7 +158,7 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
               :clockwise="false"
             >
               <div class="flex flex-col items-center">
-                <div class="w-[29.20px] h-[18.39px] text-black text-sm font-medium font-['DIN']">
+                <div class="w-[29.20px] h-[18.39px] text-black text-sm font-medium font-['D-DIN-PRO']">
                   {{
                     ((taskDetails?.completedNum ?? 0) / (taskDetails?.storeQuantity ?? 0)) * 100
                   }}%
@@ -174,7 +174,7 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
           <div class="flex flex-row items-center justify-start ml-[37px]">
             <div class="text-black/60 text-sm font-normal font-['PingFang_SC']">奖励积分:</div>
             <div class="flex items-end gap-1">
-              <div class="text-[#ff2d2d] text-[22px] font-medium font-['DIN'] leading-22px">
+              <div class="text-[#ff2d2d] text-[22px] font-medium font-['D-DIN-PRO'] leading-22px">
                 {{ taskDetails?.pointsReward }}
               </div>
               <div class="text-[#ff2d2d] text-xs font-normal font-['PingFang_SC']">积分</div>
@@ -184,21 +184,21 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
         <div class="flex flex-row items-center justify-between gap-2">
           <div class="flex items-center justify-center flex-col">
             <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">目标</div>
-            <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
+            <div class="text-black/90 text-lg font-medium font-['D-DIN-PRO'] leading-normal">
               {{ taskDetails?.storeQuantity }}
             </div>
           </div>
           <div style="width: 1px; height: 10px; background: #e8e8e8"></div>
           <div class="flex items-center justify-center flex-col">
             <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">个人完成</div>
-            <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
+            <div class="text-black/90 text-lg font-medium font-['D-DIN-PRO'] leading-normal">
               {{ taskDetails?.personalCompletedNum }}
             </div>
           </div>
           <div style="width: 1px; height: 5px; background: #e8e8e8"></div>
           <div class="flex items-center justify-center flex-col">
             <div class="text-black/60 text-xs font-normal font-['PingFang_SC']">累计完成</div>
-            <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
+            <div class="text-black/90 text-lg font-medium font-['D-DIN-PRO'] leading-normal">
               {{ taskDetails?.completedNum ?? 0 }}
             </div>
           </div>

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

@@ -58,7 +58,7 @@ onMounted(async () => {
             任务积分
           </div>
           <div class="flex-1"></div>
-          <div class="text-[#ff2e2e] text-[22px] font-medium font-['DIN'] leading-none">
+          <div class="text-[#ff2e2e] text-[22px] font-medium font-['D-DIN-PRO'] leading-none">
             {{ data?.points ?? 0 }}
           </div>
           <wd-icon name="arrow-right" size="22" color="rgba(0,0,0,.75)"></wd-icon>

+ 7 - 7
packages/merchant/src/pages/mine/components/agent-mine.vue

@@ -119,7 +119,7 @@ onMounted(async () => {
                     >
                       <div class="flex flex-col items-center">
                         <div
-                          class="w-[29.20px] h-[18.39px] text-black text-sm font-medium font-['DIN']"
+                          class="w-[29.20px] h-[18.39px] text-black text-sm font-medium font-['D-DIN-PRO']"
                         >
                           {{
                             it.thisYearComplete && it.target
@@ -142,7 +142,7 @@ onMounted(async () => {
                   {{ it.typeName }}
                 </div>
                 <div class="flex items-center gap-1">
-                  <div class="text-black/90 text-lg font-medium font-['DIN'] leading-normal">
+                  <div class="text-black/90 text-lg font-medium font-['D-DIN-PRO'] leading-normal">
                     <!-- 6000 -->
                     {{ it.target / 10000 }}
                   </div>
@@ -150,11 +150,11 @@ onMounted(async () => {
                 </div>
                 <div class="flex items-center gap-1">
                   <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">
+                  <div class="text-[#ff2d2d] text-xs font-medium font-['D-DIN-PRO'] leading-normal">
                     <!-- 3000 -->
                     {{ (it.target - (it.thisYearComplete ?? 0)) / 10000 }}
                   </div>
-                  <div class="text-[#ff2d2d] text-[10px] font-medium font-['DIN'] leading-normal">
+                  <div class="text-[#ff2d2d] text-[10px] font-medium font-['D-DIN-PRO'] leading-normal">
                   </div>
                 </div>
@@ -162,7 +162,7 @@ onMounted(async () => {
               <div class="">
                 <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">
+                  <div class="text-black/90 text-lg font-medium font-['D-DIN-PRO'] leading-normal">
                     <!-- 6000 -->
                     {{ (it.thisYearComplete ?? 0) / 10000 }}
                   </div>
@@ -170,11 +170,11 @@ onMounted(async () => {
                 </div>
                 <div class="flex items-center gap-1">
                   <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">
+                  <div class="text-[#0FC187] text-xs font-medium font-['D-DIN-PRO'] leading-normal">
                     <!-- 3000 -->
                     {{ (it.thisMonthComplete ?? 0) / 10000 }}
                   </div>
-                  <div class="text-[#0FC187] text-[10px] font-medium font-['DIN'] leading-normal">
+                  <div class="text-[#0FC187] text-[10px] font-medium font-['D-DIN-PRO'] leading-normal">
                   </div>
                 </div>