diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index b7f2338ac..6289a3733 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -40,18 +40,19 @@ class PartnerController extends ThinkController if (!empty(I('partner'))) { $map['partner'] = ['like', '%' . I('partner') . '%']; } - if (!empty(I('timestart'))) { - $timestart = strtotime(I('timestart')); - $map['_string'] = "contract_start_time >= {$timestart}"; - } - if (!empty(I('timeend'))) { - $timeend = strtotime(I('timeend') . ' 23:59:59'); - if (!empty($map['_string'])) { - $map['_string'] .= " and "; - } - $map['_string'] .= " contract_end_time < {$timeend}"; + if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { + $time_start = strtotime($_REQUEST['timestart']); + $time_end = strtotime($_REQUEST['timeend'])+ 86399; + $map["_string"] = "(contract_start_time BETWEEN {$time_start} AND {$time_end}) OR (contract_end_time BETWEEN {$time_start} AND {$time_end})"; + } elseif (isset($_REQUEST['timestart'])) { + $time_start = strtotime($_REQUEST['timestart']); + $map["_string"] = "(contract_start_time >= {$time_start} ) OR (contract_end_time >= {$time_start})"; + } elseif (isset($_REQUEST['timeend'])) { + $time_end = strtotime($_REQUEST['timeend'])+ 86399; + $map["_string"] = "(contract_start_time <= {$time_end} ) OR (contract_end_time <= {$time_end})"; } + $page = intval(I('get.p', 0)); $page = $page ? $page : 1; //默认显示第一页数据 $row = intval(I('row', 0)); diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index ab7d59f93..8368ccde8 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -497,6 +497,14 @@ class PromoteCompanyController extends ThinkController $this->meta_title ='审核信息查看'; $this->display("view"); } + public function verifyDel(){ + if(!isset($_REQUEST['id'])) $this->error('数据异常', U('index')); + $id = $_REQUEST['id']; + + M("PromoteCompanyVerify", 'tab_')->where("id = '{$id}'")->delete(); + addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除审核','url'=>U('PromoteCompany/index')]); + $this->success('删除成功', U('index')); + } public function marketingDirectorShow($ids=[], $isShow=0) diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html index f17b9b201..330f429d7 100644 --- a/Application/Admin/View/Partner/lists.html +++ b/Application/Admin/View/Partner/lists.html @@ -67,11 +67,11 @@
+ placeholder="合同开始时间"/> -
+ placeholder="合同结束时间"/>
@@ -104,6 +104,7 @@ 产品类型 游戏分成比例 + 合同期限 结算周期 帐户名 银行账号 @@ -145,6 +146,7 @@ - + {$data.contract_time} {$data.settlement_type|default="--"} {$data.payee_name|default="--"} {$data.bank_account|default="--"} diff --git a/Application/Admin/View/PromoteCompany/index.html b/Application/Admin/View/PromoteCompany/index.html index e7493d3f4..a67558ebb 100644 --- a/Application/Admin/View/PromoteCompany/index.html +++ b/Application/Admin/View/PromoteCompany/index.html @@ -165,9 +165,9 @@ {$data.contract_time} {$data.validity_time} - {$data.company_info.channel_rate}% - {$data.company_info.fax_ratio}% - {$data.company_info.taxation_rate}% + {$data.company_info.channel_rate|showPercent} + {$data.company_info.fax_ratio|showPercent} + {$data.company_info.taxation_rate|showPercent} {$data.company_info.bank_address} {$data.company_info.bank_card} @@ -199,6 +199,9 @@ 查看 + + 删除 +