From 6cb4ebd3c59e585d546a3e66672fb7f3029a06f3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 16 四月 2025 15:44:11 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html | 3 +++ cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html index 2a448d4..e1045b8 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html @@ -986,6 +986,9 @@ if (this.periodOfValidity){ data.startTime = this.periodOfValidity[0]; data.endTime = this.periodOfValidity[1]; + }else { + data.startTime = null; + data.endTime = null; } if (this.unUseTimes){ diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html index e70122c..f88105c 100644 --- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html +++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html @@ -1041,9 +1041,11 @@ let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/getDetail", (data) => { - this.periodOfValidity = [data.startTime, data.endTime] - - console.log("data.useScope",data.useScope) + if(data.startTime == null || data.endTime == null){ + this.periodOfValidity = [] + }else { + this.periodOfValidity = [data.startTime, data.endTime] + } this.huiminCard = { ...data, @@ -1106,8 +1108,8 @@ }, (data) => { - vm.tableStoreLoading = false; - Feng.error("请求失败: " + data.responseJSON.message); + this.tableStoreLoading = false; + Feng.error("请求失败: " + data); } ); ajax.set({id: id}) -- Gitblit v1.7.1