From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
index 46602af..ccafd8c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tIntegral/TIntegral.html
@@ -22,6 +22,7 @@
<option value="2">兑换商品</option>
<option value="3">完成课后练习</option>
<option value="4">观看教学视频</option>
+ <option value="5">启动游戏</option>
</#SelectCon>
</div>
<div class="col-sm-3">
@@ -36,12 +37,12 @@
<#NameCon id="time" name="变动时间" />
</div>
<div class="col-sm-3">
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="TCompetition.resetSearch()" space="true"/>
+ <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
</div>
</div>
<div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
- <#button name="赠送积分" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
+ <#button name="赠送积分" icon="fa-plus" clickFun="TSite.openAdd()"/>
</div>
<#table id="TSiteTable"/>
--
Gitblit v1.7.1