From a1eb598970dab2cb49e95a99917a293e31a183d1 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 20:27:19 +0800
Subject: [PATCH] 10.27.6
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html | 1 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html | 7 ++++++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html | 7 ++++++-
cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js | 8 ++++----
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
index 4b9a4a0..c51efd8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_add.html
@@ -179,12 +179,17 @@
function updateOne(e) {
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 = '<option value="">请选择</option>';
$.each(data, function(k,v) {
content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
});
$("#type").empty().append(content1);
+ }else{
+ console.log("=-======0000")
+ $("#t2").hide()
+
}
});
ajax.set("id",oneId);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
index cab31e1..454942c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
@@ -191,12 +191,17 @@
function updateOne(e) {
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 = '<option value="">请选择</option>';
$.each(data, function(k,v) {
content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
});
$("#type").empty().append(content1);
+ }else{
+ console.log("=-======0000")
+ $("#t2").hide()
+
}
});
ajax.set("id",oneId);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
index 7b36f3b..a1276d3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/cpPayment/cpPayment_add.html
@@ -109,6 +109,7 @@
<label class="col-sm-3 control-label">*课包类型：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="coursePackageType" name="store" onchange="TCompetition.getCoursePackage(this)" >
+ <option value="">请选择</option>
@for(obj in coursePackageType){
<option value="${obj.id}">${obj.name}</option>
@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
index e679a6d..6940eac 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js
@@ -317,13 +317,13 @@
return;
}
}
- if(name !='0') {
- if ($("#roleType").val() == 1) {
- if ($("#type").val() == '') {
+ console.log("====pagepagepage==============="+$("#page").val())
+ if(name !='0'){
+ if ($("#type").val() == ''&&($("#page").val()!=2||$("#page").val()!=25||$("#page").val()!=27||$("#page").val()!=37)) {
Feng.info("请选择跳转类型")
return;
}
- }
+
}
if(name !='0') {
if ($("#roleType").val() == 1) {
--
Gitblit v1.7.1