From 21860221f07dab6d512e4b24318d64e5bf86551a Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 4 Jun 2024 16:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/activity/book.vue | 133 ++++++++++++++++++++-------------------- pages/activity/info.vue | 6 +- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/pages/activity/book.vue b/pages/activity/book.vue index 8380841..71a85f6 100644 --- a/pages/activity/book.vue +++ b/pages/activity/book.vue @@ -49,22 +49,22 @@ 参观人数 - + - + + - - + v-if="type=='team'">{{list.form==2?10:list.team_min_count}}人以上可团体预约 + --> + @@ -95,8 +94,8 @@ - - + --> + - + - - + + + 联系人信息 - @@ -151,12 +151,7 @@ - - + @@ -567,20 +562,20 @@ return false; } if (that.formUser.card_type == 1) { - if (this.util.isNull(this.formUser.idcard)) { - uni.showToast({ - icon: "none", - title: "请填写身份证号" - }) - return false; - } - if (!that.util.isValidCardID(that.formUser.idcard)) { - uni.showToast({ - icon: "none", - title: "请正确输入身份证号" - }) - return false; - } + // if (this.util.isNull(this.formUser.idcard)) { + // uni.showToast({ + // icon: "none", + // title: "请填写身份证号" + // }) + // return false; + // } + // if (!that.util.isValidCardID(that.formUser.idcard)) { + // uni.showToast({ + // icon: "none", + // title: "请正确输入身份证号" + // }) + // return false; + // } } if (that.isEdit) { that.form.details_list[that.isEditIndex] = that.formUser; @@ -648,21 +643,19 @@ }, submitOrder() { - if (this.form.details_list.length != this.form.total) { - uni.showToast({ - icon: "none", - title: "请正确添加观众数量" - }) - return false; - } - - if (this.type != "user") { - + // if (this.form.details_list.length != this.form.total) { + // uni.showToast({ + // icon: "none", + // title: "请正确添加观众数量" + // }) + // return false; + // } + // if (this.type != "user") { if (this.util.isNull(this.form.leader)) { uni.showToast({ icon: "none", - title: "请填写领队姓名" + title: "请填写姓名" }) return false; } @@ -675,23 +668,23 @@ return false; } - if (this.util.isNull(this.form.idcard)) { - uni.showToast({ - icon: "none", - title: "请填写证件号" - }) - return false; - } - - if (this.form.card_type == 1) { - if (!this.util.isValidCardID(this.form.idcard)) { - uni.showToast({ - icon: "none", - title: "请正确输入身份证号" - }) - return false; - } - } + // if (this.util.isNull(this.form.idcard)) { + // uni.showToast({ + // icon: "none", + // title: "请填写证件号" + // }) + // return false; + // } + + // if (this.form.card_type == 1) { + // if (!this.util.isValidCardID(this.form.idcard)) { + // uni.showToast({ + // icon: "none", + // title: "请正确输入身份证号" + // }) + // return false; + // } + // } if (this.util.isNull(this.form.mobile)) { uni.showToast({ @@ -706,7 +699,15 @@ }) return false; } - } + // } + // if(this.type=='user'){ + // this.form.details_list.push({ + // name:this.form.leader, + // mobile:this.form.mobile, + // card_type:1, + // idcard:'' + // }) + // } var that = this; diff --git a/pages/activity/info.vue b/pages/activity/info.vue index 4a0c2f9..484dc58 100644 --- a/pages/activity/info.vue +++ b/pages/activity/info.vue @@ -96,7 +96,6 @@ - @@ -113,7 +112,7 @@ - + 团体预约 @@ -225,7 +224,8 @@ longitude: that.longitude }, utilSuccess: function(res) { - res.isCanBook = that.$moment(nt).isBefore(res.end_plan); + res.isCanBook = that.$moment(nt).isBefore(res.end_plan); + console.log("res.isCanBook",res.isCanBook) that.list = res; let numberArr = [] let nowTime = that.getNowTime();