From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/advertisement/advertisement.js | 16 ++++++++--------
1 files changed, 8 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 ff8c4e0..fa35e15 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
@@ -21,7 +21,7 @@
TSite.initColumn = function () {
return [
{field: 'selectItem', checkbox: true},
- {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {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]
@@ -317,17 +317,17 @@
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&&$("#page").val()!=28) {
Feng.info("请选择跳转类型")
return;
}
- }
+
}
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() == '') {
+ 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;
--
Gitblit v1.7.1