From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherOne.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 6d13e5c..1cd1d4c 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
@@ -15,10 +15,18 @@
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle',
- },
- {title: '图片', field: 'url', visible: role==1?true:false, align: 'center', valign: 'middle',
- },
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
+ {
+ title: '图片',
+ field: 'url',
+ visible: role == 1 ? true : false,
+ align: 'center',
+ valign: 'middle',
+ formatter: function(value, row, index) {
+ return '<img src="' + value + '" alt="图片" style="width: 100px; height: 100px;">';
+ }
+ }
+ ,
{title: '跳转模块', field: 'name', visible: role==1?true:false, align: 'center', valign: 'middle',
},
{title: '跳转页面', field: 'page', visible: role==1?true:false, align: 'center', valign: 'middle',
@@ -101,7 +109,7 @@
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tShop/tShop_add_two?id='+$("#id").val()
+ content: Feng.ctxPath + '/tShop/tShop_add_two1?id='+$("#id").val()
});
this.layerIndex = index;
};
@@ -589,6 +597,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("请选择跳转页面")
@@ -598,12 +612,23 @@
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;
+ // }
+ 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==''){
@@ -639,6 +664,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)
@@ -657,12 +687,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==''){
--
Gitblit v1.7.1