From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 265d356..61d7085 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();
@@ -120,6 +120,7 @@
reqData['num4'] = $("#num4").val();
reqData['num5'] = $("#num5").val();
reqData['num6'] = $("#num6").val();
+ reqData['num7'] = $("#num7").val();
console.log(JSON.stringify(reqData))
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",2);
@@ -139,6 +140,11 @@
reqData['num1'] = Number($("#num1").val());
reqData['num2'] = Number($("#num2").val());
reqData['num3'] = $("#num3").val();
+ reqData['num4'] = $("#num4").val();
+ if(reqData.num4 > reqData.num3){
+ Feng.error("平台抽成金额不能大于总抽成金额");
+ return
+ }
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",3);
ajax.start();
@@ -266,9 +272,9 @@
var a ="<div>\n" +
" <div class=\"initialLevel col-sm-12 control-label form-group\" >\n" +
" <span class=\"control-label\" >时间段</span>\n" +
- " <input class=\"control-label\" id=\"num1-"+i+"\" name=\"num1\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num1-"+i+"\" 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-"+i+"\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\">\n" +
+ " <input class=\"control-label time-item\" id=\"num2-"+i+"\" name=\"num2\" type=\"text\" placeholder=\"00:00\" style=\"height: 30px;width: 80px\" readonly>\n" +
" <span class=\"control-label\" >代驾里程</span>\n" +
" <input class=\"control-label\" id=\"num3-"+i+"\" name=\"num3\" type=\"number\" style=\"height: 30px;width: 80px\">\n" +
" <span class=\"control-label\" >公里,起步价</span>\n" +
@@ -296,20 +302,16 @@
" </div>"
$("#rules").append($(a))
- // laydate.render({
- // elem: '#num1-'+i,
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
- // laydate.render({
- // elem: '#num2-'+i,
- // type: 'time',
- // format: 'HH:mm',
- // range: false,
- // lang:'zn'
- // });
+ lay('.time-item').each(function(){
+ laydate.render({
+ elem: this,
+ type: 'time',
+ format: 'HH:mm',
+ range: false,
+ lang:'zn',
+ trigger: 'click'
+ });
+ });
}
TSystemConfig.delBox = function (o) {
--
Gitblit v1.7.1