Browse Source

feat(agent): 增加设计师强弱绑定筛选功能

- 在设计师列表中添加强弱绑定筛选选项
- 优化设计师数据展示,增加支付时间字段
- 更新积分字体为 D-DIN_Exp
- 添加浏览记录备注接口和相关展示
EvilDragon 3 months ago
parent
commit
041137fcb5

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

@@ -742,6 +742,10 @@ export interface Designer {
   expendPoints60Days: boolean
   focus: boolean
   brokerId: number
+  /**
+   * 0 弱绑定 1 强绑定
+   */
+  retryStatus?: 0 | 1
 }
 export interface DesignerBasicInfo {
   id: number

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

@@ -28,7 +28,7 @@ import calculatorBg from '@designer-hub/assets/src/libs/assets/calculatorBg'
     </div>
     <Card>
       <div
-        class="text-center text-[#ef4343] text-[40px] font-normal font-['D-DIN Exp'] leading-normal"
+        class="text-center text-[#ef4343] text-[40px] font-normal font-['D-DIN_Exp'] leading-normal"
       >
         16000
       </div>

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

@@ -65,7 +65,7 @@ const handleAddToCart = async () => {
     </div>
     <div class="flex items-center mb-6">
       <div class="flex items-end gap-1">
-        <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-5.5">
+        <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-5.5">
           <!-- 1000 -->
           {{ options.points }}
         </div>

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

@@ -88,7 +88,7 @@ onLoad(async (query: { id: string }) => {
     </div>
     <div class="relative flex-1 bg-white p-4 flex flex-col gap-4 rounded-tl-2xl rounded-tr-2xl">
       <div class="flex items-center gap-1">
-        <div class="text-[#ef4343] text-[26px] font-normal font-['D-DIN Exp'] leading-normal">
+        <div class="text-[#ef4343] text-[26px] font-normal font-['D-DIN_Exp'] leading-normal">
           <!-- 1000 -->
           {{ data?.points }}
         </div>
@@ -191,7 +191,7 @@ onLoad(async (query: { id: string }) => {
               {{ data?.prodcutName }}
             </div>
             <div class="flex items-center">
-              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
+              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal">
                 {{ data?.points }}
               </div>
               <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">

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

@@ -171,7 +171,7 @@ const handlePlaceOrder = async () => {
                   </div>
                   <div class="flex items-center gap-1.25">
                     <div
-                      class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal"
+                      class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal"
                     >
                       {{ it.points }}
                     </div>

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

@@ -79,7 +79,7 @@ onMounted(async () => {
                           兑换积分:
                         </div>
                         <div
-                          class="text-[#ef4343] text-xl font-normal font-['D-DIN Exp'] leading-[34px]"
+                          class="text-[#ef4343] text-xl font-normal font-['D-DIN_Exp'] leading-[34px]"
                         >
                           {{ it.needPointsCount }}
                         </div>

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

@@ -142,7 +142,7 @@ onMounted(async () => {
         <!-- <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">
+        <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]">

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

@@ -45,7 +45,7 @@ const router = useRouter()
               </div>
               <div class="flex items-center">
                 <div
-                  class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal"
+                  class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal"
                 >
                   <!-- 1600 -->
                   {{ it.points }}

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

@@ -34,7 +34,7 @@ const data = ref([{}, {}, {}, {}, {}])
     <div
       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-[#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>

+ 3 - 3
packages/app/src/pages/home/spread/product-detail/index.vue

@@ -74,7 +74,7 @@ onLoad(async (query: { id: string; title: string; item: string }) => {
     </div>
     <div class="relative flex-1 bg-white p-4 flex flex-col gap-4 rounded-tl-2xl rounded-tr-2xl">
       <div class="flex items-center gap-1">
-        <div class="text-[#ef4343] text-[26px] font-normal font-['D-DIN Exp'] leading-normal">
+        <div class="text-[#ef4343] text-[26px] font-normal font-['D-DIN_Exp'] leading-normal">
           {{ data?.points }}
         </div>
         <div class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-[34px]">
@@ -145,7 +145,7 @@ onLoad(async (query: { id: string; title: string; item: string }) => {
       <div
         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">
+        <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN_Exp'] leading-normal">
           {{ data?.points }}
         </div>
         <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
@@ -175,7 +175,7 @@ onLoad(async (query: { id: string; title: string; item: string }) => {
               {{ data?.prodcutName }}
             </div>
             <div class="flex items-center">
-              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
+              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal">
                 {{ data?.points }}
               </div>
               <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">

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

@@ -43,7 +43,7 @@ const router = useRouter()
               </div>
             </div>
             <div class="flex items-center">
-              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN Exp'] leading-normal">
+              <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal">
                 <!-- 1600 -->
                 {{ it.points }}
               </div>

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

@@ -108,7 +108,7 @@ onLoad(async (query: { id: string }) => {
     <div
       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-[#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>

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

@@ -128,7 +128,7 @@ onMounted(async () => {
         </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="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>

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

@@ -394,7 +394,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
           </div>
           <div class="flex items-end mt-10">
             <div>
-              <span class="text-4xl font-normal font-['D-DIN Exp'] mr-1">
+              <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>

+ 1 - 1
packages/app/src/style/fonts.css

@@ -8,7 +8,7 @@
   font-display: swap;
 }
 @font-face {
-  font-family: 'D-DIN Exp';
+  font-family: 'D-DIN_Exp';
   font-style: normal;
   font-weight: normal;
   src:

+ 5 - 0
packages/assets/src/assets/link.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="8" cy="8" r="7.25" fill="#FFF0F0" stroke="white" stroke-width="0.5"/>
+    <path d="M9.13659 7.03065C9.07294 6.95733 9.00429 6.89044 8.93311 6.82789L8.93297 6.828C8.8608 6.74805 8.75891 6.69474 8.64299 6.68654C8.40508 6.66971 8.19858 6.84892 8.18175 7.08682C8.1743 7.19209 8.20529 7.29118 8.26273 7.37045C8.26274 7.37046 8.26275 7.37048 8.26277 7.3705C8.29036 7.40857 8.32402 7.4421 8.36254 7.46948C8.40079 7.50584 8.43832 7.54165 8.47297 7.58157L8.50596 7.6196C8.92086 8.09709 8.73322 8.85588 8.25518 9.27075L6.21533 11.0405C5.73734 11.4548 5.01153 11.4034 4.59662 10.9259L4.56336 10.8876C4.14848 10.4096 4.19987 9.68322 4.67786 9.26945L5.57905 8.48764C5.6931 8.40956 5.77178 8.28218 5.7823 8.13362C5.80058 7.87522 5.60593 7.65093 5.34754 7.63265C5.25003 7.62575 5.15741 7.6492 5.07885 7.69492C5.07864 7.69441 5.07843 7.69391 5.07821 7.69338L5.06865 7.70114C5.03383 7.72262 5.0019 7.74843 4.9738 7.77809L4.04123 8.53465C3.16083 9.29922 3.06562 10.6448 3.82967 11.5246L3.86267 11.5626C4.62671 12.4424 5.97174 12.5376 6.85206 11.7741L8.89139 10.0038C9.77061 9.23977 9.93199 7.94778 9.16909 7.06807L9.13659 7.03065Z" fill="#FF2E2E"/>
+    <path d="M12.0797 4.43098L12.0467 4.39295C11.2827 3.5126 9.93763 3.41742 9.05728 4.18143L7.01795 5.95175C6.13759 6.71576 6.00831 7.89983 6.77227 8.78072L6.80478 8.8176C6.83948 8.85757 6.87575 8.89551 6.91292 8.93206C6.9393 8.96607 6.971 8.99583 7.00686 9.02013C7.00713 9.02038 7.00741 9.02063 7.00768 9.02088L7.00781 9.02078C7.06499 9.05927 7.13265 9.08387 7.20635 9.08908C7.43095 9.10498 7.6259 8.93577 7.64179 8.7112C7.64628 8.64781 7.636 8.58678 7.61391 8.53146C7.56869 8.40694 7.47325 8.32633 7.40857 8.25179L7.37604 8.21493C6.96119 7.7369 7.17662 7.1003 7.65464 6.68545L9.69506 4.91575C10.172 4.5008 10.898 4.55217 11.3129 5.03022L11.346 5.06768C11.7608 5.54575 11.7094 6.27237 11.2314 6.68667L10.3331 7.46678C10.213 7.54326 10.1294 7.67365 10.1186 7.82658C10.1005 8.08288 10.2935 8.30537 10.5498 8.3235C10.639 8.32982 10.7241 8.31048 10.7979 8.27187C10.7984 8.27281 10.7988 8.27369 10.7993 8.27464L10.8132 8.26355C10.8552 8.23955 10.8931 8.20912 10.9257 8.17357L11.8675 7.42033C12.7485 6.65638 12.8437 5.31132 12.0797 4.43098Z" fill="#FF2E2E"/>
+</svg>

+ 2 - 0
packages/assets/src/libs/assets/link.ts

@@ -0,0 +1,2 @@
+import link from '../../assets/link.svg' 
+ export default link

+ 8 - 2
packages/merchant/src/core/libs/agent-requests.ts

@@ -13,7 +13,8 @@ import {
   DesignerPointsStatistics,
   PointsOrder,
   DesignerOrderSaleOther,
-  BrowseRecordCountRes, BrowseRecord,
+  BrowseRecordCountRes,
+  BrowseRecord,
 } from '@designer-hub/app/src/core/libs/models'
 import dayjs from 'dayjs'
 /**
@@ -293,7 +294,12 @@ export const getBrowseRecordCount = (stylistId: number) =>
  */
 export const getBrowseRecords = (query = {}) =>
   httpGet<ResPageData<BrowseRecord>>('/app-api/member/browse-record/page', query)
-
+/**
+ * 浏览记录备注
+ * @param query
+ */
+export const getBrowseRecordRemarks = (query = {}) =>
+  httpGet<{ id: number; remark: string }[]>('/app-api/member/browse-record/listRemark', query)
 export const getSalesOrdersCounts = (query = {}) =>
   getSalesOrdersCount(query).then((res) => ({
     ...res,

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

@@ -33,7 +33,7 @@ import ListHelperEvo from '@/components/list-helper-evo.vue'
 import SectionHeading from '@designer-hub/app/src/components/section-heading.vue'
 import dayjs from 'dayjs'
 
-const tab = ref('activity')
+const tab = ref('basic')
 // 基础信息 家庭信息 奖项信息 销售信息 游学/活动信息
 const tabs = [
   { label: '基础信息', value: 'basic' },

+ 14 - 9
packages/merchant/src/pages/agent/designer/detail.vue

@@ -14,6 +14,7 @@ import {
   getPointsOrders,
   getBrowseRecordCount,
   getBrowseRecords,
+  getBrowseRecordRemarks,
 } from '@/core/libs/agent-requests'
 import {
   desinTopBg,
@@ -212,7 +213,7 @@ onLoad(async (query) => {
                   <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none">
                     {{ item.title }}
                   </div>
-                  <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
+                  <div class="text-black/90 text-lg font-bold font-['D-DIN_Exp'] leading-normal">
                     {{ item.value }}
                   </div>
                   <div class="flex items-center gap-1">
@@ -221,7 +222,7 @@ onLoad(async (query) => {
                     >
                       {{ item.subTitle }}
                     </div>
-                    <div class="text-black/90 text-xs font-normal font-['D-DIN Exp'] leading-norma">
+                    <div class="text-black/90 text-xs font-normal font-['D-DIN_Exp'] leading-norma">
                       {{ item.subValue }}
                     </div>
                   </div>
@@ -249,7 +250,7 @@ onLoad(async (query) => {
                     >
                       {{ item.title }}
                     </div>
-                    <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
+                    <div class="text-black/90 text-lg font-bold font-['D-DIN_Exp'] leading-normal">
                       {{ item.value }}
                     </div>
                     <div class="flex items-center gap-1">
@@ -259,7 +260,7 @@ onLoad(async (query) => {
                         {{ item.subTitle }}
                       </div>
                       <div
-                        class="text-black/90 text-xs font-normal font-['D-DIN Exp'] leading-norma"
+                        class="text-black/90 text-xs font-normal font-['D-DIN_Exp'] leading-norma"
                       >
                         {{ item.subValue }}
                       </div>
@@ -280,14 +281,18 @@ onLoad(async (query) => {
                 </div>
               </div>
               <div class="w-full h-.25 bg-[#f9f9f9]"></div>
-              <ListHelperEvo :items="recentActivities" custom-class="flex flex-col gap-6">
+              <ListHelperEvo
+                :request="getBrowseRecordRemarks"
+                :query="{ userId: id }"
+                custom-class="flex flex-col gap-6"
+              >
                 <template #default="{ item }">
                   <div class="mx-2 flex items-center gap-1 my-6">
                     <div class="w-1 h-1 bg-[#2357e9] rounded-full"></div>
                     <div
                       class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-none"
                     >
-                      {{ item.label + ':' + item.value }}
+                      {{ item }}
                     </div>
                   </div>
                 </template>
@@ -434,19 +439,19 @@ onLoad(async (query) => {
             <div class="flex items-center justify-between mt-[19px]">
               <div class="flex items-center gap-[8px]">
                 <wd-img width="17" height="17" :src="shareIcon"></wd-img>
-                <div class="text-black/90 text-sm font-normal font-['D-DIN Exp'] leading-snug">
+                <div class="text-black/90 text-sm font-normal font-['D-DIN_Exp'] leading-snug">
                   232
                 </div>
               </div>
               <div class="flex items-center gap-[8px]">
                 <wd-img width="17" height="17" :src="messageIcon"></wd-img>
-                <div class="text-black/90 text-sm font-normal font-['D-DIN Exp'] leading-snug">
+                <div class="text-black/90 text-sm font-normal font-['D-DIN_Exp'] leading-snug">
                   232
                 </div>
               </div>
               <div class="flex items-center gap-[8px]">
                 <wd-img width="17" height="17" :src="praiseIcon"></wd-img>
-                <div class="text-black/90 text-sm font-normal font-['D-DIN Exp'] leading-snug">
+                <div class="text-black/90 text-sm font-normal font-['D-DIN_Exp'] leading-snug">
                   232
                 </div>
               </div>

+ 23 - 10
packages/merchant/src/pages/agent/designer/index.vue

@@ -22,6 +22,7 @@ import SectionHeading from '@designer-hub/app/src/components/section-heading.vue
 import { useMemberLevelsStore } from '../../../store/member-levles'
 import { storeToRefs } from 'pinia'
 import { useUserStore } from '../../../store'
+import link from '@designer-hub/assets/src/libs/assets/link'
 
 const userStore = useUserStore()
 const { userInfo } = storeToRefs(userStore)
@@ -36,12 +37,14 @@ const { getMemberLevelLogo } = memberLevelsStore
 const filterQuery = ref<{
   tags: any[]
   levels: any[]
+  retryStatus: any[]
   minPoints?: string
   maxPoints?: string
   brokerId?: string
 }>({
   tags: [],
   levels: [],
+  retryStatus: [],
   brokerId: String(userInfo.value.userId),
 })
 const query = ref({})
@@ -92,6 +95,7 @@ const handleSubmit = () => {
     ...filterQuery.value,
     tags: filterQuery.value.tags.join(','),
     levels: filterQuery.value.levels.join(','),
+    retryStatus: filterQuery.value.retryStatus.join(','),
   }
   filterState.value = false
 }
@@ -144,9 +148,12 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
                 <div class="">
                   <div class="flex items-center">
                     <div
-                      class="w-[55px] h-[55px] bg-neutral-100 rounded-full mr-2 flex items-center justify-center"
+                      class="w-[55px] h-[55px] bg-neutral-100 rounded-full mr-2 flex items-center justify-center relative"
                     >
                       <wd-img width="100%" height="100%" round :src="it.avatar"></wd-img>
+                      <div v-if="it.retryStatus" class="absolute right-0 bottom--1">
+                        <wd-img width="14" height="14" :src="link"></wd-img>
+                      </div>
                     </div>
                     <div class="flex flex-col flex-1">
                       <div class="flex-row flex items-center justify-between w-full">
@@ -317,15 +324,6 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
           <wd-checkbox custom-class="w-50%!" :model-value="tag.value">{{ tag.label }}</wd-checkbox>
         </template>
       </wd-checkbox-group>
-      <!-- <div class="flex items-center justify-between py-4">
-        <template>
-          <div class="w-[168px] h-10 bg-[#f5f7f9] rounded-lg flex items-center justify-center">
-            <div class="w-7 text-black/90 text-sm font-normal font-['PingFang_SC'] leading-none">
-              全部
-            </div>
-          </div>
-        </template>
-      </div> -->
 
       <SectionHeading title="积分区间"></SectionHeading>
       <div class="flex items-center justify-between py-4">
@@ -341,6 +339,21 @@ onLoad(async (params: { title?: string; filter?: string; tags?: string }) => {
           no-border
         ></wd-input>
       </div>
+      <SectionHeading title="绑定关系"></SectionHeading>
+      <wd-checkbox-group shape="button" v-model="filterQuery.retryStatus">
+        <template
+          v-for="(tag, index) in [
+            // { label: '全部', value: '' },
+            { label: '弱绑定', value: '0' },
+            { label: '强绑定', value: '1' },
+          ]"
+          :key="index"
+        >
+          <wd-checkbox custom-class="w-50%!" :model-value="tag.value">
+            {{ tag.label }}
+          </wd-checkbox>
+        </template>
+      </wd-checkbox-group>
       <div class="flex gap-4">
         <div class="flex-1">
           <wd-button block :round="false" @click="handleReset">重置</wd-button>

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

@@ -187,7 +187,7 @@ onMounted(async () => {
         <SectionHeading title="设计师数据" size="base"></SectionHeading>
         <div class="mt-3">
           <ListHelperEvo
-            v-if="designerDataList.length"
+            v-if="designerDataList?.length"
             :items="designerDataList"
             content-class="grid grid-cols-3 gap-2.5"
           >
@@ -196,14 +196,14 @@ onMounted(async () => {
                 <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none">
                   {{ item.title }}
                 </div>
-                <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
+                <div class="text-black/90 text-lg font-bold font-['D-DIN_Exp'] leading-normal">
                   {{ item.value }}
                 </div>
                 <div class="flex items-center gap-1">
                   <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-none">
                     {{ item.subTitle }}
                   </div>
-                  <div class="text-[#ff2d2d] text-xs font-normal font-['D-DIN Exp'] leading-normal">
+                  <div class="text-[#ff2d2d] text-xs font-normal font-['D-DIN_Exp'] leading-normal">
                     {{ item.subValue }}
                   </div>
                 </div>
@@ -221,15 +221,15 @@ onMounted(async () => {
               <div class="text-black/60 text-xs font-normal font-['PingFang_SC'] leading-none">
                 {{ it.typeName }}
               </div>
-              <div class="text-black/90 text-lg font-bold font-['D-DIN Exp'] leading-normal">
-                {{ it.quantity }}
+              <div class="text-black/90 text-lg font-bold font-['D-DIN_Exp'] leading-normal">
+                {{ it.quantity ?? 0 }}
               </div>
               <div class="flex items-center gap-1">
                 <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">
-                  20
+                <div class="text-[#ff2d2d] text-xs font-normal font-['D-DIN_Exp'] leading-normal">
+                  {{ it.thisYearQuantity ?? 0 }}
                 </div>
               </div>
             </div>

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

@@ -119,7 +119,7 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
                       <div
                         class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-normal"
                       >
-                        完成时间:
+                        支付时间:
                         {{ dayjs(it.completeTime).format('YYYY-MM-DD hh:mm') }}
                       </div>