From 061c94be9c25cf3c9ad8c1e7cf5ad6b4251fd0da Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 09:32:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
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 6f75cc9..1a63206 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
@@ -262,10 +262,10 @@
TSystemConfig.serviceMgmtSubmit = function () {
var num1 = $("#num1").val();
- var reg=/^1[3-9]\d{9}$/;//由 1-9开头 的正则表达式
+ var reg=/(^1[3-9]\d{9}$)|(^400\d)/;//由 1-9开头 的正则表达式
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
if(!reg.test(num1)){
- Feng.error("请输入合法手机号!");
+ Feng.error("请输入合法电话号码!");
return;
}
@@ -289,9 +289,9 @@
" <div class=\"initialLevel col-sm-12 control-label form-group\" id='time' >\n" +
" <span class=\"control-label\" >时间段</span>\n" +
- " <input class=\"control-label\" id=\"num1\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num1\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\" readonly>\n" +
" <span class=\"control-label\" >——</span>\n" +
- " <input class=\"control-label\" id=\"num2\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num2\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\" readonly>\n" +
" <span class=\"fa fa-remove\" style='position: absolute;right: 20px;color: red;font-size: 20px;' onclick=\"TSystemConfig.delTime(this)\"></span>\n" +
" </div>\n" +
"<div class='prices'>\n" +
@@ -322,6 +322,16 @@
"</div>"
$("#rules").append($(a))
+ lay('.time-item').each(function(){
+ laydate.render({
+ elem: this,
+ type: 'time',
+ format: 'HH:mm',
+ range: false,
+ lang:'zn',
+ trigger: 'click'
+ });
+ });
}
@@ -348,7 +358,7 @@
TSystemConfig.delBox = function (o) {
- $(o).parent("div").parent("div").remove()
+ $(o).parent("div").remove()
};
TSystemConfig.openOrClose = function () {
--
Gitblit v1.7.1