From 159996ad1c9877cd18f34e2205a46c9825cb1680 Mon Sep 17 00:00:00 2001
From: gcd <wyemail666@163.com>
Date: Wed, 7 May 2025 20:46:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                     | 17 ++++-----
 pages/index/index-skeleton.vue | 16 ---------
 pages/index/index.vue          | 63 +++++-----------------------------
 3 files changed, 17 insertions(+), 79 deletions(-)

diff --git a/pages.json b/pages.json
index 2d76cca..eb07409 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,8 @@
 			"style" :
 			{
 				"navigationBarTitleText" : "接单大厅",
-				"navigationStyle": "custom"
+				"navigationBarBackgroundColor": "@backgroundColor",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -41,49 +42,49 @@
 		},
 		{
 			"path" : "pages/order/select-time",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "已和客户沟通"
 			}
 		},
 		{
 			"path" : "pages/order/arrived-on-site",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "完成上门"
 			}
 		},
 		{
 			"path" : "pages/order/complete-service",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "完成服务"
 			}
 		},
 		{
 			"path" : "pages/order/report-order-exception",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "上报异常"
 			}
 		},
 		{
 			"path" : "pages/order/worker-remark",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "工单备注"
 			}
 		},
 		{
 			"path" : "pages/user/user-agreement",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "用户协议"
 			}
 		},
 		{
 			"path" : "pages/user/privacy-policy",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "隐私协议"
 			}
diff --git a/pages/index/index-skeleton.vue b/pages/index/index-skeleton.vue
index eb54625..e2f6357 100644
--- a/pages/index/index-skeleton.vue
+++ b/pages/index/index-skeleton.vue
@@ -1,22 +1,6 @@
 <template name="skeleton">
   <view class="sk-container">
     <view class="ctr ctr data-v-1cf27b2a data-v-1cf27b2a">
-      <view class="fixed-top fixed-top data-v-1cf27b2a data-v-1cf27b2a">
-        <view is="components/me-top/me-top" class="data-v-1cf27b2a data-v-1cf27b2a">
-          <view class="me-top top--me-top data-v-e4d1a339 top--data-v-e4d1a339">
-            <view class="status-bar top--status-bar data-v-e4d1a339 top--data-v-e4d1a339" style="height:47px"></view>
-            <view class="capsule top--capsule flex-c top--flex-c data-v-e4d1a339 top--data-v-e4d1a339" style="height:40px">
-              <view class="icon-ctr top--icon-ctr flex-c top--flex-c data-v-e4d1a339 top--data-v-e4d1a339">
-                <image class="icon top--icon data-v-e4d1a339 top--data-v-e4d1a339 sk-image" mode="aspectFill"></image>
-              </view>
-              <text class="title top--title data-v-e4d1a339 top--data-v-e4d1a339 sk-transparent sk-text-14-2857-544 sk-text">接单大厅</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view is="components/me-empty-space/me-empty-space" class="data-v-1cf27b2a data-v-1cf27b2a">
-        <view class="me-empty-space space--me-empty-space" style="height:87px"></view>
-      </view>
       <view class="list list data-v-1cf27b2a data-v-1cf27b2a">
         <view class="order-item order-item data-v-1cf27b2a data-v-1cf27b2a">
           <view class="top top flex-sb flex-sb data-v-1cf27b2a data-v-1cf27b2a">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d59fe27..f025ccd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,12 +2,6 @@
   <IndexSkeleton v-if="data.is_show_skeleton"></IndexSkeleton>
   <template v-else>
     <view class="ctr">
-      <view class="fixed-top">
-        <me-top title="接单大厅"></me-top>
-      </view>
-
-      <me-empty-space :height="listMarginTop"></me-empty-space>
-
       <view class="list" v-if="data.list.length > 0">
         <view class="order-item" v-for="(item, index) in data.list" :key="index">
           <view class="top flex-sb" @click="toDetail(item.id)">
@@ -44,12 +38,6 @@
         </view>
       </view>
       <me-empty v-else text="暂无数据"></me-empty>
-
-      <view class="refresh flex-c" @click="refreshStart()" hover-class="auto-mask-layer-radius100" hover-start-time="0" hover-stay-time="50">
-        <view class="icon flex-c" :style="{ transform: `rotate(${refresh.rotate_deg}deg)` }">
-          <me-icon type="icon-reset-left-line" color="#FFFFFF" size="60rpx"></me-icon>
-        </view>
-      </view>
       <me-empty-space height="100"></me-empty-space>
     </view>
   </template>
@@ -57,16 +45,20 @@
 </template>
 
 <script setup>
-import {onReachBottom, onShow} from '@dcloudio/uni-app'
-import {reactive, computed, inject} from 'vue'
+import {onReachBottom, onShow, onPullDownRefresh} from '@dcloudio/uni-app'
+import {reactive} from 'vue'
 import MeIcon from "../../components/me-icon/me-icon";
 import MeButton from "../../components/me-button/me-button";
 import MeEmptySpace from "../../components/me-empty-space/me-empty-space";
-import MeTop from "../../components/me-top/me-top";
 import helpers from "../../utils/helpers";
 import api from "../../api/api";
 import IndexSkeleton from "./index-skeleton";
 
+onPullDownRefresh(() => {
+  data.page = 1
+  getList()
+})
+
 const acceptOrder = (index, id) => {
   uni.showModal({
     title: '接单提示',
@@ -113,10 +105,6 @@ const rejectOrder = (index, id) => {
   });
 }
 
-const listMarginTop = computed(() => {
-  return (inject('globalData').statusBarH + (inject('globalData').customBarH - inject('globalData').statusBarH)) * 2
-})
-
 const toDetail = (id) => {
   helpers.jumpToPage('order-info', `id=${id}`)
 }
@@ -151,45 +139,10 @@ const getList = () => {
     data.is_show_skeleton = false
     helpers.delayHideLoading()
   }).catch(() => {}).finally(() => {
-    setTimeout(() => {
-      refreshComplete()
-    }, 500)
+    uni.stopPullDownRefresh();
   })
 }
 
-const refresh = reactive({
-  interval: null,
-  rotate_deg: 0
-})
-const refreshStart = () => {
-  if (refresh.interval !== null) {
-    return
-  }
-
-  if (userLocation.lng === null || userLocation.lat === null) {
-    helpers.showToast('请授权位置权限')
-    return
-  }
-
-  refresh.interval = setInterval(() => {
-    refresh.rotate_deg -= 12;
-  }, 16);
-
-  data.page = 1
-  getList()
-}
-
-const refreshComplete = () => {
-  if (refresh.interval !== null) {
-    clearInterval(refresh.interval);
-    refresh.interval = null
-    uni.showToast({
-      title: '已刷新',
-      icon: "success"
-    })
-  }
-}
-
 const userLocation = reactive({
   lng: null,
   lat: null,