From c85b23cb867d4a0cebf2f22f3dd3211566cde2ea Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 10:26:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html | 76 ++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
index 885c96c..358db94 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement.html
@@ -14,49 +14,45 @@
</div>
<div class="col-sm-3">
<#SelectCon id="page" name="跳转页面" >
- <option value="">请选择</option>
- @for(obj in pages){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </#SelectCon>
+ <option value="">请选择</option>
+ @for(obj in pages){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">已上架</option>
+ <option value="2">已下架</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
+ </div>
</div>
- <div class="col-sm-3">
- <#SelectCon id="state" name="状态" >
- <option value="">全部</option>
- <option value="1">已上架</option>
- <option value="2">已下架</option>
- </#SelectCon>
- </div>
- <div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
+ <div class="hidden-xs" id="TSiteTableToolbar" role="group">
+ @if(shiro.hasPermission("/advertisement/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSite.openAddTSite()"/>
+ @}
+ @if(shiro.hasPermission("/advertisement/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TSite.openEditTSite()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/advertisement/info")){
+ <#button name="查看详情" icon="fa-search" clickFun="TSite.openInfo()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/advertisement/changeState")){
+ <#button name="上架" icon="fa-check" clickFun="TSite.onShelf()" space="true"/>
+ <#button name="下架" icon="fa-remove" clickFun="TSite.offShelf()" space="true"/>
+ @}
+ </div>
+ <#table id="TSiteTable"/>
</div>
</div>
- <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
- @if(shiro.hasPermission("/advertisement/add")){
- <#button name="添加" icon="fa-plus" clickFun="TSite.openAddTSite()"/>
- @}
-
-
- @if(shiro.hasPermission("/advertisement/update")){
- <#button name="编辑" icon="fa-edit" clickFun="TSite.openEditTSite()" space="true"/>
- @}
-
- @if(shiro.hasPermission("/advertisement/info")){
- <#button name="查看详情" icon="fa-search" clickFun="TSite.openInfo()" space="true"/>
- @}
- @if(shiro.hasPermission("/advertisement/changeState")){
- <#button name="上架" icon="fa-check" clickFun="TSite.onShelf()" space="true"/>
-
- <#button name="下架" icon="fa-remove" clickFun="TSite.offShelf()" space="true"/>
- @}
- </div>
- <#table id="TSiteTable"/>
-</div>
-</div>
-</div>
-</div>
-</div>
+ </div>
+ </div>
+ </div>
</div>
<script src="${ctxPath}/modular/system/advertisement/advertisement.js"></script>
<script>
--
Gitblit v1.7.1