From 4939986be74024d3852550f0a8146f69d409ef44 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 21 Feb 2023 17:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/book.vue  |  3 +--
 pages/activity/index.vue | 34 +++++++++++++++++++++++++++++----
 pages/activity/info.vue  | 41 +++++++++++++++++++++++++---------------
 3 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 149d4f3..368263e 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 5503f8d..4c7d0a3 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -18,7 +18,7 @@
 						<text class="activityBox-title">{{isUnde(item.name)}}</text>
 					</view>
 					<view class="activityBox-row flex-row justify-between">
-						<view class="tag tag_green activityBox_btn">
+						<view :class="item.type_name?'tag tag_green activityBox_btn':''">
 							<text>{{isUnde(item.type_name)}}</text>
 						</view>
 						<block v-if="item.orders_count==item.total&&item.orders_count!=0">
@@ -37,9 +37,24 @@
 					</view>
 
 					<view class="activityBox-row">
-						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{timeFormat(item.start_time,"yyyy年MM月DD日")}} {{getHm(item.start_time)}}-{{getHm(item.end_time)}}</text>
+						<view style="display: inline-block;">
+							<text class="icon-shijian iconfont"></text>活动场次：
+						</view>
+						<view v-for="(k,index) in item.numbers" style="display: inline-block;">
+							<view v-if="index<2" class="tag tag_green activityBox_btn activityBox_time">
+								<view>
+									{{timeFormat(k.start_time,"MM月DD日")}}
+								</view>
+								<view>
+									{{getHm(k.start_time)}}-{{getHm(k.end_time)}}
+								</view>
+							</view>
+						</view>
 
+						<view v-if="item.numbers.length>2" style="line-height: 70rpx;"
+							class="tag tag_green activityBox_btn activityBox_time">
+							更多
+						</view>
 					</view>
 					<!-- <view class="activityBox-row">
 						<text class="icon-huodongfangshi iconfont"></text>
@@ -110,7 +125,7 @@
 					url: "info?id=" + obj.id
 				})
 			},
-			loadActivity() {
+			loadActivity() {
 				console.log("aaa")
 				var that = this;
 				var nt = new Date();
@@ -159,4 +174,15 @@
 	page {
 		background-color: #f7f6f4;
 	}
+
+	.activityBox_time {
+		height: 70rpx;
+		vertical-align: middle;
+		display: inline-block;
+		margin: 4rpx;
+		background: #FCF6E3;
+		border: 2rpx solid #EF9525;
+		border-radius: 5rpx;
+		color: #4E4E4E;
+	}
 </style>
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 29da975..75a11a1 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -17,16 +17,9 @@
 				<view class="activityBox-content flex-col">
 					<view class="activityBox-row flex-row justify-between">
 						<text class="activityBox-title">{{isUnde(list.name)}}</text>
-						<view class="tag tag_green activityBox_btn">
+						<!-- <view class="tag tag_green activityBox_btn">
 							<text>{{isUnde(list.type_name)}}</text>
-						</view>
-					</view>
-
-					<view class="activityBox-row">
-						<text class="icon-shijian iconfont"></text>
-						<text>活动时间：{{timeFormat(list.start_time,"yyyy年MM月DD日")}}
-							{{getHm(list.start_time)}}-{{getHm(list.end_time)}}</text>
-
+						</view> -->
 					</view>
 					<!-- <view class="activityBox-row">
 						<text class="icon-huodongfangshi iconfont"></text>
@@ -55,6 +48,20 @@
 
 
 				</view>
+			</view>
+			<view class="infoBox" style="padding-bottom:0;margin-bottom: 26rpx;">
+			<view class="activityBox-row">
+				<view class="infoBox-title">
+					<text class="infoBox-titletxt">活动场次</text>
+				</view>
+				<view class="numbers">
+					<u-radio-group placement="column" v-model="chooseNum" @change="numChange">
+						<u-radio activeColor="#EF9525" v-for="(item, index) in numbers" :key="index"
+							:label="item.label" :disabled="item.disabled" :name="item.id">
+						</u-radio>
+					</u-radio-group>
+				</view>
+			</view>
 			</view>
 			<view class="infoBox">
 				<view class="infoBox-title">
@@ -152,13 +159,16 @@
 				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
-				})
+				// uni.navigateTo({
+				// 	url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
+				// })
 			},
 			tobook(type) {
-				this.showNumbers = true
-				this.teamType = type
+				// this.showNumbers = true
+				this.teamType = type
+				uni.navigateTo({
+					url: "book?type=" + this.teamType + "&activity_id=" + this.id + "&activity_number_id="+this.activity_number_id
+				})
 			},
 			loadActiveInfo() {
 				var that = this;
@@ -288,7 +298,8 @@
 	}
 	.numbers {
 		/* min-height: 300rpx; */
-		padding: 60rpx 40rpx;
+		padding: 31rpx 24rpx;
+		padding-bottom:13rpx;
 	}
 
 	.numbers .u-radio {