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/platform/platform.js | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
index e2fb1aa..7e6839f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
@@ -35,9 +35,8 @@
return btn;
}
},
- {title: '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
+ {title: '用户订单支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
},
- {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',},
{title: '状态', field: 'paymentStatus', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
var state = row.state;
@@ -237,7 +236,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("");
+ $("#time").val("1");
$("#insertTime").val("");
$("#state").val("");
TUser.search();
--
Gitblit v1.7.1