From 4b1d0f752567e26f90d6fd260eff34f4b36aacec Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 5 Sep 2023 15:45:49 +0800
Subject: [PATCH] up

---
 pages/guide/index.vue |  2 +-
 pages/visit/book.vue  | 24 ++++++++++++------------
 utils/util.js         |  6 ++++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index ae93591..22829fa 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -209,7 +209,7 @@
 						} else {
 							// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
 							uni.requestSubscribeMessage({
-								tmplIds: ['gPP22-SXuJmK9ffJZTNOSdq56Q2RmD2Qdg8ntteAO-Y'],
+								tmplIds: ['12MYVOc27cEbWbBMgdfDqtNkvu4z81vRV2ZhiB755L0'],
 								success(res) {
 									uni.showToast({
 										title: '订阅成功'
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index f838696..f0864ba 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -594,7 +594,6 @@
 							m.checked = false
 						}
 						that.common_user = res;
-						console.log(that.common_user)
 					},
 					utilFail: function(res) {
 
@@ -668,7 +667,6 @@
 				this.util.request({
 					api: '/api/mobile/visit/introduce',
 					utilSuccess: function(res) {
-						console.log(res);
 						that.info = res;
 						that.notice[0].content = (that.type == 'user' ? res.person_notice : res.team_notice)
 						that.notice[0].content = that.notice[0].content.replace(/\<p/gi, "<p class='richp'");
@@ -687,9 +685,9 @@
 				this.notice[type].content = this.notice[type].content.replace("@host@", this.util.HOST);
 				this.currentNotice = this.notice[type];
 			},
-			submitOrder() {
-				console.log(this.form);
-				// return
+			submitOrder() {
+				console.log(this.form)
+				return
 				this.form.date = this.currentDate.date;
 				this.form.rule_id = this.currentTime.id;
 				// if(this.specialid){
@@ -1013,7 +1011,10 @@
 				this.$forceUpdate();
 			},
 			handleSelectTime(index) {
-				var mod = this.currentDate.rules[index];
+				var mod = this.currentDate.rules[index];
+				if (!mod.isCanbook) {
+					return false
+				}
 				if (mod.remain_count == 0) {
 					this.util.toast("该时段已不可预约");
 					return false
@@ -1104,8 +1105,10 @@
 				that.currentTime = {};
 				let isDefault = false;
 				for (var mod of rules) {
-					mod.checked = false;
-
+					mod.checked = false;
+					mod.endtime = that.currentDate.date + " " + mod.end_time;
+					var isCanbook = that.$moment(nt).isBefore(mod.endtime);
+					mod.isCanbook = isCanbook;
 					if (that.bcurrentTime) {
 						if (that.bcurrentTime.id == mod.id) {
 							mod.checked = true;
@@ -1113,9 +1116,7 @@
 						}
 					} else {
 
-						mod.endtime = that.currentDate.date + " " + mod.end_time;
-						var isCanbook = that.$moment(nt).isBefore(mod.endtime);
-						mod.isCanbook = isCanbook;
+						
 						if (!isDefault && mod.remain_count > 0 && isCanbook) {
 							isDefault = true;
 							mod.checked = true;
@@ -1132,7 +1133,6 @@
 			openAdd(index) {
 				this.formUser = this.$options.data().formUser;
 				if (index || index == 0) {
-					console.log(index)
 					this.editIndex = index;
 					let r = Object.assign(this.formUser, this.form.details_list[index]);
 				} else
diff --git a/utils/util.js b/utils/util.js
index 564a6f6..a6164fc 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,7 +1,9 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	'development':'https://gb-test.ali251.langye.net',
-	'production': 'https://gb-test.ali251.langye.net',
+	// 'development':'https://gb-test.ali251.langye.net',
+	// 'production': 'https://gb-test.ali251.langye.net',
+	'development':'https://gbyuyue.szgmbwg.org.cn',
+	'production': 'https://gbyuyue.szgmbwg.org.cn',
 	// https://gbyuyue.szgmbwg.org.cn/
 }; // 审核状态