up

pages/activity/book.vue

@@ -6,8 +6,8 @@
 					预约的活动
 				</view>
 				<view class="box-card-content activityBox-content">
-					<view class="activityBox-row flex-row justify-between">
+					<view class="activityBox-row ">
-						<text class="activityBox-title">{{list.name}}</text>
+						<view class="activityBox-title">{{list.name}}</view>
 						<view class="tag tag_green activityBox_btn">
 							<text>{{numberlist.name}}</text>
 						</view>
@@ -31,7 +31,7 @@
 
 					<view class="activityBox-row">
 						<text class="icon-renshu iconfont"></text>
-						<text>人数限制：{{numberlist.total==0?'不限':numberlist.total}}</text>
+						<text>人数限制：{{(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>
@@ -62,7 +62,7 @@
 							<text class="box-tips-txt"
 								v-if="type=='user'">每单限购{{list.person_max_count}}张，同一身份证当天限购1张</text>
 							<text class="box-tips-txt"
-								v-if="type=='team'">{{list.team_min_count}}人以上可团体预约<!-- ，一个团体最多{{list.team_max_count}}人 --></text>
+								v-if="type=='team'">{{list.form==2?10:list.team_min_count}}人以上可团体预约<!-- ，一个团体最多{{list.team_max_count}}人 --></text>
 						</view>
 						<view>
 							<view class="box-card-content">
@@ -354,9 +354,9 @@
 			this.form.activity_number_id = parseInt(options.activity_number_id);
 
 		},
-		onShow(){
+		onShow() {
 			var that = this;
-			that.numberlist={};
+			that.numberlist = {};
 			wx.getStorage({
 				key: 'activityinfo',
 				success(res) {
@@ -369,7 +369,7 @@
 					if (that.form.type == 2) {
 						that.form.total = 1
 					} else if (that.form.type == 1) {
-						that.form.total = 1;//res.data.team_min_count;
+						that.form.total = 1; //res.data.team_min_count;
 					}
 				}
 			})

pages/activity/info.vue

@@ -68,10 +68,13 @@
 								</text>
 							</view>
 							<view style="padding-left:50rpx;margin-bottom:10rpx">
-								<text style="margin-right:20rpx">
+								<text v-if="list.form!=2">
 									限制人数：{{item.total==0?'不限':item.total}}
 								</text>
-								<text>
+								<text v-else>
+									{{item.has_total>0?"预约已满":""}}
+								</text>
+								<text style="margin-left:20rpx">
 									已报名数：{{item.has_total}}
 								</text>
 
@@ -145,9 +148,9 @@
 
 
 		},
-		onShow(){
+		onShow() {
 			var that = this;
-			that.numbers=[];
+			that.numbers = [];
 			wx.getLocation({
 				success(res) {
 					console.log(res)
@@ -227,24 +230,27 @@
 						let numberArr = []
 						let nowTime = that.getNowTime();
 						var i = 0;
-						var chkMod=null
+						var chkMod = null
 						for (var m of res.numbers) {
 							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
+							if (that.compareDate(nowTime, m.end_plan)) {
-									.end_plan)) {
 								m.disabled = true
 							}
 
 							if (m.has_total == m.total && m.total != 0) {
 								m.disabled = true
-
+							}
+							//如果是主题党日活动只要有人报名就不可以再次报名了
+							if (res.form == 2 && m.has_total > 0) {
+								m.disabled = true
 							}
 							numberArr.push(m);
 							if (!m.disabled) {
 								m.checked = i == 0;
-								chkMod=m;
+								if (chkMod == null)
+									chkMod = m;
 								i++;
 							}
 						}

utils/util.js

@@ -1,6 +1,6 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development':'https://leyiyuyue.szgmbwg.org.cn',//'https://leyitest.ali251.langye.net',//
+	'development':'https://leyiyuyue.szgmbwg.org.cn',
 	'production': 'https://leyiyuyue.szgmbwg.org.cn'
 }; // 审核状态