From 6da0ec1607b8f433698d6df396f3619ab29e969f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 9 Jun 2020 10:31:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 73a47deae..872a13515 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -173,6 +173,7 @@ class MemberController extends ThinkController foreach ($data as $k => &$v) { $v['register_type'] = get_registertype($v['register_type']); + if(!$isadmin){ $v['account'] = encryptStr($v['account']); $v['promote_account'] = encryptStr($v['promote_account']); @@ -217,7 +218,9 @@ class MemberController extends ThinkController )); data2csv($data,"玩家_玩家列表",$field); } - + foreach ($data as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + } //计算总人数 if($is_repeat){ $field ="count(*) user_count,IFNULL(sum(ss.pay_amount), 0) recharge_total"; From 4ff957d0f117e3aaa41d73cf6d6ab777b1ec7c04 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 9 Jun 2020 15:24:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=86=E5=AE=98=E6=96=B9=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B1=9F=E6=81=AF=E7=BD=91?= =?UTF-8?q?=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 2 +- Application/Admin/Conf/config.php | 1 + .../Admin/Controller/AjaxController.class.php | 2 +- .../Controller/ExportController.class.php | 2 +- .../Controller/FinanceController.class.php | 1 + .../FinancePromoteController.class.php | 24 ++++++++++++++++--- .../Admin/Controller/GameController.class.php | 4 ++-- .../Controller/PayChannelController.class.php | 1 + .../Controller/PlatformController.class.php | 2 +- .../PromoteCompanyController.class.php | 2 +- .../Controller/QueryController.class.php | 3 ++- .../RechargeSumController.class.php | 4 ++-- .../Controller/SpendController.class.php | 4 ++++ .../StatisticsCountSetController.class.php | 2 +- .../Admin/Controller/UserController.class.php | 5 ++++ .../Admin/Model/PromoteModel.class.php | 2 +- Application/Admin/View/BindSpend/lists.html | 2 +- Application/Admin/View/Deposit/lists.html | 16 ++++++++++--- .../View/FinancePromote/gameStatistics.html | 2 +- .../FinancePromote/gameStatisticsDetail.html | 4 ++-- .../Admin/View/FinancePromote/index.html | 6 ++++- .../View/FinancePromote/promoteUser.html | 2 +- .../Admin/View/FinancialSummary/index.html | 2 +- Application/Admin/View/Member/user_info.html | 4 ++-- Application/Admin/View/Mend/edit.html | 2 +- .../Admin/View/PromoteCompany/add.html | 14 ++++++++++- .../Admin/View/PromoteCompany/edit.html | 14 ++++++++++- .../Admin/View/PromoteCompany/view.html | 11 +++++++++ .../Admin/View/PromoteWelfare/add.html | 2 +- .../Admin/View/PromoteWelfare/edit.html | 2 +- .../Admin/View/PromoteWelfare/lists.html | 2 +- Application/Admin/View/Rebate/add.html | 2 +- Application/Admin/View/Rebate/edit.html | 2 +- Application/Admin/View/Rebate/lists.html | 2 +- Application/Admin/View/Spend/lists.html | 2 +- Application/Admin/View/SuperSign/lists.html | 4 ++-- .../Admin/View/SuperStatistical/index.html | 2 +- .../Admin/View/SuperStatistical/lists.html | 2 +- .../View/SuperStatistical/superDetail.html | 4 ++-- Application/Admin/View/Tool/lists.html | 2 +- Application/Admin/View/User/rolelist.html | 2 +- .../Base/Service/PromoteService.class.php | 6 ++--- Application/Common/Common/extend.php | 4 ++-- Data/update.sql | 10 ++++++++ 44 files changed, 140 insertions(+), 50 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index a05e905ce..213012c2e 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1109,7 +1109,7 @@ function get_promote_parent_acc($promote_id){ $data = $Promote->field('account,parent_id,chain')->find($promote_id); if(empty($data)){ - return $data["account"]="官方渠道";exit; + return $data["account"]=C('OFFICIEL_CHANNEL');exit; } $chain = trim($data['chain'], '/'); if ($chain == '') { diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index b811c5edb..4a7bc38bb 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -112,4 +112,5 @@ return array( 'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件 /*默认公司名称*/ 'DEFAULT_COMPANY'=>"海南万盟天下科技有限公司", + 'OFFICIEL_CHANNEL'=>"江息网络" ); \ No newline at end of file diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index f579f16c6..02e6eed5a 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -192,7 +192,7 @@ class AjaxController extends ThinkController{ $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : ""); } if($company_id <= 0){ - array_unshift($data,["id"=>0,"nickname"=>"官方渠道","account"=>"官方渠道","company_id"=>0]); + array_unshift($data,["id"=>0,"nickname"=>C('OFFICIEL_CHANNEL'),"account"=>C('OFFICIEL_CHANNEL'),"company_id"=>0]); } $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>$data]); diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index f0eac80a3..ea282b699 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3620,7 +3620,7 @@ class ExportController extends Controller ->where($map) ->find(); } - $authorityData['promote_account'] = "官方渠道"; + $authorityData['promote_account'] = C('OFFICIEL_CHANNEL'); $authorityData['id'] = "1"; if (isset($_REQUEST['promote_id'])||$authorityData['count']==0) { $authorityData = []; diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 26a51e2db..8d3b724cb 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -854,6 +854,7 @@ class FinanceController extends ThinkController $data[$key]['pay_way'] = getPayType($value['pay_way']); $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; if (isset($_REQUEST['export'])) { checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail'); diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 24fbd3190..ada70cf87 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -120,6 +120,21 @@ class FinancePromoteController extends AdminController if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0; if(!array_key_exists('inside_cash_count',$v)) $v['inside_cash_count']=0; $v['promote_account'] = get_promote_name($v['p_id']); + if ($v['admin_id']) { + $v['admin_id'] = get_admin_account($v['admin_id']); + } else { + $v['admin_id'] = '无'; + } + + if ($v['develop_type'] == 1) { + $v['develop_type'] = '自主开发'; + } elseif($v['develop_type'] == 2) { + $v['develop_type'] = '自主开发及维护'; + } elseif($v['develop_type'] == 3) { + $v['develop_type'] = '只维护'; + } else { + $v['develop_type'] = '未设定'; + } $v['inside_cash_count'] = number_format($v['inside_cash_count'],2,'.',''); $v['allcount'] = number_format($v['cash_count']-0+$v['balance_coin_count']+$v['bind_coin_count'],2,'.',''); @@ -148,6 +163,7 @@ class FinancePromoteController extends AdminController "allcount"=>"渠道游戏内充值合计" )); } + $pagecount = count($data); $page = set_pagination($pagecount, $row); if ($page) { @@ -222,7 +238,7 @@ class FinancePromoteController extends AdminController SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong"; + IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong,admin_id,develop_type"; return M() ->table("tab_spend s use index(promote_time)") ->field($field) @@ -239,7 +255,7 @@ class FinancePromoteController extends AdminController $map['s.source_id']=0; $field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount,IFNULL(if(substring_index(substring_index(`chain`,'/',2),'/',-1)='', s.promote_id,substring_index(substring_index(`chain`,'/',2),'/',-1)),0) p_id, - IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong"; + IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong,admin_id,develop_type"; return M("promote_coin s","tab_") ->field($field) ->where($map) @@ -323,7 +339,7 @@ class FinancePromoteController extends AdminController $v['company_belong'] = getCompanyBlong($v['company_belong']); if(empty($v['company_name'])) $v['company_name']= $this->COMPANY_NAME; - if(empty($v['promote_account'])) $v['promote_account']= "官方渠道"; + if(empty($v['promote_account'])) $v['promote_account']= C('OFFICIEL_CHANNEL'); if(!array_key_exists('cash_count',$v)) $v['cash_count']=0; if(!array_key_exists('balance_coin_count',$v)) $v['balance_coin_count']=0; if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0; @@ -460,6 +476,7 @@ class FinancePromoteController extends AdminController $value['inside_cash_count']?:0; $value['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.',''); $value['company_belong'] =getCompanyBlong($value['company_belong']); + ($value['account']=='官方渠道')?($value['account']=C('OFFICIEL_CHANNEL')):''; $value['game_name'] =clearGameNameType($value['game_name']); $value['sdk_version'] =getGameTypeName($value['sdk_version']); @@ -589,6 +606,7 @@ class FinancePromoteController extends AdminController $data[$key]['pay_way'] = getPayType($value['pay_way']); $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']); + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; if (isset($_REQUEST['export'])) { checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail'); diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index ccca79c31..c6e3f073f 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -510,7 +510,7 @@ class GameController extends ThinkController foreach($sociatyGames as $key => $value) { $sociatyGamesData[$key]['id'] = $value['id']; if($value['promote_id'] == -1) { - $sociatyGamesData[$key]['promoteAccount'] = "官方渠道"; + $sociatyGamesData[$key]['promoteAccount'] = C('OFFICIEL_CHANNEL'); }else { $promoteAccount = M('promote','tab_')->where(['id'=>$value['promote_id']])->getField('account'); $sociatyGamesData[$key]['promoteAccount'] = $promoteAccount; @@ -1229,7 +1229,7 @@ class GameController extends ThinkController $promoteData = M('promote','tab_')->field('id as value,account as title')->where(array('level'=>1,'chain'=>'/'))->select(); $data_president = M('AuthGroup')->field('data_president')->where(array('id'=>1))->find(); - $promoteData = array_merge([0=>['value'=>'-1','title'=>'官方渠道']],$promoteData); + $promoteData = array_merge([0=>['value'=>'-1','title'=>C('OFFICIEL_CHANNEL')]],$promoteData); $returnData = array('data_president'=>$data_president['data_president'],'list'=>$promoteData); $this->ajaxReturn(json_encode($returnData)); diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index f6393070d..8a3f5a3e2 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -663,6 +663,7 @@ class PayChannelController extends ThinkController foreach ($data as $key => $value) { $data[$key]['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']); + ($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):''; if ($model == 'spend') { $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']); diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index fe47af006..f80948b8e 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -521,7 +521,7 @@ class PlatformController extends ThinkController $data = []; foreach($tmdata as $k => $v){ if($v['id'] == 0){ - $v['promote_account'] = "官方渠道"; + $v['promote_account'] = C('OFFICIEL_CHANNEL'); } $data[] = $v; } diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 9f434f15b..55d42c7e2 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -318,7 +318,7 @@ class PromoteCompanyController extends ThinkController $save['last_up_time'] = $time; $save['contact_begin']=strtotime($save['contact_begin']); $save['contact_end']=strtotime($save['contact_end']); - + if(isset($save['resources'])){ $save['resources'] = json_encode($save['resources'],JSON_UNESCAPED_UNICODE); } diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 8df9d88a6..666dfd6d0 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -1561,7 +1561,7 @@ class QueryController extends ThinkController if ($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') { if ($_REQUEST['promote_id']=='0') { unset($map['root_id']); - $map['promote_account'] = '官方渠道'; + $map['promote_account'] = C('OFFICIEL_CHANNEL'); } else { $map['root_id'] = $_REQUEST['promote_id']; } @@ -1625,6 +1625,7 @@ class QueryController extends ThinkController $gameName = substr($gameInfo,0,strpos($gameInfo,'(')); $gameMap['game_name'] = ['like','%'.$gameName.'%']; $gameIdArr = M('game','tab_')->field('id')->where($gameMap)->select(); + ($data[$key]['account']=='官方渠道')?($data[$key]['account']=C('OFFICIEL_CHANNEL')):''; $gameNameIdArr = []; foreach($gameIdArr as $gameKey => $gameValue){ $gameNameIdArr[] = $gameValue['id']; diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index 5a52d93ee..615d32a6d 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -90,10 +90,10 @@ class RechargeSumController extends ThinkController $data[$key]['game_id'] = empty($_REQUEST['game_name']) ? "全部" : $_REQUEST['game_name']; switch ($_REQUEST['promote_id']) { case 'GUANFANG': - $data[$key]['promote_id'] = "官方渠道"; + $data[$key]['promote_id'] = C('OFFICIEL_CHANNEL'); break; case '0': - $data[$key]['promote_id'] = "官方渠道"; + $data[$key]['promote_id'] = C('OFFICIEL_CHANNEL'); break; case 'PROMOTE': $data[$key]['promote_id'] = "推广渠道"; diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 8c008686e..d2402f780 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -125,6 +125,10 @@ class SpendController extends ThinkController $data = D(self::model_name)->lists($_GET["p"], $map, $order); + foreach ($data['data'] as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + } + $this->assign('startDate', $startDate); $this->assign('endDate', $endDate); $this->assign('list_data', $data['data']); diff --git a/Application/Admin/Controller/StatisticsCountSetController.class.php b/Application/Admin/Controller/StatisticsCountSetController.class.php index 5c147bfb8..aba192154 100644 --- a/Application/Admin/Controller/StatisticsCountSetController.class.php +++ b/Application/Admin/Controller/StatisticsCountSetController.class.php @@ -186,7 +186,7 @@ class StatisticsCountSetController extends Controller { $value['active_user_list'] = @json_encode(array_map("intFun",explode(",",$value['active_user_list']))); if(empty($value['promote_account']) && $value['promote_id']){ if($value['promote_id'] == 0){ - $value['promote_account'] = "官方渠道"; + $value['promote_account'] = C('OFFICIEL_CHANNEL'); }else{ $value['promote_account'] = $this->PromoteModel->field("account")->where("id = {$value['promote_id']}")->find()['account']; if(!$value['promote_account']){ diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 64cc6a33e..8fbcd6977 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -704,6 +704,11 @@ class UserController extends AdminController empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"]; $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]); $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); + + foreach ($list as $key=>&$value ) { + ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; + } + $this->assign('list', $list); $this->meta_title = '角色数据'; diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index b5d1d781f..180fa3fe8 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -404,7 +404,7 @@ class PromoteModel extends Model{ $userAuth = session('user_auth'); setPowerPromoteIds($where,'id'); - $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']]; + $offcialData = [0=>['id'=>0,'nickname'=>C('OFFICIEL_CHANNEL')]]; $result = $this->field("*")->where($where)->select(); foreach ($result as &$item) { diff --git a/Application/Admin/View/BindSpend/lists.html b/Application/Admin/View/BindSpend/lists.html index 7c5fe3700..2b1f9a1ec 100644 --- a/Application/Admin/View/BindSpend/lists.html +++ b/Application/Admin/View/BindSpend/lists.html @@ -60,7 +60,7 @@ - + diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index 05ad5bb90..cb397a337 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -91,7 +91,7 @@
@@ -361,7 +361,7 @@ data:{level:$("#promote_level option:selected").val()}, dataType:'json', success:function(response){ - str = ''; + str = ''; // $.each(response.data, function(index, item){ // console.log(item.id); // str += ''; diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html index 1a4edb172..ad2c2f507 100644 --- a/Application/Admin/View/FinancePromote/index.html +++ b/Application/Admin/View/FinancePromote/index.html @@ -165,7 +165,9 @@ 推广公司 会长渠道 + 开发类型 内外团 + 市场专员 游戏现金金额▲ @@ -215,7 +217,9 @@ {$data.company_name} {$data['promote_account']} + {$data['develop_type']} {$data['company_belong']} + {$data['admin_id']} {$data.cash_count} @@ -248,7 +252,7 @@ - 汇总: + 汇总: {$all_count['cash_count']} {$all_count['balance_coin_count']} {$all_count['bind_coin_count']} diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html index 589b01a3a..74edb78e8 100644 --- a/Application/Admin/View/FinancePromote/promoteUser.html +++ b/Application/Admin/View/FinancePromote/promoteUser.html @@ -105,7 +105,7 @@
diff --git a/Application/Admin/View/FinancialSummary/index.html b/Application/Admin/View/FinancialSummary/index.html index c77ba424d..e30ae963f 100644 --- a/Application/Admin/View/FinancialSummary/index.html +++ b/Application/Admin/View/FinancialSummary/index.html @@ -376,7 +376,7 @@ success: function (response) { str = ''; if(company_id == 0 || company_id ==-1){ - str +=''; + str +=''; } data = response.data; for (var i in data) { diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index dbac7fc44..78b680350 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -156,7 +156,7 @@
@@ -272,7 +272,7 @@ - 官方渠道 + {:C('OFFICIEL_CHANNEL')} --- diff --git a/Application/Admin/View/Mend/edit.html b/Application/Admin/View/Mend/edit.html index 88a4e2e25..dccb49a24 100644 --- a/Application/Admin/View/Mend/edit.html +++ b/Application/Admin/View/Mend/edit.html @@ -74,7 +74,7 @@ + + 开发类型： + + + + 备注： @@ -299,7 +310,8 @@ "bank_name":["nocheck","银行名称不能为空"], "bank_address":["nocheck","银行开户网点不能为空"], "content":["nocheck"], - "status":["nocheck","","radio"] + "status":["nocheck","","radio"], + "develop_type":["nocheck","开发类型不能为空","select"] } var cres = CIC.checkAddInput(obj); if(!cres){ diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 967008ee5..f2604d4b6 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -165,6 +165,17 @@ + + 开发类型： + + + + 备注： @@ -368,7 +379,8 @@ "bank_name":[["nocheck",true],"银行名称不能为空"], "bank_address":[["nocheck",true],"银行开户网点不能为空"], "content":[["nocheck",true]], - "status":["nocheck","","radio"] + "status":["nocheck","","radio"], + "develop_type":["nocheck","开发类型不能为空","select"] } var cres = CIC.checkAddInput(obj); if(!cres){ diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index a8d745481..5eae0aa8e 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -164,6 +164,17 @@ + + 开发类型： + + + + 备注： diff --git a/Application/Admin/View/PromoteWelfare/add.html b/Application/Admin/View/PromoteWelfare/add.html index 216060c62..2b77d19c1 100644 --- a/Application/Admin/View/PromoteWelfare/add.html +++ b/Application/Admin/View/PromoteWelfare/add.html @@ -82,7 +82,7 @@ diff --git a/Application/Admin/View/PromoteWelfare/edit.html b/Application/Admin/View/PromoteWelfare/edit.html index 57aaa09c8..cda12b2c4 100644 --- a/Application/Admin/View/PromoteWelfare/edit.html +++ b/Application/Admin/View/PromoteWelfare/edit.html @@ -70,7 +70,7 @@ diff --git a/Application/Admin/View/PromoteWelfare/lists.html b/Application/Admin/View/PromoteWelfare/lists.html index 4fc16c7bc..4b5ec675d 100644 --- a/Application/Admin/View/PromoteWelfare/lists.html +++ b/Application/Admin/View/PromoteWelfare/lists.html @@ -78,7 +78,7 @@ diff --git a/Application/Admin/View/Rebate/add.html b/Application/Admin/View/Rebate/add.html index b6cd4a9f1..e6e7ea68a 100644 --- a/Application/Admin/View/Rebate/add.html +++ b/Application/Admin/View/Rebate/add.html @@ -74,7 +74,7 @@ 设置不同对象可享受的返利，对象包含全站玩家、官方渠道、推广渠道 diff --git a/Application/Admin/View/Rebate/edit.html b/Application/Admin/View/Rebate/edit.html index 62e122569..5474290b0 100644 --- a/Application/Admin/View/Rebate/edit.html +++ b/Application/Admin/View/Rebate/edit.html @@ -49,7 +49,7 @@ 设置不同对象可享受的返利，对象包含全站玩家、官方渠道、推广渠道 diff --git a/Application/Admin/View/Rebate/lists.html b/Application/Admin/View/Rebate/lists.html index da3d5d44d..1ad66d9b0 100644 --- a/Application/Admin/View/Rebate/lists.html +++ b/Application/Admin/View/Rebate/lists.html @@ -114,7 +114,7 @@ 全站玩家 - 官方渠道 + {:C('OFFICIEL_CHANNEL')} 推广渠道 diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index f7c6790c8..f338e98e0 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -205,7 +205,7 @@ （{$data.small_account}） {$data.game_name} - 官方渠道 + C('OFFICIEL_CHANNEL')