From ecc4e57b4f7c6ecfd6823704688ee786b3350b1f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 02 十二月 2024 11:06:13 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 6a4c19b..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>'
}
},
];
@@ -691,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;
--
Gitblit v1.7.1