From 0449cc7dd6f12b2b0b29bfdea41356c310f4b467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?= <153298343@qq.com> Date: Thu, 4 Aug 2022 22:51:38 +0800 Subject: [PATCH] up --- pages/visit/book.vue | 27 ++++++++++++++++----------- utils/util.js | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pages/visit/book.vue b/pages/visit/book.vue index 65cf194..c47c2d1 100644 --- a/pages/visit/book.vue +++ b/pages/visit/book.vue @@ -739,9 +739,14 @@ _that.util.toast("导入失败,原因‘" + err.errmsg + "’请查看批量导入说明"); } else { - var jsonlist = JSON.parse(res.data); - _that.form.total=jsonlist.length; + + console.log(res.data); + var jsonlist = JSON.parse(res.data); + + console.log(jsonlist); + _that.form.total = jsonlist.length||6; for (var m of jsonlist) { + console.log("m",m); _that.form.details_list.push({ name: m.name, idcard: m.idcard, @@ -1013,15 +1018,15 @@ mod.checked = true; that.currentTime = that.bcurrentTime; } - } 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; - that.currentTime = mod; + } 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; + that.currentTime = mod; } } diff --git a/utils/util.js b/utils/util.js index c14fa10..e9d644b 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,6 +1,6 @@ import md5 from "./md5.min"; const HOSTARR = { - 'development': 'http://dangxingjiaoyujidi.langye.net', + 'development': 'https://leyiyuyue.szgmbwg.org.cn', 'production': 'https://leyiyuyue.szgmbwg.org.cn' }; // 审核状态