From 63b3402949b53b27313f819d9c1d5ae495ceacf3 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 5 Jun 2024 09:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/book.vue | 52 ++++++++++++++++++++++-------------------
 pages/activity/info.vue |  8 ++++---
 utils/util.js           |  4 ++--
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 71a85f6..356cd28 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -31,7 +31,8 @@
 
 					<view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
-						<text>人数限制：{{(list.form==2?10 : (numberlist.total==0?'不限':numberlist.total))}}</text>
+						<text>{{list.form==2?'起约人数':'人数限制'}}：{{(list.form==2?10 : (numberlist.total==0?'不限':numberlist.total))}}</text>
+						
 					</view>
 					<view class="activityBox-row flex-row align-center" @click="tothere">
 						<text class="icon-ditu-dibiao iconfont"></text>
@@ -44,14 +45,14 @@
 
 			</view>
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="form">
-				<view class="box-card">
+				<view class="box-card" v-if="type=='team'">
 					<view class="box-card-title">
-						参观人数
+						参加人数
 					</view>
 					<view class="box-card-content">
-						<u-form-item label="人数" labelWidth="120" prop="total" ref="total">
+						<u-form-item label="人数" labelWidth="120" prop="total" ref="total" v-if="type=='team'">
 							<u-number-box slot="right" v-model="form.total" inputWidth="44" color="#EF9525"
-								bgColor="#FCF6E3" :min="(type=='user'?1:list.team_min_count)"
+								bgColor="#FCF6E3" :min="(list.form==2?10:(type=='user'?1:list.team_min_count))"
 								:max="(type=='user'?list.person_max_count:list.team_max_count)" class="plus">
 							</u-number-box>
 						</u-form-item>
@@ -143,12 +144,12 @@
 						联系人信息
 					</view>
 					<view class="box-card-content">
-						<u-form-item :label="(type=='team'?'预约人':'联系人')" labelWidth="80" prop="leader" ref="leader"
+						<u-form-item :label="(type=='team'?'领队人':'预约人')" labelWidth="80" prop="leader" ref="leader"
 							required>
-							<u-input placeholder="请输入联系人" v-model="form.leader"></u-input>
+							<u-input :placeholder="`请输入${type=='team'?'领队人':'预约人'}`" v-model="form.leader"></u-input>
 						</u-form-item>
 						<block>
-							<u-form-item label="单位名称" labelWidth="80" prop="unit" required>
+							<u-form-item v-if="type=='team'" label="单位名称" labelWidth="80" prop="unit" required>
 								<u-input placeholder="请输入单位名称" v-model="form.unit"></u-input>
 							</u-form-item>
 							<!-- <u-form-item label="证件类型" labelWidth="80" prop="card_type1" required>
@@ -659,14 +660,16 @@
 						})
 						return false;
 					}
-
-					if (this.util.isNull(this.form.unit)) {
-						uni.showToast({
-							icon: "none",
-							title: "请填写单位名称"
-						})
-						return false;
+					if(this.type != "user"){
+						if (this.util.isNull(this.form.unit)) {
+							uni.showToast({
+								icon: "none",
+								title: "请填写单位名称"
+							})
+							return false;
+						}
 					}
+					
 
 					// if (this.util.isNull(this.form.idcard)) {
 					// 	uni.showToast({
@@ -700,16 +703,17 @@
 						return false;
 					}
 				// }
-				// if(this.type=='user'){
-				// 	this.form.details_list.push({
-				// 		name:this.form.leader,
-				// 		mobile:this.form.mobile,
-				// 		card_type:1,
-				// 		idcard:''
-				// 	})
-				// }
-
+				if(this.type=='user'){
+					this.form.details_list.push({
+						name:this.form.leader,
+						mobile:this.form.mobile,
+						card_type:1,
+						idcard:''
+					})
+				}
 
+                console.log("this.form",this.form)
+				// return
 				var that = this;
 				this.util.request({
 					api: '/api/mobile/activity/order',
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 484dc58..1d76336 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -236,13 +236,15 @@
 							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
+								m.disabled = true
+								console.log("1",m.disabled)
 							}
 
 							if (m.has_total == m.total && m.total != 0) {
-								m.disabled = true
+								m.disabled = true
+								console.log("2",m.disabled)
 							}
-							//如果是主题党日活动只要有人报名就不可以再次报名了
+							// 如果是主题党日活动只要有人报名就不可以再次报名了
 							if (res.form == 2 && m.has_total > 0) {
 								m.disabled = true
 							}
diff --git a/utils/util.js b/utils/util.js
index a77fb37..284e6d7 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -2,8 +2,8 @@ import md5 from "./md5.min";
 const HOSTARR = {
 	'development':'https://leyiyuyue.szgmbwg.org.cn',
 	'production': 'https://leyiyuyue.szgmbwg.org.cn',
-	// 'development':'http://leyitest.ali251.langye.net',
-	// 'production': 'http://leyitest.ali251.langye.net',
+	// 'development':'https://leyitest.ali251.langye.net',
+	// 'production': 'https://leyitest.ali251.langye.net',
 	
 }; // 审核状态