From 4170c490924137aa34433b1d27985090d10980a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 11 May 2023 14:18:31 +0800
Subject: [PATCH] up

---
 pages/activity/book.vue  |  2 +-
 pages/activity/index.vue |  2 +-
 pages/activity/info.vue  | 59 ++++++++++++++++++++--------------------
 utils/util.js            |  2 +-
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 39b8d54..3122a50 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -58,7 +58,7 @@
 							<text class="box-tips-txt"
 								v-if="type=='user'">每单限购{{list.person_max_count}}张，同一身份证当天限购1张</text>
 							<text class="box-tips-txt"
-								v-if="type=='team'">{{list.team_min_count}}人以上可团体预约，一个团体最多{{list.team_max_count}}人</text>
+								v-if="type=='team'">{{list.team_min_count}}人以上可团体预约<!-- ，一个团体最多{{list.team_max_count}}人 --></text>
 						</view>
 						<view>
 							<view class="box-card-content">
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 54c136b..360c600 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -31,7 +31,7 @@
 						</block>
 						<block v-else>
 							<view class="tag" :class="{activityBox_btn:item.isCanBook}">
-								<text>{{item.isCanBook?"立即报名":"不可报名"}}</text>
+								<text>{{item.isCanBook?"立即报名":"已结束"}}</text>
 							</view>
 						</block>
 					</view>
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 881894b..5af4e94 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -75,9 +75,9 @@
 									已报名数：{{item.has_total}}
 								</text>
 
-							</view>
-							<view class="book-box-row-timeitem-status" v-if="item.checked">
-								<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
+							</view>
+							<view class="book-box-row-timeitem-status" v-if="item.checked">
+								<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -110,7 +110,7 @@
 					</view>
 				</view>
 			</u-popup>
-			<view class="flex-row">
+			<view class="flex-row" v-if="list.status==1">
 				<view style="margin-right: 14rpx;flex: 1;" v-if="list.join_type==1||list.join_type==0">
 					<u-button type="primary" @click="tobook('team')">团体预约</u-button>
 				</view>
@@ -175,10 +175,10 @@
 				this.showNumbers = false
 				this.chooseNum = ""
 			},
-			numChange(item) {
-				if(item.disabled) {
-					this.util.alert("您选择的产次不可预约！");
-					return;
+			numChange(item) {
+				if (item.disabled) {
+					this.util.alert("您选择的场次不可预约！");
+					return;
 				};
 				var _numbers = this.numbers;
 				for (var mod of _numbers) {
@@ -228,21 +228,22 @@
 								.getHm(m.start_time) + "-" + that.getHm(m.end_time);
 							if (that.compareDate(nowTime, m
 									.end_plan)) {
-									m.disabled = true
-							}
-							
-							if (m.has_total == m.total && m.total != 0){
-									m.disabled = true
-								
+								m.disabled = true
+							}
+
+							if (m.has_total == m.total && m.total != 0) {
+								m.disabled = true
+
 							}
 							numberArr.push(m);
 							if (!m.disabled) {
-
-								this.activity_number_id = (i == 0 ? m.id : '')
 								m.checked = i == 0;
 								i++;
 							}
 						}
+						console.log("numberArr[0].id", numberArr[0].id);
+						if (numberArr.length > 0)
+							that.activity_number_id = numberArr[0].id
 						that.numbers = numberArr
 						wx.setStorage({
 							key: 'activityinfo',
@@ -380,20 +381,20 @@
 
 	.numbersBoxActive {
 		border: #D98012 1px solid;
-		background-color: #FCF6E3;
+		background-color: #FCF6E3;
 		position: relative;
 
-	}
-	
-	.book-box-row-timeitem-status {
-		position: absolute;
-		right: 0;
-		top: 0;
-		background: #EF9525;
-		border-top-right-radius: 5rpx;
-		border-bottom-left-radius: 5rpx;
-		font-size: 20rpx;
-		color: #828282;
-		padding: 7rpx;
+	}
+
+	.book-box-row-timeitem-status {
+		position: absolute;
+		right: 0;
+		top: 0;
+		background: #EF9525;
+		border-top-right-radius: 5rpx;
+		border-bottom-left-radius: 5rpx;
+		font-size: 20rpx;
+		color: #828282;
+		padding: 7rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index e1fd8f2..256446b 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,6 +1,6 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development': 'https://leyitest.ali251.langye.net',
+	'development':'https://leyiyuyue.szgmbwg.org.cn',// 'https://leyitest.ali251.langye.net',
 	'production': 'https://leyiyuyue.szgmbwg.org.cn'
 }; // 审核状态