From 5ec3b17cc5f241463113714d41592c670eff9f15 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: Tue, 9 May 2023 11:09:32 +0800
Subject: [PATCH] up

---
 pages/activity/book.vue  |   3 +-
 pages/activity/index.vue |   2 +-
 pages/activity/info.vue  | 118 ++++++++++++++++++++++++++++-----------
 3 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 1b9d0f3..39b8d54 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -15,8 +15,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{timeFormat(numberlist.start_time,"yyyy年MM月DD日")}}
-							{{getHm(numberlist.start_time)}}-{{getHm(numberlist.end_time)}}</text>
+						<text>活动时间：{{timeFormat(numberlist.start_time,"yyyy年MM月DD日")}} {{getHm(numberlist.start_time)}}-{{getHm(numberlist.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 8ae4fdc..54c136b 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -42,7 +42,7 @@
 						</view>
 						<view style="display: flex;flex-direction: column;">
 							<block v-for="(k,index) in item.numbers">
-								<view v-if="index<2" class="tag tag_green activityBox_btn activityBox_time">
+								<view v-if="index<2" class="tag tag_green activityBox_btn activityBox_time" style="margin-top: -5px;margin-bottom: 10px;">
 									<text style="margin-right:12rpx">
 										{{timeFormat(k.start_time,"MM月DD日")}}
 									</text>
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index b842f97..881894b 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -55,24 +55,31 @@
 						<text class="infoBox-titletxt">活动场次</text>
 					</view>
 					<view class="numbers">
-						<u-radio-group placement="column" v-model="chooseNum" @change="numChange">
-							<view v-for="(item, index) in numbers" :key="index">
-								<u-radio activeColor="#EF9525"
-									:label="item.label" :disabled="item.disabled" :name="item.id">
-								</u-radio>
-								<view style="padding-left:50rpx;margin-bottom:10rpx">
-									<text style="margin-right:20rpx">
-										限制人数：{{item.total==0?'不限':item.total}}
-									</text>
-									<text>
-										已报名数：{{item.has_total}}
-									</text>
-									
-								</view>
-								
+						<view v-for="(item, index) in numbers" :key="index" @click="numChange(item)" class="numbersBox"
+							:class="{numbersBoxActive:item.checked}">
+							<view style="padding-left:50rpx;margin-bottom:10rpx">
+								<text style="margin-right:20rpx;font-size: 28rpx;font-weight: bold;">
+									{{item.label}}
+								</text>
+							</view>
+							<view style="padding-left:50rpx;margin-bottom:10rpx">
+								<text style="margin-right:20rpx">
+									活动时间：{{item.time}}
+								</text>
+							</view>
+							<view style="padding-left:50rpx;margin-bottom:10rpx">
+								<text style="margin-right:20rpx">
+									限制人数：{{item.total==0?'不限':item.total}}
+								</text>
+								<text>
+									已报名数：{{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>
-							
-						</u-radio-group>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -168,14 +175,20 @@
 				this.showNumbers = false
 				this.chooseNum = ""
 			},
-			numChange(val) {
-				console.log(val)
-				this.activity_number_id = val
-				console.log("book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id=" + this
-					.activity_number_id)
-				// uni.navigateTo({
-				// 	url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
-				// })
+			numChange(item) {
+				if(item.disabled) {
+					this.util.alert("您选择的产次不可预约！");
+					return;
+				};
+				var _numbers = this.numbers;
+				for (var mod of _numbers) {
+					mod.checked = false;
+
+				}
+				item.checked = true;
+				this.activity_number_id = item.id;
+				this.numbers = _numbers;
+				this.$forceUpdate()
 			},
 			tobook(type) {
 				// this.showNumbers = true
@@ -207,17 +220,27 @@
 						res.isCanBook = that.$moment(nt).isBefore(res.end_plan);
 						that.list = res;
 						let numberArr = []
-						let nowTime = that.getNowTime()
+						let nowTime = that.getNowTime();
+						var i = 0;
 						for (var m of res.numbers) {
-							m.label = m.name + "(" + that.timeFormat(m.start_time, "yyyy年MM月DD日") + " " + that
-								.getHm(m.start_time) + "-" + that.getHm(m.end_time) + ")"
-							if (m.has_total == m.total && m.total != 0 || that.compareDate(nowTime, m
-								.end_plan)) {
-								m.disabled = true
+							m.label = m.name;
+							m.time = that.timeFormat(m.start_time, "yyyy年MM月DD日") + " " + that
+								.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
+								
 							}
-							numberArr.push(m);
-							if(that.chooseNum==""){
-								that.chooseNum=m.id;
+							numberArr.push(m);
+							if (!m.disabled) {
+
+								this.activity_number_id = (i == 0 ? m.id : '')
+								m.checked = i == 0;
+								i++;
 							}
 						}
 						that.numbers = numberArr
@@ -346,4 +369,31 @@
 	.colortext {
 		color: #D98012
 	}
+
+	.numbersBox {
+		border: #F7F6F4 1px solid;
+		border-radius: 5px;
+		background-color: #F7F6F4;
+		padding: 10px;
+		margin-bottom: 10px;
+	}
+
+	.numbersBoxActive {
+		border: #D98012 1px solid;
+		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;
+	}
 </style>
\ No newline at end of file