From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
index 0d4ecfd..8fb9ad7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit_two.html
@@ -4,11 +4,11 @@
<div class="form-horizontal" id="carInfoForm">
<input id="id" value="${item.id}" hidden>
<input id="name1" value="${item.name}" hidden>
- <#avatar id="url" name="图片(推荐像素宽度316px)" avatarImg="${item.url}"/>
+ <#avatar id="url" name="*图片(推荐像素宽度316px)" avatarImg="${item.url}"/>
<div class="input-group" style="margin-left: 342px;">
<div class="input-group-btn">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
- 跳转模块
+ *跳转模块
</button>
</div>
<select class="form-control" id="name" style="width: 400px;" onchange="updateType(this)">
@@ -23,7 +23,7 @@
<div class="input-group" style="margin-left: 342px;" id="t1" hidden >
<div class="input-group-btn">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
- 跳转页面
+ *跳转页面
</button>
</div>
<select class="form-control" id="page" style="width: 400px;" onchange="updateOne(this)">
@@ -36,7 +36,7 @@
<div class="input-group" style="margin-left: 342px;" id="t2" >
<div class="input-group-btn">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
- 跳转类型
+ *跳转类型
</button>
</div>
<select class="form-control" id="type" style="width: 400px;" onchange="updateT(this)">
@@ -47,14 +47,14 @@
</div>
<div class="form-group" id="t3" >
- <label class="col-sm-3 control-label">跳转ID：</label>
+ <label class="col-sm-3 control-label">*跳转ID：</label>
<div class="col-sm-9">
<input class="form-control" id="turnId" name="turnId" type="text" style="width: 400px;" value="${item.turnId}">
</div>
</div>
<div class="form-group" id="t4" >
- <label class="col-sm-3 control-label">排序：</label>
+ <label class="col-sm-3 control-label">*排序：</label>
<div class="col-sm-9">
<input class="form-control" id="sort" name="sort" type="text" style="width: 400px;" value="${item.sort}">
@@ -131,6 +131,12 @@
$("#t3").show()
$("#t3").val("")
}
+ var page = $('#page option:selected').text();
+ if (page=="线上课得积分" || page=="看视频得奖励"){
+ if (oneId == "列表"){
+ $("#t3").show()
+ }
+ }
}
function updateOne(e) {
--
Gitblit v1.7.1