diff --git a/acupuncture-前台/src/views/screening/h5Result.vue b/acupuncture-前台/src/views/screening/h5Result.vue
index 9dbacb5f..7855d315 100644
--- a/acupuncture-前台/src/views/screening/h5Result.vue
+++ b/acupuncture-前台/src/views/screening/h5Result.vue
@@ -21,15 +21,16 @@
}}{{
weightShow
- ? `您属于${form["SCWJ-JL"]}型肥胖`
- : "您的体重筛查结论是正常的"
+ ? `您属于${form["SCWJ-JL"]}型肥胖。`
+ : "您的体重筛查结论是正常的。"
}}
+
- 您已成功报名此次减重活动!下一步请扫码关注南宁市第七人民医院微信公众号,预约体重管理中心医师进一步评估。流程为:
-
- 公众号→体重管理→减重预约挂号→体重管理中心→选择医师。咨询电话0771-2312932。
+ 请您扫码关注南宁市第七人民医院微信公众号,进行身高、体重等健康指标综合测量。流程为公众号➙体重管理➙减重预约挂号➙体重管理中心➙选择医师和时间➙按时到现场测量。本项目已减免了挂号费,请按预约时间前往南宁市第七人民医院金桥院区2楼体重管理中心(地址:兴宁区金桥路120号)进行全面测量评估(医生有余号的均可点击预约,如当周预约已满,可在下周预约)。咨询电话:0771-2312932、0771-2312933。谢谢您的支持参与!
diff --git a/acupuncture-前台/src/views/screening/h5eva.vue b/acupuncture-前台/src/views/screening/h5eva.vue
index 09c754dc..e2f628c8 100644
--- a/acupuncture-前台/src/views/screening/h5eva.vue
+++ b/acupuncture-前台/src/views/screening/h5eva.vue
@@ -317,6 +317,18 @@ import {
export default {
name: "Notice",
data() {
+ var numberValidator = (rule, value, callback) => {
+ // 年龄范围需要在18-65岁之间
+ if (!value) {
+ callback(new Error("年龄不能为空"));
+ return;
+ }
+ if (value < 18 || value > 65) {
+ callback(new Error("年龄范围需要在18-65岁之间"));
+ } else {
+ callback();
+ }
+ };
return {
popupRadio: 1,
open: false,
@@ -567,7 +579,7 @@ export default {
"SCWJ-AGE": [
{
required: true,
- message: "年龄不能为空",
+ validator: numberValidator,
trigger: ["blur", "change"],
},
],
@@ -656,7 +668,10 @@ export default {
// 编辑信息
handlePopupVerify() {
if (this.popupRadio === 1) {
- this.form = { ...this.form, ...this.detailList };
+ this.form = {
+ ...this.form,
+ ...JSON.parse(JSON.stringify(this.detailList)),
+ };
setTimeout(() => {
this.open = false;
}, 500);
@@ -679,11 +694,10 @@ export default {
if (name && phone && /^1[3456789]\d{9}$/.test(phone)) {
queryDetailNoToken({ param: { name: name, phone: phone } }).then(
(res) => {
- this.detailList = {};
if (res.data.list.length) {
+ this.detailList = {};
let data = res.data.list[0];
this.detailId = data.id;
- console.log("this.detailId", this.detailId);
data.detailList.forEach((item) => {
this.detailList[item.questionCode] = item.answer;
});
@@ -955,6 +969,11 @@ export default {
await this.saveAnswer(this.tips, "SCREEN-JL");
// ------ 提交筛查 ------
const submitParams = { param: { detailId: this.detailId } };
+ // 判断对象是否为空 this.detailList
+ if (Object.keys(this.detailList).length !== 0) {
+ submitParams.param.phone = this.detailList["SCWJ-PHONE"];
+ submitParams.param.name = this.detailList["SCWJ-NAME"];
+ }
await screenSubmit(submitParams).then((response) => {
this.loading = false;
this.disabled = false;
diff --git a/acupuncture-前台/针灸前台client-2.zip b/acupuncture-前台/针灸前台client.zip
similarity index 92%
rename from acupuncture-前台/针灸前台client-2.zip
rename to acupuncture-前台/针灸前台client.zip
index 53075f22..f3a0128e 100644
Binary files a/acupuncture-前台/针灸前台client-2.zip and b/acupuncture-前台/针灸前台client.zip differ
diff --git a/acupuncture-前台/针灸前台clientssl-2.zip b/acupuncture-前台/针灸前台clientssl.zip
similarity index 92%
rename from acupuncture-前台/针灸前台clientssl-2.zip
rename to acupuncture-前台/针灸前台clientssl.zip
index e63d1a07..e99878e8 100644
Binary files a/acupuncture-前台/针灸前台clientssl-2.zip and b/acupuncture-前台/针灸前台clientssl.zip differ