From 790cf8aeb6859c911da2f3a8ff747a21d6cbe6cd Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 21 Feb 2023 15:08:16 +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 | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 53bda34..149d4f3 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -9,14 +9,14 @@
 					<view class="activityBox-row flex-row justify-between">
 						<text class="activityBox-title">{{list.name}}</text>
 						<view class="tag tag_green activityBox_btn">
-							<text>{{list.type_name}}</text>
+							<text>{{numberlist.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>
+						<text>活动时间：{{timeFormat(numberlist.start_time,"yyyy年MM月DD日")}}
+							{{getHm(numberlist.start_time)}}-{{getHm(numberlist.end_time)}}</text>
 
 					</view>
 					<!-- <view class="activityBox-row">
@@ -31,7 +31,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
-						<text>人数限制：{{list.total==0?'不限':list.total}}</text>
+						<text>人数限制：{{numberlist.total==0?'不限':numberlist.total}}</text>
 					</view>
 					<view class="activityBox-row flex-row align-center" @click="tothere">
 						<text class="icon-ditu-dibiao iconfont"></text>
@@ -252,7 +252,8 @@
 				isEdit: false,
 				isEditIndex: 0,
 				showInfo: false,
-				list: {},
+				list: {},
+				numberlist:{},
 				common_user: [],
 				form: {
 					unit: "",
@@ -338,7 +339,14 @@
 			wx.getStorage({
 				key: 'activityinfo',
 				success(res) {
-					that.list = res.data;
+					that.list = res.data;
+					console.log(that.list)
+					for(var m of that.list.numbers){
+						if(that.form.activity_number_id==m.id){
+							that.numberlist = m
+						}
+					}
+					console.log(that.numberlist)
 					if (that.form.type == 2) {
 						that.form.total = 1
 					} else if (that.form.type == 1) {