From e09208199364925d9fcddd0658f4830983c38985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= <wyemail666@163.com>
Date: Fri, 9 May 2025 11:47:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue         |  4 ++--
 pages/workbench/workbench.vue | 29 ++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index f729685..634a1b2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <IndexSkeleton v-if="data.is_show_skeleton"></IndexSkeleton>
-  <template v-else>
+<!--  <IndexSkeleton v-if="data.is_show_skeleton"></IndexSkeleton>-->
+  <template v-if="data.list !== null">
     <view class="ctr">
       <view class="list" v-if="data.list.length > 0">
         <view class="order-item" v-for="(item, index) in data.list" :key="index">
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 64ffe64..f034cd1 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -1,16 +1,16 @@
 <template>
-  <WorkbenchSkeleton v-if="data.is_show_skeleton"></WorkbenchSkeleton>
-  <view class="ctr" v-else>
+<!--  <WorkbenchSkeleton v-if="data.is_show_skeleton"></WorkbenchSkeleton>-->
+  <view class="ctr" v-if="data.list !== null">
     <view class="fixed-top">
       <me-top title="工作台"></me-top>
       <view class="filter flex-sb line-after">
         <view v-for="(item, type) in filterType" :key="type" class="filter-item flex-c" @click="filter(type)">
-          <view :class="['title', 'flex-c', data.type === type ? 'title-active' : '']">{{item.name}}({{ countOrderByType(type) }})</view>
+          <view :class="['title', 'flex-c', data.type === type ? 'title-active' : '']">{{item.name}}{{ countOrderByType(type) }}</view>
           <view class="select-style" v-if="data.type === type"></view>
         </view>
       </view>
       <view class="date flex-l" v-if="data.type === 'need_visit'">
-        <view :class="['item', 'flex-c', data.need_visit_type === type ? 'item-selected' : '']" v-for="(item, type) in needVisitType" :key="type">{{item.name}}(1)</view>
+        <view @click="filterNeedVisit(type)" :class="['item', 'flex-c', data.need_visit_type === type ? 'item-selected' : '']" v-for="(item, type) in needVisitType" :key="type">{{item.name}}{{ countOrderByType(type) }}</view>
       </view>
     </view>
 
@@ -158,12 +158,11 @@ const countWorkbenchOrder = () => {
 }
 
 const countOrderByType = (type) => {
-  let res = countOrder.value[type] > 99 ? '99+' : countOrder.value[type]
-  if (type === 'all') {
-    return countOrder.value[type] > 999 ? '999+' : countOrder.value[type]
+  if (Object.keys(countOrder.value).length === 0) {
+    return ''
   }
 
-  return res
+  return '(' + (countOrder.value[type] > 99 ? '99+' : countOrder.value[type]) + ')'
 }
 
 const data = reactive({
@@ -172,7 +171,7 @@ const data = reactive({
   page: 1,
   page_size: 10,
   last_page: 0,
-  is_show_skeleton: true,
+  is_show_skeleton: false,//因页面改版，暂时关闭骨架屏
   list: null
 })
 const getList = () => {
@@ -186,6 +185,7 @@ const getList = () => {
     page: data.page,
     page_size: data.page_size,
     workbench_type: data.type,
+    need_visit_type: data.need_visit_type,
   }
   api.workbenchOrderList(params).then(res => {
     data.last_page = res.last_page
@@ -249,6 +249,16 @@ const filter = (type) => {
   });
   getList()
 }
+
+const filterNeedVisit = (type) => {
+  data.need_visit_type = type
+  data.page = 1
+  uni.showLoading({
+    title: '加载中'
+  });
+  getList()
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -297,6 +307,7 @@ const filter = (type) => {
     .date {
       width: 686rpx;
       height: 100rpx;
+      animation: animation-fade-out .3s ease-out 0s 1;
       .item {
         height: 60rpx;
         border-radius: 8rpx;