Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

2025-04-16 6cb4ebd3c59e585d546a3e66672fb7f3029a06f3

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

@@ -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){

 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})