Merge branch 'hotfix/change_mend_list' of wmtx/platform into release

新增补链账号错误

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);

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>

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>