From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js |   61 ++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 8 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 a0799ce..f357f36 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
@@ -16,7 +16,15 @@
     return [
         {field: 'selectItem', radio: true},
         {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
-        {title: '图片', field: 'url', visible: role==1?true:false, 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',
         },
@@ -599,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==''){
@@ -638,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)
 
@@ -656,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==''){
@@ -742,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==''){
@@ -788,7 +828,11 @@
         Feng.info("请填写板块名称")
         return;
     }
-
+    let sort = $("#sort").val()
+    if(sort=='' || sort ==null){
+        Feng.info("请填写排序")
+        return;
+    }
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tShop/addConfig1", function(data){
         if(data.code == 200){
@@ -804,6 +848,7 @@
     });
     ajax.set("name",name);
     ajax.set("id",$("#id").val());
+    ajax.set("sort",$("#sort").val());
     ajax.start();
 }
 TCompetition.close = function() {

--
Gitblit v1.7.1