Merge branches 'feature/juhe_sms' and 'master' of 47.111.118.107:wmtx/platform into feature/juhe_sms

Application/Admin/Controller/AmericaIpForbitController.class.php

@@ -120,6 +120,13 @@ class AmericaIpForbitController extends ThinkController
         }
         fclose($fp);
 
+        addOperationLog(array(
+            "op_type"=>3,
+            "key"=> getNowDate(),
+            "menu"=>"游戏-游戏管理-ip限制白名单-导出",
+            "url"=>U("AmericaIpForbit/index")
+        ));
+
         $getData = $_GET;
         unset($getData['id']);
         unset($getData['xlsname']);
@@ -147,6 +154,23 @@ class AmericaIpForbitController extends ThinkController
         $is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->save(['status'=>$status]);
 
         if ($is_change) {
+            if (I('status')) {
+                addOperationLog(array(
+                    "op_type"=>1,
+                    "key"=> getNowDate(),
+                    "menu"=>"游戏-游戏管理-ip限制白名单-开启",
+                    "url"=>U("AmericaIpForbit/index")
+                ));
+            } else{
+                addOperationLog(array(
+                    "op_type"=>1,
+                    "key"=> getNowDate(),
+                    "menu"=>"游戏-游戏管理-ip限制白名单-关闭",
+                    "url"=>U("AmericaIpForbit/index")
+                ));
+            }
+
+
             $this->ajaxReturn(['code'=>1]);
         } else {
             $this->ajaxReturn(['code'=>0]);
@@ -165,6 +189,14 @@ class AmericaIpForbitController extends ThinkController
         $is_del = $is_change = M('forbit_ip','tab_')->where(['id'=>['in',$id]])->delete();
 
         if ($is_del) {
+            $hav_firbit = M('forbit_ip','tab_')->where(['id'=>I('id')])->find();
+            addOperationLog(array(
+                "op_type"=>2,
+                "key"=> $hav_firbit['user_account'],
+                "menu"=>"游戏-游戏管理-ip限制白名单-删除",
+                "url"=>U("AmericaIpForbit/index")
+            ));
+
             $this->ajaxReturn(['code'=>1]);
         } else {
             $this->ajaxReturn(['code'=>0]);
@@ -208,6 +240,14 @@ class AmericaIpForbitController extends ThinkController
         $is_insert = M('forbit_ip','tab_')->add($insert);
 
         if ($is_insert) {
+
+            addOperationLog(array(
+                "op_type"=>0,
+                "key"=> I('account'),
+                "menu"=>"游戏-游戏管理-ip限制白名单-新增",
+                "url"=>U("AmericaIpForbit/index")
+            ));
+
             $this->success('添加成功',U('AmericaIpForbit/index'));
         } else {
             $this->error('添加失败');

Application/Admin/Controller/PartnerController.class.php

@@ -62,7 +62,7 @@ class PartnerController extends ThinkController
         //获取分页数据
         $query = $model->alias('p')
             ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
-            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
+            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type,p.has_game_evidence,p.is_sign_contract")
             ->where($map)
             ->order("id desc");
         if($is_export){
@@ -143,8 +143,8 @@ class PartnerController extends ThinkController
         $parseData = array();
         foreach ($partners as $key =>$value) {
             $value['game'] = $parseGames[$value['id']];
-            $value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
-            $value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
+            $value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否';
+            $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
             $value['channel_rate'] *= 100;
             $value['invoice_rate'] *= 100;
             if ($value['settlement_type'] == 0) {

Application/Admin/View/PromoteCompany/view.html

@@ -159,9 +159,9 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="l">开户网点：</td>
+                            <td class="l">账户名：</td>
                             <td class="r" >
-                                <input type="text" class="txt " name="bank_address" value="{$data.bank_address}" readonly placeholder="请输入开户网点">
+                                <input type="text" class="txt " name="bank_address" value="{$data.bank_address}" readonly placeholder="请输入账户名">
                             </td>
                         </tr>
                         <tr>