From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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..d042a33 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
@@ -24,7 +24,7 @@
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '广告类型', field: 'position', visible: true, align: 'center', valign: 'middle',width:'20%',
formatter:function (data) {
- return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题"}[data]
+ return {1:"首页banner",2:"线上课得积分",3:"看视频得奖励",4:"常见问题",6:"社区世界杯顶部",7:"社区世界杯底部"}[data]
}
},
{title: '广告名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
@@ -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