From 558714d6200c98ab484602e6c97749333818df64 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 30 Sep 2019 20:41:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E9=95=BF=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/View/default/Promote/mygrand.html    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Application/Home/View/default/Promote/mygrand.html b/Application/Home/View/default/Promote/mygrand.html
index 9d4b99d78..0a6417de4 100644
--- a/Application/Home/View/default/Promote/mygrand.html
+++ b/Application/Home/View/default/Promote/mygrand.html
@@ -87,18 +87,21 @@
                       <a href="javascript:;" style="color: red;" class="unfreeze-btn editbtn">解冻</a>
                     </if>
                     <a href="javascript:;" class="reset-password-btn editbtn">重置密码</a>
-                    <?php if($isGrand):?>
-                      <?php if(!in_array($vo['id'], $hasShiftList)):?>
-                      <a href="javascript:;" class="shift-btn editbtn">换组</a>
-                      <?php else:?>
-                      <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消换组</a>
+                    <?php if(get_promote_levels() == '一级推广员'):?>
+                      <?php if($isGrand):?>
+                        <?php if(!in_array($vo['id'], $hasShiftList)):?>
+                        <a href="javascript:;" class="shift-btn editbtn">换组</a>
+                        <?php else:?>
+                        <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消换组</a>
+                        <?php endif;?>
                       <?php endif;?>
-                    <?php endif;?>
-                    <?php if(in_array($vo['id'], $hasPlayerList)):?>
-                      <?php if(!in_array($vo['id'], $hasShiftPlayerList)):?>
-                      <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>
-                      <?php else:?>
-                      <a href="javascript:;" style="color: red;" class="cancel-shift-player-btn editbtn">取消玩家迁移</a>
+
+                      <?php if(in_array($vo['id'], $hasPlayerList)):?>
+                        <?php if(!in_array($vo['id'], $hasShiftPlayerList)):?>
+                        <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>
+                        <?php else:?>
+                        <a href="javascript:;" style="color: red;" class="cancel-shift-player-btn editbtn">取消玩家迁移</a>
+                        <?php endif;?>
                       <?php endif;?>
                     <?php endif;?>
                   </td>

From c726705d333b4cd0f537b44d6db32e30de5677f3 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 30 Sep 2019 20:45:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E9=95=BF=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Promote/mygrand.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Application/Home/View/default/Promote/mygrand.html b/Application/Home/View/default/Promote/mygrand.html
index 0a6417de4..98c0f7d55 100644
--- a/Application/Home/View/default/Promote/mygrand.html
+++ b/Application/Home/View/default/Promote/mygrand.html
@@ -87,13 +87,11 @@
                       <a href="javascript:;" style="color: red;" class="unfreeze-btn editbtn">解冻</a>
                     </if>
                     <a href="javascript:;" class="reset-password-btn editbtn">重置密码</a>
-                    <?php if(get_promote_levels() == '一级推广员'):?>
-                      <?php if($isGrand):?>
-                        <?php if(!in_array($vo['id'], $hasShiftList)):?>
-                        <a href="javascript:;" class="shift-btn editbtn">换组</a>
-                        <?php else:?>
-                        <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消换组</a>
-                        <?php endif;?>
+                    <?php if($isGrand):?>
+                      <?php if(!in_array($vo['id'], $hasShiftList)):?>
+                      <a href="javascript:;" class="shift-btn editbtn">换组</a>
+                      <?php else:?>
+                      <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消换组</a>
                       <?php endif;?>
 
                       <?php if(in_array($vo['id'], $hasPlayerList)):?>