From 6173cf3f66ce3671d4c0dfd1ae8100b2d14effd2 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 8 May 2023 14:19:01 +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  |  2 +-
 pages/activity/index.vue | 17 +++++++++--------
 pages/activity/info.vue  | 31 ++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 8038b48..1b9d0f3 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -1,4 +1,4 @@
-git<template>
+<template>
 	<view>
 		<view class="content">
 			<view class="box-card">
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 4c7d0a3..481fe62 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -8,10 +8,10 @@
 					<view class="book-status">
 						{{item.rate_name}}
 					</view>
-					<view class="book-num" v-if="item.orders_count>0">
+					<!-- <view class="book-num" v-if="item.orders_count>0">
 						<text class="book-num-y"> {{isUnde(item.orders_count)}} </text>
 						<text>人已报名</text>
-					</view>
+					</view> -->
 				</view>
 				<view class="activityBox-content flex-col">
 					<view class="activityBox-row">
@@ -51,9 +51,9 @@
 							</view>
 						</view>
 
-						<view v-if="item.numbers.length>2" style="line-height: 70rpx;"
+						<view v-if="item.numbers.length" style="line-height: 70rpx;"
 							class="tag tag_green activityBox_btn activityBox_time">
-							更多
+							更多场次
 						</view>
 					</view>
 					<!-- <view class="activityBox-row">
@@ -66,10 +66,10 @@
 						<text>活动地址：{{isUnde(item.address)}}</text>
 					</view>
 
-					<view class="activityBox-row">
+					<!-- <view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
 						<text>人数限制：{{isUnde(item.total)==0?'不限':isUnde(item.total)}}</text>
-					</view>
+					</view> -->
 					<view class="activityBox-row flex-row align-center" style="margin-bottom: 0rpx;"
 						@click.stop="tothere(item)">
 						<text class="icon-ditu-dibiao iconfont"></text>
@@ -182,7 +182,8 @@
 		margin: 4rpx;
 		background: #FCF6E3;
 		border: 2rpx solid #EF9525;
-		border-radius: 5rpx;
-		color: #4E4E4E;
+		border-radius: 20rpx;
+		color: #4E4E4E;
+		margin-right: 10rpx;
 	}
 </style>
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 65bd4f4..b842f97 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -31,10 +31,10 @@
 						<text>活动地址：{{isUnde(list.address)}}</text>
 					</view>
 
-					<view class="activityBox-row">
+					<!-- <view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
 						<text>人数限制：{{isUnde(list.total)==0?'不限':isUnde(list.total)}}</text>
-					</view>
+					</view> -->
 					<view class="activityBox-row flex-row align-center" @click="tothere">
 						<text class="icon-ditu-dibiao iconfont"></text>
 						<text>距离：{{isUnde(list.distance)}}km</text>
@@ -42,9 +42,9 @@
 							<text class="icon-daohang1 iconfont" style="margin-right: 0;"></text>
 						</view>
 					</view>
-					<view class="colortext activityBox-row" v-if="list.status==1">
+					<!-- <view class="colortext activityBox-row" v-if="list.status==1">
 						{{list.rate_name}} (已报名{{list.orders_total}}人)
-					</view>
+					</view> -->
 
 
 				</view>
@@ -55,10 +55,23 @@
 						<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 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>
+							
 						</u-radio-group>
 					</view>
 				</view>
@@ -318,7 +331,7 @@
 	}
 
 	.numbers .u-radio {
-		margin-bottom: 40rpx
+		margin-bottom: 10rpx
 	}
 
 	swiper {