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/static/modular/system/advertisement/advertisement.js | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
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 352c7f4..dd36d09 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
@@ -319,7 +319,7 @@
}
console.log("====pagepagepage==============="+$("#page").val())
if(name !='0'){
- if ($("#type").val() == ''&&($("#page").val()!=2||$("#page").val()!=25||$("#page").val()!=27||$("#page").val()!=37)) {
+ if ($("#type").val() == ''&&$("#page").val()!=2&&$("#page").val()!=25&&$("#page").val()!=27&&$("#page").val()!=37&&$("#page").val()!=28) {
Feng.info("请选择跳转类型")
return;
}
@@ -327,7 +327,7 @@
}
if(name !='0') {
if ($("#roleType").val() == 1) {
- if ($('#type option:selected').text() == "详情") {
+ if ($('#type option:selected').text() == "详情"&&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
if ($("#pageId").val() == '') {
Feng.info("请输入跳转ID")
return;
@@ -413,7 +413,7 @@
}
if(name !='0') {
if ($("#roleType").val() == 1) {
- if ($("#type").val() == ''&&($("#page").val()!=2||$("#page").val()!=25||$("#page").val()!=27||$("#page").val()!=37)) {
+ if ($("#type").val() == ''&&$("#page").val()!=2&&$("#page").val()!=25&&$("#page").val()!=27&&$("#page").val()!=37&&$("#page").val()!=28) {
Feng.info("请选择跳转类型")
return;
}
@@ -421,7 +421,7 @@
}
if(name !='0') {
if ($("#roleType").val() == 1) {
- if ($('#type option:selected').text() == "详情") {
+ if ($('#type option:selected').text() == "详情"&&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
if ($("#pageId").val() == '') {
Feng.info("请输入跳转ID")
return;
@@ -486,12 +486,13 @@
var carPhoto7 = new $WebUpload("cover7");
carPhoto7.setUploadBarId("progressBar");
carPhoto7.init();
+ var carPhoto = new $WebUpload("img");
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
+
var defaultColunms = TSite.initColumn();
var table = new BSTable(TSite.id, "/advertisement/listAll", defaultColunms);
table.setPaginationType("client");
TSite.table = table.init();
- var carPhoto = new $WebUpload("img");
- carPhoto.setUploadBarId("progressBar");
- carPhoto.init();
});
--
Gitblit v1.7.1