From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
index a5c4f0f..ee4a82d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
@@ -20,17 +20,13 @@
{title: '操作人', field: 'handle', visible: true, align: 'center', valign: 'middle',
},
- {title: '红包可抵扣比例', field: 'proportion', visible: true, align: 'center', valign: 'middle',
+ {title: '红包可抵扣比例', field: 'deductionRatio', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
- if(row.proportion != '' && row.proportion != null) {
- var time = row.proportion;
- btn = time+"%"
- }
- return btn;
+
+ return value+"%";
}
},
- {title: '生效时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
+ {title: '生效时间', field: 'effectiveDate', visible: true, align: 'center', valign: 'middle',},
];
};
@@ -70,7 +66,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: '编辑跨城站点',
+ title: '编辑红包支付设置',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
--
Gitblit v1.7.1