From 10ee1e984cb567f6fd8c6974f928875143cec621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Wed, 21 Jan 2026 17:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E9=A2=84=E7=BA=A6=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E9=80=9A=E7=9F=A5=20=E8=B7=B3=E8=BD=AC=E5=BE=85?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=82=E7=BA=BF=E4=B8=8B=E5=88=B0=E6=9C=9F?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Services/OrderService.php | 12 +++++++-----
 h5/pages/main/index/index.vue         |  8 ++++++--
 h5/pages/main/login/login.vue         | 10 +++++++++-
 h5/pages/main/order/src/order.vue     | 24 ++++++++++++------------
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/Laravel/app/Services/OrderService.php b/Laravel/app/Services/OrderService.php
index 2d6b899..ddcefa8 100644
--- a/Laravel/app/Services/OrderService.php
+++ b/Laravel/app/Services/OrderService.php
@@ -247,11 +247,13 @@ class OrderService
           'type' => $orderInfo->type,
           '预约Id' => $orderInfo->appointment_number
         ]);
-        $orderJson = json_encode($orderInfo, JSON_UNESCAPED_UNICODE);
-        $insert=DB::table('orders_delete')->insert(['order_info' =>$orderJson]);
-        if($insert){
-          DB::table('orders')->where(['id' => $orderInfo->id])->delete();
-        }
+        //之前是到期进行删除，26年1月改为不删除，只把状态为取消即可。
+        //$orderJson = json_encode($orderInfo, JSON_UNESCAPED_UNICODE);
+//        $insert=DB::table('orders_delete')->insert(['order_info' =>$orderJson]);
+//        if($insert){
+//          DB::table('orders')->where(['id' => $orderInfo->id])->delete();
+//        }
+
       }
         return true;
     }
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index 0e59686..699ccc5 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -31,6 +31,10 @@
 			type:String,
 			default:''
 		},
+		status: {
+		    type: String,
+		    default: ''
+		}
 	});
 
 	const getUserInfo = async () => {
@@ -237,7 +241,8 @@
 			 NoticeInfo.value=response.data
 			 if (!!$props.path && $props.path=='order') {
 				 let orderid=$props.orderid?$props.orderid:''
-				 let canshu='?orderid='+orderid
+				 let status=$props.status?$props.status:''
+				 let canshu='?orderid='+orderid+'&status='+status
 				 uni.navigateTo({
 				 	url: "/pages/main/order/order"+canshu  
 				 })
@@ -249,7 +254,6 @@
             return item ? item.value : '';
         }
 	onShow(() => {
-		
 		uni.getLocation({
 			type: 'wgs84',
 			success: (res) => {
diff --git a/h5/pages/main/login/login.vue b/h5/pages/main/login/login.vue
index 49acd76..9d63cc6 100644
--- a/h5/pages/main/login/login.vue
+++ b/h5/pages/main/login/login.vue
@@ -22,7 +22,11 @@ const props = defineProps({
   orderid: {
     type: String,
     default: ''
-  }
+  },
+  status: {            
+      type: String,
+      default: ''
+    }
 });
 
 const tip_str = ref('授权登录中，请稍候...')
@@ -40,6 +44,7 @@ const checkOpenid = () => {
   const openid = getPureValue(props.openid);
   const path = getPureValue(props.path);
   const orderid = getPureValue(props.orderid);
+  const status = getPureValue(props.status); 
 
   // 4. 初始化参数拼接字符串，避免 undefined 开头
   let redirectParams = '';
@@ -51,6 +56,9 @@ const checkOpenid = () => {
   if (orderid) {
     redirectParams += `${redirectParams ? '&' : '?'}orderid=${orderid}`;
   }
+  if (status) { 
+      redirectParams += `${redirectParams ? '&' : '?'}status=${encodeURIComponent(status)}`;
+    }
 
   if (openid) {
     uni.setStorageSync('OPENID', openid);
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 4dead3d..a9b89d7 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -716,7 +716,7 @@
 		line-height: 60rpx;
 		text-align: center;
 		font-weight: 400;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		margin-left: 20rpx;
 	}
 
@@ -750,7 +750,7 @@
 	}
 
 	.order_pay_time_wrapper {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #101010;
 		line-height: 26rpx;
 	}
@@ -783,7 +783,7 @@
 
 		text-align: right;
 		margin-right: 30rpx;
-		font-size: 26rpx;
+		font-size: 28rpx;
 	}
 
 	.price_text {
@@ -807,7 +807,7 @@
 	.order_info_line_label_wrapper {
 		width: 140rpx;
 		font-weight: 400;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #101010;
 		line-height: 1;
 		margin-left: 30rpx;
@@ -815,7 +815,7 @@
 
 	.order_info_line_value_wrapper {
 		font-weight: 400;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #101010;
 		line-height: 1;
 		margin-left: 10rpx;
@@ -824,7 +824,7 @@
 	.combo_name_wrapper {
 		padding-top: 4rpx;
 		width: calc(550rpx - 30rpx);
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #101010;
 		line-height: 1; 
 		margin-left: 10rpx;
@@ -837,7 +837,7 @@
 		position: absolute;
 		top: 27rpx;
 		right: 27rpx;
-		font-size: 26rpx;
+		font-size: 28rpx;
 	}
 
 	.order_status_wrapper.status1 {
@@ -877,7 +877,7 @@
 	}
 
 	.click_detail {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #239ea3;
 		margin-left: 30rpx;
 		margin-top: 20rpx;
@@ -886,7 +886,7 @@
 
 	.OrderInfoRow {
 		display: flex;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		margin-top: 16rpx;
 		color: #666;
 
@@ -919,12 +919,12 @@
 	 
 	.tishi_title{
 		text-align: center;
-		font-size: 30rpx;
+		font-size: 32rpx;
 		font-weight: 600;
 		color:#2b2827;
 	}
 	.tishi_title2{
-		font-size: 28rpx;
+		font-size: 30rpx;
 		margin-top: 30rpx;
 		font-weight: 600;
 		color:#3a3635;
@@ -932,7 +932,7 @@
 		padding-left: 5rpx;
 	}
 	.tishi_content{
-		font-size: 28rpx;
+		font-size: 30rpx;
 		margin-top: 30rpx;
 		color:#474241;
 	}