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/tShop/TShop_add_two.html | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
index 377d70f..f779cda 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
@@ -4,15 +4,15 @@
<div class="form-horizontal" id="carInfoForm">
- <#avatar id="url" name="图片(推荐像素宽度316px)"/>
+ <#avatar id="url" name="*图片(推荐像素宽度316px)"/>
<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;" onclick="updateType(this)">
+ <select class="form-control" id="name" style="width: 400px;" onchange="updateType(this)">
<option value="" selected disabled>选择跳转模块</option>
<option value="不跳转">不跳转</option>
<option value="加入玩湃">加入玩湃</option>
@@ -25,7 +25,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)" >
@@ -45,14 +45,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;">
</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;">
@@ -82,30 +82,42 @@
function updateT(e) {
var oneId = $('#type option:selected').text();
console.log(oneId);
- if (oneId!="详情"){
+ if (oneId!="详情"&&oneId!="指定商品"&&oneId!="指定折扣"){
$("#t3").hide()
+ $("#t3").val("")
}else{
$("#t3").show()
+ }
+ var page = $('#page option:selected').text();
+ if (page=="线上课得积分" || page=="看视频得奖励"){
+ if (oneId == "列表"){
+ $("#t3").show()
+ }
}
}
function updateType(e) {
let name = $("#name").val()
- console.log(name
- )
+ console.log(name)
if(name =='不跳转'){
$("#t1").hide()
$("#t2").hide()
$("#t3").hide()
+ $("#t1").val("")
+ $("#t2").val("")
+ $("#t3").val("")
+ $("#type").val("")
+ $("#page").val("")
}else {
$("#t1").show()
$("#t2").show()
$("#t3").show()
-
+ $("#type").val("")
+ $("#page").val("")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
if(data!=null){
- var content;
+ var content= "<option value=''>请选择</option>";
$.each(data, function(k,v) {
content += "<option value='"+v.id+"'>"+v.name+"</option>";
});
@@ -116,9 +128,7 @@
ajax.start();
}
- var pageElement = document.getElementById('page');
- var event = new Event('change');
- pageElement.dispatchEvent(event);
+
}
@@ -129,7 +139,7 @@
if(data!=null&&data.length>0){
$("#t2").show()
- var content1;
+ var content1= "<option value=''>请选择</option>";
$.each(data, function(k,v) {
content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
});
@@ -137,6 +147,7 @@
}else{
console.log("=-======0000")
$("#t2").hide()
+ $("#t2").val("")
}
});
--
Gitblit v1.7.1