From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index 9bbeebf..82657ea 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -72,7 +72,7 @@
return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +' ' +
'<a href="#" onclick="TDriver.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +' ' +
'<a href="#" onclick="TDriver.updateInfo('+row.id+')" style="color:green">编辑</a>'
- }else if (row.status === 2){
+ }else if (row.status === 2 || row.approvalStatus === 2){
return '<a href="#" onclick="TDriver.searchTDriverDetail('+row.id+')" style="color:green">详情</a>' +' ' +
'<a href="#" onclick="TDriver.start('+row.id+','+row.status+')" style="color:green">解冻</a>'
}
@@ -164,7 +164,7 @@
TDriver.stop = function (id) {
var index = layer.open({
type: 2,
- title: '停用',
+ title: '冻结',
area: ['45%', '50%'], //宽高
fix: false, //不固定
maxmin: true,
@@ -234,6 +234,18 @@
* 提交充值
*/
TDriver.rechargeBalance = function () {
+ var balance = $('#backgroundBalance').val().trim();
+ var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
+ //先判断是否为整数 在判断 是否在 1-总页 整数范围之内
+ if(reg.test(balance)){
+ if(parseInt(balance) <= 0){
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
+ }else{
+ Feng.error("请输入大于0的正整数");
+ return;
+ }
var ajax = new $ax(Feng.ctxPath + "/tDriver/recharge-balance", function (data) {
Feng.success("修改成功!");
TDriverInfoDlg.close();
--
Gitblit v1.7.1