From 5310eaa507864ad83bdff1feedc9dd1b102bf5aa Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sun, 28 Nov 2021 17:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AuthManagerController.class.php           |  5 ++++-
 .../Admin/View/AuthManager/dataempower.html   | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php
index 586701fd3..82a121138 100644
--- a/Application/Admin/Controller/AuthManagerController.class.php
+++ b/Application/Admin/Controller/AuthManagerController.class.php
@@ -536,7 +536,7 @@ class AuthManagerController extends AdminController{
         $auth_group = M('AuthGroup')->where( array('status'=>array('egt','0'),'module'=>'admin','type'=>AuthGroupModel::TYPE_ADMIN) )
             ->getfield('id,id,title,rules');
 //        var_dump($auth_group);die();
-        $empower_type = M('AuthGroup')->field('data_empower_type,show_data,show_market_admin,show_promote,allow_over_week')->where(array('id'=>$_GET['group_id']))->find();
+        $empower_type = M('AuthGroup')->field('data_empower_type,show_data,show_merchant,show_market_admin,show_promote,allow_over_week')->where(array('id'=>$_GET['group_id']))->find();
 //        var_dump($empower_type);die();
 
         $this->assign('data_empower_type', $empower_type['data_empower_type']);
@@ -544,6 +544,7 @@ class AuthManagerController extends AdminController{
         $this->assign('auth_group', $auth_group);
         $this->assign('show_market_admin', $empower_type['show_market_admin']);
         $this->assign('show_promote', $empower_type['show_promote']);
+        $this->assign('show_merchant', $empower_type['show_merchant']);
         $this->assign('allow_over_week', $empower_type['allow_over_week']);
         $this->display();
 
@@ -558,6 +559,7 @@ class AuthManagerController extends AdminController{
         $allow_over_week = I('allow_over_week');
         $show_promote = I('show_promote');
         $promoteData = I('promote_data');
+        $show_merchant = I('show_merchant');
 
 //        dump(json_decode($promoteData,true));
 //        var_dump($promoteData);die();
@@ -588,6 +590,7 @@ class AuthManagerController extends AdminController{
             'show_market_admin' => $show_market_admin,
             'allow_over_week' => $allow_over_week,
             'show_promote' => $show_promote,
+            'show_merchant'=>$show_merchant
         ))) {
 
             resetUserAuth();
diff --git a/Application/Admin/View/AuthManager/dataempower.html b/Application/Admin/View/AuthManager/dataempower.html
index 5ee3d36fe..f058f2092 100644
--- a/Application/Admin/View/AuthManager/dataempower.html
+++ b/Application/Admin/View/AuthManager/dataempower.html
@@ -130,6 +130,25 @@
                 </td>
               </tr>
 
+              <tr>
+                <td class="l noticeinfo" style="padding-left: 15px;">是否展示商户：</td>
+                <td class="r table_radio">
+                    <span class="form_radio table_btn">
+                        <label>
+                            <input type="radio" class="inp_radio" value="1"  name="show_merchant"
+                            <if condition="$show_merchant==1"> checked </if>> 是
+                        </label>
+                        <label>
+                            <input type="radio" class="inp_radio" value="0"  name="show_merchant"
+                            <if condition="$show_merchant==0"> checked </if>> 否
+                        </label>
+                    </span>
+                  <span class="notice-text">游戏充值，公会统计中订单统计商户列展示</span>
+                </td>
+              </tr>
+
+              
+
               </tbody>
             </table>
           </div>