From 21ee583563d59d9d04840f65cb0053df9b183554 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 30 十月 2023 10:08:50 +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/tShop/tShopOtherTwo.js | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
index 57f6acf..ac30f9f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
@@ -607,10 +607,23 @@
}
let turnId = $("#turnId").val()
- if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
- Feng.info("请输入跳转ID")
+ // if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
+ // Feng.info("请输入跳转ID")
+ // return;
+ // }
+
+ if ($('#type option:selected').text() == "详情" &&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
+ if ($("#turnId").val() == '') {
+ Feng.info("请输入跳转ID")
+ return;
+ }
+ }
+
+ if ($("#type").val() == ''&&$("#page").val()!=2&&$("#page").val()!=25&&$("#page").val()!=27&&$("#page").val()!=37&&$("#page").val()!=28) {
+ Feng.info("请选择跳转类型")
return;
}
+
let sort = $("#sort").val()
if(sort==''){
@@ -646,6 +659,10 @@
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)
@@ -664,12 +681,20 @@
}
let turnId = $("#turnId").val()
- if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
- if(turnId==""){
+ // if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
+ // if(turnId==""){
+ // Feng.info("请输入跳转ID")
+ // return;
+ // }
+ // }
+
+ 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==''){
@@ -750,12 +775,19 @@
}
let turnId = $("#turnId").val()
- if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
- if(turnId==""){
+ // if( type =='11' || type=='13'|| type=='16'|| type=='19'|| type=='21'|| type=='40'|| type=='43'){
+ // if(turnId==""){
+ // Feng.info("请输入跳转ID")
+ // return;
+ // }
+ // }
+ 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==''){
--
Gitblit v1.7.1