From a736a3d09dd52bb81fa922861fc8938c8eb26550 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:23 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
index 5878705..be97dd6 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js
@@ -35,7 +35,10 @@
},
{title: '操作', visible: role==1?true:false, align: 'center', valign: 'middle',
formatter:function (value,row) {
- return '<a href="javascript:void(0);" style="color: blue" onclick="TCompetition.delete1(' + row.id +')">删除 </a> <a href="javascript:void(0);" style="color: blue" onclick="TCompetition.openTCompetitionDetail(' + row.id +')">编辑</a>'
+ return '<a href="javascript:void(0);" style="color: blue" ' +
+ 'onclick="TCompetition.delete1(' + row.id +')">删除 </a> ' +
+ '<a href="javascript:void(0);" style="color: blue" ' +
+ 'onclick="TCompetition.openTCompetitionDetail(' + row.id +')">编辑</a>'
}
},
];
@@ -597,6 +600,12 @@
Feng.info("请选择跳转模块")
return;
}
+
+ if ($("#type").val() == ''&&$("#page").val()!=2&&$("#page").val()!=25&&$("#page").val()!=27&&$("#page").val()!=37&&$("#page").val()!=28) {
+ Feng.info("请选择跳转类型")
+ return;
+ }
+
let page = $("#page").val()
if(page=='' && name !='不跳转'){
Feng.info("请选择跳转页面")
@@ -606,12 +615,26 @@
if(type=='' && name !='不跳转'){
}
+
+
+
let turnId = $("#turnId").val()
- if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
- Feng.info("请输入跳转ID")
- return;
+ // if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
+ // Feng.info("请输入跳转ID")
+ // return;
+ // }
+ console.log("看看跳转类型")
+ console.log($('#type option:selected').text())
+ if ($('#type option:selected').text() == "详情" || $('#type option:selected').text() == "指定商品"||$('#type option:selected').text() == "指定折扣") {
+
+ if ($("#turnId").val() == '') {
+ Feng.info("请输入跳转ID")
+ return;
+ }
}
+
+
let sort = $("#sort").val()
if(sort==''){
@@ -647,6 +670,11 @@
if(url==''){
}
+ if ($("#type").val() == ''&&$("#page").val()!=2&&$("#page").val()!=25&&$("#page").val()!=27&&$("#page").val()!=37&&$("#page").val()!=28) {
+ Feng.info("请选择跳转类型")
+ return;
+ }
+
let name = $("#name").val()
console.log(name)
@@ -665,12 +693,20 @@
}
let turnId = $("#turnId").val()
- if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
- if(turnId==""){
+
+ if ($('#type option:selected').text() == "详情"||$('#type option:selected').text() == "指定商品"||$('#type option:selected').text() == "指定折扣") {
+ if ($("#turnId").val() == '') {
Feng.info("请输入跳转ID")
return;
}
}
+
+ // if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
+ // if(turnId==""){
+ // Feng.info("请输入跳转ID")
+ // return;
+ // }
+ // }
let sort = $("#sort").val()
if(sort==''){
@@ -704,9 +740,14 @@
let name = $("#name").val()
+ let sort = $("#sort").val()
if(name=='' || name ==null){
Feng.info("请填写板块名称")
+ return;
+ }
+ if(sort=='' || sort ==null){
+ Feng.info("请填写排序")
return;
}
@@ -725,6 +766,7 @@
});
ajax.set("name",name);
ajax.set("id",$("#id").val());
+ ajax.set("sort",$("#sort").val());
ajax.start();
}
--
Gitblit v1.7.1