From 00833b420814d991eeb463de64c4f4c16cb0646b Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 2 Jun 2026 13:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue         |    2 +-
 pages.json                           |    2 +-
 pages/home/components/orderCard2.vue |    5 +-
 pages/order/userorder-list.vue       | 1635 +++++++++++---------------
 4 files changed, 701 insertions(+), 943 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index a72a431..32b9d65 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -51,7 +51,7 @@ export default {
                     iconPath: "/static/images/tabbar/new_order_gray.png",
                     text: "订单",
                     selectedIconPath: "/static/images/tabbar/new_order.png",
-                    pagePath: "/pages/order/all-orders"
+                    pagePath: "/pages/order/userorder-list"
                 },
                 {
                     iconPath: "/static/images/tabbar/new_message_gray.png",
diff --git a/pages.json b/pages.json
index a4d132a..9f3daa3 100644
--- a/pages.json
+++ b/pages.json
@@ -1048,7 +1048,7 @@
 				"iconPath": "/static/images/tabbar/new_order_gray.png",
 				"text": "订单",
 				"selectedIconPath": "/static/images/tabbar/new_order.png",
-				"pagePath": "pages/order/all-orders"
+				"pagePath": "pages/order/userorder-list"
 			},
 			{
 				"iconPath": "/static/images/tabbar/new_message_gray.png",
diff --git a/pages/home/components/orderCard2.vue b/pages/home/components/orderCard2.vue
index bf8bdf5..6049cee 100644
--- a/pages/home/components/orderCard2.vue
+++ b/pages/home/components/orderCard2.vue
@@ -171,6 +171,7 @@
 			},
 			emitStart() {
 				this.$emit("start");
+				
 			},
 			emitDone() {
 				this.$emit("done");
@@ -181,8 +182,8 @@
 
 <style scoped lang="less">
 	.order-card {
-		padding: 20rpx 30rpx 20rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
+		padding: 24rpx 20rpx 24rpx 20rpx;
+		margin: 0;
 		background-color: #fff;
 		border-radius: 12px;
 		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */
diff --git a/pages/order/userorder-list.vue b/pages/order/userorder-list.vue
index a1e487e..81038d1 100644
--- a/pages/order/userorder-list.vue
+++ b/pages/order/userorder-list.vue
@@ -1,970 +1,727 @@
 <template>
-	<view class="order-list">
-		<view v-if="isLogin">
-			<!-- 订单状态标签 -->
-			<view class="status">
-				<scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
-					<view style="padding-left: 20rpx;">
-						<view class="tab-item" v-for="(tab, index) in OrderType" :key="tab.id"
-							:class="{ active: OrderTypeIndex === tab.id }" @click="switchOrderTab(tab.id)">
-							{{tab.title}}
-						</view>
-					</view>
-					
-				</scroll-view>
-				<scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
-					<view class="tab-item2" v-for="(tab, index) in tabs" :key="tab.id"
-						:class="{ active: currentTab === tab.id }" @click="switchTab(tab.id)">
-						{{tab.title}}
-					</view>
-				</scroll-view>
-			</view>
+    <view class="order-list-page" style="background-color: #fafafa">
+        
+        <view class="status" v-if="isLogin">
+            <scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
+                <view style="padding-left: 20rpx">
+                    <view 
+                        class="tab-item"
+                        v-for="(item, index) in firstTabs" 
+                        :key="index"
+                        :class="{ active: activeFirstId === item.id }" 
+                        @click="handleFirstTabClick(item)"
+                    >
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
 
+            <scroll-view scroll-x class="status-tabs2" :show-scrollbar="false">
+                <view style="padding-left: 20rpx; white-space: nowrap; padding-bottom: 20rpx;">
+                    <view 
+                        class="tab-item2"
+                        v-for="(item, index) in secondTabs" 
+                        :key="index"
+                        :class="{ active: activeSecondId === item.id }" 
+                        @click="handleSecondTabClick(item.id, item.title)"
+                    >
+                        {{ item.title }}
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
 
-			<!-- 订单列表 -->
-			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
-				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh"
-				:style="{height:`calc(100vh - ${210}rpx)`}">
-				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag" v-if="!order.team_buy_id || order.team_buy_id==`0`">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' :  order.order_kind == 3 ? '到家' : ''}}</text>
-						</view>
-						<text class="order-number">订单编号：{{order.number}}</text>
-						<text class="order-status"
-							:class="order.statusClass">{{order.state == 1 ? '待支付' : order.state == 2 ? '待接单' : order.state == 3 ? '待服务' : order.state == 4 ? '待完成' : order.state == 5 ? '已完成' : order.state == 6 ? '待评价' : order.state == 7 ? '已取消' : ''}}</text>
-					</view>
+        <CommonList 
+            ref="groupRef" 
+            :isLogin="isLogin" 
+            :apiUrl="apiUrl" 
+            :listScrollHeight="`calc(100vh - 280rpx - 100rpx)`"
+            @load-success="loadSuccess"
+        >
+            <template #listData="{ list }">
+                <view class="order-item-wrap" v-for="item in popList" :key="item.id">
+                    <OrderCard 
+                        v-if="activeFirstId != 3" 
+                        :haveButton="haveButton" 
+                        :showState="false" 
+                        :dataItem="item"
+                        :typeId="activeFirstId" 
+                        @cancel="cancelOrder($event, item)" 
+                        @start="startOrder($event, item)"
+                        @done="endOrder($event, item)" 
+                        @goOrderDetail="goOrderDetail" 
+                    />
+                    
+                    <WorkHourOrderCard 
+                        v-else 
+                        :showState="false" 
+                        :dataItem="item" 
+                        :typeId="activeFirstId"
+                        @cancel="cancelOrder($event, item)" 
+                        @accept="confirmOrder($event, item)"
+                        @start="startOrder($event, item)" 
+                        @done="endOrder($event, item)" 
+                        @goOrderDetail="goOrderDetail"
+                    >
+                    </WorkHourOrderCard>
+                </view>
+            </template>
 
-					<!-- 订单内容 -->
-					<view class="order-content" @click="goDetail(order)">
-						<image v-if="order.order_photo" :src="order.order_photo[0]" mode="aspectFill"
-							class="service-image"></image>
-						<view class="service-image" v-else></view>
-						<view class="service-info">
-							<view class="service-name">
-								<image v-if="order.team_buy_id && order.team_buy_id!=0"
-									:src="getGroupType(order.team_buy_order_state)" class="service-name-type"
-									mode="heightFix"></image>
-								<text class="service-name-text">
-									{{order.server_title}}
-								</text>
+            <template #empty>
+                <view class="noDataBox">
+                    <noData tipText="暂无服务订单哟～" v-if="isLogin"></noData>
+                    <view class="nologin_part" v-else>
+                        <image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
+                        <view class="btn-login" @click="goLogin">
+                            <text class="login-text">前去登录</text>
+                        </view>
+                    </view>
+                </view>
+            </template>
+        </CommonList>
 
-							</view>
-							<view class="service-time" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.reservation_time }}</text>
-							</view>
-							<view class="service-time"
-								v-if="order.order_kind == 2 && (!order.team_buy_id || order.team_buy_id==0)">
-								<!-- <image src="/static/images/time_icon.png" class="time-icon"></image> -->
-								<text>下单时间：{{order.add_time}}</text>
-							</view>
-							<view class="service-address" v-if="order.order_kind == 1 || order.order_kind == 3">
-								<!-- <image src="/static/images/position_icon.png" class="location-icon"></image> -->
-								<text
-									class="text-overflow-1">到家地址：{{Object.assign({},order.reservation_address_arr).server_address}}</text>
-							</view>
-							<view class="service-group" v-if="order.team_buy_id && order.team_buy_id!=0">
-								<view class="service-group-time">
-									下单时间：{{ order.add_time }}
-								</view>
-								<view class="service-group-price">
-									团购价:<text style="font-size: 34rpx;">{{ order.order_money }}</text>
-								</view>
+        <serviceCodeInput :show="showInput" @close="showInput = false" @confirm="onConfirm" />
 
-							</view>
-						</view>
-					</view>
-
-					<!-- 订单操作按钮 -->
-					<view class="order-actions">
-						<view class="action-left">
-							<image src="/static/images/evaluate/delete-icon.png" class="delete-icon"
-								@click="deleteOrder(order)"
-								v-if="order.state == 5 || order.state == 6 || order.state == 7"></image>
-						</view>
-						<view class="action-right">
-							<text class="action-btn contact" @click="cancelService(order)"
-								v-if="order.state == 1">取消订单</text>
-							<text class="action-btn contact" @click="refoundService(order)"
-								v-if="order.state == 2 || order.state == 3">申请退款</text>
-							<text class="action-btn contact" @click="contactService(order.order_shopphone)">联系客服</text>
-							<text class="action-btn review" v-if="order.state == 1" @click="payOrder(order)">立即支付</text>
-
-							<text class="action-btn again" v-if="order.state == 5 || order.state == 6"
-								@click="orderAgain(order)">再来一单</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 1"
-								@click="addComplaint(order)">投诉</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.appeal == 2"
-								@click="lookComplaint(order)">查看投诉</text>
-							<text class="action-btn review" v-if="order.state == 5 && order.evaluate==2"
-								@click="reviewOrder(order)">立即评价</text>
-							<text class="action-btn again" v-if="order.state == 5 && order.evaluate==1"
-								@click="goEvaluateDetail(order)">已评价</text>
-						</view>
-					</view>
-				</view>
-
-				<!-- 加载更多 -->
-				<view class="loading-more" v-if="hasMore">加载中...</view>
-				<view class="no-more" v-if="!hasMore && orderList.length">暂无数据哦～</view>
-
-				<!-- 没数据的情况 -->
-				<noData v-if="orderList.length==0"></noData>
-
-
-				<!-- 获取权限提示匡内容 -->
-				<view class="permission" :class="{ transform: isShowPer }">
-					<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-					<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-				</view>
-			</scroll-view>
-		</view>
-		<view class="nologin_part" v-else>
-			<image src="/static/images/no_login.png" class="nologin_icon" mode="aspectFit"></image>
-			<view class="btn-login">
-				<text class="login-text" @click="goLogin">前去登录</text>
-			</view>
-		</view>
-
-		<!-- 自定义TabBar -->
-		<TabBar :selected="1"></TabBar>
-	</view>
+        <TabBar :selected="1"></TabBar>
+    </view>
 </template>
 
 <script>
-	import TabBar from "@/components/tabbar/tabbar.vue"
-	import request from '../../utils/request'
-	import locationService from '../../utils/locationService';
-	import permissionUtils from '../../utils/per'
-	import {
-		debounce
-	} from '@/utils/debounce.js'
-	import {
-		url
-	} from '../../uni_modules/uv-ui-tools/libs/function/test';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				isShowPer: false,
-				OrderType: [{
-					id: 0,
-					title: '全部订单',
-					url: "/user/order/list",
-				}, {
-					id: 1,
-					title: '普通订单',
-					url: "/user/userorders",
-				}, {
-					id: 2,
-					title: '自营订单',
-					url: "/user/orderSelf/list",
-				}],
-				urls: {
-					order: {
-						cancelorder: "/user/cancelorder",
-						deleteorder: "/user/deleteorder"
-					},
-					order_self: {
-						cancelorder: "/user/orderSelf/cancel",
-						deleteorder: "/user/orderSelf/del"
-					}
-				},
-				OrderTypeIndex: 0,
-				tabs: [{
-					id: 0,
-					title: '全部'
-				}, {
-					id: 1,
-					title: '待支付'
-				}, {
-					id: 2,
-					title: '待接单'
-				}, {
-					id: 3,
-					title: '待服务'
-				}, {
-					id: 4,
-					title: '服务中'
-				}, {
-					id: 5,
-					title: '已完成'
-				}, {
-					id: 7,
-					title: '已取消'
-				}],
-				// ,{id: 6,title: '待评价'}
-				currentTab: 0,
-				isRefreshing: false,
-				hasMore: true,
-				orderList: [],
-				formData: {
-					page: 1,
-					limit: 10
-				},
-				isLogin: false
-			}
-		},
-		computed: {
+    import OrderCard from "@/pages/home/components/orderCard2.vue";
+    import WorkHourOrderCard from "@/pages/home/components/workOrderCard.vue";
+    import CommonList from "@/components/common/CommonList.vue";
+    import noLogin from "@/components/noData/noLogin.vue";
+    import request from "@/utils/request";
+    import serviceCodeInput from "@/components/service-code-input/service-code-input.vue";
+    import TabBar from "@/components/tabbar/tabbar.vue";
 
-		},
-		onLoad() {
-			//隐藏原生Tabar
-			uni.hideTabBar()
-			// this.loadOrders();
-			this.handleOrderTypeFromGlobal();
-		},
-		onShow() {
-			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
-			if (!this.isLogin) return;
+    export default {
+        name: "filters",
+        props: {
+            title: {
+                type: String,
+                default: "",
+            },
+            userInfo: {
+                type: Object,
+                default: () => ({}),
+            },
+            // 自营状态 0未加入 1加入 2停用
+            selfState: {
+                type: Number,
+                default: 0,
+            },
+        },
+        components: {
+            CommonList,
+            noLogin,
+            serviceCodeInput,
+            OrderCard,
+            WorkHourOrderCard,
+            TabBar
+        },
+        data() {
+            return {
+                isLogin: false, // 将isLogin移至data内管理
+                popList:[],
+                haveButton: true,
+                statusBarHeight: 0,
+                tabs: [{
+                        title: "到店订单",
+                        id: 1
+                    },
+                    {
+                        title: "自营到店订单",
+                        id: 2,
+                        isNeedLogin: true,
+                        isRuzHu: true,
+                        isSelfOrder: true
+                    },
+                    {
+                        title: "工位订单",
+                        id: 3,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                    {
+                        title: "上门订单",
+                        id: 4,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                    {
+                        title: "自营上门订单",
+                        id: 5,
+                        isNeedLogin: true,
+                        id_type: 1
+                    },
+                ], // 1级类目
+                activeFirstId: 1, // 记录选中的1级tab id
+                activeSecondId: 3, // 记录选中的2级tab id（null表示"全部"）
+                numInfo: {
+                    djd: 0,
+                    dfw: 0,
+                    dwc: 0,
+                    nocompletednum: 0,
+                    noconfirmnum: 0,
+                    noservernum: 0,
+                },
+                sjId: undefined,
+                idType: undefined,
+                showInput: false,
+                orderInfo: {},
+                urls: {
+                    1: {
+                        weChatRefund: "/sj/yhwechatrefund",
+                        aliRefund: "/sj/yhalirefund",
+                        startOrder: "/sj/startserver",
+                        endOrder: "/sj/endserver",
+                        ordernum: "/sj/ordernum",
+                        list: "/sj/sjgetyhorder",
+                    },
+                    2: {
+                        weChatRefund: "/sj/orderSelf/weChatRefund",
+                        aliRefund: "/sj/orderSelf/aliRefund",
+                        startOrder: "/sj/orderSelf/start",
+                        endOrder: "/sj/orderSelf/end",
+                        ordernum: "/sj/orderSelf/orderNum",
+                        list: "/sj/orderSelf/list",
+                    },
+                    3: {
+                        weChatRefund: "/sj/workSeatOrder/weChatRefund",
+                        aliRefund: "/sj/workSeatOrder/aliRefund",
+                        startOrder: "/sj/workSeatOrder/start",
+                        sureOrder:"/sj/workSeatOrder/sure",
+                        endOrder: "/sj/workSeatOrder/end",
+                        ordernum: "/sj/workSeatOrder/orderNum",
+                        list: "/sj/workSeatOrder/list",
+                    },
+                    4: {
+                        ordernum: "/sj/sjonsiteordernum",
+                        list: "/sj/sjonsiteorder",
+                    },
+                    5: {
+                        ordernum: "/sj/sjonsiteordernumself",
+                        list: "/sj/sjonsiteorderself",
+                    }
+                },
+            };
+        },
+        computed: {
+            apiUrl() {
+                if(!this.urls[this.activeFirstId]){
+                    return ""
+                } 
+                const urls = this.urls[this.activeFirstId];
+                return urls.list;
+            },
+            getNumUrl() {
+                const urls = this.urls[this.activeFirstId];
+                return urls.ordernum;
+            },
+            // 计算是否显示自营订单tab
+            showSelfOrderTab() {
+                // 只有当self_state为1或2时才显示自营订单tab
+                return this.selfState == 1 || this.selfState == 2;
+            },
+            firstTabs() {
+                return this.tabs
+                    .filter((tab) => !tab.isNeedLogin || this.isLogin)
+                    .filter((tab) => {
+                        if (tab.id_type) {
+                            return this.idType == tab.id_type;
+                        }
+                        return true;
+                    })
+                    .filter((tab) => !tab.isRuzHu || this.idType != 0)
+                    // 自营订单tab显示条件
+                    .filter((tab) => {
+                        if (tab.isSelfOrder) {
+                            return this.showSelfOrderTab;
+                        }
+                        return true;
+                    });
+            },
+            secondTabs() {
+                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                    return [{
+                            title: `待开始(${this.numInfo.noservernum})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.nocompletednum})`,
+                            id: 4
+                        },
+                    ];
+                } else if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                    return [{
+                            title: `待接单(${this.numInfo.noconfirmnum})`,
+                            id: 2
+                        },
+                        {
+                            title: `待开始(${this.numInfo.noservernum})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.nocompletednum})`,
+                            id: 4
+                        },
+                    ];
+                } else {
+                    return [{
+                            title: `待接单(${this.numInfo.djd})`,
+                            id: 2
+                        },
+                        {
+                            title: `待服务(${this.numInfo.dfw})`,
+                            id: 3
+                        },
+                        {
+                            title: `待完成(${this.numInfo.dwc})`,
+                            id: 4
+                        },
+                    ];
+                }
 
-			// 在 onShow 中也处理全局变量
-			this.handleOrderTypeFromGlobal();
+            },
+        },
+        onLoad() {
+            uni.hideTabBar(); // 隐藏原生TabBar
+        },
+        onShow() {
+            this.isLogin = uni.getStorageSync("accessToken") ? true : false;
+            if (this.isLogin) {
+                // 默认选中判断
+                if(!this.activeFirstId) this.activeFirstId = 1;
+                if(!this.activeSecondId) this.activeSecondId = 3;
+                this.searchList();
+            } else {
+                this.activeFirstId = null;
+                this.activeSecondId = null; 
+            }
+        },
+        watch: {
+            isLogin(newVal) {
+                if (newVal) {
+                    this.activeFirstId = 1;
+                    this.activeSecondId = 2; // 默认选中"待接单"
+                    this.searchList();
+                }
+            },
+        },
+        methods: {
+            searchList() {
+                if (this.syrId && this.idType) {
+                    this.$refs.groupRef.manualRefresh({
+                        sjid: this.sjId,
+                        state: this.activeSecondId || undefined,
 
-			this.orderList = [];
-			this.formData.page = 1;
-			this.loadOrders();
-		},
-		methods: {
-			//获取拼团状态文字
-			// getGroupType(id) {
-			// 	let list = [{
-			// 			id: 1,
-			// 			text: "团购中",
-			// 		},
-			// 		{
-			// 			id: 2,
-			// 			text: "已成团",
-			// 		},
-			// 		{
-			// 			id: 3,
-			// 			text: "拼团失败",
-			// 		},
-			// 	];
-			// 	let name = list.find((it) => it.id == id)?.text;
-			// 	return name;
-			getGroupType(id) {
-				const imageBasePath = '/static/images/';
-				const imageMap = {
-					1: imageBasePath + 'pintuan_ing.png', // 团购中
-					2: imageBasePath + 'pintuan_done.png', // 已成团
-					3: imageBasePath + 'pintuan_fail.png' // 拼团失败
-				};
-				return imageMap[id] || ''; // 如果id不在1-3范围内，返回空字符串
-			},
-			// 切换标签
-			switchOrderTab(index) {
-				this.OrderTypeIndex = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				delete this.formData.state;
-				this.currentTab = 0;
-				this.loadOrders()
-			},
-			// 切换标签
-			switchTab(index) {
-				this.currentTab = index;
-				this.orderList = [];
-				this.formData.page = 1;
-				// TODO: 根据当前标签加载对应订单数据
-				if (this.currentTab != 0) {
-					this.formData.state = this.currentTab;
-				} else {
-					delete this.formData.state;
-				}
-				this.loadOrders()
-			},
+                    });
+                } else {
+                    request.post("/sj/user/getUser").then((result) => {
+                        this.sjId = result.data.id;
+                        this.idType = result.data.id_type;
+                        this.$refs.groupRef.manualRefresh({
+                            sjid: this.sjId,
+                            state: this.activeSecondId,
+                        });
+                    });
+                }
+            },
+            loadSuccess(res) {
+                this.popList = res.list
+                request
+                    .post(this.getNumUrl, {
+                        sjid: this.sjId,
+                    })
+                    .then((result) => {
+                        for (let key in result.data) {
+                            this.numInfo[key] = result.data[key];
+                        }
+                    });
+            },
+            // 一级tab点击事件
+            handleFirstTabClick(item) {
+                this.popList = []
+                if (!this.isLogin) return;
+                // 避免重复点击
+                if (this.activeFirstId === item.id) return;
+                // 更新1级选中状态
+                this.activeFirstId = item.id;
 
-			// 加载订单数据
-			loadOrders() {
-				request.post(this.OrderType[this.OrderTypeIndex].url, this.formData).then(res => {
-					this.orderList = [...this.orderList, ...res.data];
-					if (res.count == this.orderList.length) {
-						this.hasMore = false
-					} else {
-						this.hasMore = true
-						this.formData.page = this.formData.page + 1;
-					}
-					this.isRefreshing = false
-				})
-			},
+                this.haveButton = true
+                if (this.activeFirstId == 4 || this.activeFirstId == 5) {
+                    this.haveButton = false
+                }
 
-			// 下拉刷新
-			onRefresh() {
-				this.isRefreshing = true
-				this.formData.page = 1;
-				this.orderList = [];
-				this.loadOrders()
-			},
+                // 重置2级选中状态（默认选中"全部"）
+                if (this.activeFirstId == 1 || this.activeFirstId == 2) {
+                    this.activeSecondId = 3;
+                } else {
+                    this.activeSecondId = 2;
+                }
 
-			// 加载更多
-			loadMore() {
-				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
-				this.loadOrders();
-			},
-
-			// 跳转订单详情
-			goDetail(order) {
-				console.log('order', order)
-				if (order.table_source == "order") {
-					//如果是普通订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}`
-					})
-				} else if (order.table_source == "order_self") {
-					//如果是自营订单
-					uni.navigateTo({
-						url: `/pages/order/userorder-detail?id=${order.id}&serviceType=2`
-					})
-				}
-
-			},
-
-			// 删除订单
-			deleteOrder: debounce(async function(order) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 删除订单
-							request.post(this.urls[order.table_source].deleteorder, {
-								id: order.id
-							}).then(res => {
-								uni.showToast({
-									title: '删除成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							})
-						}
-					}
-				})
-			}, 500),
-
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-			// 订单状态全局变量
-			handleOrderTypeFromGlobal() {
-				const orderType = getApp().globalData.selectedOrderType;
-				console.log('接收到的订单类型:', orderType);
-
-				if (orderType) {
-					// 创建类型映射
-					const typeMap = {
-						'unpaid': 1, // 待支付
-						'unaccepted': 2, // 待接单  
-						'unserved': 3, // 待服务
-						'finnish': 5 // 已完成
-					};
-
-					// 映射到对应的数字类型
-					this.currentTab = typeMap[orderType] || 0;
-					console.log('映射后的currentTab:', this.currentTab);
-
-					// 根据currentTab设置formData.state
-					if (this.currentTab !== 0) {
-						this.formData.state = this.currentTab;
-					} else {
-						delete this.formData.state;
-					}
-
-					// 清除全局变量
-					getApp().globalData.selectedOrderType = null;
-				}
-			},
-
-			// 联系客服
-			async contactService(phone) {
-				// TODO: 实现联系客服功能
-				uni.navigateTo({
-					url: '/pages/contact/contact'
-				})
-				//  const systemInfo = uni.getSystemInfoSync()
-				//  if(systemInfo.platform === 'ios') {
-				//  	uni.makePhoneCall({
-				//  		phoneNumber: phone //仅为示例
-				//  	})
-				//  }else {
-				//  	let permission = '';
-				//  	if(systemInfo.platform === 'ios') {
-				//  		permission = 'phone'
-				//  	}else {
-				//  		permission = 'android.permission.CALL_PHONE'
-				//  	}
-				// this.isShowPer = true;
-				//  	const firstRequest = !plus.storage.getItem(`perm_${permission}`)
-				//  	if(firstRequest) {
-				//  		this.isShowPer = true;
-				//  	}
-				//  	// 1. 检查权限
-				//  	const { granted } = await permissionUtils.checkPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	if (granted) {
-				//   this.isShowPer = false;
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	}
-				//  	this.isShowPer = false;
-				//  	// 2. 显示权限说明弹窗
-				//  	const confirm = await this.showPermissionDialog(
-				//  	  '拨打电话权限申请',
-				//  	  '我们需要拨打电话权限，方便您联系商家或平台'
-				//  	);
-
-				//  	if (!confirm) return;
-
-				//  	// 3. 请求权限
-				//  	const result = await permissionUtils.requestPermission('phone', '需要拨打电话权限，方便您联系商家或平台');
-				//  	console.log('result',result)
-				//  	if (result) {
-				//  	  uni.makePhoneCall({
-				//  	  	phoneNumber: phone //仅为示例
-				//  	  })
-				//  	  return;
-				//  	} else {
-				//  	  locationService.openAppSettings();
-				//  	  return;
-				//  	  // uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-				//  	}
-				//  }
-
-			},
-			// 取消订单
-			async cancelService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				console.log(order)
-				uni.showModal({
-					title: '取消订单',
-					content: '确定要取消该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 取消订单
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							request.post(this.urls[order.table_source].cancelorder, data).then(res => {
-								uni.showToast({
-									title: '取消成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-			// 申请退款
-			async refoundService(order) {
-				let id = '';
-				await request.post('/user/getuser', {
-					type: 1
-				}).then(res => {
-					console.log(res)
-					id = res.data.id
-				})
-				uni.showModal({
-					title: '申请退款',
-					content: '确定申请退款？退款后则订单取消！',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 申请退款
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								cancel_state: 1,
-								cancel_id: id
-							}
-							let url = '';
-							if (order.pay_kind == 1) {
-								url = ''
-							} else if (order.pay_kind == 2) {
-								url = '/user/wechatrefund'
-							} else if (order.pay_kind == 3) {
-								url = '/user/alirefund'
-							}
-							console.log(data, url)
-							request.post(url, data).then(res => {
-								console.log('申请退款订单返回结果', res)
-								uni.showToast({
-									title: '申请退款成功！',
-									icon: 'none'
-								})
-								this.formData.page = 1;
-								this.orderList = [];
-								this.loadOrders();
-							}).catch(err => {
-								console.log(err)
-							})
-						}
-					}
-				})
-			},
-
-			// 支付订单
-			payOrder(order) {
-				if(order.table_source == "order_self"){
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}&table_source=order_self`
-					})
-				}else{
-					// TODO: 实现支付功能
-					uni.navigateTo({
-						url: `/pages/order/pay?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
-					})
-				}
-				
-			},
-
-			// 评价订单
-			reviewOrder(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/comment?id=${order.id}&evaluator_type=3&order_type=1&order_kind=${order.order_kind}`
-				})
-			},
-			goEvaluateDetail(order) {
-				uni.navigateTo({
-					url: `/pages/evaluate/evaluationDetails?order_id=${order.id}&order_type=1`
-				});
-			},
-
-			// 再次下单
-			orderAgain(order) {
-				console.log(1111111,order)
-				if(order.table_source=="order_self"){
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/selfOperated/detail?id=' + order.server_id
-					})
-				}else{
-					// TODO: 实现再次下单功能
-					uni.navigateTo({
-						url: '/pages/service/detail?id=' + order.server_id
-					})
-				}
-				
-			},
-			// 投诉
-			addComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/add-complaint?number=' + order.number
-				})
-			},
-			// 查看投诉
-			lookComplaint(order) {
-				uni.navigateTo({
-					url: '/pages/complaint/detail?number=' + order.number
-				})
-			},
-			goLogin() {
-				// uni.oprPresentLogin()
-				uni.navigateTo({
-					url: '/pages/blogPopup/blogPopup'
-				});
-			}
-		}
-	}
+                // 传递给父组件（1级选中数据）
+                this.$emit("tabChange", {
+                    firstId: this.activeFirstId,
+                    secondId: this.activeSecondId,
+                });
+                this.$nextTick(() => {
+                    this.searchList();
+                });
+            },
+            // 二级tab点击事件
+            handleSecondTabClick(id, title) {
+                this.popList = []
+                if (!this.isLogin) return;
+                if (this.activeSecondId === id) return;
+                // 更新2级选中状态
+                this.activeSecondId = id;
+                // 传递给父组件（2级选中数据）
+                this.$emit("tabChange", {
+                    firstId: this.activeFirstId,
+                    secondId: this.activeSecondId,
+                });
+                this.$nextTick(() => {
+                    this.searchList();
+                });
+            },
+            cancelOrder(e, order) {
+                uni.showModal({
+                    title: "取消订单",
+                    content: "确定要取消该订单吗？（订单取消后，支付金额将原路退回）",
+                    success: (res) => {
+                        if (res.confirm) {
+                            // TODO: 取消订单
+                            let data = {
+                                orderNo: order.number,
+                                amount: order.pay_money,
+                                syrid: this.syrId,
+                            };
+                            let url = "";
+                            if (order.pay_kind == 1) {
+                                url = "";
+                            } else if (order.pay_kind == 2) {
+                                url = this.urls[this.activeFirstId].weChatRefund;
+                            } else if (order.pay_kind == 3) {
+                                url = this.urls[this.activeFirstId].aliRefund;
+                            }
+                            console.log(data, url);
+                            if (this.clickType) {
+                                return;
+                            }
+                            this.clickType = true;
+                            request
+                                .post(url, data)
+                                .then((res) => {
+                                    if (res.state == 1 || res.code == 200 || res.code == 1) {
+                                        uni.showToast({
+                                            title: "取消成功！",
+                                            icon: "none",
+                                        });
+                                        this.searchList();
+                                    } else {
+                                        uni.showToast({
+                                            title: res.msg,
+                                            icon: "none",
+                                        });
+                                    }
+                                })
+                                .catch((err) => {
+                                    console.log(err);
+                                })
+                                .finally(() => {
+                                    this.clickType = false;
+                                });
+                        }
+                    },
+                });
+            },
+            // 确认接单
+            confirmOrder(e, order) {
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                console.log(111,this.activeFirstId,this.urls)
+                request
+                    .post(this.urls[this.activeFirstId].sureOrder, {
+                        id: order.id,
+                        syrid: this.syrId,
+                        order_kind: this.idType == 2 ? 3 : 1,
+                    })
+                    .then((res) => {
+                        if (res.state != 1 || res.code != 200) {
+                            uni.showToast({
+                                title: "开始服务",
+                                icon: "none",
+                            });
+                        } else {
+                            uni.showToast({
+                                title: "已接单",
+                                icon: "none",
+                            });
+                        }
+                        this.searchList();
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            // 开始服务
+            startOrder(e, order) {
+                if (order.team_buy_order_state == 1) {
+                    uni.showToast({
+                        title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+                        icon: "none",
+                    });
+                    return
+                }
+                this.showInput = true;
+                this.orderInfo = order;
+            },
+            // 输入完成
+            onConfirm(code) {
+                this.showInput = false;
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                console.log(this.orderInfo, "this.urls[this.activeFirstId].startOrder");
+                request
+                    .post(this.urls[this.activeFirstId].startOrder, {
+                        id: this.orderInfo.id,
+                        server_code: code,
+                        sjid: this.sjId,
+                    })
+                    .then((res) => {
+                        console.log(res);
+                        if (res.state == 1 || res.code == 200) {
+                            uni.showToast({
+                                title: "开始服务",
+                                icon: "none",
+                            });
+                            this.searchList();
+                        } else {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                        }
+                        this.orderInfo = {};
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            // 完成服务
+            endOrder(e, order) {
+                // app阻止事件冒泡
+                // #ifdef APP-PLUS
+                // e.preventDefault();
+                // e.stopPropagation();
+                // #endif
+                if (this.clickType) {
+                    return;
+                }
+                this.clickType = true;
+                request
+                    .post(this.urls[this.activeFirstId].endOrder, {
+                        id: order.id,
+                        sjid: this.sjId,
+                    })
+                    .then((res) => {
+                        if (res.state == 1 || res.code == 200) {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                            this.searchList();
+                        } else {
+                            uni.showToast({
+                                title: res.msg,
+                                icon: "none",
+                            });
+                        }
+                    })
+                    .finally(() => {
+                        this.clickType = false;
+                    });
+            },
+            goOrderDetail(order) {
+                if (this.idType == 1) {
+                    if (this.activeFirstId == 1) {
+                        uni.navigateTo({
+                            url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 2) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 3) {
+                        uni.navigateTo({
+                            url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 4) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
+                        });
+                    }
+                    if (this.activeFirstId == 5) {
+                        uni.navigateTo({
+                            url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
+                        });
+                    }
+                }
+            },
+            // 去登录
+            goLogin() {
+                uni.navigateTo({ url: '/pages/blogPopup/blogPopup' });
+            }
+        },
+    };
 </script>
 
-<style lang="less">
-	/* 状态标签栏 */
-	.status {
-		position: sticky;
-		top: 0;
-		/* #ifdef H5 */
-		top: 88rpx;
-		/* H5端顶部适配 */
-		/* #endif */
-		left: 0;
-		right: 0;
-	}
+<style scoped lang="less">
+    .order-list-page {
+        min-height: 100vh;
+        display: flex;
+        flex-direction: column;
+    }
 
-	.status-tabs {
+    /* 状态标签栏 (移植自用户端示例) */
+    .status {
+        position: sticky;
+        top: 0;
+        /* #ifdef H5 */
+        top: 88rpx;
+        /* H5端顶部适配 */
+        /* #endif */
+        left: 0;
+        right: 0;
+        background: #fff;
+        z-index: 99;
+    }
 
-		height: 94rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		// padding-left: 20rpx;
-	}
+    .status-tabs {
+        height: 94rpx;
+        background-color: #ffffff;
+        white-space: nowrap;
+    }
 
-	.tab-item {
-		display: inline-block;
-		height: 48rpx;
-		position: relative;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-		margin: 20rpx 50rpx 26rpx 0rpx;
-	}
+    .tab-item {
+        display: inline-block;
+        height: 48rpx;
+        position: relative;
+        font-weight: 500;
+        font-size: 30rpx;
+        color: #333333;
+        line-height: 42rpx;
+        text-align: left;
+        font-style: normal;
+        margin: 20rpx 50rpx 26rpx 0rpx;
+        
+        &.active {
+            color: #ff4767;
+            font-weight: 500;
+        }
 
-	.tab-item.active {
-		color: #FF4767;
-		font-weight: 500;
-	}
+        &.active::after {
+            content: "";
+            position: absolute;
+            width: 34rpx;
+            height: 6rpx;
+            left: 50%;
+            bottom: -16rpx;
+            transform: translateX(-50%);
+            background-color: #ff4767;
+            border-radius: 3rpx;
+        }
+    }
 
-	.tab-item.active::after {
-		content: '';
-		position: absolute;
-		width: 28rpx;
-		height: 6rpx;
-		left: 50%;
-		bottom: 0;
-		transform: translateX(-50%);
-		background-color: #FF4767;
-		border-radius: 3rpx;
-	}
+    .status-tabs2 {
+        height: 56rpx;
+        background-color: #ffffff;
+        white-space: nowrap;
+        padding-bottom: 30rpx;
+        padding-top: 10rpx;
+    }
 
-	.status-tabs2 {
-		height: 56rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-		padding-bottom: 30rpx;
-	}
+    .tab-item2 {
+        display: inline-block;
+        height: 56rpx;
+        padding: 0 20rpx;
+        background: #f3f5f6;
+        border-radius: 10rpx;
+        position: relative;
+        margin: 0 18rpx 0 0;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 56rpx;
+        text-align: left;
+        font-style: normal;
+        
+        &.active {
+            color: #ff4767;
+            font-weight: 500;
+            background: #fee5e7;
+        }
+    }
 
-	.tab-item2 {
-		display: inline-block;
-		height: 56rpx;
-		padding: 0 20rpx;
-		background: #F3F5F6;
-		border-radius: 10rpx;
-		position: relative;
-		margin: 0 18rpx;
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 56rpx;
-		text-align: left;
-		font-style: normal;
-	}
+    /* 数据列表及卡片外框样式 */
+    .order-item-wrap {
+        margin: 0 0 24rpx 0;
+        border-radius: 20rpx;
+        overflow: hidden;
+    }
 
-	.tab-item2.active {
-		color: #FF4767;
-		font-weight: 500;
-		background: #FEE5E7;
-	}
+    .noDataBox {
+        background-color: transparent;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 
+    /* 未登录状态的样式 */
+    .nologin_part {
+        display: flex;
+        flex-flow: column nowrap;
+        justify-content: center;
+        align-items: center;
+    }
 
+    .nologin_icon {
+        width: 360rpx;
+        height: 360rpx;
+        margin-top: 100rpx;
+        margin-bottom: 40rpx;
+    }
 
-	/* 订单列表 */
-	.order-scroll {
-		padding: 0 20rpx 24rpx;
-		margin-top: 24rpx;
-		height: calc(100vh - 112rpx - 24rpx);
-		box-sizing: border-box;
-	}
+    .btn-login {
+        width: 200rpx;
+        height: 68rpx;
+        background-color: #ff4767;
+        border-radius: 34rpx;
+        display: flex;
+        flex-flow: row nowrap;
+        justify-content: center;
+        align-items: center;
+        box-shadow: 0 4rpx 10rpx rgba(255, 71, 103, 0.3);
+    }
 
-	.order-item {
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-		margin-bottom: 24rpx;
-		padding: 20rpx;
-		box-sizing: border-box;
-	}
+    .login-text {
+        font-size: 30rpx;
+        color: #fff;
+    }
 
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
-
-	.order-tag {
-		padding: 2rpx 6rpx;
-		background: #FF4767;
-		border-radius: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 10rpx;
-	}
-
-	.order-tag-text {
-		font-weight: 400;
-		font-size: 20rpx;
-		color: #FFFFFF;
-		line-height: 25rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #FF4767;
-		line-height: 39rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.status-pending {
-		color: #FF4767;
-	}
-
-	.status-cancelled {
-		color: #FF4767;
-	}
-
-	.status-completed {
-		color: #FF4767;
-	}
-
-	.order-content {
-		display: flex;
-		margin-bottom: 24rpx;
-	}
-
-	.service-image {
-		width: 182rpx;
-		height: 182rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #000000;
-	}
-
-	.service-info {
-		flex: 1;
-	}
-
-	.service-name {
-		width: 400rpx;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		display: flex;
-		align-items: center;
-
-		.service-name-type {
-			height: 28rpx;
-			margin-right: 10rpx;
-		}
-
-		.service-name-text {
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-
-	.service-time,
-	.service-address {
-		display: flex;
-		align-items: center;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #999999;
-		line-height: 34rpx;
-		text-align: left;
-		font-style: normal;
-		margin-top: 6rpx;
-	}
-
-	.service-time {
-		margin-top: 16rpx;
-	}
-
-	.time-icon,
-	.location-icon {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
-	}
-
-	.order-actions {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-top: 1rpx solid #EEEEEE;
-		padding-top: 24rpx;
-	}
-
-	.delete-icon {
-		width: 36rpx;
-		height: 40rpx;
-	}
-
-	.action-left {
-		display: flex;
-		align-items: center;
-	}
-
-	.action-right {
-		display: flex;
-		align-items: center;
-		padding: 4rpx 0;
-		gap: 18rpx;
-	}
-
-	.action-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 129rpx;
-		height: 56rpx;
-		border-radius: 32rpx;
-		border: 2rpx solid #979797;
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #333333;
-		line-height: 33rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.action-btn.contact {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #333333;
-	}
-
-	.action-btn.primary {
-		background-color: #FF4767;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		border-color: transparent;
-		background: linear-gradient(143deg, #F52540 0%, #FF4767 100%);
-		color: #FFFFFF;
-	}
-
-	.action-btn.again {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #666666;
-	}
-
-	.nologin_part {
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.nologin_icon {
-		width: 360rpx;
-		height: 360rpx;
-		margin-top: 100rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.btn-login {
-		width: 200rpx;
-		height: 68rpx;
-		background-color: yellowgreen;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.login-text {
-		font-size: 36rpx;
-		color: #fff;
-		text-shadow:
-			1px 1px 1px #919191,
-			2px 2px 1px #919191,
-			2px 3px 1px #919191,
-			2px 4px 1px #919191,
-			2px 5px 1px #919191,
-			2px 6px 1px #919191,
-			2px 7px 2px rgba(16, 16, 16, 0.4);
-	}
-
-	/* 加载更多 */
-	.loading-more,
-	.no-more {
-		text-align: center;
-		font-size: 26rpx;
-		color: #999999;
-		padding: 24rpx 0;
-	}
-
-	/* #ifdef APP-PLUS */
-	/* APP端权限弹窗位置适配 */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-
-	.service-group {
-		display: flex;
-		flex-wrap: wrap;
-		align-content: space-between;
-		flex: 1;
-		margin-top: 16rpx;
-
-		.service-group-time {
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #999999;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			width: 100%;
-		}
-
-		.service-group-price {
-			margin-top: 56rpx;
-			font-family: DINPro, DINPro;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FF4767;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-		}
-	}
+    ::v-deep .list-scroll {
+        margin-top: 0 !important;
+        box-sizing: border-box;
+        /* padding-top: 24rpx; */
+    }
 </style>
\ No newline at end of file