From d5b547aa7aef17e698a4062808023e085df4b32f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 10 三月 2025 14:02:19 +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/tShop/tShopOtherOne.js | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 1cd1d4c..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>'
}
},
];
@@ -621,7 +624,10 @@
// Feng.info("请输入跳转ID")
// return;
// }
- if ($('#type option:selected').text() == "详情" &&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
+ 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;
@@ -688,7 +694,7 @@
let turnId = $("#turnId").val()
- if ($('#type option:selected').text() == "详情"&&$('#type option:selected').text() == "指定商品"&&$('#type option:selected').text() == "指定折扣") {
+ if ($('#type option:selected').text() == "详情"||$('#type option:selected').text() == "指定商品"||$('#type option:selected').text() == "指定折扣") {
if ($("#turnId").val() == '') {
Feng.info("请输入跳转ID")
return;
@@ -734,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;
}
@@ -755,6 +766,7 @@
});
ajax.set("name",name);
ajax.set("id",$("#id").val());
+ ajax.set("sort",$("#sort").val());
ajax.start();
}
--
Gitblit v1.7.1