From 048aa2720b645e5a71316627869082a2c2a3b343 Mon Sep 17 00:00:00 2001
From: "geng.tang@qq.com" <foxes2004>
Date: Fri, 26 Jan 2024 23:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/checkout/checkout.vue | 9 +++++----
 pages/order/detail.vue      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/checkout/checkout.vue b/pages/checkout/checkout.vue
index 60d3581..5b19607 100644
--- a/pages/checkout/checkout.vue
+++ b/pages/checkout/checkout.vue
@@ -102,7 +102,7 @@
 
 			<view class="xieyi">
 				<checkbox-group @change="onAgree" style="display: flex; align-items: center;">
-					<checkbox :checked="agree" />我已同意并阅读<div class="xieyi-text" @click="showXieyi(64)">《租赁合同》</div>与<div
+					<checkbox :checked="agree" />我已阅读并同意<div class="xieyi-text" @click="showXieyi(64)">《租赁合同》</div>与<div
 						class="xieyi-text" @click="showXieyi(51)">《隐私协议》</div>
 				</checkbox-group>
 			</view>
@@ -258,6 +258,10 @@
 			},
 			async onBuy() {
 				const app = this
+				if(!this.agree){
+					app.$error("请先同意租赁合同和隐私协议！")
+					return
+				}
 				const {
 					record,
 					dealerPhone
@@ -289,9 +293,6 @@
 				var time = new Date().getTime() + 60 * 60 * 1000 * 24
 				const expirationTime = dateFormat('YYYY-mm-dd HH:MM:SS', new Date(time))
 				app.expirationTime = expirationTime
-
-
-
 				
 				addOrder({
 					orderNo: createOrderNo(),
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index f722af6..ef05462 100755
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -518,7 +518,7 @@
 					<view class="btn-item" @click="handleRentingOut(order)"
 						v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租</view>
 						
-					<view class="btn-item" @click="handleHireEquipment(item.orderId)"
+					<view class="btn-item" @click="handleHireEquipment(order.orderId)"
 						v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804">我要续费</view>
 				
 					<block v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0">