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

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
zhengyongxing 5 years ago
parent 7a873a9d98 668e4d097c
commit c1c4fbd0fa
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File

5
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

@ -70,7 +70,8 @@ unset($_REQUEST['parent_id']);
$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find()); $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
if(!empty(I('oa_associated'))) { if(!empty(I('oa_associated')) || !is_null(I('oa_associated'))) {
$map['oa_associated'] = I('oa_associated');
$oa_data = []; $oa_data = [];
for($i = 1; $i > 0; $i++) { for($i = 1; $i > 0; $i++) {
$arr['time'] = time(); $arr['time'] = time();
@ -127,7 +128,7 @@ unset($_REQUEST['parent_id']);
} }
} }
} }
$count = D(self::model_name)->count(); $count = (I('oa_associated') || !is_null(I('oa_associated') )) ? D(self::model_name)->where($map)->count() : D(self::model_name)->count();
$page = set_pagination($count,$row); $page = set_pagination($count,$row);
if($page) {$this->assign('_page', $page);} if($page) {$this->assign('_page', $page);}
$this->assign('list_data', $list_data); $this->assign('list_data', $list_data);

4
Application/Admin/Model/GameModel.class.php
Unescape Escape View File

@ -38,8 +38,8 @@ class GameModel extends Model{
array('support_quota', '/^[0-9]*$/', '请输入正确的扶持额度', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('support_quota', '/^[0-9]*$/', '请输入正确的扶持额度', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),
array('game_score', '/^(\d(\.\d)?|10)$/', '游戏评分输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('game_score', '/^(\d(\.\d)?|10)$/', '游戏评分输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),
array('recommend_level', '/^(\d(\.\d)?|10)$/', '推荐指数输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('recommend_level', '/^(\d(\.\d)?|10)$/', '推荐指数输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),
array('discount',[1,10],'代充折扣错误', self::MUST_VALIDATE, 'between', self::MODEL_BOTH), // array('discount',[1,10],'代充折扣错误', self::MUST_VALIDATE, 'between', self::MODEL_BOTH),
array('bind_recharge_discount',[1,10],'绑币充值折扣错误',self::MUST_VALIDATE, 'between', self::MODEL_BOTH), // array('bind_recharge_discount',[1,10],'绑币充值折扣错误',self::MUST_VALIDATE, 'between', self::MODEL_BOTH),
array('dratio','/^(((\d|[1-9]\d)(\.\d{1,2})?)|100|100.0|100.00)$/','开发者分成比例错误',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('dratio','/^(((\d|[1-9]\d)(\.\d{1,2})?)|100|100.0|100.00)$/','开发者分成比例错误',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),
array('support_ratio','/^100$|^(\d|[1-9]\d)$/','请输入正确的扶持比例',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('support_ratio','/^100$|^(\d|[1-9]\d)$/','请输入正确的扶持比例',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),

12
Application/Admin/View/Deposit/lists.html
Unescape Escape View File

@ -328,12 +328,12 @@ $(document).ready(function () {
function initSelect2WithSearch() { function initSelect2WithSearch() {
$("#sel_order").select2({ // $("#sel_order").select2({
tags: true, // tags: true,
placeholder: '订单状态', // placeholder: '订单状态',
allowClear: false, //清空 // allowClear: false, //清空
minimumResultsForSearch: Infinity, // 永久隐藏搜索框 // minimumResultsForSearch: Infinity, // 永久隐藏搜索框
}); // });
} }
</script> </script>
</block> </block>

4
Application/Admin/View/Promote/lists.html
Unescape Escape View File

@ -131,7 +131,7 @@
<select name="oa_associated"> <select name="oa_associated">
<option value="">oa关联</option> <option value="">oa关联</option>
<option value="1">已关联</option> <option value="1">已关联</option>
<option value="2">未关联</option> <option value="0">未关联</option>
</select> </select>
</div> </div>
<else/> <else/>
@ -153,7 +153,7 @@
<select name="oa_associated"> <select name="oa_associated">
<option value="">oa关联</option> <option value="">oa关联</option>
<option value="1">已关联</option> <option value="1">已关联</option>
<option value="2">未关联</option> <option value="0">未关联</option>
</select> </select>
</div> </div>
</empty> </empty>

22
Application/Admin/View/RechargeSum/summation.html
Unescape Escape View File

@ -66,23 +66,23 @@
</select> </select>
</div> --> </div> -->
<div class="input-list input-list-game search_label_rehab"> <div class="input-list input-list-game search_label_rehab">
<select id="game_type" name="game_type" class="select_gallery" > <select id="game_name" name="game_name" class="select_gallery" >
<option value="">设备类型</option> <option value="">游戏名称</option>
<option value="1">安卓</option> <volist name=":getAllGame()" id="vo">
<option value="2">苹果</option> <option value="{$vo.game_name}" <?php echo $vo.relation_game_name == I('game_name') ? 'selected':''; ?> >{$vo.game_name}</option>
</volist>
</select> </select>
</div> </div>
<div class="input-list input-list-game search_label_rehab"> <div class="input-list input-list-game search_label_rehab">
<select id="game_name" name="game_name" class="select_gallery" > <select id="game_type" name="game_type" class="select_gallery" >
<option value="">游戏名称</option> <option value="">设备类型</option>
<!-- <volist name=":get_game_list(null, $_GET['game_type'])" id="vo"> <option value="1" <?php echo I('game_type') == 1 ? "selected" : ''?>>安卓</option>
<option game-id="{$vo.id}" value="{$vo.id}">{$vo.game_name}</option> <option value="2" <?php echo I('game_type') == 2 ? "selected" : ''?>>苹果</option>
</volist> -->
</select> </select>
</div> </div>
<div class="input-list input-list-server search_label_rehab"> <div class="input-list input-list-server search_label_rehab">
<select id="server_id" name="server_id" class="select_gallery" style="width:120px;"> <select id="server_name" name="server_name" class="select_gallery" style="width:120px;">
<option value="">请选择区服</option> <option value="">区服名称</option>
</select> </select>
</div> </div>
<div class="input-list search_item input-list-gamenoticestatus"> <div class="input-list search_item input-list-gamenoticestatus">

Write Preview
Loading…
Cancel
Save