elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Browse Source
master
zhanglingsheng 5 years ago
parent dbd1e6f070 94293b4bec
commit 9c39b731fd
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
Application/Admin/View/ResourceVerifyConfig/add.html
Unescape Escape View File

@ -111,21 +111,21 @@
<tr> <tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td> <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td>
<td class="r"> <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> </td>
</tr> </tr>
<tr> <tr>
<td class="l">新用户资源最低申请额度(/个)：</td> <td class="l">新用户资源最低申请额度(/个)：</td>
<td class="r"> <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> </td>
</tr> </tr>
<tr> <tr>
<td class="l">新用户资源最高申请额度(/个)：</td> <td class="l">新用户资源最高申请额度(/个)：</td>
<td class="r"> <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> </td>
</tr> </tr>

6
Application/Admin/View/ResourceVerifyConfig/edit.html
Unescape Escape View File

@ -110,21 +110,21 @@
<tr> <tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td> <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>新用户判断标准(说明第几次之前为新用户)(次)：</td>
<td class="r"> <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> </td>
</tr> </tr>
<tr> <tr>
<td class="l">新用户资源最低申请额度(/个)：</td> <td class="l">新用户资源最低申请额度(/个)：</td>
<td class="r"> <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> </td>
</tr> </tr>
<tr> <tr>
<td class="l">新用户资源最高申请额度(/个)：</td> <td class="l">新用户资源最高申请额度(/个)：</td>
<td class="r"> <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> </td>
</tr> </tr>

11
Application/Admin/View/TestOrder/addOrder.html
Unescape Escape View File

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

8
Data/update.sql
Unescape Escape View File

@ -1368,12 +1368,12 @@ CREATE TABLE `tab_resource_verify_config` (
`game_name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '游戏名称', `game_name` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '游戏名称',
`sdk_version` tinyint(2) DEFAULT NULL COMMENT '区别版本 1安卓 2苹果 0 双版本', `sdk_version` tinyint(2) DEFAULT NULL COMMENT '区别版本 1安卓 2苹果 0 双版本',
`new_apply_count` int(4) DEFAULT '0' COMMENT '新用户判断标准(申请次数不大于此值)', `new_apply_count` int(4) DEFAULT '0' COMMENT '新用户判断标准(申请次数不大于此值)',
`new_low_value` decimal(20,2) DEFAULT '0.00' COMMENT '新用户资源最低申请额度', `new_low_value` int(11) DEFAULT '0' COMMENT '新用户资源最低申请额度',
`new_high_value` decimal(20,2) DEFAULT '0.00' COMMENT '新用户资源最高申请额度', `new_high_value` int(11) DEFAULT '0' COMMENT '新用户资源最高申请额度',
`old_value_ratio` varchar(5) COLLATE utf8mb4_bin DEFAULT '0' COMMENT '非新用户可申请额度占总充值量的比例', `old_value_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '非新用户可申请额度占总充值量的比例',
`status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '状态：0-锁定；1-正常', `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '状态：0-锁定；1-正常',
`uid` int(11) DEFAULT '0' COMMENT '后台操作员id', `uid` int(11) DEFAULT '0' COMMENT '后台操作员id',
`add_time` int(11) DEFAULT '0' COMMENT '新增时间', `add_time` int(11) DEFAULT '0' COMMENT '新增时间',
`update_time` int(11) DEFAULT '0' COMMENT '更新时间', `update_time` int(11) DEFAULT '0' COMMENT '更新时间',
PRIMARY KEY (`id`) 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='资源审核配置';

Write Preview
Loading…
Cancel
Save