From d11d03fff4a71674d6ae1fd946503c2d5fb30c63 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 六月 2023 15:27:40 +0800
Subject: [PATCH] 改派规则修改，优惠券取消上限
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html | 4 ++--
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 2 +-
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html | 14 +++++++-------
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index 24d5a39..3d938ae 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -81,7 +81,7 @@
model.addAttribute("num2",jsonObject.getInteger("num2"));
model.addAttribute("num3",jsonObject.getInteger("num3"));
model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
+// model.addAttribute("num5",jsonObject.getInteger("num5"));
return PREFIX + "tSystemConfigDispatchRules.html";
}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
index de4a41c..e04ea70 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
@@ -52,7 +52,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券限制数量：</label>
- <input id="couponCount" name="couponCount2" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponCount" name="couponCount2" type="number" min="1" placeholder="请输入优惠券限制数量" style="height: 30px" required>
</div>
</div>
@@ -98,7 +98,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">赠送数量：</label>
- <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" placeholder="请输入赠送数量" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>张</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
index 9d1a791..eb276ca 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
@@ -51,19 +51,19 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" >
+ <!--<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >改派设置:</label>
</div>
- </div>
+ </div>-->
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <!--<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
<span class="control-label" >改派后暂停接单</span>
- <input class="control-label" id="num5" name="num5" value="${num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num5" name="num5" value="" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >分钟</span>
</div>
- </div>
+ </div>-->
<div class="row btn-group-m-t">
<div class="col-sm-10" style="text-align: center">
@@ -96,10 +96,10 @@
var value = $(this).val()
regexp(value)
})
- $("input[name=num5]").bind('input',function(){
+ /*$("input[name=num5]").bind('input',function(){
var value = $(this).val()
regexp(value)
- })
+ })*/
function regexp(value){
var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 03ef6e2..3cc7f6e 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -97,7 +97,7 @@
reqData['num2'] = Number($("#num2").val());
reqData['num3'] = Number($("#num3").val());
reqData['num4'] = Number($("#num4").val());
- reqData['num5'] = Number($("#num5").val());
+ // reqData['num5'] = Number($("#num5").val());
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",1);
ajax.start();
--
Gitblit v1.7.1