From 3742651644523c1ebd9d1bd0a714325e04a29099 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 17 Jun 2022 13:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/book.vue        |  9 +++-
 pages/order/activityorder.vue  | 12 ++---
 pages/order/visitorderinfo.vue |  8 +--
 pages/visit/book.vue           | 96 +++++++++++++++++++++++++---------
 4 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 741ab3b..1223b49 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -252,10 +252,15 @@
 			wx.getStorage({
 				key: 'activityinfo',
 				success(res) {
-					that.list = res.data
+					that.list = res.data;
+					if(that.form.type==2){
+						that.form.total = 1
+					}else if(that.form.type==1){
+						that.form.total = res.data.team_min_count;
+					}
 				}
 			})
-			console.log(this.list)
+			
 
 			that.util.getUserInfo(function(r) {
 				that.form.mobile = r.mobile;
diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue
index 2f5b819..b8063fc 100644
--- a/pages/order/activityorder.vue
+++ b/pages/order/activityorder.vue
@@ -9,9 +9,9 @@
 			<block v-for="(item,index) in listOrder" :key="index">
 				<view class="orderBox" :class="{'cancelBox':item.status==0}" @click="toinfo(item.id)">
 					<view class="orderBoxTitle flex-row">
-						<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text>
-						<view v-for="sta in list" v-if="sta.idx==item.status" class="orderBoxStatus"
-							:class="{'cancelStatus':item.status==0}">{{sta.name}}
+						<text class="orderBoxTitleTxt">{{item.type==1?"团队预约":"个人预约"}}</text>
+						<view
+							:class="item.status!=1?'cancelStatus orderBoxStatus':'orderBoxStatus'">{{item.status_name}}
 						</view>
 					</view>
 
@@ -59,13 +59,13 @@
 					name: '全部',
 					idx: ""
 				}, {
-					name: '待参加',
+					name: '已预约',
 					idx: "1"
 				}, {
-					name: '已参加',
+					name: '已核销',
 					idx: "2"
 				}, {
-					name: '已预约',
+					name: '已取消',
 					idx: "0"
 				}],
 				current: 0,
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index 980cf98..f9d4524 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -3,7 +3,7 @@
 		<view class="orderBoxList">
 			<view class="orderBox">
 				<view class="orderBoxTitle flex-row">
-					<text class="orderBoxTitleTxt">{{info.type==1?"团队预约信息":"个人预约信息"}}</text>
+					<text class="orderBoxTitleTxt">预约信息</text>
 				</view>
 
 				<view class="orderBoxInfo flex-col">
@@ -84,9 +84,11 @@
 			</view>
 		</view> -->
 		<view>
-			<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 25rpx;">
+			<view class="orderBoxInfoRow flex-row" style="margin-top: 25rpx;">
 				<!-- <text class="iconfont icon-iconfontgerenzhongxin"></text> -->
-				<text class="orderBoxInfoRowTxt">领队人：{{info.leader||""}}丨 {{info.mobile||""}}</text>
+				<text v-if="info.type==1" class="orderBoxInfoRowTxt">领队人：{{info.leader||""}}丨 {{info.mobile||""}}</text>
+				<text v-if="info.type==2" class="orderBoxInfoRowTxt">联系方式：{{info.mobile||""}}</text>
+			
 			</view>
 			<view class="orderBoxInfoRow flex-row" v-if="info.type==1" style="margin-top: 20rpx;">
 				<!-- <text class="iconfont icon-danwei"></text> -->
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index a696c52..fd7599b 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -131,6 +131,21 @@
 							</view>
 						</view>
 					</view>
+				</view>
+				<view class="box-card">
+					<u-form-item label="特殊情况" labelWidth="80" prop="leader" ref="leader">
+							<!-- <u-radio-group v-model="specialtype">
+								<u-radio ref="specialradio" width="50%" @change="radioChange" activeColor="#EF9525"
+									 name='3' label="">
+								</u-radio>
+								
+							</u-radio-group> -->
+							<u-checkbox-group @change="radioChange">
+								<u-checkbox activeColor="#EF9525" label="乘坐轮椅等行动不便者" v-model="specialtype" name='1' shape="circle"></u-checkbox>
+							</u-checkbox-group>
+					</u-form-item>
+					
+					
 				</view>
 				<view class="box-card" v-if="type=='team'">
 					<view class="box-card-title">
@@ -160,6 +175,14 @@
 							<u-input readonly placeholder="请输入手机号" v-model="form.mobile"></u-input>
 						</u-form-item>
 					</view>
+				</view>
+				<view class="box-card" v-if="type=='user'">
+					
+					<view class="box-card-content" style="padding: 10px;">
+						<u-form-item label="手机号" labelWidth="80" prop="mobile" ref="mobile" required>
+							<u-input readonly placeholder="请输入手机号" v-model="form.mobile"></u-input>
+						</u-form-item>
+					</view>
 				</view>
 			</u--form>
 			<view class="page-bottom">
@@ -186,7 +209,7 @@
 						<u-form-item label="证件号码" labelWidth="80" prop="idcard" ref="idcard" required>
 							<u-input placeholder="请输入证件号码" v-model="formUser.idcard"></u-input>
 						</u-form-item>
-						<u-form-item label="手机号" labelWidth="80" prop="from.mobile" ref="mobile" required>
+						<u-form-item label="手机号" labelWidth="80" prop="from.mobile" ref="mobile">
 							<u-input placeholder="请输入手机号" v-model="formUser.mobile"></u-input>
 						</u-form-item>
 					</u--form>
@@ -234,7 +257,9 @@
 				}, {
 					title: "批量上传帮助",
 					content: "<p>1.批量上传EXCEL的以xlsx结尾</p><p>2.第一列为标题列 姓名	手机号	证件号</p><p>3.文件是从微信聊天记录中选取或者微信文件传输助手</p><img src='@host@/export.png' style='width:100%'/>"
-				}],
+				}],
+				specialtype:false,
+				specialid:0,
 				form: {
 					date: "",
 					rule_id: "",
@@ -335,7 +360,19 @@
 
 
 		},
-		methods: {
+		methods: {
+			radioChange(val){
+				console.log(val)
+				this.specialtype = !this.specialtype;
+				if(this.specialtype){
+					this.specialid = val[0]
+				}else{
+					this.specialid = 0
+				}
+				// if(this.$refs.radio.currentValue){
+				// 	this.specialtype = val;
+				// }
+			},
 			loadConfig() {
 
 
@@ -384,7 +421,11 @@
 			},
 			submitOrder() {
 				this.form.date = this.currentDate.date;
-				this.form.rule_id = this.currentTime.id;
+				this.form.rule_id = this.currentTime.id;
+				if(this.specialid){
+					// 
+					this.form.is_disability = this.specialid;
+				}
 
 				if (this.form.details_list.length != this.form.total) {
 					uni.showToast({
@@ -393,12 +434,7 @@
 					})
 					return false;
 				}
-
-
-
 				if (this.type != "user") {
-
-
 					if (this.util.isNull(this.form.leader)) {
 
 						uni.showToast({
@@ -446,7 +482,8 @@
 							return false;
 						}
 					}
-				}
+				}
+				
 
 
 
@@ -535,25 +572,36 @@
 								return false;
 							}
 						}
-						if (this.util.isNull(this.formUser.mobile)) {
-							uni.showToast({
-								icon: "none",
-								title: "请填写手机号"
-							})
-							return false;
-						} else if (!this.util.phoneRegex.test(this.formUser.mobile)) {
-							uni.showToast({
-								icon: "none",
-								title: "请正确填写手机号"
-							})
-							return false;
-						}
+						// if (this.util.isNull(this.formUser.mobile)) {
+						// 	uni.showToast({
+						// 		icon: "none",
+						// 		title: "请填写手机号"
+						// 	})
+						// 	return false;
+						// } else if (!this.util.phoneRegex.test(this.formUser.mobile)) {
+						// 	uni.showToast({
+						// 		icon: "none",
+						// 		title: "请正确填写手机号"
+						// 	})
+						// 	return false;
+						// }
+						if(!this.util.isNull(this.formUser.mobile)){
+							if (!this.util.phoneRegex.test(this.formUser.mobile)) {
+								uni.showToast({
+									icon: "none",
+									title: "请正确填写手机号"
+								})
+								return false;
+							}
+						}
+						
+						
 						//判断是不是编辑 如果是编辑
 						if (that.editIndex != -1) {
 							that.form.details_list.splice(that.editIndex, 1, that.formUser)
 						} else
 							that.form.details_list.push(that.formUser);
-						that.addUserAfter();
+						// that.addUserAfter();
 						that.showAdd = false;
 					}).catch(errors => {
 						uni.showToast({