From e94a21ad822d96111c1c0c65c45e143ee184903a Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 6 Feb 2025 10:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserOrderController.php |  3 +++
 大庆东城小程序/pages/buy/info/info.vue       |  2 +-
 大庆东城小程序/pages/buy/items/items.vue     |  2 +-
 大庆东城小程序/pages/main/order/order.vue    | 20 ++++++++++----------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php
index 1678215..e1b1b20 100644
--- a/app/Http/Controllers/UserOrderController.php
+++ b/app/Http/Controllers/UserOrderController.php
@@ -448,6 +448,9 @@ class UserOrderController extends Controller
   {
     Login::user();
     $status = $request->post('status');
+    if($status >= 3) {
+      $status=$status+1;
+    }
     $list = UserOrder::select('*')
       ->selectRaw("IFNULL((select name from hospitals where hospitals.id = user_orders.hospital),'') as hospital_name")
       ->selectRaw("IFNULL((select address from hospitals where hospitals.id = user_orders.hospital),'') as address")
diff --git a/大庆东城小程序/pages/buy/info/info.vue b/大庆东城小程序/pages/buy/info/info.vue
index 13b4dc0..7566f33 100644
--- a/大庆东城小程序/pages/buy/info/info.vue
+++ b/大庆东城小程序/pages/buy/info/info.vue
@@ -241,7 +241,7 @@
 			<view class="bottom_wrapper">
 				<view class="bottom_box_wrapper">
 					<view class="bottom_count_wrapper">
-						<view>您需付费</view>
+						<view>您需现场付费</view>
 						<view>{{ buy_info.count }}个项目</view>
 					</view>
 					<view class="bottom_line_wrapper"></view>
diff --git a/大庆东城小程序/pages/buy/items/items.vue b/大庆东城小程序/pages/buy/items/items.vue
index a9035ef..40af166 100644
--- a/大庆东城小程序/pages/buy/items/items.vue
+++ b/大庆东城小程序/pages/buy/items/items.vue
@@ -147,7 +147,7 @@
 		<view class="bottom_wrapper">
 			<view v-if="!!buy_info" class="bottom_box_wrapper">
 				<view class="bottom_count_wrapper">
-					<view>您需付费</view>
+					<view>您需现场付费</view>
 					<view>{{ buy_info.count }}个项目</view>
 				</view>
 				<view class="bottom_line_wrapper"></view>
diff --git a/大庆东城小程序/pages/main/order/order.vue b/大庆东城小程序/pages/main/order/order.vue
index 89b26e8..f6018f0 100644
--- a/大庆东城小程序/pages/main/order/order.vue
+++ b/大庆东城小程序/pages/main/order/order.vue
@@ -29,7 +29,7 @@
 		tab_active.value = type
 		OrderList()
 	}
-	const tab_arr = ['全部', '待支付', '进行中', '已取消', '已完成', '已退款']
+	const tab_arr = ['全部', '待预约', '进行中' , '已完成', '已取消']
 	onMounted(() => {
 		$store.buy_info = {
 			hospital: 0,
@@ -60,7 +60,7 @@
 		let index = order_list.value.findIndex(ii => ii.id === id)
 		if (index !== -1) order_list.value[index].status = status
 	}
-	const status_arr = ['', '待支付', '已预约', '已取消', '已完成', '已退款']
+	const status_arr = ['', '待预约', '已预约', '' , '已完成', '已取消']
 	const status_color_arr = ['', '#F02E50', '#0BBACF', '#333333', '#FF6201', '#FFA40A']
 
 	const orderClick = (info) => {
@@ -115,14 +115,14 @@
 	const order_refund = ref(0)
 	const OrderRefund = async () => {
 		uni.showLoading({
-			title: '正在退款'
+			title: '正在取消'
 		})
 		const response = await OrderRefundAction({
 			id: order_refund.value
 		})
 		uni.hideLoading()
 		$response(response, () => {
-			uni.$lu.toast("退款成功");
+			uni.$lu.toast("取消成功");
 			OrderList()
 			refundClose()
 		})
@@ -203,14 +203,14 @@
 	<view>
 		<view v-if="cancel_show">
 			<uni-popup :ref="cancelPopupRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="取消确认" content="是否确认取消？"
+				<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="取消确认" content="是否取消预约？"
 					@confirm="OrderCancel" @close="cancelClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 
 		<view v-if="refund_show">
 			<uni-popup :ref="refundPopupRef" type="dialog">
-				<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="退款确认" content="是否确认退款？"
+				<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="取消确认" content="是否确认取消？"
 					@confirm="OrderRefund" @close="refundClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
@@ -253,7 +253,7 @@
 						color:status_color_arr[i.status]
 					}">
 						<view v-if="i.status !== 5">{{ status_arr[i.status] }}</view>
-						<view v-else>已{{ !!Number(i.price) ? '退款' : '退订' }}</view>
+						<view v-else>已{{ !!Number(i.price) ? '取消' : '退订' }}</view>
 					</view>
 				</view>
 				<view class="order_info_wrapper">
@@ -336,10 +336,10 @@
 						</view>
 					</view>
 					<view v-if="i.status === 5" class="order_price_box_wrapper">
-						<view class="order_pay_time_wrapper">{{ !!Number(i.price) ? '退款' : '退订' }}时间 {{ i.refund_time }}</view>
+						<view class="order_pay_time_wrapper">{{ !!Number(i.price) ? '取消' : '退订' }}时间 {{ i.refund_time }}</view>
 						<view v-if="!!Number(i.price)" class="order_pay_price_wrapper refund_info_wrapper">
-							<view class="order_pay_price_title_wrapper">已退款</view>
-							<view class="order_pay_price_content_wrapper">￥{{ i.price }}</view>
+							<view class="order_pay_price_title_wrapper">已取消预约</view>
+							<!-- <view class="order_pay_price_content_wrapper">￥{{ i.price }}</view> -->
 						</view>
 					</view>
 				</view>