From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“
---
pagesA/appointment/appointment.vue | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/pagesA/appointment/appointment.vue b/pagesA/appointment/appointment.vue
index aaae71c..735728c 100644
--- a/pagesA/appointment/appointment.vue
+++ b/pagesA/appointment/appointment.vue
@@ -63,7 +63,11 @@
<text class="currency">楼</text>
<text class="amount">{{ item.price }}</text>
</view>
+<<<<<<< HEAD
<text class="book-count">棰勭害閲弡{ item.bookCount || 0 }}</text>
+=======
+ <text class="book-count">棰勭害閲弡{ item.bookCount }}+</text>
+>>>>>>> master
</view>
</view>
</view>
@@ -159,12 +163,19 @@
//鐐瑰嚮閲嶇疆鎸夐挳
+<<<<<<< HEAD
resetChoosedList() {
this.choosedList = []
this.categoryId = "" // 濡傛灉浣犻渶瑕佷篃鎶婄瓫閫夋潯浠舵竻绌�
this.getList() // 閲嶆柊鑾峰彇鏁版嵁
this.$refs.selectPopup.close()
},
+=======
+ resetChoosedList() {
+ this.choosedList = []
+ this.$refs.selectPopup.close()
+ },
+>>>>>>> master
//鐐瑰嚮纭畾鎸夐挳
submit() {
if (this.choosedList.length == 1) {
--
Gitblit v1.8.0