diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 3c264ca95..6313e3da0 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -70,7 +70,8 @@ unset($_REQUEST['parent_id']);
$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(!empty(I('oa_associated'))) {
+ if(!empty(I('oa_associated')) || !is_null(I('oa_associated'))) {
+ $map['oa_associated'] = I('oa_associated');
$oa_data = [];
for($i = 1; $i > 0; $i++) {
$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);
if($page) {$this->assign('_page', $page);}
$this->assign('list_data', $list_data);
diff --git a/Application/Admin/Model/GameModel.class.php b/Application/Admin/Model/GameModel.class.php
index 2b4c3d92a..a83665f45 100644
--- a/Application/Admin/Model/GameModel.class.php
+++ b/Application/Admin/Model/GameModel.class.php
@@ -38,8 +38,8 @@ class GameModel extends Model{
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('recommend_level', '/^(\d(\.\d)?|10)$/', '推荐指数输入格式不正确', self::VALUE_VALIDATE, 'regex', 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('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('support_ratio','/^100$|^(\d|[1-9]\d)$/','请输入正确的扶持比例',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH),
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 86eb58abe..d78d1c67c 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -328,12 +328,12 @@ $(document).ready(function () {
function initSelect2WithSearch() {
- $("#sel_order").select2({
- tags: true,
- placeholder: '订单状态',
- allowClear: false, //清空
- minimumResultsForSearch: Infinity, // 永久隐藏搜索框
- });
+ // $("#sel_order").select2({
+ // tags: true,
+ // placeholder: '订单状态',
+ // allowClear: false, //清空
+ // minimumResultsForSearch: Infinity, // 永久隐藏搜索框
+ // });
}
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index 95b87420d..13cadf0aa 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -131,7 +131,7 @@
@@ -153,7 +153,7 @@
diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html
index c86300fc8..9be1f5bfc 100644
--- a/Application/Admin/View/RechargeSum/summation.html
+++ b/Application/Admin/View/RechargeSum/summation.html
@@ -66,23 +66,23 @@
-->
-
-
-