From 91eb2125cdb91ee2ee0d22ab05a62443190f0d14 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 29 May 2020 17:07:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Site/wap.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/Site/wap.html b/Application/Admin/View/Site/wap.html
index 377896289..f404cdfec 100644
--- a/Application/Admin/View/Site/wap.html
+++ b/Application/Admin/View/Site/wap.html
@@ -9,7 +9,7 @@
   <script type="text/javascript" src="__STATIC__/webuploader/webuploader.before.js"></script>	
     
     <div class="cf main-place top_nav_list navtab_list">
-    {:W('Index/navigation',array('value'=>'Site/wap'))}
+    {:W('Index/navigation',array('value'=>'Site/wap', 'compare' => '', 'title' => '站点设置'))}
         <h3 class="page_title">基本配置</h3>
         <p class="description_text">说明：针对wap官网的基本信息进行配置</p>
     </div>

From 903fc712553a44503cc2fa1244977056f1bfb2e5 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 1 Jun 2020 17:16:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A5=E9=93=BE?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MendController.class.php | 6 +++++-
 Application/Admin/View/Mend/recordList.html           | 8 +-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index 9ba943f92..62bd5671e 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -65,6 +65,7 @@ class MendController extends ThinkController {
         } elseif (isset($_REQUEST['time_end'])) {
             $map['order_time'] = ['LT', strtotime($_REQUEST['time_end']) + 86399];
         }
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
         //为数据权限添加
         setPowerPromoteIds($map);
         $data =  M("Mend","tab_")
@@ -81,6 +82,9 @@ class MendController extends ThinkController {
         foreach ($data as $key => $value) {
             $data[$key]['create_time'] = date("Y-m-d H:i:s",$value['create_time']);
             $data[$key]['order_time'] = date("Y-m-d H:i:s",$value['order_time']);
+            if(!$show_data_power){
+                $data[$key]['user_account'] = encryptStr($data[$key]['user_account']);
+            }
         }
 
         if($export) db2csv($data,"推广员管理_推广补链_补链记录",["玩家账号","补链前渠道","补链前归属金额","补链后渠道","切分时间","补链时间","操作人员","备注"]);
@@ -102,7 +106,7 @@ 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/View/Mend/recordList.html b/Application/Admin/View/Mend/recordList.html
index 189d2334f..14bf92805 100644
--- a/Application/Admin/View/Mend/recordList.html
+++ b/Application/Admin/View/Mend/recordList.html
@@ -150,13 +150,7 @@
     {@each list_data as item,index}
     <tr>
         <td><input class="ids" type="checkbox" value="${item['id']}" name="ids[]"></td>
-        <td>
-            <if condition="$show_data_power eq true ">
-                {$data['user_account']}
-                <else />
-                {$data['user_account']|encryptStr}
-            </if>
-        </td>
+        <td>${item['user_account']}</td>
         <td>${item['promote_account']}</td>
         <td>${item['pay_amount']}</td>
         <td>${item['promote_account_to']}</td>