From 4cb88be352f2f9e6e979f882820927758998feb2 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 17 Feb 2020 14:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DepositController.class.php | 4 +- .../Controller/MemberController.class.php | 3 +- .../Admin/Controller/MendController.class.php | 3 +- .../Controller/PromoteController.class.php | 2 + .../Admin/Controller/UserController.class.php | 3 +- .../Admin/View/Deposit/lists_secord.html | 2 +- Application/Admin/View/Giftbag/record.html | 14 ++--- .../Admin/View/Member/login_record.html | 5 +- Application/Admin/View/Mend/lists.html | 15 +++--- Application/Admin/View/Mend/record.html | 4 +- Application/Admin/View/Mend/recordList.html | 53 ++++++++++++++----- Application/Admin/View/Mend/shiftInfo.html | 34 ++++++------ Application/Admin/View/Promote/edit.html | 4 +- Application/Admin/View/Support/lists.html | 14 +++-- Application/Admin/View/User/rolelist.html | 10 ++-- 15 files changed, 100 insertions(+), 70 deletions(-) diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php index bd1c1aa67..4dcfa806f 100644 --- a/Application/Admin/Controller/DepositController.class.php +++ b/Application/Admin/Controller/DepositController.class.php @@ -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(); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index bb5d4b408..c7b731c89 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -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']); } diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 0e0477f30..ffaf82853 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -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); } diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index bd70095ec..ce9f467d2 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -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(); } diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 9ce267470..9ffabd858 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -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(); } diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html index a57da2ead..203d7f3a6 100644 --- a/Application/Admin/View/Deposit/lists_secord.html +++ b/Application/Admin/View/Deposit/lists_secord.html @@ -138,7 +138,7 @@ 官方渠道 - + {$data.promote_account} {$data.promote_account|encryptStr} diff --git a/Application/Admin/View/Giftbag/record.html b/Application/Admin/View/Giftbag/record.html index 066e224d7..ce7a1111d 100644 --- a/Application/Admin/View/Giftbag/record.html +++ b/Application/Admin/View/Giftbag/record.html @@ -26,14 +26,14 @@ } .select2-results__option[aria-selected] {font-size:12px;} - - + +

礼包领取

说明：礼包领取记录：此功是查看玩家领取礼包的功能

- - + +
@@ -44,14 +44,14 @@
- +
+
- - {$data.user_account} + {$gamename}APP登录官网登录 diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html index c21685421..98ec0d32c 100644 --- a/Application/Admin/View/Mend/lists.html +++ b/Application/Admin/View/Mend/lists.html @@ -68,12 +68,11 @@ - - {$data.account} + {$data.register_time|date='Y-m-d H:i:s',###} {$data.login_time|date='Y-m-d H:i:s',###} @@ -82,20 +81,18 @@ {$data.login_time|date='Y-m-d H:i:s',###} - - {$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))} + - {:get_promote_name($data['promote_id'])} - + diff --git a/Application/Admin/View/Mend/record.html b/Application/Admin/View/Mend/record.html index 480028275..d8fe2b98a 100644 --- a/Application/Admin/View/Mend/record.html +++ b/Application/Admin/View/Mend/record.html @@ -157,7 +157,7 @@ $(function(){ var navlist = $(this).find('.i_list_li'); if (navlist.hasClass('hidden')) { navlist.removeClass('hidden'); - $('#i_list_id').focus().val(''); + $('#i_list_id').focus().val(''); } else { navlist.addClass('hidden'); } @@ -171,7 +171,7 @@ $(function(){ var val = $.trim($(this).val()).toLowerCase(); $('#i_list_idh').val(val); }); - + $("#i_list_li").find("a").each(function(){ $(this).click(function(){ var text = $.trim($(this).text()).toLowerCase(); diff --git a/Application/Admin/View/Mend/recordList.html b/Application/Admin/View/Mend/recordList.html index 51f932653..ca777c835 100644 --- a/Application/Admin/View/Mend/recordList.html +++ b/Application/Admin/View/Mend/recordList.html @@ -20,9 +20,9 @@

补链记录

说明：此处功能查看玩家推广补链记录。

- - - + + +
@@ -53,7 +53,7 @@
搜索
- +
@@ -87,10 +87,29 @@ - {$data['user_account']} - {$data['promote_account']} + + + {$data['user_account']} + + {$data['user_account']|encryptStr} + + + + + {$data['promote_account']} + + {$data['promote_account']|encryptStr} + + {$data['pay_amount']} - {$data['promote_account_to']} + + + {$data['promote_account_to']} + + {$data['promote_account_to']|encryptStr} + + + {$data['remark']} @@ -109,10 +128,10 @@
{$_page|default=''}
- + - - + +
@@ -121,7 +140,7 @@
已添加添加至常用设置
- + @@ -129,7 +148,13 @@ {@each list_data as item,index} - ${item['user_account']} + + + {$data['user_account']} + + {$data['user_account']|encryptStr} + + ${item['promote_account']} ${item['pay_amount']} ${item['promote_account_to']} @@ -217,7 +242,7 @@ $(function(){ var navlist = $(this).find('.i_list_li'); if (navlist.hasClass('hidden')) { navlist.removeClass('hidden'); - $('#i_list_id').focus().val(''); + $('#i_list_id').focus().val(''); } else { navlist.addClass('hidden'); } @@ -231,7 +256,7 @@ $(function(){ var val = $.trim($(this).val()).toLowerCase(); $('#i_list_idh').val(val); }); - + $("#i_list_li").find("a").each(function(){ $(this).click(function(){ var text = $.trim($(this).text()).toLowerCase(); diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html index 050614e98..c8a272de3 100644 --- a/Application/Admin/View/Mend/shiftInfo.html +++ b/Application/Admin/View/Mend/shiftInfo.html @@ -17,9 +17,9 @@ height:26px;line-height:26px;font-size:12px; } .select2-results__option[aria-selected] {font-size:12px;} - + .tabcon1711 .select2-container--default .select2-selection--single{ - font-size: 12px; + font-size: 12px; color: #555; vertical-align: middle; -webkit-border-radius: 4px; @@ -41,17 +41,17 @@ } .tabcon1711 .select2-results__option[aria-selected] {font-size:12px;} - +

推广补链查看

说明：此处功能用于修改玩家所属推广渠道的功能。

- - - - -
- + + + + +
+ @@ -99,8 +99,8 @@
- - + +
- +
- - + +
@@ -121,7 +121,7 @@
已添加添加至常用设置
- + @@ -162,14 +162,14 @@ $('#submit').click(function(){ window.location.href = data.url; }); }else{ - layer.msg('取消补链失败，或补链已经生效无法取消') + layer.msg('取消补链失败，或补链已经生效无法取消') } }, error:function(){ layer.msg('网络错误'); } }) - + // window.location.href = "{:U('Mend/cancelShift')}"+"&id="+taskid; }); $(function(){ diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html index fdabbe255..1f1a61d5c 100644 --- a/Application/Admin/View/Promote/edit.html +++ b/Application/Admin/View/Promote/edit.html @@ -84,7 +84,7 @@ 真实姓名： - + @@ -94,7 +94,7 @@ 手机号码： - + diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index ebdf2349f..396fd72ea 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -128,14 +128,20 @@ - {$data['promote_account']} - - {$data['user_account']} + {$data['game_name']} {$data['server_name']} diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 86e01260e..b27ab3d0b 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -135,12 +135,11 @@ {$data.create_time|date='Y-m-d H:i:s',###} - - {$data.user_account} + {$rolename}空 {$data.role_level} - - {$data.promote_account} + {$data.play_ip}