From aff43f8ebe077b9daf097e1c583304c0252bf440 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 18:49:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
index 9eb2b1f..7cdfae4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
@@ -40,6 +40,7 @@
                                  </div>
                             </div>
                             @}
+                            @if(role!='3'){
                             <div class="col-sm-3">
                                 <#NameCon id="name" name="店长姓名" />
                             </div>
@@ -49,18 +50,23 @@
                             <div class="col-sm-3">
                                 <#NameCon id="shopName" name="门店名称" />
                             </div>
+                            @}
+                            @if(role!='3'){
                     <div class="col-sm-3">
                         <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
                         <#button name="重置" icon="fa-trash" clickFun="TCompetition.resetSearch()" space="true"/>
                     </div>
+                            @}
                 </div>
                 <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
+                    @if(role !='3'){
                     <#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
                     <#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
                     <#button name="冻结" icon="fa-remove" clickFun="TCompetition.freeze()" space="true"/>
                     <#button name="解冻" icon="fa-remove" clickFun="TCompetition.unfreeze()" space="true"/>
                     <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.info()" space="true"/>
                     <#button name="重置密码" icon="fa-remove" clickFun="TCompetition.reload()" space="true"/>
+                    @}
                     <#button name="免费福利" icon="fa-remove" clickFun="TCompetition.gift()" space="true"/>
                     <#button name="首页设置" icon="fa-remove" clickFun="TCompetition.indexSet()" space="true"/>
                 </div>

--
Gitblit v1.7.1