Bläddra i källkod

领包区域修复

yuanmingze 1 månad sedan
förälder
incheckning
3313a8d76f

+ 2 - 2
.env.development

@@ -1,6 +1,6 @@
 VITE_MODE=development
 VITE_APP_TYPE=dev
 VITE_PROJECT_TITLE=要易小助手
-VITE_BASE_API=https://preapi.yaoyi.net
-# VITE_BASE_API=https://pre1.yaoyi.net
+# VITE_BASE_API=https://preapi.yaoyi.net/
+VITE_BASE_API=https://pre1.yaoyi.net
 VITE_WX_APPID=wxd03398e1bff2b241

+ 9 - 28
src/pages-task/points-package-record/index.vue

@@ -74,7 +74,7 @@
 
             <view class="record-card__status">
               <view class="record-card__dot" />
-              <text>{{ getPackageStatusText(item.packageStatus) }}</text>
+              <text>{{ item.claimStatusLabel }}</text>
             </view>
           </view>
 
@@ -197,6 +197,7 @@ enum RecordTab {
   Processing = '2',
   Approving = '3',
   Finished = '4',
+  Rejected = '5',
 }
 
 type Nullable<T> = T | null | undefined
@@ -219,8 +220,9 @@ interface ListResponse {
  */
 const tabs = [
   { label: '全部', value: RecordTab.All },
-  { label: '进行中', value: RecordTab.Processing },
   { label: '待审批', value: RecordTab.Approving },
+  { label: '已拒绝', value: RecordTab.Rejected },
+  { label: '进行中', value: RecordTab.Processing },
   { label: '已完成', value: RecordTab.Finished },
 ] as const
 
@@ -250,7 +252,6 @@ const openType = ref<PageEntryType>('')
 const loading = ref(false)
 const finished = ref(false)
 const recordList = ref<ScorePackageRecordItem[]>([])
-const packageStatusMap = ref<DictItem[]>([])
 
 /**
  * 当前选中的月份,格式:YYYY-MM
@@ -265,7 +266,7 @@ const selectedDate = computed(() => {
  */
 const selectedDateText = computed(() => {
   const { selectedYear, selectedMonth } = params
-  return selectedYear && selectedMonth ? `${selectedYear}年${selectedMonth}月` : '筛选'
+  return selectedYear && selectedMonth ? `${selectedYear}/${selectedMonth}` : '筛选'
 })
 
 /**
@@ -301,18 +302,6 @@ const refreshRecordList = () => {
   fetchRecordList()
 }
 
-/**
- * 获取积分包状态字典
- */
-const fetchPackageStatus = async () => {
-  try {
-    const res = await getDictTypeApi('package_new_status')
-    packageStatusMap.value = res?.data ?? []
-  } catch (error) {
-    console.error('获取积分包状态字典失败:', error)
-  }
-}
-
 /**
  * 获取积分包记录列表
  */
@@ -440,14 +429,6 @@ const handleOpenDetail = (item: ScorePackageRecordItem) => {
   })
 }
 
-/**
- * 获取积分包状态文案
- */
-const getPackageStatusText = (status: Nullable<string | number>) => {
-  const statusItem = packageStatusMap.value.find((item) => String(item.value) === String(status))
-  return statusItem?.label || '-'
-}
-
 /**
  * 获取积分包类型标签
  */
@@ -589,7 +570,6 @@ onLoad((query) => {
   }
 
   fetchRecordList()
-  fetchPackageStatus()
 })
 </script>
 
@@ -649,9 +629,10 @@ onLoad((query) => {
 
   .record-date {
     display: flex;
+    flex-shrink: 0;
     align-items: center;
     justify-content: center;
-    width: 240rpx;
+    width: 200rpx;
     height: 100%;
     color: #333333;
   }
@@ -659,7 +640,7 @@ onLoad((query) => {
   .record-date__divider {
     width: 2rpx;
     height: 40rpx;
-    margin-right: 24rpx;
+    margin-right: 16rpx;
     background: #ebebeb;
   }
 
@@ -667,7 +648,7 @@ onLoad((query) => {
     display: flex;
     align-items: center;
     justify-content: center;
-    min-width: 170rpx;
+    min-width: 140rpx;
     height: 100%;
   }
 

+ 1 - 0
src/services/modules/pointsPackageRecord/type.d.ts

@@ -51,6 +51,7 @@ export interface ScorePackageRecordItem {
   userRealAmount: number | string | null
   waitApprovalScore: number
   waitApprovalTaskNum: number
+  claimStatusLabel: string
 }
 
 export interface PkgWithdrawRequest {