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

Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Browse Source
master
ELF
parent 2967d023d7 2ac78def85
commit 0134a158e1
23 changed files with 122 additions and 83 deletions

4
Application/Admin/Controller/DepositController.class.php
Unescape Escape View File

@ -249,8 +249,8 @@ class DepositController extends ThinkController {
$page = set_pagination($count,$row);
if($page) {$this->assign('_page', $page);}
$this->assign("is_admin",is_administrator());
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
$this->assign('list_data', $data);
$this->meta_title = '平台币充值列表';
$this->display();die();

2
Application/Admin/Controller/GameController.class.php
Unescape Escape View File

@ -379,6 +379,7 @@ class GameController extends ThinkController
$_POST['pay_config'] = json_encode($_POST['pay_config']);
$gameService = new GameService();
$_POST['download_ways'] = $gameService->getDownLoadWaysValue($downloadWays);
unset($_POST['apply_auth']);
$res = $game->update();
$id = $res["id"];
@ -387,6 +388,7 @@ class GameController extends ThinkController
$sid = $sibling['id'];
$map['id'] = array('neq', $sid);
$another = D("Game")->where($map)->find(); //获取另一个所有
$phone['apply_auth'] = $sibling['apply_auth'];
$phone['game_type_id'] = $sibling['game_type_id'];
$phone['dow_num'] = $sibling['dow_num'];
$phone['game_type_name'] = $sibling['game_type_name'];

3
Application/Admin/Controller/MemberController.class.php
Unescape Escape View File

@ -1190,7 +1190,8 @@ class MemberController extends ThinkController
$this->assign('user_count',$count[0]['count']);
$this->assign("is_admin",is_administrator());
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
parent::lists("UserLoginRecord", $p, $extend['map']);
}

3
Application/Admin/Controller/MendController.class.php
Unescape Escape View File

@ -97,7 +97,8 @@ class MendController extends ThinkController {
$page = set_pagination($count,$row);
if($page) {$this->assign('_page', $page);}
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
$this->display();
// parent::lists("Mend",$p,$map);
}

15
Application/Admin/Controller/PartnerController.class.php
Unescape Escape View File

@ -126,7 +126,7 @@ class PartnerController extends ThinkController
} else {
$val["row"] = 1;
}
$val['original_package_name'] = $val['original_package_name'] ?: '-';
$parseGames[$val['partner_id']][] = $val;
}
@ -137,6 +137,8 @@ class PartnerController extends ThinkController
$value['game'] = $parseGames[$value['id']];
$value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
$value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
$value['channel_rate'] *= 100;
$value['invoice_rate'] *= 100;
if ($value['settlement_type'] == 0) {
$value['settlement_type'] = '未配置';
} elseif ($value['settlement_type'] == 1) {
@ -238,8 +240,8 @@ class PartnerController extends ThinkController
$save['matche_platform'] = I('matche_platform');
$save['contract_start_time'] = strtotime(I('contract_start_time'));
$save['contract_end_time'] = strtotime(I('contract_end_time'));
$save['channel_rate'] = I('channel_rate');
$save['invoice_rate'] = I('invoice_rate') ?: 0;
$save['channel_rate'] = I('channel_rate')/100;
$save['invoice_rate'] = (I('invoice_rate') ?: 0)/100;
$save['is_sign_contract'] = I('is_sign_contract');
$save['settlement_type'] = I('settlement_type');
$save['has_game_evidence'] = I('has_game_evidence');
@ -338,8 +340,9 @@ class PartnerController extends ThinkController
$save['matche_platform'] = I('matche_platform');
$save['contract_start_time'] = strtotime(I('contract_start_time'));
$save['contract_end_time'] = strtotime(I('contract_end_time'));
$save['channel_rate'] = I('channel_rate');
$save['invoice_rate'] = I('invoice_rate') ?: 0;
$save['channel_rate'] = I('channel_rate')/100;
$save['invoice_rate'] = (I('invoice_rate') ?: 0)/100;
$save['is_sign_contract'] = I('is_sign_contract');
$save['settlement_type'] = I('settlement_type');
$save['has_game_evidence'] = I('has_game_evidence');
@ -366,6 +369,8 @@ class PartnerController extends ThinkController
}
$data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
$data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
$data['channel_rate'] *= 100;//存的是小数，显示百分比
$data['invoice_rate'] *= 100;//存的是小数，显示百分比
// dd($data);
$this->assign('data', $data);
$action = I('action');

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

@ -425,6 +425,8 @@ class PromoteController extends ThinkController
$companys = M('promote_company', 'tab_')->where(['status' => 1])->select();
$this->assign("is_admin",is_administrator());
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
$this->assign('companys', $companys);
$this->display();
}

2
Application/Admin/Controller/SettlementController.class.php
Unescape Escape View File

@ -435,7 +435,7 @@ class SettlementController extends ThinkController
} else if ($arr_index + 1 == sizeof($info['audit_users']) && $info['status'] != 3) {
return $this->error('该结算单已经审核完毕', true, true);
}
$is_last = ($info['setp'] + 1 >= sizeof($info['audit_users']));
$is_last = ($info['step'] + 1 >= sizeof($info['audit_users']));
$update['remark'] = $remark;
$update['status'] = $audit_type == 1 ? ($is_last ? 1 : 3) : 2;
$update['step'] = ($audit_type == 1 && !$is_last) ? $info['step'] + 1 : $info['step'];

3
Application/Admin/Controller/UserController.class.php
Unescape Escape View File

@ -675,7 +675,8 @@ class UserController extends AdminController
$this->m_title = '角色查询';
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'User/rolelist', 'status' => 1])->find());
$this->assign("is_admin",is_administrator());
$show_data_power = (is_administrator()|| session('user_auth')['show_data']);
$this->assign('show_data_power', $show_data_power);
$this->display();
}

2
Application/Admin/View/Deposit/lists_secord.html
Unescape Escape View File

@ -138,7 +138,7 @@
<if condition="$data['promote_account'] eq '自然注册'">
官方渠道
<else/>
<if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data.promote_account}
<else />
{$data.promote_account|encryptStr}

5
Application/Admin/View/Member/login_record.html
Unescape Escape View File

@ -144,12 +144,11 @@
<tr>
<td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td>
<td>
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data.user_account}
<else />
{$data.user_account|encryptStr}
</if>-->
{$data.user_account}
</if>
</td>
<?php $gamename=trim(get_game_name($data['game_id'],'id'));?>
<td><notempty name="gamename">{$gamename}<else /><eq name="data.type" value="2">APP登录<else/>官网登录</eq></notempty></td>

15
Application/Admin/View/Mend/lists.html
Unescape Escape View File

@ -68,12 +68,11 @@
<volist name="list_data" id="data">
<tr>
<td>
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data.account}
<else />
{$data.account|encryptStr}
</if>-->
{$data.account}
</if>
</td>
<td>{$data.register_time|date='Y-m-d H:i:s',###}</td>
<td>{$data.login_time|date='Y-m-d H:i:s',###}</td>
@ -82,20 +81,18 @@
<td>{$data.login_time|date='Y-m-d H:i:s',###}</td>
<td>
<if condition="get_parent_promoteto($data['promote_id']) neq '' ">
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
<else />
{$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
</if>-->
{$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
</if>
<else/>
{:get_promote_name($data['promote_id'])}
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{:get_promote_name($data['promote_id'])}
<else />
{:encryptStr(get_promote_name($data['promote_id']))}
</if>-->
</if>
</if></td>
<td>

33
Application/Admin/View/Mend/recordList.html
Unescape Escape View File

@ -87,10 +87,29 @@
<volist name="list_data" id="data">
<tr>
<td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
<td>{$data['user_account']}</td>
<td>{$data['promote_account']}</td>
<td>
<if condition="$show_data_power eq true ">
{$data['user_account']}
<else />
{$data['user_account']|encryptStr}
</if>
</td>
<td>
<if condition="$show_data_power eq true ">
{$data['promote_account']}
<else />
{$data['promote_account']|encryptStr}
</if>
</td>
<td>{$data['pay_amount']}</td>
<td>{$data['promote_account_to']}</td>
<td>
<if condition="$show_data_power eq true ">
{$data['promote_account_to']}
<else />
{$data['promote_account_to']|encryptStr}
</if>
</td>
<td class="js-pop" style="max-width: 400px;padding: 0 20px;">
<a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{$data['remark']}</a>
</td>
@ -129,7 +148,13 @@
{@each list_data as item,index}
<tr>
<td><input class="ids" type="checkbox" value="${item['id']}" name="ids[]"></td>
<td>${item['user_account']}</td>
<td>
<if condition="$show_data_power eq true ">
{$data['user_account']}
<else />
{$data['user_account']|encryptStr}
</if>
</td>
<td>${item['promote_account']}</td>
<td>${item['pay_amount']}</td>
<td>${item['promote_account_to']}</td>

2
Application/Admin/View/Partner/add.html
Unescape Escape View File

@ -61,7 +61,7 @@
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
<td class="r" >
<input type="text" class="txt " name="invoice_rate" value="" placeholder="请输入开票税点">
<input type="text" class="txt " name="invoice_rate" value="" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
</tr>

2
Application/Admin/View/Partner/edit.html
Unescape Escape View File

@ -61,7 +61,7 @@
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
<td class="r" >
<input type="text" class="txt " name="invoice_rate" value="{$data.invoice_rate}" placeholder="请输入开票税点">
<input type="text" class="txt " name="invoice_rate" value="{$data.invoice_rate}" placeholder="请输入开票税点"><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
</tr>

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

@ -28,6 +28,8 @@
.select2-results__option[aria-selected] {font-size:12px;}
.data_list table td{
text-indent:0;
height: 30px;
line-height: 30px;
}
</style>
@ -86,7 +88,7 @@
<!-- 表头 -->
<thead>
<tr>
<th style="width:5%;min-width:10px;">操作</th>
<th style="width:8%;min-width:10px;">操作</th>
<th>合同合作方名称</th>
<th>对应平台</th>
<th>合同期限</th>

2
Application/Admin/View/Partner/show.html
Unescape Escape View File

@ -61,7 +61,7 @@
<tr>
<td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
<td class="r" >
<input type="text" class="txt " name="inoice_rate" value="{$data.inoice_rate}" placeholder="请输入开票税点" readonly>
<input type="text" class="txt " name="inoice_rate" value="{$data.inoice_rate}" placeholder="请输入开票税点" readonly><span style="margin-left: 3px;padding-top: 5px">%</span>
</td>
</tr>

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

@ -84,7 +84,7 @@
<tr>
<td class="l">真实姓名：</td>
<td class="r">
<if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
<input type="text" class="txt" name="real_name" value="{$data['real_name']}" disabled="disabled" style="background:#CCCCCC">
<else />
<input type="text" class="txt" name="real_name" value="{$data['real_name']|encryptRealName}" disabled="disabled" style="background:#CCCCCC">
@ -94,7 +94,7 @@
<tr>
<td class="l">手机号码：</td>
<td class="r">
<if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
<input type="text" class="txt" name="mobile_phone" value="{$data['mobile_phone']}" disabled="disabled" style="background:#CCCCCC">
<else />
<input type="text" class="txt" name="mobile_phone" value="{$data['mobile_phone']|encryptStr}" disabled="disabled" style="background:#CCCCCC">

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

@ -32,15 +32,15 @@
.data_game_list table td{
line-height:1;
padding: 3px;
height: 30px;
}
</style>
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">{$meta_title}</h3>
<p class="description_text">说明：该功能是用于录入工会所属的推广公司名称</p>
</div>
<div class="jssearch search_list fl cf">
<div class="cf top_nav_list">
<div class="fl button_list">
<div class="tools">

14
Application/Admin/View/Support/lists.html
Unescape Escape View File

@ -128,14 +128,20 @@
<volist name="list_data" id="data">
<tr>
<td>{$data['promote_account']}</td>
<td>
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data['promote_account']}
<else />
{$data['promote_account']|encryptStr}
</if>
</td>
<td>
<if condition="$show_data_power eq true ">
{$data['user_account']}
<else />
{$data['user_account']|encryptStr}
</if>-->
{$data['user_account']}
</if>
</td>
<td>{$data['game_name']}</td>
<td>{$data['server_name']}</td>

10
Application/Admin/View/User/rolelist.html
Unescape Escape View File

@ -135,12 +135,11 @@
<tr>
<td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
<td>
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data.user_account}
<else />
{$data.user_account|encryptStr}
</if>-->
{$data.user_account}
</if>
</td>
<?php $gamename = trim($data['game_name']);
@ -153,12 +152,11 @@
<td><notempty name="rolename">{$rolename}<else />空</notempty></td>
<td>{$data.role_level}</td>
<td>
<!-- <if condition="$is_admin eq true ">
<if condition="$show_data_power eq true ">
{$data.promote_account}
<else />
{$data.promote_account|encryptStr}
</if>-->
{$data.promote_account}
</if>
</td>
<td><?= date('Y-m-d H:i:s', $data['play_time']) ?></td>
<td>{$data.play_ip}</td>

Write Preview
Loading…
Cancel
Save