diff --git a/Laravel/app/Http/Controllers/API/Internal/OrderController.php b/Laravel/app/Http/Controllers/API/Internal/OrderController.php
index ade2b76..5a07f87 100644
--- a/Laravel/app/Http/Controllers/API/Internal/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/Internal/OrderController.php
@@ -298,7 +298,12 @@ class OrderController extends Controller
 
 
     if(is_array($date_range) and count($date_range)==2){
-      $OrderList=$OrderList ->whereBetween('created_at', [$date_range[0], $date_range[1].' 23:59:59']);
+      if(isset($status) and $status==3){
+        $OrderList=$OrderList ->whereBetween('appointment_date', [$date_range[0], $date_range[1].' 23:59:59']);
+      }else{
+        $OrderList=$OrderList ->whereBetween('created_at', [$date_range[0], $date_range[1].' 23:59:59']);
+      }
+
     }
 
     $OrderList=$OrderList ->where(function ($query) use ($persons_sfz,$user) {
diff --git a/h5/pages/buy/done/yuyue_done.vue b/h5/pages/buy/done/yuyue_done.vue
index eea022b..b4e8117 100644
--- a/h5/pages/buy/done/yuyue_done.vue
+++ b/h5/pages/buy/done/yuyue_done.vue
@@ -111,7 +111,7 @@
 					<view class="order_icon_image_wrapper">
 						<image src="@/static/assets/buy/yuan_duihao.png"></image>
 					</view>
-					<view class="order_icon_tip_wrapper"><span v-if="($store.getTempPlan()?.plan_id || order_info.combo_id=='2814' || order_info.source?.includes('线下体检预约'))">支付成功</span><span v-else>预约成功</span></view>
+					<view class="order_icon_tip_wrapper"><span v-if="($store.getTempPlan()?.plan_id || order_info.combo_id=='2814' || order_info.source?.includes('线下体检预约') || order_info.true_price>0)">支付成功</span><span v-else>预约成功</span></view>
 					<view v-if="order_info.checkup_type_id==4 && (order_info.title=='男性免费婚检（双方）' || order_info.title=='女性免费婚检（双方）')"
 						style="font-size: 24rpx;padding:20rpx 40rpx; 0rpx 40rpx;color:#FF0000;">
 						请您的配偶在15分钟内完成预约，否则本次预约将会失效，如有支付金额会原路退回
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index 136e28e..acf4d8b 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -26,7 +26,11 @@
 		path:{
 			type:String,
 			default:''
-		}
+		},
+		orderid:{
+			type:String,
+			default:''
+		},
 	});
 
 	const getUserInfo = async () => {
@@ -232,8 +236,10 @@
 		$response(response, () => {
 			 NoticeInfo.value=response.data
 			 if (!!$props.path && $props.path=='order') {
+				 let orderid=$props.orderid?$props.orderid:''
+				 let canshu='?orderid='+orderid
 			 	 uni.navigateTo({
-			 	 	url: "/pages/main/order/order"
+			 	 	url: "/pages/main/order/order"+canshu
 			 	 })
 			 }
 		});
diff --git a/h5/pages/main/login/login.vue b/h5/pages/main/login/login.vue
index cbe6ef2..5a1eedd 100644
--- a/h5/pages/main/login/login.vue
+++ b/h5/pages/main/login/login.vue
@@ -22,6 +22,10 @@ import DraggableButton from "@/pages/components/goHome.vue";
 		path:{
 			type:String,
 			default:''
+		},
+		orderid:{
+			type:String,
+			default:''
 		}
 	});
 	const tip_str = ref('授权登录中，请稍候...')
@@ -42,6 +46,14 @@ import DraggableButton from "@/pages/components/goHome.vue";
 			
 			param=param+"?path="+path
 		}
+		if (!!$props.orderid) {
+			path = decodeURIComponent($props.orderid)
+			const index = path.indexOf('#');
+			if (index !== -1) {
+			        path= path.substring(0, index); // 包含 # 时，返回 # 前面的部分
+			}
+			param=param+"&orderid="+path
+		}
 		if (!!openid) {
 			const index = openid.indexOf('#');
 			if (index !== -1) {
diff --git a/h5/pages/main/order/order - 副本.vue b/h5/pages/main/order/order - 副本.vue
new file mode 100644
index 0000000..7e8aa23
--- /dev/null
+++ b/h5/pages/main/order/order - 副本.vue	
@@ -0,0 +1,266 @@
+<script setup>
+import DraggableButton from "@/pages/components/goHome.vue";
+import TabBar from "@/common/TabBar.vue";
+	/**
+	 * name：
+	 * user：sa0ChunLuyu
+	 * date：2024年8月7日 20:05:05
+	 */
+	import {
+		ref,
+		computed,
+		nextTick,
+
+	} from 'vue'
+	import {
+		$api,
+		$response
+	} from '@/api'
+	import {
+		onShow,onLoad,onBackPress
+	} from '@dcloudio/uni-app'
+	import OrderComponent from './src/order.vue'
+	import {
+		useStore
+	} from '@/store'
+	import { useRouter } from 'vue-router';
+	
+	const $props = defineProps({
+		orderid:{
+			type:String,
+			default:''
+		}
+	});
+	let searchInfo=ref({
+		orderid:null
+	})
+	const router = useRouter();
+	const $store = useStore()
+	const order_list = ref([])
+	const getOrderList = async () => {
+		uni.showLoading()
+		const response = await $api('OrderList',{
+		searchInfo:searchInfo.value
+	})
+		uni.hideLoading()
+		$response(response, () => {
+			order_list.value = response.data.list
+			if(searchInfo.value.orderid && order_list.value.length>0){
+				 
+				nextTick(() => {
+					statusClick(getTabByOrder(order_list.value[0]))
+				})	 
+				 
+			}
+			
+		})
+	}
+	const getStatusAllow = (statusActive) => {
+	  switch (statusActive) {
+	    case '0': return [1, 2, 3, 4, 5, 6]
+	    case '1': return [1]
+	    case '2': return [2]  // 未预约
+	    case '3': return [2]  // 已预约
+	    case '4': return [3, 4, 5, 6]
+	    default: return []
+	  }
+	}
+	const getTabByOrder = (order) => {
+	  const { status, appointment_number } = order
+	
+	  if (status === 1) {
+	    return '1'
+	  } else if (status === 2) {
+	    return (appointment_number == null || appointment_number === '') ? '2' : '3'
+	  } else if ([3, 4, 5, 6].includes(status)) {
+	    return '4'
+	  } else {
+	    return '0' // 默认全部
+	  }
+	}
+	const order_list_computed = computed(() => {
+		let list = []
+		// let status_allow = []
+		// switch (status_active.value) {
+		// 	case '0':
+		// 		status_allow = [1, 2, 3, 4, 5,6]
+		// 		break;
+		// 	case '1':
+		// 		status_allow = [1]
+		// 		break;
+		// 	case '2':
+		// 		status_allow = [2]
+		// 		break;
+		// 	case '3':
+		// 		status_allow = [2]
+		// 		break;
+		// 	case '4':
+		// 		status_allow = [3,4,5,6]
+		// 		break;
+		// }
+		 const status_allow = getStatusAllow(status_active.value)
+		for (let i in order_list.value) {
+			
+			if (status_allow.includes(order_list.value[i].status)) {
+				if(status_active.value=='2' ){ 
+				 	if (order_list.value[i].appointment_number == null) {
+				 	     list.push(order_list.value[i]);
+				 	}
+				}else if(status_active.value=='3' ){ 
+				 	if (order_list.value[i].appointment_number != null && order_list.value[i].appointment_number != '') {
+				 	     list.push(order_list.value[i]);
+				 	}
+				}
+				else{
+					list.push(order_list.value[i])
+				}
+				
+			}
+		}
+		return list
+	})
+
+	const config_ref = ref(null)
+	const configRef = (e) => {
+		if (!config_ref.value) {
+			config_ref.value = e
+			getOrderList()
+		}
+	}
+	const status_active = ref('0')
+	const status_arr = ref([{
+		label: '全部',
+		value: '0'
+	}, {
+		label: '待支付',
+		value: '1'
+	}, {
+		label: '待预约',
+		value: '2'
+	}, {
+		label: '进行中',
+		value: '3'
+	}, {
+		label: '已结束',
+		value: '4'
+	}])
+	const statusClick = (status) => {
+		status_active.value = '-1'
+		nextTick(() => {
+			status_active.value = status
+			if(status=='0'){
+				uni.redirectTo({
+					url: "/pages/main/order/order"
+				});
+			}
+		})
+	}
+
+	const ReLoadOrderList = (newValue) => {
+		if (newValue == "orderUpdate") {
+			setTimeout(() => { 
+			   uni.redirectTo({
+			   	url: "/pages/main/order/order"
+			   }); 
+			  }, 1000);
+		  
+		}
+	};
+	
+	onShow(() => {
+		if (!!config_ref.value) {
+			getOrderList()
+		}
+		searchInfo.value.orderid=$props.orderid
+	})
+	onBackPress((options)=> {
+		console.log(options)
+			  uni.reLaunch({
+			       url: '/pages/main/index/index'
+			     });
+				  return true;
+		})
+</script>
+<template>
+	<TabBar></TabBar>
+	<!-- <DraggableButton /> -->
+	<view>
+		<view v-if="!!$store.config">
+			<view :ref="configRef"></view>
+		</view>
+		<view class="order_select_wrapper">
+			<view v-for="(i,k) in status_arr" :key="k" class="order_select_item_wrapper" :class="[
+				i.value === status_active ? 'active' : ''
+			]" @click="statusClick(i.value)">
+				{{ i.label }}
+				<view class="order_select_item_line_wrapper"></view>
+			</view>
+		</view>
+		<view class="order_list_wrapper">
+			<OrderComponent v-for="(i,k) in order_list_computed" :key="k" :info="i" @updateValue="ReLoadOrderList">
+			</OrderComponent>
+		</view>
+		<view class="blank_wrapper"></view>
+	</view>
+</template>
+<style scoped>
+	.order_list_wrapper {
+		height: calc(100vh - 100rpx - 30rpx);
+		width: 750rpx;
+		overflow-y: auto;
+		padding-bottom: 140rpx;
+		margin: 0 auto;
+		overflow-x: hidden;
+		background: #F8F8F8;
+		-ms-overflow-style: none;
+		scrollbar-width: none;
+		overflow: -moz-scrollbars-none;
+		overflow-y: scroll;
+	}
+
+	.order_list_wrapper::-webkit-scrollbar {
+		display: none;
+	}
+
+	.order_select_item_line_wrapper {
+		position: absolute;
+		width: 95rpx;
+		height: 10rpx;
+		background: linear-gradient(to bottom, #ffffff00, #1B9A9F);
+		border-radius: 5rpx;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		opacity: 0;
+	}
+
+	.order_select_item_wrapper {
+		width: calc(100% / 5);
+		height: 100rpx;
+		text-align: center;
+		line-height: 100rpx;
+		position: relative;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #2F2F2F;
+	}
+
+	.order_select_item_wrapper.active {
+		color: #239EA3;
+	}
+
+	.order_select_item_wrapper.active .order_select_item_line_wrapper {
+		opacity: 1;
+	}
+
+	.order_select_wrapper {
+		width: 750rpx;
+		height: 100rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx -1rpx 1rpx 0rpx rgba(0, 0, 0, 0.1);
+		margin: 0 auto;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
\ No newline at end of file
diff --git a/h5/pages/main/order/order.vue b/h5/pages/main/order/order.vue
index 3a3dd5d..e7bf7d2 100644
--- a/h5/pages/main/order/order.vue
+++ b/h5/pages/main/order/order.vue
@@ -24,38 +24,91 @@ import TabBar from "@/common/TabBar.vue";
 		useStore
 	} from '@/store'
 	import { useRouter } from 'vue-router';
+	
+	const $props = defineProps({
+		orderid:{
+			type:String,
+			default:''
+		},
+		status:{
+			type:Number,
+			default:null
+		}
+	});
+	let searchInfo=ref({
+		orderid:null
+	})
+	let DaiBanArr=ref([0,0,0,0]);
 	const router = useRouter();
 	const $store = useStore()
 	const order_list = ref([])
 	const getOrderList = async () => {
 		uni.showLoading()
-		const response = await $api('OrderList')
+		const response = await $api('OrderList',{
+		searchInfo:searchInfo.value
+	})
 		uni.hideLoading()
 		$response(response, () => {
 			order_list.value = response.data.list
+			DaiBanArr.value=response.data.DaiBanCountArr
+		 	 
+			if(searchInfo.value.orderid && order_list.value.length>0){
+				 
+				nextTick(() => {
+					statusClick(getTabByOrder(order_list.value[0]))
+				})	 
+				 
+			}
+			if($props.status){
+				status_active.value = $props.status
+			}
+			
 			
 		})
 	}
+	const getStatusAllow = (statusActive) => {
+	  switch (statusActive) {
+	    case '0': return [1, 2, 3, 4, 5, 6]
+	    case '1': return [1]
+	    case '2': return [2]  // 未预约
+	    case '3': return [2]  // 已预约
+
+	    default: return []
+	  }
+	}
+	const getTabByOrder = (order) => {
+	  const { status, appointment_number } = order
+	
+	  if (status === 1) {
+	    return '1'
+	  } else if (status === 2) {
+	    return (appointment_number == null || appointment_number === '') ? '2' : '3'
+	  } else {
+	    return '0' // 默认全部
+	  }
+	}
+ 
 	const order_list_computed = computed(() => {
 		let list = []
-		let status_allow = []
-		switch (status_active.value) {
-			case '0':
-				status_allow = [1, 2, 3, 4, 5,6]
-				break;
-			case '1':
-				status_allow = [1]
-				break;
-			case '2':
-				status_allow = [2]
-				break;
-			case '3':
-				status_allow = [2]
-				break;
-			case '4':
-				status_allow = [3,4,5,6]
-				break;
-		}
+		// let status_allow = []
+		// switch (status_active.value) {
+		// 	case '0':
+		// 		status_allow = [1, 2, 3, 4, 5,6]
+		// 		break;
+		// 	case '1':
+		// 		status_allow = [1]
+		// 		break;
+		// 	case '2':
+		// 		status_allow = [2]
+		// 		break;
+		// 	case '3':
+		// 		status_allow = [2]
+		// 		break;
+		// 	case '4':
+		// 		status_allow = [3,4,5,6]
+		// 		break;
+		// }
+		 const status_allow = getStatusAllow(status_active.value)
 		for (let i in order_list.value) {
 			
 			if (status_allow.includes(order_list.value[i].status)) {
@@ -86,25 +139,32 @@ import TabBar from "@/common/TabBar.vue";
 	}
 	const status_active = ref('0')
 	const status_arr = ref([{
-		label: '全部',
-		value: '0'
-	}, {
 		label: '待支付',
 		value: '1'
 	}, {
 		label: '待预约',
 		value: '2'
 	}, {
-		label: '进行中',
+		label: '已预约',
 		value: '3'
-	}, {
-		label: '已结束',
-		value: '4'
+	},{
+		label: '全部',
+		value: '0'
 	}])
-	const statusClick = (status) => {
+	const statusClick = (status,dotype=0) => { //dotype=1为手动点击，0为自动点击
 		status_active.value = '-1'
 		nextTick(() => {
 			status_active.value = status
+			if(status=='0' && searchInfo.value.orderid && dotype==1){
+				uni.redirectTo({
+					url: "/pages/main/order/order"
+				});
+			}
+			if( searchInfo.value.orderid && dotype==1){
+				 uni.redirectTo({
+				 	url: "/pages/main/order/order?status="+status
+				 });
+			}
 		})
 	}
 
@@ -120,9 +180,14 @@ import TabBar from "@/common/TabBar.vue";
 	};
 	
 	onShow(() => {
+		uni.showLoading()
 		if (!!config_ref.value) {
 			getOrderList()
 		}
+		searchInfo.value.orderid=$props.orderid
+		if($props.orderid){
+			status_active.value=null
+		}
 	})
 	onBackPress((options)=> {
 		console.log(options)
@@ -142,7 +207,8 @@ import TabBar from "@/common/TabBar.vue";
 		<view class="order_select_wrapper">
 			<view v-for="(i,k) in status_arr" :key="k" class="order_select_item_wrapper" :class="[
 				i.value === status_active ? 'active' : ''
-			]" @click="statusClick(i.value)">
+			]" @click="statusClick(i.value,1)">
+			<view class="hongdian" v-if="DaiBanArr[k]>0" ></view>
 				{{ i.label }}
 				<view class="order_select_item_line_wrapper"></view>
 			</view>
@@ -155,6 +221,20 @@ import TabBar from "@/common/TabBar.vue";
 	</view>
 </template>
 <style scoped>
+	.hongdian{
+		line-height: 14rpx;
+		height: 14rpx;
+		width: 14rpx;
+		background-color: #ff9170;
+		border-radius: 50%;
+		position: absolute;
+		right: 10rpx;
+		top: 30rpx;
+		z-index: 100;
+		font-size: 16rpx;
+		color: #fff;
+		text-align: center;
+	}
 	.order_list_wrapper {
 		height: calc(100vh - 100rpx - 30rpx);
 		width: 750rpx;