From ba96083bb52afa7b94042490ab679a2d3af1c3c9 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Wed, 26 Feb 2020 16:15:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/TestOrder/addOrder.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/TestOrder/addOrder.html b/Application/Admin/View/TestOrder/addOrder.html
index d1c160c14..520d94327 100644
--- a/Application/Admin/View/TestOrder/addOrder.html
+++ b/Application/Admin/View/TestOrder/addOrder.html
@@ -166,14 +166,21 @@
 
 <script>
     $(function(){
-        $('#datetimepicker').datetimepicker({
+        /*$('#datetimepicker').datetimepicker({
             format: 'yyyy-mm-dd hh:ii:ss',
             language: "zh-CN",
             minView: 2,
             endDate:new Date(),
             autoclose: true,
             pickerPosition: 'bottom-left'
-        })
+        })*/
+        $('#datetimepicker').datetimepicker({
+            language:"zh-CN",
+            hour: 13,
+            minute: 15,
+            autoclose: true
+        });
+
         EVENT.changeCompany();
         EVENT.createStatement();
         $("#first_partner_id").change();//默认甲方只能是我们公司

From cc8e2149e08cd4eecfd33e30215e9277bb7c21a1 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 26 Feb 2020 16:23:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=80=E4=BD=8E=E9=A2=9D=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=80=E9=AB=98=E9=A2=9D=E5=BA=A6=EF=BC=8C=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/ResourceVerifyConfig/add.html  | 8 ++++----
 Application/Admin/View/ResourceVerifyConfig/edit.html | 8 ++++----
 Data/update.sql                                       | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/View/ResourceVerifyConfig/add.html b/Application/Admin/View/ResourceVerifyConfig/add.html
index ecf97c301..2ea28940c 100644
--- a/Application/Admin/View/ResourceVerifyConfig/add.html
+++ b/Application/Admin/View/ResourceVerifyConfig/add.html
@@ -111,28 +111,28 @@
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_apply_count" value="1" placeholder="请输入新用户判断标准">
+                                <input type="text" class="txt " name="new_apply_count" value="1" placeholder="请输入新用户判断标准" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">新用户资源最低申请额度(/个)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_low_value" value="0" placeholder="请输入最低申请额度">
+                                <input type="text" class="txt " name="new_low_value" value="0" placeholder="请输入最低申请额度" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">新用户资源最高申请额度(/个)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_high_value" value="300" placeholder="请输入最高申请额度">
+                                <input type="text" class="txt " name="new_high_value" value="300" placeholder="请输入最高申请额度" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">非新用户可申请额度占总充值量的比例(%)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="old_value_ratio" value="70" placeholder="请输入比例">
+                                <input type="text" class="txt " name="old_value_ratio" value="70" placeholder="请输入比例" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
diff --git a/Application/Admin/View/ResourceVerifyConfig/edit.html b/Application/Admin/View/ResourceVerifyConfig/edit.html
index c15f37fb3..24ae3f2ff 100644
--- a/Application/Admin/View/ResourceVerifyConfig/edit.html
+++ b/Application/Admin/View/ResourceVerifyConfig/edit.html
@@ -110,28 +110,28 @@
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_apply_count" value="{$data['new_apply_count']}" placeholder="请输入新用户判断标准">
+                                <input type="text" class="txt " name="new_apply_count" value="{$data['new_apply_count']}" placeholder="请输入新用户判断标准" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">新用户资源最低申请额度(/个)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_low_value" value="{$data['new_low_value']}" placeholder="请输入最低申请额度">
+                                <input type="text" class="txt " name="new_low_value" value="{$data['new_low_value']}" placeholder="请输入最低申请额度" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">新用户资源最高申请额度(/个)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="new_high_value" value="{$data['new_high_value']}" placeholder="请输入最高申请额度">
+                                <input type="text" class="txt " name="new_high_value" value="{$data['new_high_value']}" placeholder="请输入最高申请额度" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
                         <tr>
                             <td class="l">非新用户可申请额度占总充值量的比例(%)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="old_value_ratio" value="{$data['old_value_ratio']}" placeholder="请输入比例">
+                                <input type="text" class="txt " name="old_value_ratio" value="{$data['old_value_ratio']}" placeholder="请输入比例" onkeyup="value=value.replace(/[^\d]/g,'')">
                             </td>
                         </tr>
 
diff --git a/Data/update.sql b/Data/update.sql
index c3cac1170..b0ed7a0a0 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1365,12 +1365,12 @@ CREATE TABLE `tab_resource_verify_config` (
   `game_name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '游戏名称',
   `sdk_version` tinyint(2) DEFAULT NULL COMMENT '区别版本   1安卓 2苹果 0 双版本',
   `new_apply_count` int(4) DEFAULT '0' COMMENT '新用户判断标准(申请次数不大于此值)',
-  `new_low_value` decimal(20,2) DEFAULT '0.00' COMMENT '新用户资源最低申请额度',
-  `new_high_value` decimal(20,2) DEFAULT '0.00' COMMENT '新用户资源最高申请额度',
-  `old_value_ratio` varchar(5) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '非新用户可申请额度占总充值量的比例',
+  `new_low_value` int(11) DEFAULT '0' COMMENT '新用户资源最低申请额度',
+  `new_high_value` int(11) DEFAULT '0' COMMENT '新用户资源最高申请额度',
+  `old_value_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '非新用户可申请额度占总充值量的比例',
   `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '状态：0-锁定；1-正常',
   `uid` int(11) DEFAULT '0' COMMENT '后台操作员id',
   `add_time` int(11) DEFAULT '0' COMMENT '新增时间',
   `update_time` int(11) DEFAULT '0' COMMENT '更新时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='资源审核配置';
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='资源审核配置';

From b4fafbe0bf24395dce91263f62fbb8bdb02dd249 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 26 Feb 2020 17:16:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/ResourceVerifyConfig/add.html  | 2 +-
 Application/Admin/View/ResourceVerifyConfig/edit.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/ResourceVerifyConfig/add.html b/Application/Admin/View/ResourceVerifyConfig/add.html
index 2ea28940c..548978141 100644
--- a/Application/Admin/View/ResourceVerifyConfig/add.html
+++ b/Application/Admin/View/ResourceVerifyConfig/add.html
@@ -132,7 +132,7 @@
                         <tr>
                             <td class="l">非新用户可申请额度占总充值量的比例(%)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="old_value_ratio" value="70" placeholder="请输入比例" onkeyup="value=value.replace(/[^\d]/g,'')">
+                                <input type="text" class="txt " name="old_value_ratio" value="70" placeholder="请输入比例">
                             </td>
                         </tr>
 
diff --git a/Application/Admin/View/ResourceVerifyConfig/edit.html b/Application/Admin/View/ResourceVerifyConfig/edit.html
index 24ae3f2ff..4575bd25f 100644
--- a/Application/Admin/View/ResourceVerifyConfig/edit.html
+++ b/Application/Admin/View/ResourceVerifyConfig/edit.html
@@ -131,7 +131,7 @@
                         <tr>
                             <td class="l">非新用户可申请额度占总充值量的比例(%)：</td>
                             <td class="r">
-                                <input type="text" class="txt " name="old_value_ratio" value="{$data['old_value_ratio']}" placeholder="请输入比例" onkeyup="value=value.replace(/[^\d]/g,'')">
+                                <input type="text" class="txt " name="old_value_ratio" value="{$data['old_value_ratio']}" placeholder="请输入比例">
                             </td>
                         </tr>