From 59c6be0ad21459caadcc7ff0a43c912af0d195ce Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 9 Oct 2024 09:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=9C=BA=E5=9C=B0=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js                    | 4 ++--
 packages/booksubmit/appointment.vue | 8 +++++++-
 packages/booksubmit/index.vue       | 8 +++++++-
 packages/mybook/detail.vue          | 8 +++++++-
 packages/mybook/index.vue           | 6 +++++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/common/config.js b/common/config.js
index 4f0fb9f..f69e14f 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,7 +1,7 @@
 const mode = 'production'; //devLocal：本地测试、devOnline：线上测试、production：生产环境
 let ROOTPATH = '';  //域名
-// let baseUrl = "https://suzhoukeji-test.ali251.langye.net"
-let baseUrl = "https://wx.sstbc.com"
+let baseUrl = "https://suzhoukeji-test.ali251.langye.net"
+// let baseUrl = "https://wx.sstbc.com"
 switch (mode) {
 	case 'devLocal':
 		ROOTPATH = baseUrl
diff --git a/packages/booksubmit/appointment.vue b/packages/booksubmit/appointment.vue
index cdb69d1..a3a34df 100644
--- a/packages/booksubmit/appointment.vue
+++ b/packages/booksubmit/appointment.vue
@@ -78,7 +78,13 @@
 				<view class="big-info">
 					<view @click="getUser">入校请刷码：点击刷新二维码</view>
 					<view>预约时间：{{formatTime(myQrcode.start_time,myQrcode.end_time)}}</view>
-					<view>预约场地：{{myQrcode.appointment_config.real_name}}</view>
+					<view>预约场地：
+						<block v-if="myQrcode.site_detail && myQrcode.site_detail.length>0">
+							<block v-for="(site,index) in myQrcode.site_detail">
+								{{site.real_name}}<block v-if="index+1<myQrcode.site_detail.length">,</block>
+							</block>
+						</block>
+					</view>
 				</view>
 			</view>
 		</view>
diff --git a/packages/booksubmit/index.vue b/packages/booksubmit/index.vue
index bef0951..1975151 100644
--- a/packages/booksubmit/index.vue
+++ b/packages/booksubmit/index.vue
@@ -122,7 +122,13 @@
 				<view class="slot-content-title">提示</view>
 				<view class="slot-content-tip">您已有一次预约，预约时间为<span
 						style="color:red">{{myQrcode.mytime}}</span>，预约场地为<span
-						style="color:red">{{myQrcode.appointment_config.real_name}}</span>,如您想再次预约其他时间，需先取消该预约，请确认是否取消？
+						style="color:red">
+						<block v-if="myQrcode.site_detail && myQrcode.site_detail.length>0">
+							<block v-for="(site,index) in myQrcode.site_detail">
+								{{site.real_name}}<block v-if="index+1<myQrcode.site_detail.length">,</block>
+							</block>
+						</block>
+						</span>,如您想再次预约其他时间，需先取消该预约，请确认是否取消？
 				</view>
 				<view class="slot-content-btn">
 					<view @click="backBook">返回</view>
diff --git a/packages/mybook/detail.vue b/packages/mybook/detail.vue
index 27d5c0b..964b50c 100644
--- a/packages/mybook/detail.vue
+++ b/packages/mybook/detail.vue
@@ -13,7 +13,13 @@
 				</view>
 				<view>
 					<text>预约场地</text>
-					<text>{{info.appointment_config.name}}</text>
+					<text>
+						<block v-if="info.site_detail && info.site_detail.length>0">
+							<block v-for="(site,index) in info.site_detail">
+								{{site.real_name}}<block v-if="index+1<info.site_detail.length">,</block>
+							</block>
+						</block>
+					</text>
 				</view>
 				<view>
 					<text>预约事项</text>
diff --git a/packages/mybook/index.vue b/packages/mybook/index.vue
index 6f816b2..7118c92 100644
--- a/packages/mybook/index.vue
+++ b/packages/mybook/index.vue
@@ -30,7 +30,11 @@
 						
 						<view>
 							<image :src="base.imgHost('mybook-icon4.png')" style="width:20rpx;height: 26rpx;"></image>
-							{{item.appointment_config?item.appointment_config.name:''}}
+							<block v-if="item.site_detail && item.site_detail.length>0">
+								<span v-for="(site,index) in item.site_detail">
+									{{site.real_name}}<span v-if="index+1<item.site_detail.length">,</span>
+								</span>
+							</block>
 						</view>
 						<view>
 							<image :src="base.imgHost('mybook-icon5.png')"  style="width:21rpx;height: 23rpx;"></image>