From d61f98df7b3286f5dc5a4b378f3a4063e430cf40 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Sep 2019 15:08:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/User/rolelist.html | 25 ++++++++++++++--- .../View/default/CoinOrder/order_detail.html | 4 +-- Application/Mobile/View/Ssg/home.html | 2 +- .../Sdk/Controller/UserController.class.php | 27 +++++++++++++++++-- 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 634926ab9..8c25ebc62 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -25,6 +25,19 @@ height:26px;line-height:26px;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; + }
@@ -69,8 +82,10 @@ 查询时间 玩家账号 - 游戏名称 - 游戏区服 + 游戏名称 + 游戏区服ID + 游戏区服 + 角色ID 角色名 游戏等级 最后登录时间 @@ -87,8 +102,10 @@ - {$gamename}空 - {$servername}空 + {$gamename}空 + {$data['server_id']} + {$servername}空 + {$data['role_id']} {$rolename}空 {$data.role_level} {$data.play_time|date='Y-m-d H:i:s',###} diff --git a/Application/Home/View/default/CoinOrder/order_detail.html b/Application/Home/View/default/CoinOrder/order_detail.html index 989a48e9f..f5d56cf42 100644 --- a/Application/Home/View/default/CoinOrder/order_detail.html +++ b/Application/Home/View/default/CoinOrder/order_detail.html @@ -129,7 +129,7 @@
- {$order_info.pay_amount} + {$order_info.real_amount}
@@ -138,7 +138,7 @@
- {$order_info.real_amount} + {$order_info.pay_amount}
diff --git a/Application/Mobile/View/Ssg/home.html b/Application/Mobile/View/Ssg/home.html index ef6f7107f..d8167fd66 100644 --- a/Application/Mobile/View/Ssg/home.html +++ b/Application/Mobile/View/Ssg/home.html @@ -75,7 +75,7 @@
-

闽ICP备19003775号-1      闽网文{2019} 1554-099号

+

琼ICP备19000556号-1      琼网文（2019）2354-200号

抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。
适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index 28125e418..ebbfaa7d2 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -1169,6 +1169,7 @@ class UserController extends BaseController $res = $data = $user_play -> where($map) -> find(); $user = M('user', 'tab_'); $user_data = $user -> find($user_id); + $data['promote_id'] = $request['promote_id']; $data['promote_account'] = get_promote_account($request['promote_id']); $data['game_id'] = $request['game_id']; @@ -1176,7 +1177,7 @@ class UserController extends BaseController $data['server_id'] = $request['server_id']; $data['server_name'] = $request['server_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['user_id'] = $user_id; $data['user_account'] = $user_data['account']; @@ -1770,6 +1771,24 @@ class UserController extends BaseController if (isset($r['union']) && $r['union'] == 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); //0:APP 1:WAP $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, 'ptb_game' => $ptb_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开 ))); }