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

修改内容

Browse Source
master
ELF 5 years ago
parent 49928f1caa
commit d61f98df7b
4 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,6 +25,19 @@
height:26px;line-height:26px;font-size:12px; height:26px;line-height:26px;font-size:12px;
} }
.select2-results__option[aria-selected] {font-size:12px;} .select2-results__option[aria-selected] {font-size:12px;}
.badge {
position: relative;
display: inline-block;
padding: 0 6px;
font-size: 12px;
text-align: center;
background-color: #1E9FFF;
color: #fff;
border-radius: 2px;
height: 18px;
line-height: 18px;
margin-right: 10px;
}
</style> </style>
<!-- 标题栏 --> <!-- 标题栏 -->
<div class="cf main-place top_nav_list navtab_list"> <div class="cf main-place top_nav_list navtab_list">
@ -69,8 +82,10 @@
<tr> <tr>
<th class="">查询时间</th> <th class="">查询时间</th>
<th class="">玩家账号</th> <th class="">玩家账号</th>
<th class="">游戏名称</th> <th class="">游戏名称</th>
<th class="">游戏区服</th> <th class="">游戏区服ID</th>
<th class="">游戏区服</th>
<th class="">角色ID</th>
<th class="">角色名</th> <th class="">角色名</th>
<th class="">游戏等级</th> <th class="">游戏等级</th>
<th class="">最后登录时间</th> <th class="">最后登录时间</th>
@ -87,8 +102,10 @@
<?php $gamename = trim($data['game_name']); <?php $gamename = trim($data['game_name']);
$servername = trim($data['server_name']); $servername = trim($data['server_name']);
$rolename = trim($data['role_name']);?> $rolename = trim($data['role_name']);?>
<td><notempty name="gamename">{$gamename}<else />空</notempty></td> <td><notempty name="gamename">{$gamename}<else />空</notempty></td>
<td><notempty name="servername">{$servername}<else />空</notempty></td> <td><span class="badge">{$data['server_id']}</span></td>
<td><notempty name="servername">{$servername}<else />空</notempty></td>
<td><span class="badge">{$data['role_id']}</span></td>
<td><notempty name="rolename">{$rolename}<else />空</notempty></td> <td><notempty name="rolename">{$rolename}<else />空</notempty></td>
<td>{$data.role_level}</td> <td>{$data.role_level}</td>
<td>{$data.play_time|date='Y-m-d H:i:s',###}</td> <td>{$data.play_time|date='Y-m-d H:i:s',###}</td>

4
Application/Home/View/default/CoinOrder/order_detail.html
Unescape Escape View File

@ -129,7 +129,7 @@
<div class="tr"> <div class="tr">
<label class="detailed-title detailed-label mr-300">订单金额：</label> <label class="detailed-title detailed-label mr-300">订单金额：</label>
<div class="detailed-content-box"> <div class="detailed-content-box">
<span>{$order_info.pay_amount}</span> <span>{$order_info.real_amount}</span>
</div> </div>
</div> </div>
</div> </div>
@ -138,7 +138,7 @@
<div class="tr"> <div class="tr">
<label class="detailed-title detailed-label mr-300">实付金额：</label> <label class="detailed-title detailed-label mr-300">实付金额：</label>
<div class="detailed-content-box"> <div class="detailed-content-box">
<span>{$order_info.real_amount}</span> <span>{$order_info.pay_amount}</span>
</div> </div>
</div> </div>
</div> </div>

2
Application/Mobile/View/Ssg/home.html
Unescape Escape View File

@ -75,7 +75,7 @@
</a> </a>
</div> </div>
<div class="footer"> <div class="footer">
<p class="footer-up">闽ICP备19003775号-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;闽网文{2019} 1554-099号</p> <p class="footer-up">琼ICP备19000556号-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;琼网文（2019）2354-200号</p>
<p class="footer-down">抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。<br>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</p> <p class="footer-down">抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。<br>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</p>
</div> </div>
</div> </div>

27
Application/Sdk/Controller/UserController.class.php
Unescape Escape View File

@ -1169,6 +1169,7 @@ class UserController extends BaseController
$res = $data = $user_play -> where($map) -> find(); $res = $data = $user_play -> where($map) -> find();
$user = M('user', 'tab_'); $user = M('user', 'tab_');
$user_data = $user -> find($user_id); $user_data = $user -> find($user_id);
$data['promote_id'] = $request['promote_id']; $data['promote_id'] = $request['promote_id'];
$data['promote_account'] = get_promote_account($request['promote_id']); $data['promote_account'] = get_promote_account($request['promote_id']);
$data['game_id'] = $request['game_id']; $data['game_id'] = $request['game_id'];
@ -1176,7 +1177,7 @@ class UserController extends BaseController
$data['server_id'] = $request['server_id']; $data['server_id'] = $request['server_id'];
$data['server_name'] = $request['server_name']; $data['server_name'] = $request['server_name'];
$data['role_name'] = $request['game_player_name']; $data['role_name'] = $request['game_player_name'];
// $data['role_name'] = $request['role_name']; $data['role_id'] = $request['game_player_id'];
$data['role_level'] = $request['role_level']; $data['role_level'] = $request['role_level'];
$data['user_id'] = $user_id; $data['user_id'] = $user_id;
$data['user_account'] = $user_data['account']; $data['user_account'] = $user_data['account'];
@ -1770,6 +1771,24 @@ class UserController extends BaseController
if (isset($r['union']) && $r['union'] == 1) if (isset($r['union']) && $r['union'] == 1)
$squnion_pay = 1; $squnion_pay = 1;
} }
// 双乾银联快捷支付
$shortcut_pay = 0;
$sqpay = M('tool','tab_')->field('status, config')->where(array('name'=>'sqpay'))->find();
if ($sqpay['status'] == 1) {
$r = json_decode($sqpay['config'], true);
if (isset($r['shortcut']) && $r['shortcut'] == 1)
$shortcut_pay = 1;
}
$user_id = $request['user_id'];
$game_id = $request['game_id'];
$balance = M ('user', 'tab_')->where (array(
'id' => $user_id
))->getField('balance');
$bind_balance = M('user_play', 'tab_')->where(array(
'user_id' => $user_id,
'game_id' => $game_id
))->getField('bind_balance');
// pp($squnion_pay); // pp($squnion_pay);
//0:APP 1:WAP //0:APP 1:WAP
$zfb_type = pay_set_status('alipay') == 1 ? (empty(C('alipay.way')) ? 0 : C('alipay.way')) : 1; $zfb_type = pay_set_status('alipay') == 1 ? (empty(C('alipay.way')) ? 0 : C('alipay.way')) : 1;
@ -1782,7 +1801,11 @@ class UserController extends BaseController
'zfb_type' => $zfb_type, 'zfb_type' => $zfb_type,
'ptb_game' => $ptb_game, 'ptb_game' => $ptb_game,
'bind_game' => $bind_game, 'bind_game' => $bind_game,
'squnion_pay' => $squnion_pay, 'squnion_pay' => $squnion_pay, // 银联0关 1开
'platform_coin' => $balance,
'bind_coin' => $bind_balance,
'wx_type' => 0, // 0微信 1 微信小程序 双乾
'shortcut_pay' => 0, // 快捷支付 0关 1开
))); )));
} }

Write Preview
Loading…
Cancel
Save