Merge remote-tracking branch 'own/main' into main

packages/app/src/pages/mine/points/index.vue

@@ -9,7 +9,8 @@ import { useUserStore } from '../../../store'
 import { storeToRefs } from 'pinia'
 import dayjs from 'dayjs'
 import NavbarEvo from '@/components/navbar-evo.vue'
-
+const year = ref<number>(Date.now())
+// const year = ref<number>(dayjs().toDate().getFullYear())
 const userStore = useUserStore()
 const { userInfo } = storeToRefs(userStore)
 </script>
@@ -49,12 +50,12 @@ const { userInfo } = storeToRefs(userStore)
         </div>
         <div class="flex-1"></div>
         <div></div>
-        <div class="text-[#b6b6b6] text-sm font-normal font-['PingFang_SC'] leading-relaxed">
-          2024
+        <div class="text-[#b6b6b6] text-sm font-normal font-['PingFang_SC'] leading-relaxed pos-relative">
+			<wd-datetime-picker custom-label-class="label-class" custom-cell-class="date-view" type="year" v-model="year" />
         </div>
       </div>
       <Card custom-class="relative">
-        <PageHelper :request="getPoints" :query="{ stylistId: userInfo.userId, year: 2024 }">
+        <PageHelper :request="getPoints" :query="{ stylistId: userInfo.userId, year: dayjs(year).toDate().getFullYear() }">
           <template #default="{ source }">
             <div class="flex flex-col gap-4">
               <template v-for="(it, i) in source.list" :key="i">
@@ -92,3 +93,16 @@ const { userInfo } = storeToRefs(userStore)
     </div>
   </div>
 </template>
+<style lang="scss">
+	.date-view{
+		background-color: rgba(0,0,0,0) !important;
+		color: #fff !important;
+		padding: 0 !important;
+	}
+	.wd-picker__value{
+		color: #fff !important;
+	}
+	.wd-picker__arrow{
+		color: #fff !important;;
+	}
+</style>