From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改

---
 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js |  138 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 126 insertions(+), 12 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..e8e2304 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',
         },
@@ -26,7 +34,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>'
             }
         },
     ];
@@ -599,10 +610,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 +662,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 +684,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 +778,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==''){
@@ -762,11 +805,77 @@
             window.parent.TCompetition.table.refresh();
             parent.layer.close(window.parent.TCompetition.layerIndex);
         }else{
-            Feng.error(data.msg);
+            Feng.error("添加失败");
         }
 
     },function(data){
-        Feng.error("添加失败!" + data.responseJSON.message + "!");
+        Feng.error("添加失败!" );
+    });
+    ajax.set("url",url);
+    ajax.set("name",name);
+    ajax.set("page",page);
+    ajax.set("type",type);
+    ajax.set("turnId",turnId);
+    ajax.set("sort",sort);
+    ajax.set("id",$("#id").val());
+    ajax.start();
+}
+TCompetition.addSubmit9 = function() {
+
+    let url = $("#url").val()
+    if(url==''){
+    }
+
+    let name = $("#name").val()
+    console.log(name)
+
+    if(name=='' || name ==null){
+        Feng.info("请选择跳转模块")
+        return;
+    }
+    let page = $("#page").val()
+    if(page=='' && name !='不跳转'){
+        Feng.info("请选择跳转页面")
+        return;
+    }
+    let type = $("#type").val()
+
+    if(type==''  && name !='不跳转'){
+    }
+    let turnId = $("#turnId").val()
+
+    // 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==''){
+        Feng.info("请输入排序")
+        return;
+    }
+
+    //提交信息
+    var ajax = new $ax(Feng.ctxPath + "/tShop/addConfigOne9", function(data){
+        if(data.code == 200){
+            Feng.success("添加成功!");
+            window.parent.TCompetition.table.refresh();
+            parent.layer.close(window.parent.TCompetition.layerIndex);
+        }else{
+            Feng.error("添加失败");
+        }
+
+    },function(data){
+        Feng.error("添加失败!" );
     });
     ajax.set("url",url);
     ajax.set("name",name);
@@ -788,7 +897,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){
@@ -796,7 +909,7 @@
             window.parent.TCompetition.table.refresh();
             parent.layer.close(window.parent.TCompetition.layerIndex);
         }else{
-            Feng.error(data.msg);
+            Feng.error("添加失败");
         }
 
     },function(data){
@@ -804,6 +917,7 @@
     });
     ajax.set("name",name);
     ajax.set("id",$("#id").val());
+    ajax.set("sort",$("#sort").val());
     ajax.start();
 }
 TCompetition.close = function() {

--
Gitblit v1.7.1