diff --git a/pages/order/pay-success.vue b/pages/order/pay-success.vue
index 7e2d29e..48d56dc 100644
--- a/pages/order/pay-success.vue
+++ b/pages/order/pay-success.vue
@@ -1,115 +1,112 @@
-<template>
-  <view class="success-page">
-    <!-- 自定义导航栏 -->
-    <custom-navbar 
-      title="支付成功"
-      :showBack="true"
-      backgroundColor="#FFFFFF"
-    ></custom-navbar>
-
-    <!-- 成功提示 -->
-    <view class="success-content">
-	  <image src="/static/images/success_icon.png"
-			 mode="aspectFit"
-			 class="success-icon"></image>
-      <text class="success-text">支付成功</text>
-    </view>
-
-    <!-- 查看订单按钮 -->
-	<view class="btn-box" @click="goToOrder">
-		<text class="btn-text">查看订单</text>
-	</view>
-  </view>
-</template>
-
-<script>
-import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
-
-export default {
-  components: {
-    customNavbar
-  },
-  data() {
-    return {
-      orderId: '',
-	  serviceType:1,//订单类型，1普通，2自营
-    }
-  },
-  onLoad(options) {
-    if (options.orderId) {
-      this.orderId = options.orderId
-    }
-	if(options.serviceType){
-		this.serviceType = options.serviceType
-	}
-  },
-  methods: {
-    goToOrder() {
-		if(this.serviceType==1){
-			uni.redirectTo({
-			  url:`/pages/order/userorder-detail?id=${this.orderId}`
-			})
-		}else{
-			uni.redirectTo({
-			  url: `/pages/order/userorder-detail?id=${this.orderId}&serviceType=2`
-			})
-		}
-      
-    }
-  }
-}
-</script>
-
-<style>
-.success-page {
-  min-height: 100vh;
-  background-color: #FFFFFF;
-  padding-bottom: env(safe-area-inset-bottom);
-}
-
-.success-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 120rpx;
-}
-
-.success-icon {
-  width: 250rpx;
-  height: 184rpx;
-  margin-bottom: 40rpx;
-}
-
-.success-text {
-  font-size: 40rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.action-button {
-  width: 686rpx;
-  height: 88rpx;
-  background: #FF4B4B;
-  border-radius: 44rpx;
-  color: #FFFFFF;
-  font-size: 32rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 80rpx auto 0;
-}
-
-/* 多端适配 */
-/* #ifdef H5 */
-.success-page {
-  padding-bottom: 0;
-}
-/* #endif */
-
-/* #ifdef APP-PLUS || MP */
-.success-page {
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-}
-/* #endif */
-</style> 
\ No newline at end of file
+<template>
+	<view class="success-page">
+		<!-- 自定义导航栏 -->
+		<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
+
+		<!-- 成功提示 -->
+		<view class="success-content">
+			<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
+			<text class="success-text">支付成功</text>
+		</view>
+
+		<!-- 查看订单按钮 -->
+		<view class="btn-box" @click="goToOrder">
+			<text class="btn-text">查看订单</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import customNavbar from '@/components/custom-navbar/custom-navbar.vue'
+
+	export default {
+		components: {
+			customNavbar
+		},
+		data() {
+			return {
+				orderId: '',
+				serviceType: 1, //订单类型，1普通，2自营
+			}
+		},
+		onLoad(options) {
+			console.log(options, '查看订单options');
+			if (options.orderId) {
+				this.orderId = options.orderId
+			}
+			if (options.serviceType) {
+				this.serviceType = options.serviceType
+			}
+		},
+		methods: {
+			goToOrder() {
+				if (this.serviceType == 1) {
+					uni.redirectTo({
+						url: `/pages/order/userorder-detail?id=${this.orderId}`
+					})
+				} else {
+					uni.redirectTo({
+						url: `/pages/order/userorder-detail?id=${this.orderId}&serviceType=2`
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style>
+	.success-page {
+		min-height: 100vh;
+		background-color: #FFFFFF;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.success-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 120rpx;
+	}
+
+	.success-icon {
+		width: 250rpx;
+		height: 184rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.success-text {
+		font-size: 40rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.action-button {
+		width: 686rpx;
+		height: 88rpx;
+		background: #FF4B4B;
+		border-radius: 44rpx;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 80rpx auto 0;
+	}
+
+	/* 多端适配 */
+	/* #ifdef H5 */
+	.success-page {
+		padding-bottom: 0;
+	}
+
+	/* #endif */
+
+	/* #ifdef APP-PLUS || MP */
+	.success-page {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index c1c812d..d42af13 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -1,690 +1,697 @@
-<template>
-	<view class="order-list">
-		<view v-if="isLogin">
-			<!-- 订单状态标签 -->
-			<scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
-				<view class="tab-item" v-for="(tab, index) in tabs" :key="tab.id"
-					:class="{ active: currentTab === tab.id }" @click="switchTab(tab.id)">
-					{{tab.title}}
-				</view>
-			</scroll-view>
-
-			<!-- 订单列表 -->
-			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
-				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh">
-				<view class="order-item" v-for="(order, index) in orderList" :key="index">
-					<!-- 订单编号和状态 -->
-					<view class="order-header">
-						<view class="order-tag">
-							<text
-								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' : ''}}</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>
-
-					<!-- 订单内容 -->
-					<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">
-							<text class="service-name">{{order.server_title}}</text>
-							<view class="service-time" v-if="order.order_kind == 1">
-								<image src="/static/images/time_icon.png" class="time-icon"></image>
-								<text>{{order.reservation_time}}</text>
-							</view>
-							<view class="service-address" v-if="order.order_kind == 1">
-								<image src="/static/images/position_icon.png" class="location-icon"></image>
-								<text
-									>{{Object.assign({},order.reservation_address_arr).dependency}}{{Object.assign({},order.reservation_address_arr).address}}
-								</text>
-							</view>
-						</view>
-					</view>
-
-					<!-- 订单操作按钮 -->
-					<view class="order-actions">
-						<view class="action-left">
-							<image src="/static/images/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 primary" v-if="order.state == 1"
-								@click="payOrder(order)">立即支付</text>
-							<text class="action-btn review" v-if="order.state == 6"
-								@click="reviewOrder(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>
-						</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>
-
-
-	</view>
-</template>
-
-<script>
-	import request from '../../utils/request'
-	import locationService from '../../utils/locationService';
-	import permissionUtils from '../../utils/per'
-	import {
-		debounce
-	} from '@/utils/debounce.js'
-	export default {
-		data() {
-			return {
-				isShowPer: false,
-				sjid: null,
-				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
-			}
-		},
-		onLoad() {
-			// this.loadOrders();
-
-		},
-		async onShow() {
-			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
-			if (!this.isLogin) return;
-			const shopInfo = await request.post('/user/getuser', {
-				type: 3
-			});
-			this.sjid = shopInfo.data.id;
-			this.orderList = [];
-			this.formData.page = 1;
-			this.formData.sjid = shopInfo.data.id;
-			this.loadOrders();
-		},
-		methods: {
-			// 切换标签
-			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()
-			},
-
-			// 加载订单数据
-			loadOrders() {
-				request.post('/sj/sjselforder', 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
-				})
-			},
-
-			// 下拉刷新
-			onRefresh() {
-				this.isRefreshing = true
-				this.formData.page = 1;
-				this.orderList = [];
-				this.loadOrders()
-			},
-
-			// 加载更多
-			loadMore() {
-				if (!this.hasMore) return
-				// TODO: 加载更多订单数据
-				this.loadOrders();
-			},
-
-			// 跳转订单详情
-			goDetail(order) {
-				console.log('order', order)
-				uni.navigateTo({
-					url: `/pages/shop/buyorder-detail?id=${order.id}`
-				})
-			},
-
-			// 删除订单
-			deleteOrder: debounce(async function(order) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 删除订单
-							request.post('/sj/deleteorder', {
-								id: order.id,
-								sjid: this.sjid
-							}).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);
-						}
-					});
-				});
-			},
-			// 联系客服
-			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) {
-				console.log(order)
-				uni.showModal({
-					title: '取消订单',
-					content: '确定要取消该订单吗？',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 取消订单
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								sjid: this.sjid
-							}
-							request.post('/sj/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) {
-				uni.showModal({
-					title: '申请退款',
-					content: '确定申请退款？退款后则订单取消！',
-					success: (res) => {
-						if (res.confirm) {
-							// TODO: 申请退款
-							let data = {
-								orderNo: order.number,
-								amount: order.pay_money,
-								sjid: this.sjid
-							}
-							let url = '';
-							if (order.pay_kind == 1) {
-								url = '/'
-							} else if (order.pay_kind == 2) {
-								url = '/sj/selfwechatrefund'
-							} else if (order.pay_kind == 3) {
-								url = '/sj/selfalirefund'
-							}
-							console.log('==========', order, 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) {
-				// TODO: 实现支付功能
-				uni.navigateTo({
-					url: `/pages/shop/pay-order?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
-				})
-			},
-
-			// 评价订单
-			reviewOrder(order) {
-				// uni.navigateTo({
-				//   url: `/pages/order/pay?id=${order.id}`
-				// })
-			},
-
-			// 再次下单
-			orderAgain(order) {
-				// TODO: 实现再次下单功能
-				uni.navigateTo({
-					url: '/pages/shop/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'
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	/* 状态标签栏 */
-	.status-tabs {
-		position: sticky;
-		top: 0;
-		/* #ifdef H5 */
-		top: 88rpx;
-		/* #endif */
-		left: 0;
-		right: 0;
-		height: 112rpx;
-		background-color: #FFFFFF;
-		z-index: 99;
-		white-space: nowrap;
-	}
-
-	.tab-item {
-		display: inline-block;
-		height: 88rpx;
-		line-height: 88rpx;
-		font-size: 30rpx;
-		color: #666666;
-		position: relative;
-		margin: 0 20rpx;
-	}
-
-	.tab-item.active {
-		color: #000000;
-		font-weight: 500;
-	}
-
-	.tab-item.active::after {
-		content: '';
-		position: absolute;
-		width: 32rpx;
-		height: 6rpx;
-		left: 50%;
-		bottom: 0;
-		transform: translateX(-50%);
-		background-color: #E8101E;
-		border-radius: 3rpx;
-	}
-
-	/* 订单列表 */
-	.order-scroll {
-		padding: 0 24rpx 24rpx;
-		margin-top: 24rpx;
-		height: calc(100vh - 112rpx - 24rpx);
-		box-sizing: border-box;
-	}
-
-	.order-item {
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-		margin-bottom: 24rpx;
-		padding: 24rpx;
-		box-sizing: border-box;
-	}
-
-	.order-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 34rpx;
-	}
-
-	.order-tag {
-		width: 74rpx;
-		height: 38rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		border-radius: 19rpx;
-		margin-right: 8rpx;
-		background-color: rgba(232, 16, 30, 0.2);
-	}
-
-	.order-tag-text {
-		color: #E8101E;
-		font-size: 24rpx;
-	}
-
-	.order-number {
-		flex: 1;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.order-status {
-		font-size: 28rpx;
-		font-weight: 500;
-	}
-
-	.status-pending {
-		color: #E8101E;
-	}
-
-	.status-cancelled {
-		color: #E8101E;
-	}
-
-	.status-completed {
-		color: #E8101E;
-	}
-
-	.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 {
-		font-size: 24rpx;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.service-time,
-	.service-address {
-		display: flex;
-		align-items: center;
-		font-size: 24rpx;
-		color: #999999;
-		font-weight: 500;
-		margin-top: 8rpx;
-		align-items: flex-start;
-	}
-
-	.text-overflow-1 {
-		white-space: normal !important;
-		word-break: break-word !important;
-		overflow: visible !important;
-		text-overflow: clip !important;
-		flex: 1;
-	}
-
-	.time-icon,
-	.location-icon {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 4rpx;
-		flex-shrink: 0;
-		margin-top: 4rpx;
-	}
-
-	.order-actions {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		border-top: 1rpx solid #EEEEEE;
-		padding-top: 24rpx;
-	}
-
-	.delete-icon {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-	.action-right {
-		display: flex;
-		align-items: center;
-	}
-
-	.action-btn {
-		display: inline-block;
-		width: 128rpx;
-		height: 48rpx;
-		line-height: 48rpx;
-		margin-left: 16rpx;
-		text-align: center;
-		font-size: 28rpx;
-		border-radius: 24rpx;
-		font-size: 24rpx;
-	}
-
-	.action-btn.contact {
-		background-color: #FFFFFF;
-		border: 1rpx solid #999999;
-		color: #333333;
-	}
-
-	.action-btn.primary {
-		background-color: #E8101E;
-		color: #FFFFFF;
-	}
-
-	.action-btn.review {
-		background-color: rgba(252, 67, 124, 0.40);
-		border: 1rpx solid #E8101E;
-		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;
-	}
-
-	/* APP适配 */
-	/* #ifdef APP-PLUS */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-	/* 平台适配 */
-	/* #ifdef H5 */
-	/* .order-list {
-  padding-bottom: env(safe-area-inset-bottom);
-} */
-	/* #endif */
+<template>
+	<view class="order-list">
+		<view v-if="isLogin">
+			<!-- 订单状态标签 -->
+			<scroll-view scroll-x class="status-tabs" :show-scrollbar="false">
+				<view class="tab-item" v-for="(tab, index) in tabs" :key="tab.id"
+					:class="{ active: currentTab === tab.id }" @click="switchTab(tab.id)">
+					{{tab.title}}
+				</view>
+			</scroll-view>
+
+			<!-- 订单列表 -->
+			<scroll-view scroll-y class="order-scroll" @scrolltolower="loadMore" refresher-enabled
+				:refresher-triggered="isRefreshing" @refresherrefresh="onRefresh">
+				<view class="order-item" v-for="(order, index) in orderList" :key="index">
+					<!-- 订单编号和状态 -->
+					<view class="order-header">
+						<view class="order-tag">
+							<text
+								class="order-tag-text">{{order.order_kind == 1 ? '到家' : order.order_kind == 2 ? '到店' : ''}}</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>
+
+					<!-- 订单内容 -->
+					<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">
+							<text class="service-name">{{order.server_title}}</text>
+							<view class="service-time" v-if="order.order_kind == 1">
+								<image src="/static/images/time_icon.png" class="time-icon"></image>
+								<text>{{order.reservation_time}}</text>
+							</view>
+							<view class="service-address" v-if="order.order_kind == 1">
+								<image src="/static/images/position_icon.png" class="location-icon"></image>
+								<text>{{Object.assign({},order.reservation_address_arr).dependency}}{{Object.assign({},order.reservation_address_arr).address}}
+								</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 订单操作按钮 -->
+					<view class="order-actions">
+						<view class="action-left">
+							<image src="/static/images/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)"
+								v-if="order.state != 7 || order.state!=2">联系客服</text>
+							<text class="action-btn primary" v-if="order.state == 1"
+								@click="payOrder(order)">立即支付</text>
+							<text class="action-btn review" v-if="order.state == 6"
+								@click="reviewOrder(order)">评价</text>
+							<text class="action-btn again"
+								v-if="order.state == 5 || order.state == 6 || order.state == 7"
+								@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>
+						</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>
+
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request'
+	import locationService from '../../utils/locationService';
+	import permissionUtils from '../../utils/per'
+	import {
+		debounce
+	} from '@/utils/debounce.js'
+	export default {
+		data() {
+			return {
+				isShowPer: false,
+				sjid: null,
+				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
+			}
+		},
+		onLoad() {
+			// this.loadOrders();
+
+		},
+		async onShow() {
+			this.isLogin = uni.getStorageSync('accessToken') ? true : false;
+			if (!this.isLogin) return;
+			const shopInfo = await request.post('/user/getuser', {
+				type: 3
+			});
+			this.sjid = shopInfo.data.id;
+			this.orderList = [];
+			this.formData.page = 1;
+			this.formData.sjid = shopInfo.data.id;
+			this.loadOrders();
+		},
+		methods: {
+			// 切换标签
+			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()
+			},
+
+			// 加载订单数据
+			loadOrders() {
+				request.post('/sj/sjselforder', 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
+				})
+			},
+
+			// 下拉刷新
+			onRefresh() {
+				this.isRefreshing = true
+				this.formData.page = 1;
+				this.orderList = [];
+				this.loadOrders()
+			},
+
+			// 加载更多
+			loadMore() {
+				if (!this.hasMore) return
+				// TODO: 加载更多订单数据
+				this.loadOrders();
+			},
+
+			// 跳转订单详情
+			goDetail(order) {
+				console.log('order', order)
+				uni.navigateTo({
+					url: `/pages/shop/buyorder-detail?id=${order.id}`
+				})
+			},
+
+			// 删除订单
+			deleteOrder: debounce(async function(order) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除该订单吗？',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 删除订单
+							request.post('/sj/deleteorder', {
+								id: order.id,
+								sjid: this.sjid
+							}).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);
+						}
+					});
+				});
+			},
+			// 联系客服
+			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) {
+				console.log(order)
+				uni.showModal({
+					title: '取消订单',
+					content: '确定要取消该订单吗？',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 取消订单
+							let data = {
+								orderNo: order.number,
+								amount: order.pay_money,
+								sjid: this.sjid
+							}
+							request.post('/sj/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) {
+				uni.showModal({
+					title: '申请退款',
+					content: '确定申请退款？退款后则订单取消！',
+					success: (res) => {
+						if (res.confirm) {
+							// TODO: 申请退款
+							let data = {
+								orderNo: order.number,
+								amount: order.pay_money,
+								sjid: this.sjid
+							}
+							let url = '';
+							if (order.pay_kind == 1) {
+								url = '/'
+							} else if (order.pay_kind == 2) {
+								url = '/sj/selfwechatrefund'
+							} else if (order.pay_kind == 3) {
+								url = '/sj/selfalirefund'
+							}
+							console.log('==========', order, 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) {
+				// TODO: 实现支付功能
+				uni.navigateTo({
+					url: `/pages/shop/pay-order?id=${order.id}&money=${order.order_money}&title=${order.server_title}&number=${order.number}`
+				})
+			},
+
+			// 评价订单
+			reviewOrder(order) {
+				// uni.navigateTo({
+				//   url: `/pages/order/pay?id=${order.id}`
+				// })
+			},
+
+			// 再次下单
+			orderAgain(order) {
+				// TODO: 实现再次下单功能
+				uni.navigateTo({
+					url: '/pages/shop/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'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 状态标签栏 */
+	.status-tabs {
+		position: sticky;
+		top: 0;
+		/* #ifdef H5 */
+		top: 88rpx;
+		/* #endif */
+		left: 0;
+		right: 0;
+		height: 112rpx;
+		background-color: #FFFFFF;
+		z-index: 99;
+		white-space: nowrap;
+	}
+
+	.tab-item {
+		display: inline-block;
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 30rpx;
+		color: #666666;
+		position: relative;
+		margin: 0 20rpx;
+	}
+
+	.tab-item.active {
+		color: #000000;
+		font-weight: 500;
+	}
+
+	.tab-item.active::after {
+		content: '';
+		position: absolute;
+		width: 32rpx;
+		height: 6rpx;
+		left: 50%;
+		bottom: 0;
+		transform: translateX(-50%);
+		background-color: #E8101E;
+		border-radius: 3rpx;
+	}
+
+	/* 订单列表 */
+	.order-scroll {
+		padding: 0 24rpx 24rpx;
+		margin-top: 24rpx;
+		height: calc(100vh - 112rpx - 24rpx);
+		box-sizing: border-box;
+	}
+
+	.order-item {
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		margin-bottom: 24rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+	}
+
+	.order-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 34rpx;
+	}
+
+	.order-tag {
+		width: 74rpx;
+		height: 38rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		border-radius: 19rpx;
+		margin-right: 8rpx;
+		background-color: rgba(232, 16, 30, 0.2);
+	}
+
+	.order-tag-text {
+		color: #E8101E;
+		font-size: 24rpx;
+	}
+
+	.order-number {
+		flex: 1;
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.order-status {
+		font-size: 28rpx;
+		font-weight: 500;
+		background-image: url('https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5349af61-d67a-4ecf-91ce-6e4f05ad5edb.png');
+		background-repeat: no-repeat;
+		background-size: 100%;
+		height: 49rpx;
+		width: 128rpx;
+		padding-left: 30rpx;
+	}
+
+	.status-pending {
+		color: #E8101E;
+	}
+
+	.status-cancelled {
+		color: #E8101E;
+	}
+
+	.status-completed {
+		color: #E8101E;
+	}
+
+	.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 {
+		font-size: 24rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.service-time,
+	.service-address {
+		display: flex;
+		align-items: center;
+		font-size: 24rpx;
+		color: #999999;
+		font-weight: 500;
+		margin-top: 8rpx;
+		align-items: flex-start;
+	}
+
+	.text-overflow-1 {
+		white-space: normal !important;
+		word-break: break-word !important;
+		overflow: visible !important;
+		text-overflow: clip !important;
+		flex: 1;
+	}
+
+	.time-icon,
+	.location-icon {
+		width: 24rpx;
+		height: 24rpx;
+		margin-right: 4rpx;
+		flex-shrink: 0;
+		margin-top: 4rpx;
+	}
+
+	.order-actions {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		border-top: 1rpx solid #EEEEEE;
+		padding-top: 24rpx;
+	}
+
+	.delete-icon {
+		width: 36rpx;
+		height: 36rpx;
+	}
+
+	.action-right {
+		display: flex;
+		align-items: center;
+	}
+
+	.action-btn {
+		display: inline-block;
+		width: 128rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		margin-left: 16rpx;
+		text-align: center;
+		font-size: 28rpx;
+		border-radius: 24rpx;
+		font-size: 24rpx;
+	}
+
+	.action-btn.contact {
+		background-color: #FFFFFF;
+		border: 1rpx solid #999999;
+		color: #333333;
+	}
+
+	.action-btn.primary {
+		background-color: #E8101E;
+		color: #FFFFFF;
+	}
+
+	.action-btn.review {
+		background-color: rgba(252, 67, 124, 0.40);
+		border: 1rpx solid #E8101E;
+		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;
+	}
+
+	/* APP适配 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	/* #endif */
+	/* 平台适配 */
+	/* #ifdef H5 */
+	/* .order-list {
+  padding-bottom: env(safe-area-inset-bottom);
+} */
+	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index 2555757..3e9439d 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -88,11 +88,11 @@
         <text class="label">下单时间</text>
         <text class="value">{{orderInfo.add_time}}</text>
       </view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3">
+      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 7">
         <text class="label">开始服务时间</text>
         <text class="value">{{orderInfo.server_start_time}}</text>
       </view>
-      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4">
+      <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.state != 2 && orderInfo.state != 3 && orderInfo.state != 4 && orderInfo.state != 7">
         <text class="label">服务完成时间</text>
         <text class="value">{{orderInfo.server_end_time}}</text>
       </view>
diff --git a/pages/shop/manHour/components/orderCard.vue b/pages/shop/manHour/components/orderCard.vue
index f0c0e3f..f130e57 100644
--- a/pages/shop/manHour/components/orderCard.vue
+++ b/pages/shop/manHour/components/orderCard.vue
@@ -51,7 +51,7 @@
 			<view class="btn accept-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitRefund">申请退款</view>
 			
 			<!-- 已完成状态：再来一单 -->
-			<view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再来一单</view>
+			<view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再次购买</view>
 			
 			<!-- 已取消状态：重新预订 -->
 			<!-- <view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> -->
diff --git a/pages/shop/manHourDetail.vue b/pages/shop/manHourDetail.vue
index 3d18c07..100bdd9 100644
--- a/pages/shop/manHourDetail.vue
+++ b/pages/shop/manHourDetail.vue
@@ -1,1031 +1,1036 @@
-<template>
-	<view class="detail-page">
-		<!-- 顶部导航栏 -->
-		<custom-navbar title="订单详情" :show-back="true" title-color="#333333"
-			:backgroundColor="backgroundColor"></custom-navbar>
-		<view class="content-part">
-			<!-- 订单状态 -->
-			<view class="status-section">
-				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
-				<text class="status-text">{{ stateItem.text }}</text>
-			</view>
-
-			<view class="syr-card" v-if="identity==0">
-				<view class="syr-card-header">
-					预约手艺人信息
-				</view>
-				<view class="syr-card-footer flex-row-center-between">
-					<view class="syr-card-footer-left flex-row-center">
-						<image class="syr-card-footer-left-img" :src="orderInfo.head_photo"></image>
-						<view class="syr-card-footer-left-text">{{ `${orderInfo.name} ${orderInfo.account}` }}</view>
-					</view>
-					<image class="syr-card-footer-right" @click="contactService(orderInfo.account)"
-						src="/static/images/icons/phone.png"></image>
-				</view>
-			</view>
-
-			<view class="order-card time-card">
-				<view class="card_title">服务时段信息</view>
-				<view class="service-real">
-					<view class="card_time">预约开始时间：{{
-						formatDateTime(orderInfo.reserve_start_time)
-						}}
-					</view>
-					<view class="card_time">预约结束时间：{{
-						formatDateTime(orderInfo.reserve_end_time)
-						}}
-					</view>
-				</view>
-			</view>
-
-			<!-- 预约信息 -->
-			<view class="booking-card">
-				<view class="card_title">预约信息</view>
-				<view class="service-item">
-					<image :src="photo[0]" v-if="orderInfo.photo && orderInfo.photo.length != 0" mode="aspectFill"
-						class="service-image"></image>
-					<view class="service-info">
-						<view class="service-box">
-							<view class="service-name-row">
-								<text class="service-name white-space-nowrap">{{
-							orderInfo.title
-						}}</text>
-								<text class="service-name-num">×1</text>
-							</view>
-							<text class="service-subtitle white-space-nowrap"
-								v-if="orderInfo.second_class_title">{{identity==0?'服务范围':'使用场景'}}：{{
-                  orderInfo.first_class_title +
-                  "   " +
-                  orderInfo.second_class_title.join("、")
-                }}</text>
-						</view>
-						<view class="service-price">
-							<text>单价：{{ orderInfo.price }}元/10分钟</text>
-						</view>
-					</view>
-				</view>
-				<view class="service-real-1">
-					<text class="real-lable">应付金额：</text>
-					<view class="real-price">
-						<text class="icon">￥</text>
-						<text class="price">{{ orderInfo.order_money }}</text>
-					</view>
-				</view>
-				<!-- <view class="service-real">
-          <view class="card_time"
-            >预约开始时间：{{
-              formatDateAndAddMinutes(orderInfo.reserve_start_time).original
-            }}
-          </view>
-          <view class="card_time"
-            >预约结束时间：{{
-              formatDateAndAddMinutes(orderInfo.reserve_end_time).original
-            }}
-          </view>
-        </view> -->
-			</view>
-
-			<!-- 订单信息 -->
-			<view class="order-card info-card">
-				<view class="card_title">订单信息</view>
-				<view class="info-item">
-					<text class="label">订单编号</text>
-					<text class="value">{{ orderInfo.number }}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.server_code && orderInfo.state !=7">
-					<text class="label">服务码</text>
-					<text class="value">{{ orderInfo.server_code }}</text>
-				</view>
-				<view class="info-item">
-					<text class="label">下单时间</text>
-					<text class="value">{{ orderInfo.add_time }}</text>
-				</view>
-				<view class="info-item">
-					<text class="label">服务时长</text>
-					<text class="value">{{ orderInfo.service_duration }}</text>
-				</view>
-				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
-					<text class="label">支付方式</text>
-					<text class="value">{{
-						orderInfo.pay_kind == 1
-						? "账户余额"
-						: orderInfo.pay_kind == 2
-						? "微信支付"
-						: orderInfo.pay_kind == 3
-						? "支付宝支付"
-						: ""
-					}}</text>
-				</view>
-
-				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
-					<text class="label">支付小计</text>
-					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
-				</view> -->
-				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
-					<text class="label">支付时间</text>
-					<text class="value">{{ orderInfo.pay_time }}</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
-					<text class="label">接单时间</text>
-					<text class="value">{{ orderInfo.get_time }}</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state >= 4 && orderInfo.start_time">
-					<text class="label">开始服务时间</text>
-					<text class="value">{{ orderInfo.start_time }}</text>
-				</view>
-
-				<view class="info-item" v-if="orderInfo.state >= 5 && orderInfo.end_time">
-					<text class="label">完成服务时间</text>
-					<text class="value">{{ orderInfo.end_time }}</text>
-				</view>
-			</view>
-
-			<!-- 到家订单 客户以及手艺人信息 -->
-			<!-- <view class="shop_card">
-        <view class="card_title" v-if="identity==0">手艺人信息</view>
-        <view class="card_title" v-if="identity==1">店铺信息</view>
-        <view class="shop_title_box">
-          <image class="shop_photo" :src="orderInfo.head_photo" />
-          <view class="shop_title">{{ orderInfo.name }}</view>
-        </view>
-        <view class="service_content " v-if="orderInfo.second_class_title"
-          >{{identity==0?'服务范围详情':'使用场景详情'}}：{{
-            orderInfo.first_class_title +
-            "   " +
-            orderInfo.second_class_title.join("、")
-          }}</view
-        >
-        <view class="shop_address" @click="openMap()" v-if="identity==1">
-          <image
-            class="shop_icon"
-            src="@/static/images/icons/address_gray.png"
-          />
-          <text>{{ orderInfo.dependency }}{{ orderInfo.address }}</text>
-        </view>
-        <view class="shop_address mt_10" @click="contactService(orderInfo.phone)">
-          <image class="shop_icon" src="@/static/images/icons/phone_gray.png" />
-          <text>{{ orderInfo.phone || orderInfo.account}}</text>
-        </view>
-      </view> -->
-		</view>
-
-		<!-- 底部按钮 -->
-		<view class="bottom-buttons" v-show="orderInfo.state != 5">
-			<view class="handel-button btn-border" v-if="orderInfo.state == 2 || orderInfo.state == 3"
-				@click.stop="refund($event, orderInfo)">
-				<text class="button-text">申请退款</text>
-			</view>
-			<view class="handel-button btn-border" v-if="orderInfo.state == 1"
-				@click.stop="cancelOrder($event, orderInfo)">
-				<text class="button-text">取消订单</text>
-			</view>
-			<view class="handel-button btn-bg" v-if="orderInfo.state == 1" @click.stop="goPay($event, orderInfo)">
-				<text class="button-text">去支付</text>
-			</view>
-			<!-- <view
-        class="handel-button btn-bg"
-        v-if="orderInfo.state == 2"
-        @click.stop="confirmOrder($event, orderInfo)"
-      >
-        <text class="button-text">接单</text>
-      </view>
-      <view
-        class="handel-button btn-bg"
-        v-if="orderInfo.state == 3"
-        @click.stop="startOrder($event, orderInfo)"
-      >
-        <text class="button-text">开始服务</text>
-      </view>
-      <view
-        class="handel-button btn-bg"
-        v-if="orderInfo.state == 4"
-        @click.stop="endOrder($event, orderInfo)"
-      >
-        <text class="button-text">服务完成</text>
-      </view> -->
-		</view>
-
-		<!-- 获取权限提示匡内容 -->
-		<view class="permission" :class="{ transform: isShowPer }">
-			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
-			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import request from "../../utils/request";
-	import _public from "../../utils/public";
-	import serviceCodeInput from "../../components/service-code-input/service-code-input.vue";
-	import locationService from "../../utils/locationService";
-	import permissionUtils from "../../utils/per";
-	export default {
-		components: {
-			serviceCodeInput
-		},
-		data() {
-			return {
-				identity: 0, //身份0为商家1为手艺人
-				interfaceList: [{
-						weChatRefund: "/sj/workHourOrder/weChatRefund",
-						aliRefund: "/sj/workHourOrder/aliRefund",
-						cancel: "/sj/workHourOrder/cancel",
-						details: "/sj/workHourOrder/details",
-					},
-					{
-						weChatRefund: "/syr/workSeatOrder/weChatRefund",
-						aliRefund: "/syr/workSeatOrder/aliRefund",
-						cancel: "/syr/workSeatOrder/cancel",
-						details: "/syr/workSeatOrder/details",
-					},
-				],
-				isShowPer: false,
-				id: "",
-				staffInfo: {
-					avatar: "/static/images/staff.jpg",
-					name: "中医理疗谢飞",
-					rating: 5,
-				},
-				showInput: false,
-				userInfo: {},
-				orderInfo: {},
-				reservation_address_arr: {},
-				user_syr: {},
-				scrollTop: 0,
-			};
-		},
-		async onLoad(options) {
-			this.id = options.order_id;
-			if (options.identity) {
-				this.identity = options.identity;
-			}
-			if (options.order_id) {
-				// 请求订单详情
-				const {
-					data
-				} = await request.post("/user/getuser", {
-					type: 2
-				});
-				this.userInfo = data;
-				this.getOrderDetail();
-			}
-			//信息读取
-			if (options.push_id) {
-				this.messageRead(options.push_id)
-			}
-		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
-		computed: {
-			backgroundColor() {
-				if (this.scrollTop > 10) {
-					return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
-				}
-				return "transparent";
-			},
-			stateItem() {
-				const list = [{
-						text: "待支付",
-						icon: "/static/images/icons/pay.png",
-						state: "1"
-					},
-					{
-						text: "待接单",
-						icon: "/static/images/icons/pending.png",
-						state: "2",
-					},
-					{
-						text: "待服务",
-						icon: "/static/images/icons/pendingService.png",
-						state: "3",
-					},
-					{
-						text: "服务中",
-						icon: "/static/images/icons/pendingService.png",
-						state: "4",
-					},
-					{
-						text: "已完成",
-						icon: "/static/images/icons/payOk.png",
-						state: "5"
-					},
-					{
-						text: "待评价",
-						icon: "/static/images/icons/pending.png",
-						state: "6",
-					},
-					{
-						text: "已取消",
-						icon: "/static/images/evaluate/cancel.png",
-						state: "7"
-					},
-				];
-				const item = list.find((it) => it.state == this.orderInfo.state) || {};
-				return item;
-			},
-			photo() {
-				return JSON.parse(this.orderInfo.photo);
-			},
-		},
-		methods: {
-			// 用于标准格式的方法
-			formatDateTime(dateStr, includeSeconds = true) {
-				if (!dateStr) {
-					return '';
-				}
-
-				// 处理日期字符串，兼容不同格式
-				const originalDate = new Date(dateStr.replace(/-/g, '/'));
-
-				// 格式化为 YYYY-MM-DD HH:mm:ss
-				const year = originalDate.getFullYear();
-				const month = String(originalDate.getMonth() + 1).padStart(2, "0");
-				const day = String(originalDate.getDate()).padStart(2, "0");
-				const hours = String(originalDate.getHours()).padStart(2, "0");
-				const minutes = String(originalDate.getMinutes()).padStart(2, "0");
-				const seconds = String(originalDate.getSeconds()).padStart(2, "0");
-
-				if (includeSeconds) {
-					return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-				} else {
-					return `${year}-${month}-${day} ${hours}:${minutes}`;
-				}
-			},
-
-			formatDateAndAddMinutes(dateStr, addMinutes = 0) {
-				if (!dateStr) {
-					return {
-						original: '',
-						afterAddingMinutes: '',
-					};
-				}
-				const originalDate = new Date(dateStr.replace(/-/g, '/'));
-
-				function format(date) {
-					const year = date.getFullYear();
-					const month = String(date.getMonth() + 1).padStart(2, "0");
-					const day = String(date.getDate()).padStart(2, "0");
-					const hours = String(date.getHours()).padStart(2, "0");
-					const minutes = String(date.getMinutes()).padStart(2, "0");
-					return `${year}年${month}月${day}日 ${hours}:${minutes}`;
-				}
-				const formattedOriginal = format(originalDate);
-				const newDate = new Date(originalDate);
-				newDate.setMinutes(newDate.getMinutes() + addMinutes);
-				const formattedNew = format(newDate);
-				return {
-					original: formattedOriginal,
-					afterAddingMinutes: formattedNew,
-				};
-			},
-			getOrderDetail() {
-				request
-					.post(this.interfaceList[this.identity].details, {
-						id: this.id
-					})
-					.then((res) => {
-						if (this.identity == 0) {
-							this.orderInfo = res.data ?
-								{
-									...res.data.order,
-									...res.data.work_hour,
-									...res.data.user_syr,
-									work_hour_id: res.data.work_hour.id,
-									order_id: res.data.order.id,
-									user_sj_id: res.data.user_syr.id,
-								} :
-								{};
-						} else if (this.identity == 1) {
-							this.orderInfo = res.data ?
-								{
-									...res.data.order,
-									...res.data.work_seat,
-									...res.data.user_sj,
-									work_hour_id: res.data.work_seat.id,
-									order_id: res.data.order.id,
-									user_sj_id: res.data.user_sj.id,
-								} :
-								{};
-						}
-
-						// 计算服务时长
-						this.orderInfo.service_duration = this.calculateServiceDuration();
-
-						console.log(22222, this.orderInfo)
-					});
-			},
-
-			// 计算服务时长（返回XX分钟格式）
-			calculateServiceDuration() {
-				if (!this.orderInfo.reserve_start_time || !this.orderInfo.reserve_end_time) {
-					return '--';
-				}
-
-				try {
-					// 处理日期字符串，兼容不同格式
-					const startTime = new Date(this.orderInfo.reserve_start_time.replace(/-/g, '/'));
-					const endTime = new Date(this.orderInfo.reserve_end_time.replace(/-/g, '/'));
-
-					// 计算时间差（毫秒）
-					const diffMs = endTime.getTime() - startTime.getTime();
-
-					if (diffMs <= 0) {
-						return '--';
-					}
-
-					// 转换为分钟
-					const diffMinutes = Math.floor(diffMs / (1000 * 60));
-
-					// 返回XX分钟格式
-					return `${diffMinutes}分钟`;
-
-				} catch (error) {
-					console.error('计算服务时长失败:', error);
-					return '--';
-				}
-			},
-
-
-			refund(e, order) {
-				// #ifdef APP-PLUS
-				e.preventDefault();
-				e.stopPropagation();
-				// #endif
-				uni.showModal({
-					title: "申请退款",
-					content: "确定要申请退款吗？（订单取消后，支付金额将原路退回）",
-					success: (res) => {
-						if (res.confirm) {
-							let data;
-							if (this.identity == 0) {
-								data = {
-									orderNo: order.number,
-									amount: order.pay_money,
-									sjid: this.userInfo.id,
-								};
-							} else if (this.identity == 1) {
-								data = {
-									orderNo: order.number,
-									amount: order.pay_money,
-									syrid: this.userInfo.id,
-								};
-							}
-							let url = "";
-							if (order.pay_kind == 1) {
-								url = "";
-							} else if (order.pay_kind == 2) {
-								url = this.interfaceList[this.identity].weChatRefund;
-							} else if (order.pay_kind == 3) {
-								url = this.interfaceList[this.identity].aliRefund;
-							}
-							request
-								.post(url, data)
-								.then((res) => {
-									if (res.code == 1 || res.code == 200) {
-										uni.showToast({
-											title: "申请退款！",
-											icon: "none"
-										});
-										this.getOrderDetail();
-										const pages = getCurrentPages();
-										const prevPage = pages[pages.length - 2];
-										if (prevPage) {
-											prevPage.$vm.getOrderNumber();
-											prevPage.$vm.getOrderList();
-										}
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: "none"
-										});
-									}
-								})
-								.catch((err) => console.log(err));
-						}
-					},
-				});
-			},
-			cancelOrder(e, order) {
-				// #ifdef APP-PLUS
-				e.preventDefault();
-				e.stopPropagation();
-				// #endif
-				uni.showModal({
-					title: "取消订单",
-					content: "确定要取消该订单吗？",
-					success: (res) => {
-						if (res.confirm) {
-							let data = {
-								order_no: order.number,
-							};
-
-							let url = this.interfaceList[this.identity].cancel;
-							request
-								.post(url, data)
-								.then((res) => {
-									if (res.code == 200 || res.code == 1) {
-										uni.showToast({
-											title: "取消成功！",
-											icon: "none"
-										});
-										this.getOrderDetail();
-										const pages = getCurrentPages();
-										const prevPage = pages[pages.length - 2];
-										if (prevPage) {
-											prevPage.$vm.getOrderNumber();
-											prevPage.$vm.getOrderList();
-										}
-									} else {
-										uni.showToast({
-											title: res.msg,
-											icon: "none"
-										});
-									}
-								})
-								.catch((err) => console.log(err));
-						}
-					},
-				});
-			},
-			goPay(e, order) {
-				uni.redirectTo({
-					url: `/pages/shop/pay?id=${order.id}&money=${order.order_money}&title=${order.title}&number=${order.number}&identity=${this.identity}`,
-				});
-			},
-
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: "去开启",
-						success(res) {
-							resolve(res.confirm);
-						},
-					});
-				});
-			},
-			async contactService(phone) {
-				const systemInfo = uni.getSystemInfoSync();
-				if (systemInfo.platform === "ios") {
-					uni.makePhoneCall({
-						phoneNumber: phone
-					});
-				} else {
-					let permission =
-						systemInfo.platform === "ios" ?
-						"phone" :
-						"android.permission.CALL_PHONE";
-					this.isShowPer = true;
-					const firstRequest = !plus.storage.getItem(`perm_${permission}`);
-					if (firstRequest) this.isShowPer = true;
-					const {
-						granted
-					} = await permissionUtils.checkPermission(
-						"phone",
-						"需要拨打电话权限，方便您联系商家或平台"
-					);
-					if (granted) {
-						this.isShowPer = false;
-						uni.makePhoneCall({
-							phoneNumber: phone
-						});
-						return;
-					}
-					this.isShowPer = false;
-					const confirm = await this.showPermissionDialog(
-						"拨打电话权限申请",
-						"我们需要拨打电话权限，方便您联系商家或平台"
-					);
-					if (!confirm) return;
-					const result = await permissionUtils.requestPermission(
-						"phone",
-						"需要拨打电话权限，方便您联系商家或平台"
-					);
-					if (result) {
-						uni.makePhoneCall({
-							phoneNumber: phone
-						});
-					} else {
-						locationService.openAppSettings();
-					}
-				}
-			},
-			openMap() {
-				// #ifdef MP-WEIXIN
-				uni.openLocation({
-					success: () => console.log("打开系统位置地图成功"),
-					fail: (error) => console.log(error),
-				});
-				// #endif
-				// #ifdef APP-PLUS
-				_public.goMap({
-					latitude: parseFloat(this.orderInfo.latitude),
-					longitude: parseFloat(this.orderInfo.longitude),
-					name: this.orderInfo.name,
-					address: this.orderInfo.address,
-				});
-				// #endif
-			},
-		},
-	};
-</script>
-
-<style lang="less">
-	page {
-		position: relative;
-		background-color: #fff;
-	}
-
-	.detail-page::before {
-		content: "";
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		height: 1200rpx !important;
-		background-image: url("/static/images/bg.png");
-		background-size: cover;
-		background-position: center top;
-		background-repeat: no-repeat;
-		z-index: 1;
-	}
-
-	.content-part {
-		position: relative;
-		left: 0;
-		right: 0;
-		z-index: 9;
-	}
-
-	/* 状态区域 */
-	.status-section {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		gap: 20rpx;
-		padding-top: 55rpx;
-		padding-bottom: 50rpx;
-
-		.status-section-image {
-			width: 52rpx;
-		}
-	}
-
-	.status-text {
-		font-size: 44rpx;
-		color: #333333;
-		font-weight: 600;
-	}
-
-	/* 预约手艺人信息卡片 */
-	.syr-card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		padding: 30rpx 20rpx;
-
-		border-radius: 16rpx;
-
-		.syr-card-header {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			line-height: 45rpx;
-			text-align: left;
-			font-style: normal;
-			margin-bottom: 40rpx;
-		}
-
-		.syr-card-footer {
-			.syr-card-footer-left {
-				.syr-card-footer-left-img {
-					width: 70rpx;
-					height: 70rpx;
-					border-radius: 50%;
-					margin-right: 20rpx;
-				}
-
-				.syr-card-footer-left-text {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #333333;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.syr-card-footer-right {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
-
-	/* 预约信息卡片 */
-	.booking-card {
-		margin: 0rpx 30rpx 20rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 34rpx 30rpx 40rpx 20rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			margin-bottom: 40rpx;
-		}
-	}
-
-	.service-item {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: flex-start;
-		align-items: center;
-		margin-bottom: 32rpx;
-	}
-
-	.service-image {
-		width: 160rpx;
-		height: 160rpx;
-		border-radius: 16rpx;
-		margin-right: 24rpx;
-		background-color: #e2e2e2;
-	}
-
-	.service-info {
-		flex: 1;
-		height: 160rpx;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: space-between;
-		align-items: flex-start;
-		margin-right: 24rpx;
-
-		.service-box {
-			width: 100%;
-			gap: 18rpx;
-			display: flex;
-			flex-direction: column;
-
-			.service-subtitle {
-				font-size: 26rpx;
-				color: #666666;
-				width: 400rpx;
-			}
-		}
-	}
-
-	.service-name-row {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		gap: 20rpx;
-	}
-
-	.service-name {
-		width: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #333333;
-		line-height: 34rpx;
-		flex: 1;
-		text-align: left;
-		font-style: normal;
-	}
-
-	.service-name-num {
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 34rpx;
-		flex-shrink: 0;
-	}
-
-	.service-price {
-		font-size: 26rpx;
-		color: #333333;
-	}
-
-	.service-real {
-		display: flex;
-		flex-direction: column;
-		padding-top: 24rpx;
-		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
-	}
-
-	.service-real-1 {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-end;
-		align-items: center;
-		padding-top: 14rpx;
-		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
-	}
-
-	.real-lable {
-		font-size: 30rpx;
-		color: #333333;
-	}
-
-	.real-price {
-		font-size: 42rpx;
-		font-weight: 500;
-		color: #E8101E;
-		transform: translateY(-5rpx);
-
-		.icon {
-			font-size: 20rpx;
-		}
-
-		.price {
-			font-family: DINPro, DINPro;
-		}
-	}
-
-	.card_time {
-		font-size: 28rpx;
-		color: #666666;
-		margin-top: 8rpx;
-	}
-
-	/* 订单信息卡片 */
-	.order-card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		border-radius: 16rpx;
-		padding: 36rpx 20rpx 40rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-			padding-bottom: 10rpx;
-		}
-	}
-
-	.shop_card {
-		margin: 30rpx;
-		background-color: #ffffff;
-		border-radius: 16rpx;
-		padding: 36rpx 20rpx 40rpx;
-		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
-
-		.card_title {
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #333333;
-		}
-
-		.shop_title_box {
-			display: flex;
-			align-items: center;
-			gap: 14rpx;
-			padding-top: 40rpx;
-			padding-bottom: 24rpx;
-			border-bottom: 2rpx solid #f6f5f5;
-
-			.shop_photo {
-				width: 94rpx;
-				height: 94rpx;
-				border-radius: 10rpx;
-			}
-
-			.shop_title {
-				font-size: 32rpx;
-				color: #333333;
-			}
-		}
-
-		.service_content {
-			padding-top: 30rpx;
-			padding-bottom: 30rpx;
-			font-size: 28rpx;
-			color: #666666;
-			border-bottom: 1rpx solid #f6f5f5;
-		}
-
-		.service_content__last {
-			border-bottom: 0rpx;
-			padding-bottom: 10rpx;
-		}
-
-		.shop_address {
-			padding-top: 30rpx;
-			display: flex;
-			gap: 10rpx;
-			color: #666666;
-			font-size: 26rpx;
-
-			.shop_icon {
-				width: 30rpx;
-				height: 30rpx;
-				flex-shrink: 0;
-				transform: translateY(4rpx);
-			}
-		}
-	}
-
-	.info-item {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 30rpx;
-	}
-
-	.label {
-		font-size: 28rpx;
-		color: #999999;
-	}
-
-	.value {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	/* 底部按钮 */
-	.bottom-buttons {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		height: 128rpx;
-		background-color: #ffffff;
-		display: flex;
-		flex-flow: row nowrap;
-		align-items: center;
-		justify-content: flex-end;
-		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
-		padding: 0 24rpx 0 78rpx;
-		/* #ifdef H5 */
-		padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-		z-index: 999;
-	}
-
-	.handel-button {
-		width: 186rpx;
-		height: 72rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		border-radius: 36rpx;
-		margin-left: 60rpx;
-	}
-
-	.btn-border {
-		border: 1rpx solid #E8101E;
-		background-color: #fff;
-		box-sizing: border-box;
-		margin-left: 60rpx;
-	}
-
-	.btn-bg {
-		background-color: #E8101E;
-	}
-
-	.button-text {
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #ffffff;
-	}
-
-	.btn-border .button-text {
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #E8101E;
-	}
-
-	/* 权限提示 */
-	/* #ifdef APP-PLUS */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	.detail-page {
-		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-	}
-
-	/* #endif */
-	/* #ifdef H5 */
-	.detail-page {
-		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
-	}
-
-	/* #endif */
-
-	.mt_10 {
-		margin-top: 10rpx;
-	}
+<template>
+	<view class="detail-page">
+		<!-- 顶部导航栏 -->
+		<custom-navbar title="订单详情" :show-back="true" title-color="#333333"
+			:backgroundColor="backgroundColor"></custom-navbar>
+		<view class="content-part">
+			<!-- 订单状态 -->
+			<view class="status-section">
+				<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
+				<text class="status-text">{{ stateItem.text }}</text>
+			</view>
+
+			<view class="syr-card" v-if="identity==0">
+				<view class="syr-card-header">
+					预约手艺人信息
+				</view>
+				<view class="syr-card-footer flex-row-center-between">
+					<view class="syr-card-footer-left flex-row-center">
+						<image class="syr-card-footer-left-img" :src="orderInfo.head_photo"></image>
+						<view class="syr-card-footer-left-text">{{ `${orderInfo.name} ${orderInfo.account}` }}</view>
+					</view>
+					<image class="syr-card-footer-right" @click="contactService(orderInfo.account)"
+						src="/static/images/icons/phone.png"></image>
+				</view>
+			</view>
+
+			<view class="order-card time-card">
+				<view class="card_title">服务时段信息</view>
+				<view class="service-real">
+					<view class="card_time">预约开始时间：{{
+						formatDateTime(orderInfo.reserve_start_time)
+						}}
+					</view>
+					<view class="card_time">预约结束时间：{{
+						formatDateTime(orderInfo.reserve_end_time)
+						}}
+					</view>
+				</view>
+			</view>
+
+			<!-- 预约信息 -->
+			<view class="booking-card">
+				<view class="card_title">预约信息</view>
+				<view class="service-item">
+					<image :src="photo[0]" v-if="orderInfo.photo && orderInfo.photo.length != 0" mode="aspectFill"
+						class="service-image"></image>
+					<view class="service-info">
+						<view class="service-box">
+							<view class="service-name-row">
+								<text class="service-name white-space-nowrap">{{
+							orderInfo.title
+						}}</text>
+								<text class="service-name-num">×1</text>
+							</view>
+							<text class="service-subtitle white-space-nowrap"
+								v-if="orderInfo.second_class_title">{{identity==0?'服务范围':'使用场景'}}：{{
+                  orderInfo.first_class_title +
+                  "   " +
+                  orderInfo.second_class_title.join("、")
+                }}</text>
+						</view>
+						<view class="service-price">
+							<text>单价：{{ orderInfo.price }}元/10分钟</text>
+						</view>
+					</view>
+				</view>
+				<view class="service-real-1">
+					<text class="real-lable">应付金额：</text>
+					<view class="real-price">
+						<text class="icon">￥</text>
+						<text class="price">{{ orderInfo.order_money }}</text>
+					</view>
+				</view>
+				<!-- <view class="service-real">
+          <view class="card_time"
+            >预约开始时间：{{
+              formatDateAndAddMinutes(orderInfo.reserve_start_time).original
+            }}
+          </view>
+          <view class="card_time"
+            >预约结束时间：{{
+              formatDateAndAddMinutes(orderInfo.reserve_end_time).original
+            }}
+          </view>
+        </view> -->
+			</view>
+
+			<!-- 订单信息 -->
+			<view class="order-card info-card">
+				<view class="card_title">订单信息</view>
+				<view class="info-item">
+					<text class="label">订单编号</text>
+					<text class="value">{{ orderInfo.number }}</text>
+				</view>
+			<!-- 	<view class="info-item" v-if="orderInfo.server_code && orderInfo.state !=7">
+					<text class="label">服务码</text>
+					<text class="value">{{ orderInfo.server_code }}</text>
+				</view> -->
+				<view class="info-item">
+					<text class="label">下单时间</text>
+					<text class="value">{{ orderInfo.add_time }}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">服务时长</text>
+					<text class="value">{{ orderInfo.service_duration }}</text>
+				</view>
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_kind">
+					<text class="label">支付方式</text>
+					<text class="value">{{
+						orderInfo.pay_kind == 1
+						? "账户余额"
+						: orderInfo.pay_kind == 2
+						? "微信支付"
+						: orderInfo.pay_kind == 3
+						? "支付宝支付"
+						: ""
+					}}</text>
+				</view>
+
+				<!-- <view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_money">
+					<text class="label">支付小计</text>
+					<text class="value" style="color: #E8101E">{{ orderInfo.order_money }}元</text>
+				</view> -->
+				<view class="info-item" v-if="orderInfo.state != 1 && orderInfo.pay_time">
+					<text class="label">支付时间</text>
+					<text class="value">{{ orderInfo.pay_time }}</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state >= 3 && orderInfo.get_time">
+					<text class="label">接单时间</text>
+					<text class="value">{{ orderInfo.get_time }}</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state >= 4 && orderInfo.start_time">
+					<text class="label">开始服务时间</text>
+					<text class="value">{{ orderInfo.start_time }}</text>
+				</view>
+
+				<view class="info-item" v-if="orderInfo.state >= 5 && orderInfo.end_time">
+					<text class="label">完成服务时间</text>
+					<text class="value">{{ orderInfo.end_time }}</text>
+				</view>
+			</view>
+
+			<!-- 到家订单 客户以及手艺人信息 -->
+			<!-- <view class="shop_card">
+        <view class="card_title" v-if="identity==0">手艺人信息</view>
+        <view class="card_title" v-if="identity==1">店铺信息</view>
+        <view class="shop_title_box">
+          <image class="shop_photo" :src="orderInfo.head_photo" />
+          <view class="shop_title">{{ orderInfo.name }}</view>
+        </view>
+        <view class="service_content " v-if="orderInfo.second_class_title"
+          >{{identity==0?'服务范围详情':'使用场景详情'}}：{{
+            orderInfo.first_class_title +
+            "   " +
+            orderInfo.second_class_title.join("、")
+          }}</view
+        >
+        <view class="shop_address" @click="openMap()" v-if="identity==1">
+          <image
+            class="shop_icon"
+            src="@/static/images/icons/address_gray.png"
+          />
+          <text>{{ orderInfo.dependency }}{{ orderInfo.address }}</text>
+        </view>
+        <view class="shop_address mt_10" @click="contactService(orderInfo.phone)">
+          <image class="shop_icon" src="@/static/images/icons/phone_gray.png" />
+          <text>{{ orderInfo.phone || orderInfo.account}}</text>
+        </view>
+      </view> -->
+		</view>
+
+		<!-- 底部按钮 -->
+		<view class="bottom-buttons" v-show="orderInfo.state != 5">
+			<view class="handel-button btn-border" v-if="orderInfo.state == 2 || orderInfo.state == 3"
+				@click.stop="refund($event, orderInfo)">
+				<text class="button-text">申请退款</text>
+			</view>
+			<view class="handel-button btn-border" v-if="orderInfo.state == 1"
+				@click.stop="cancelOrder($event, orderInfo)">
+				<text class="button-text">取消订单</text>
+			</view>
+			<view class="handel-button btn-bg" v-if="orderInfo.state == 1" @click.stop="goPay($event, orderInfo)">
+				<text class="button-text">去支付</text>
+			</view>
+			<!-- <view
+        class="handel-button btn-bg"
+        v-if="orderInfo.state == 2"
+        @click.stop="confirmOrder($event, orderInfo)"
+      >
+        <text class="button-text">接单</text>
+      </view>
+      <view
+        class="handel-button btn-bg"
+        v-if="orderInfo.state == 3"
+        @click.stop="startOrder($event, orderInfo)"
+      >
+        <text class="button-text">开始服务</text>
+      </view>
+      <view
+        class="handel-button btn-bg"
+        v-if="orderInfo.state == 4"
+        @click.stop="endOrder($event, orderInfo)"
+      >
+        <text class="button-text">服务完成</text>
+      </view> -->
+		</view>
+
+		<!-- 获取权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowPer }">
+			<view class="per-tit">美融融plus 对拨打电话权限申请说明</view>
+			<view class="per-cont">当您需要联系商家或平台客服的时候，需要获取拨打电话权限。</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from "../../utils/request";
+	import _public from "../../utils/public";
+	import serviceCodeInput from "../../components/service-code-input/service-code-input.vue";
+	import locationService from "../../utils/locationService";
+	import permissionUtils from "../../utils/per";
+	export default {
+		components: {
+			serviceCodeInput
+		},
+		data() {
+			return {
+				identity: 0, //身份0为商家1为手艺人
+				interfaceList: [{
+						weChatRefund: "/sj/workHourOrder/weChatRefund",
+						aliRefund: "/sj/workHourOrder/aliRefund",
+						cancel: "/sj/workHourOrder/cancel",
+						details: "/sj/workHourOrder/details",
+					},
+					{
+						weChatRefund: "/syr/workSeatOrder/weChatRefund",
+						aliRefund: "/syr/workSeatOrder/aliRefund",
+						cancel: "/syr/workSeatOrder/cancel",
+						details: "/syr/workSeatOrder/details",
+					},
+				],
+				isShowPer: false,
+				id: "",
+				staffInfo: {
+					avatar: "/static/images/staff.jpg",
+					name: "中医理疗谢飞",
+					rating: 5,
+				},
+				showInput: false,
+				userInfo: {},
+				orderInfo: {},
+				reservation_address_arr: {},
+				user_syr: {},
+				scrollTop: 0,
+				options: {}
+			};
+		},
+		async onLoad(options) {
+			console.log(options, '查看参数------------------------');
+			this.options = options
+			this.id = options.order_id;
+			if (options.identity) {
+				this.identity = options.identity;
+			}
+			if (options.order_id) {
+				// 请求订单详情
+				const {
+					data
+				} = await request.post("/user/getuser", {
+					type: 2
+				});
+				this.userInfo = data;
+				this.getOrderDetail();
+			}
+			console.log(this.userInfo, 'this.userInfothis.userInfo');
+			//信息读取
+			if (options.push_id) {
+				this.messageRead(options.push_id)
+			}
+		},
+		async onShow() {
+			this.getOrderDetail();
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		computed: {
+			backgroundColor() {
+				if (this.scrollTop > 10) {
+					return `rgba(255, 255, 255, ${0.02 * this.scrollTop});`;
+				}
+				return "transparent";
+			},
+			stateItem() {
+				const list = [{
+						text: "待支付",
+						icon: "/static/images/icons/pay.png",
+						state: "1"
+					},
+					{
+						text: "待接单",
+						icon: "/static/images/icons/pending.png",
+						state: "2",
+					},
+					{
+						text: "待服务",
+						icon: "/static/images/icons/pendingService.png",
+						state: "3",
+					},
+					{
+						text: "服务中",
+						icon: "/static/images/icons/pendingService.png",
+						state: "4",
+					},
+					{
+						text: "已完成",
+						icon: "/static/images/icons/payOk.png",
+						state: "5"
+					},
+					{
+						text: "待评价",
+						icon: "/static/images/icons/pending.png",
+						state: "6",
+					},
+					{
+						text: "已取消",
+						icon: "/static/images/evaluate/cancel.png",
+						state: "7"
+					},
+				];
+				const item = list.find((it) => it.state == this.orderInfo.state) || {};
+				return item;
+			},
+			photo() {
+				return JSON.parse(this.orderInfo.photo);
+			},
+		},
+		methods: {
+			// 用于标准格式的方法
+			formatDateTime(dateStr, includeSeconds = true) {
+				if (!dateStr) {
+					return '';
+				}
+
+				// 处理日期字符串，兼容不同格式
+				const originalDate = new Date(dateStr.replace(/-/g, '/'));
+
+				// 格式化为 YYYY-MM-DD HH:mm:ss
+				const year = originalDate.getFullYear();
+				const month = String(originalDate.getMonth() + 1).padStart(2, "0");
+				const day = String(originalDate.getDate()).padStart(2, "0");
+				const hours = String(originalDate.getHours()).padStart(2, "0");
+				const minutes = String(originalDate.getMinutes()).padStart(2, "0");
+				const seconds = String(originalDate.getSeconds()).padStart(2, "0");
+
+				if (includeSeconds) {
+					return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+				} else {
+					return `${year}-${month}-${day} ${hours}:${minutes}`;
+				}
+			},
+
+			formatDateAndAddMinutes(dateStr, addMinutes = 0) {
+				if (!dateStr) {
+					return {
+						original: '',
+						afterAddingMinutes: '',
+					};
+				}
+				const originalDate = new Date(dateStr.replace(/-/g, '/'));
+
+				function format(date) {
+					const year = date.getFullYear();
+					const month = String(date.getMonth() + 1).padStart(2, "0");
+					const day = String(date.getDate()).padStart(2, "0");
+					const hours = String(date.getHours()).padStart(2, "0");
+					const minutes = String(date.getMinutes()).padStart(2, "0");
+					return `${year}年${month}月${day}日 ${hours}:${minutes}`;
+				}
+				const formattedOriginal = format(originalDate);
+				const newDate = new Date(originalDate);
+				newDate.setMinutes(newDate.getMinutes() + addMinutes);
+				const formattedNew = format(newDate);
+				return {
+					original: formattedOriginal,
+					afterAddingMinutes: formattedNew,
+				};
+			},
+			async getOrderDetail() {
+				console.log(this.identity, 'this.identitythis.identity');
+				console.log(this.id, 'this.id.ididididididid');
+				request.post(this.interfaceList[this.identity].details, {
+						id: this.id
+					})
+					.then((res) => {
+						if (this.identity == 0) {
+							this.orderInfo = res.data ? {
+								...res.data.order,
+								...res.data.work_hour,
+								...res.data.user_syr,
+								work_hour_id: res.data.work_hour.id,
+								order_id: res.data.order.id,
+								user_sj_id: res.data.user_syr.id,
+							} : {};
+							console.log(this.orderInfo, '----------------------------------')
+						} else if (this.identity == 1) {
+							this.orderInfo = res.data ? {
+								...res.data.order,
+								...res.data.work_seat,
+								...res.data.user_sj,
+								work_hour_id: res.data.work_seat.id,
+								order_id: res.data.order.id,
+								user_sj_id: res.data.user_sj.id,
+							} : {};
+						}
+
+						// 计算服务时长
+						this.orderInfo.service_duration = this.calculateServiceDuration();
+
+						console.log('----------------------------------', this.orderInfo)
+					});
+			},
+
+			// 计算服务时长（返回XX分钟格式）
+			calculateServiceDuration() {
+				if (!this.orderInfo.reserve_start_time || !this.orderInfo.reserve_end_time) {
+					return '--';
+				}
+
+				try {
+					// 处理日期字符串，兼容不同格式
+					const startTime = new Date(this.orderInfo.reserve_start_time.replace(/-/g, '/'));
+					const endTime = new Date(this.orderInfo.reserve_end_time.replace(/-/g, '/'));
+
+					// 计算时间差（毫秒）
+					const diffMs = endTime.getTime() - startTime.getTime();
+
+					if (diffMs <= 0) {
+						return '--';
+					}
+
+					// 转换为分钟
+					const diffMinutes = Math.floor(diffMs / (1000 * 60));
+
+					// 返回XX分钟格式
+					return `${diffMinutes}分钟`;
+
+				} catch (error) {
+					console.error('计算服务时长失败:', error);
+					return '--';
+				}
+			},
+
+
+			refund(e, order) {
+				// #ifdef APP-PLUS
+				e.preventDefault();
+				e.stopPropagation();
+				// #endif
+				uni.showModal({
+					title: "申请退款",
+					content: "确定要申请退款吗？（订单取消后，支付金额将原路退回）",
+					success: (res) => {
+						if (res.confirm) {
+							let data;
+							if (this.identity == 0) {
+								data = {
+									orderNo: order.number,
+									amount: order.pay_money,
+									sjid: this.userInfo.id,
+								};
+							} else if (this.identity == 1) {
+								data = {
+									orderNo: order.number,
+									amount: order.pay_money,
+									syrid: this.userInfo.id,
+								};
+							}
+							let url = "";
+							if (order.pay_kind == 1) {
+								url = "";
+							} else if (order.pay_kind == 2) {
+								url = this.interfaceList[this.identity].weChatRefund;
+							} else if (order.pay_kind == 3) {
+								url = this.interfaceList[this.identity].aliRefund;
+							}
+							request
+								.post(url, data)
+								.then((res) => {
+									if (res.code == 1 || res.code == 200) {
+										uni.showToast({
+											title: "申请退款！",
+											icon: "none"
+										});
+										this.getOrderDetail();
+										const pages = getCurrentPages();
+										const prevPage = pages[pages.length - 2];
+										if (prevPage) {
+											prevPage.$vm.getOrderNumber();
+											prevPage.$vm.getOrderList();
+										}
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none"
+										});
+									}
+								})
+								.catch((err) => console.log(err));
+						}
+					},
+				});
+			},
+			cancelOrder(e, order) {
+				// #ifdef APP-PLUS
+				e.preventDefault();
+				e.stopPropagation();
+				// #endif
+				uni.showModal({
+					title: "取消订单",
+					content: "确定要取消该订单吗？",
+					success: (res) => {
+						if (res.confirm) {
+							let data = {
+								order_no: order.number,
+							};
+
+							let url = this.interfaceList[this.identity].cancel;
+							request
+								.post(url, data)
+								.then((res) => {
+									if (res.code == 200 || res.code == 1) {
+										uni.showToast({
+											title: "取消成功！",
+											icon: "none"
+										});
+										this.getOrderDetail();
+										const pages = getCurrentPages();
+										const prevPage = pages[pages.length - 2];
+										if (prevPage) {
+											prevPage.$vm.getOrderNumber();
+											prevPage.$vm.getOrderList();
+										}
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: "none"
+										});
+									}
+								})
+								.catch((err) => console.log(err));
+						}
+					},
+				});
+			},
+			goPay(e, order) {
+				uni.redirectTo({
+					url: `/pages/shop/pay?id=${order.id}&money=${order.order_money}&title=${order.title}&number=${order.number}&identity=${this.identity}`,
+				});
+			},
+
+			showPermissionDialog(title, content) {
+				return new Promise((resolve) => {
+					uni.showModal({
+						title,
+						content,
+						confirmText: "去开启",
+						success(res) {
+							resolve(res.confirm);
+						},
+					});
+				});
+			},
+			async contactService(phone) {
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform === "ios") {
+					uni.makePhoneCall({
+						phoneNumber: phone
+					});
+				} else {
+					let permission =
+						systemInfo.platform === "ios" ?
+						"phone" :
+						"android.permission.CALL_PHONE";
+					this.isShowPer = true;
+					const firstRequest = !plus.storage.getItem(`perm_${permission}`);
+					if (firstRequest) this.isShowPer = true;
+					const {
+						granted
+					} = await permissionUtils.checkPermission(
+						"phone",
+						"需要拨打电话权限，方便您联系商家或平台"
+					);
+					if (granted) {
+						this.isShowPer = false;
+						uni.makePhoneCall({
+							phoneNumber: phone
+						});
+						return;
+					}
+					this.isShowPer = false;
+					const confirm = await this.showPermissionDialog(
+						"拨打电话权限申请",
+						"我们需要拨打电话权限，方便您联系商家或平台"
+					);
+					if (!confirm) return;
+					const result = await permissionUtils.requestPermission(
+						"phone",
+						"需要拨打电话权限，方便您联系商家或平台"
+					);
+					if (result) {
+						uni.makePhoneCall({
+							phoneNumber: phone
+						});
+					} else {
+						locationService.openAppSettings();
+					}
+				}
+			},
+			openMap() {
+				// #ifdef MP-WEIXIN
+				uni.openLocation({
+					success: () => console.log("打开系统位置地图成功"),
+					fail: (error) => console.log(error),
+				});
+				// #endif
+				// #ifdef APP-PLUS
+				_public.goMap({
+					latitude: parseFloat(this.orderInfo.latitude),
+					longitude: parseFloat(this.orderInfo.longitude),
+					name: this.orderInfo.name,
+					address: this.orderInfo.address,
+				});
+				// #endif
+			},
+		},
+	};
+</script>
+
+<style lang="less">
+	page {
+		position: relative;
+		background-color: #fff;
+	}
+
+	.detail-page::before {
+		content: "";
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 1200rpx !important;
+		background-image: url("/static/images/bg.png");
+		background-size: cover;
+		background-position: center top;
+		background-repeat: no-repeat;
+		z-index: 1;
+	}
+
+	.content-part {
+		position: relative;
+		left: 0;
+		right: 0;
+		z-index: 9;
+	}
+
+	/* 状态区域 */
+	.status-section {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 20rpx;
+		padding-top: 55rpx;
+		padding-bottom: 50rpx;
+
+		.status-section-image {
+			width: 52rpx;
+		}
+	}
+
+	.status-text {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: 600;
+	}
+
+	/* 预约手艺人信息卡片 */
+	.syr-card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		padding: 30rpx 20rpx;
+
+		border-radius: 16rpx;
+
+		.syr-card-header {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 45rpx;
+			text-align: left;
+			font-style: normal;
+			margin-bottom: 40rpx;
+		}
+
+		.syr-card-footer {
+			.syr-card-footer-left {
+				.syr-card-footer-left-img {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.syr-card-footer-left-text {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #333333;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.syr-card-footer-right {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	}
+
+	/* 预约信息卡片 */
+	.booking-card {
+		margin: 0rpx 30rpx 20rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 34rpx 30rpx 40rpx 20rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			margin-bottom: 40rpx;
+		}
+	}
+
+	.service-item {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		margin-bottom: 32rpx;
+	}
+
+	.service-image {
+		width: 160rpx;
+		height: 160rpx;
+		border-radius: 16rpx;
+		margin-right: 24rpx;
+		background-color: #e2e2e2;
+	}
+
+	.service-info {
+		flex: 1;
+		height: 160rpx;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: flex-start;
+		margin-right: 24rpx;
+
+		.service-box {
+			width: 100%;
+			gap: 18rpx;
+			display: flex;
+			flex-direction: column;
+
+			.service-subtitle {
+				font-size: 26rpx;
+				color: #666666;
+				width: 400rpx;
+			}
+		}
+	}
+
+	.service-name-row {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 20rpx;
+	}
+
+	.service-name {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #333333;
+		line-height: 34rpx;
+		flex: 1;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.service-name-num {
+		font-weight: 500;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 34rpx;
+		flex-shrink: 0;
+	}
+
+	.service-price {
+		font-size: 26rpx;
+		color: #333333;
+	}
+
+	.service-real {
+		display: flex;
+		flex-direction: column;
+		padding-top: 24rpx;
+		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.service-real-1 {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		align-items: center;
+		padding-top: 14rpx;
+		border-top: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.real-lable {
+		font-size: 30rpx;
+		color: #333333;
+	}
+
+	.real-price {
+		font-size: 42rpx;
+		font-weight: 500;
+		color: #E8101E;
+		transform: translateY(-5rpx);
+
+		.icon {
+			font-size: 20rpx;
+		}
+
+		.price {
+			font-family: DINPro, DINPro;
+		}
+	}
+
+	.card_time {
+		font-size: 28rpx;
+		color: #666666;
+		margin-top: 8rpx;
+	}
+
+	/* 订单信息卡片 */
+	.order-card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 36rpx 20rpx 40rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+			padding-bottom: 10rpx;
+		}
+	}
+
+	.shop_card {
+		margin: 30rpx;
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 36rpx 20rpx 40rpx;
+		box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
+
+		.card_title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #333333;
+		}
+
+		.shop_title_box {
+			display: flex;
+			align-items: center;
+			gap: 14rpx;
+			padding-top: 40rpx;
+			padding-bottom: 24rpx;
+			border-bottom: 2rpx solid #f6f5f5;
+
+			.shop_photo {
+				width: 94rpx;
+				height: 94rpx;
+				border-radius: 10rpx;
+			}
+
+			.shop_title {
+				font-size: 32rpx;
+				color: #333333;
+			}
+		}
+
+		.service_content {
+			padding-top: 30rpx;
+			padding-bottom: 30rpx;
+			font-size: 28rpx;
+			color: #666666;
+			border-bottom: 1rpx solid #f6f5f5;
+		}
+
+		.service_content__last {
+			border-bottom: 0rpx;
+			padding-bottom: 10rpx;
+		}
+
+		.shop_address {
+			padding-top: 30rpx;
+			display: flex;
+			gap: 10rpx;
+			color: #666666;
+			font-size: 26rpx;
+
+			.shop_icon {
+				width: 30rpx;
+				height: 30rpx;
+				flex-shrink: 0;
+				transform: translateY(4rpx);
+			}
+		}
+	}
+
+	.info-item {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 30rpx;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.value {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	/* 底部按钮 */
+	.bottom-buttons {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 128rpx;
+		background-color: #ffffff;
+		display: flex;
+		flex-flow: row nowrap;
+		align-items: center;
+		justify-content: flex-end;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05);
+		padding: 0 24rpx 0 78rpx;
+		/* #ifdef H5 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		z-index: 999;
+	}
+
+	.handel-button {
+		width: 186rpx;
+		height: 72rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		border-radius: 36rpx;
+		margin-left: 60rpx;
+	}
+
+	.btn-border {
+		border: 1rpx solid #E8101E;
+		background-color: #fff;
+		box-sizing: border-box;
+		margin-left: 60rpx;
+	}
+
+	.btn-bg {
+		background-color: #E8101E;
+	}
+
+	.button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #ffffff;
+	}
+
+	.btn-border .button-text {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #E8101E;
+	}
+
+	/* 权限提示 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+	/* #ifdef H5 */
+	.detail-page {
+		padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+	}
+
+	/* #endif */
+
+	.mt_10 {
+		margin-top: 10rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/pay-success.vue b/pages/shop/pay-success.vue
index 696c5cc..9f6dbcf 100644
--- a/pages/shop/pay-success.vue
+++ b/pages/shop/pay-success.vue
@@ -1,121 +1,115 @@
-<template>
-  <view class="success-page">
-    <!-- 自定义导航栏 -->
-    <custom-navbar
-      title="支付成功"
-      :showBack="true"
-      backgroundColor="#FFFFFF"
-    ></custom-navbar>
-
-    <!-- 成功提示 -->
-    <view class="success-content">
-      <image
-        src="/static/images/success_icon.png"
-        mode="aspectFit"
-        class="success-icon"
-      ></image>
-      <text class="success-text">支付成功</text>
-    </view>
-
-    <!-- 查看订单按钮 -->
-    <view class="btn-box" @click="goToOrder">
-      <text class="btn-text">查看订单</text>
-    </view>
-  </view>
-</template>
-
-<script>
-import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
-
-export default {
-  components: {
-    customNavbar,
-  },
-  data() {
-    return {
-      orderId: "",
-      path: "",
-	  identity:"",
-    };
-  },
-  onLoad(options) {
-    if (options.orderId) {
-      this.orderId = options.orderId;
-    }
-    if (options.path) {
-      this.path = options.path;
-    }
-	if(options.identity)
-	{
-	  this.identity = options.identity;
-	}
-  },
-  methods: {
-    goToOrder() {
-      if (this.path) {
-        uni.redirectTo({
-          url: `${this.path}?id=${this.orderId}&identity=${this.identity}`,
-        });
-      } else {
-        uni.redirectTo({
-          url: "/pages/shop/buyorder-detail?id=" + this.orderId,
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style>
-.success-page {
-  min-height: 100vh;
-  background-color: #ffffff;
-  padding-bottom: env(safe-area-inset-bottom);
-}
-
-.success-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 120rpx;
-}
-
-.success-icon {
-  width: 250rpx;
-  height: 184rpx;
-  margin-bottom: 40rpx;
-}
-
-.success-text {
-  font-size: 40rpx;
-  color: #333333;
-  font-weight: 500;
-}
-
-.action-button {
-  width: 686rpx;
-  height: 88rpx;
-  background: #ff4b4b;
-  border-radius: 44rpx;
-  color: #ffffff;
-  font-size: 32rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 80rpx auto 0;
-}
-
-/* 多端适配 */
-/* #ifdef H5 */
-.success-page {
-  padding-bottom: 0;
-}
-/* #endif */
-
-/* #ifdef APP-PLUS || MP */
-.success-page {
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-}
-/* #endif */
-</style>
+<template>
+	<view class="success-page">
+		<!-- 自定义导航栏 -->
+		<custom-navbar title="支付成功" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
+
+		<!-- 成功提示 -->
+		<view class="success-content">
+			<image src="/static/images/success_icon.png" mode="aspectFit" class="success-icon"></image>
+			<text class="success-text">支付成功</text>
+		</view>
+
+		<!-- 查看订单按钮 -->
+		<view class="btn-box" @click="goToOrder">
+			<text class="btn-text">查看订单</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
+
+	export default {
+		components: {
+			customNavbar,
+		},
+		data() {
+			return {
+				orderId: "",
+				path: "",
+				identity: "",
+			};
+		},
+		onLoad(options) {
+			console.log(options, 'options查看订单');
+			if (options.orderId) {
+				this.orderId = options.orderId;
+			}
+			if (options.path) {
+				this.path = options.path;
+			}
+			if (options.identity) {
+				this.identity = options.identity;
+			}
+		},
+		methods: {
+			goToOrder() {
+				if (this.path) {
+					uni.redirectTo({
+						url: `${this.path}?order_id=${this.orderId}&identity=${this.identity}`,
+					});
+				} else {
+					uni.redirectTo({
+						url: "/pages/shop/buyorder-detail?id=" + this.orderId,
+					});
+				}
+			},
+		},
+	};
+</script>
+
+<style>
+	.success-page {
+		min-height: 100vh;
+		background-color: #ffffff;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.success-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 120rpx;
+	}
+
+	.success-icon {
+		width: 250rpx;
+		height: 184rpx;
+		margin-bottom: 40rpx;
+	}
+
+	.success-text {
+		font-size: 40rpx;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.action-button {
+		width: 686rpx;
+		height: 88rpx;
+		background: #ff4b4b;
+		border-radius: 44rpx;
+		color: #ffffff;
+		font-size: 32rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 80rpx auto 0;
+	}
+
+	/* 多端适配 */
+	/* #ifdef H5 */
+	.success-page {
+		padding-bottom: 0;
+	}
+
+	/* #endif */
+
+	/* #ifdef APP-PLUS || MP */
+	.success-page {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index abaa94e..db1c3df 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -285,7 +285,7 @@
 			<view class="handel-button btn-bg" v-if="orderInfo.state == 3" @click.stop="startOrder($event, orderInfo)">
 				<text class="button-text">开始服务</text>
 			</view>
-			<view class="handel-button btn-bg" v-if="orderInfo.state == 4" @click.stop="endOrder($event, orderInfo)">
+			<view class="handel-button btn-bg" v-if="orderInfo.state != 4" @click.stop="endOrder($event, orderInfo)">
 				<text class="button-text">服务完成</text>
 			</view>
 		</view>