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_edit_two.html | 74 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 13 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 d6141ed..0c59bc4 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,17 +4,14 @@
<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;" onclick="updateType(this)">
+ <select class="form-control" id="name" style="width: 400px;" onchange="updateType(this)">
<option value="不跳转">不跳转</option>
<option value="加入玩湃">加入玩湃</option>
<option value="开始课程">开始课程</option>
@@ -26,11 +23,11 @@
<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)">
- @for(obj in list){
+ @for(obj in list!){
<option value="${obj.id}" ${obj.id == item.pageId ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
@@ -39,10 +36,10 @@
<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;" >
+ <select class="form-control" id="type" style="width: 400px;" onchange="updateT(this)">
@for(obj in list1){
<option value="${obj.id}" ${obj.id == item.typeId ? 'selected=selected' : ''}>${obj.name}</option>
@}
@@ -50,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}">
@@ -78,10 +75,14 @@
</div>
<script src="${ctxPath}/modular/system/tShop/tShopOtherOne.js"></script>
<script>
+
laydate.render({
elem: '#time',
range:true
});
+
+
+
function updateType(e) {
let name = $("#name").val()
@@ -91,11 +92,19 @@
$("#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("")
+ console.log("页面")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
if(data!=null){
@@ -109,26 +118,65 @@
ajax.set("name",oneId);
ajax.start();
}
+
+
}
+ function updateT(e) {
+ var oneId = $('#type option:selected').text();
+ console.log(oneId);
+ if (oneId!="详情"&&oneId!="指定商品"&&oneId!="指定折扣"){
+ $("#t3").hide()
+ $("#t2").val("")
+ }else{
+ $("#t3").show()
+ $("#t3").val("")
+ }
+ var page = $('#page option:selected').text();
+ if (page=="线上课得积分" || page=="看视频得奖励"){
+ if (oneId == "列表"){
+ $("#t3").show()
+ }
+ }
+ }
+
function updateOne(e) {
+ console.log("类型")
var oneId=$(e).val();
var ajax = new $ax(Feng.ctxPath + "/tShop/typeChangeOne", function(data){
- if(data!=null){
+ if(data!=null&&data.length>0){
+ $("#t2").show()
var content1;
$.each(data, function(k,v) {
content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
});
$("#type").empty().append(content1);
+ }else {
+ console.log("=-======0000")
+ $("#t2").hide()
+ $("#t2").val("")
}
});
+ if (oneId==2 || oneId==25|| oneId==27){
+ $("#t3").val("")
+ $("#t3").hide()
+ }
ajax.set("id",oneId);
ajax.start();
+ updateT(document.getElementById("type"));
+
}
window.onload = function() {
$("#name").val($("#name1").val());
+
+ if($("#name").val() =='不跳转') {
+ $("#t1").hide()
+ $("#t2").hide()
+ $("#t3").hide()
+ }
+
}
</script>
@}
--
Gitblit v1.7.1