From 044546d30b3b242f59a9450935245bec40093324 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 15:49:36 +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/tShopOther.js |   49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
index 417f463..c9d5e92 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
@@ -312,6 +312,10 @@
 
 };
 
+TCompetition.close = function() {
+    parent.layer.close(parent.layer.getFrameIndex(window.name));
+};
+
 TCompetition.saveAllImg = function (e) {
     var id = $("#id").val()
     var px1 = $("#px1").val()
@@ -322,7 +326,6 @@
     var px6 = $("#px6").val()
     var px7 = $("#px7").val()
     var px8 = $("#px8").val()
-    var px9 = $("#px9").val()
     var c1 = $("#c1").val()
     var c2 = $("#c2").val()
     var c3 = $("#c3").val()
@@ -331,7 +334,6 @@
     var c6 = $("#c6").val()
     var c7 = $("#7").val()
     var c8 = $("#c8").val()
-    var c9 = $("#c9").val()
     var r1 =  document.querySelector('input[name="r1"]').checked;
     var r2 =  document.querySelector('input[name="r2"]').checked;
     var r3 =  document.querySelector('input[name="r3"]').checked;
@@ -340,7 +342,28 @@
     var r6 =  document.querySelector('input[name="r6"]').checked;
     var r7 =  document.querySelector('input[name="r7"]').checked;
     var r8 =  document.querySelector('input[name="r8"]').checked;
-    var r9 =  document.querySelector('input[name="r9"]').checked;
+
+    var json1=[];
+    for (let i = 0; i < $('input[name="px9"]').length; i++) {
+        var arr = {}
+        var id = $($('input[name="cupId"]')[i]).val()
+        console.log(i+$("#"+id).val())
+        var str = $("#"+id).val();
+        if($("#"+id).val() == null || $("#"+id).val() == ""){
+            arr['backgroundImage'] = $($('input[name="backgroundImage"]')[i]).val();
+        }else {
+            arr['backgroundImage'] = str;
+        }
+        if(document.querySelector('input[name="'+ id +'"]').checked){
+            arr['isOpen'] = 1;
+        }else {
+            arr['isOpen'] = 0;
+        }
+        arr['sort'] = Number($($('input[name="px9"]')[i]).val());
+        arr['id'] = Number($($('input[name="cupId"]')[i]).val());
+        console.log(arr)
+        json1.push(arr)
+    }
     if(r1){
         r1 =1
     }else{
@@ -381,15 +404,11 @@
     }else{
         r8=0
     }
-    if(r9){
-        r9 =1
-    }else{
-        r9=0
-    }
 
     var ajax = new $ax(Feng.ctxPath + "/tShop/saveImgAll", function(data){
         if(data.code == 200){
             Feng.success("保存成功!");
+            TCompetition.close();
         }else{
             Feng.error(data.msg);
         }
@@ -406,7 +425,6 @@
     ajax.set("px6",px6);
     ajax.set("px7",px7);
     ajax.set("px8",px8);
-    ajax.set("px9",px9);
     ajax.set("c1",c1);
     ajax.set("c2",c2);
     ajax.set("c3",c3);
@@ -415,7 +433,6 @@
     ajax.set("c6",c6);
     ajax.set("c7",c7);
     ajax.set("c8",c8);
-    ajax.set("c9",c9);
     ajax.set("r1",r1);
     ajax.set("r2",r2);
     ajax.set("r3",r3);
@@ -424,7 +441,7 @@
     ajax.set("r6",r6);
     ajax.set("r7",r7);
     ajax.set("r8",r8);
-    ajax.set("r9",r9);
+    ajax.set("str",JSON.stringify(json1));
     ajax.start();
 }
 
@@ -494,9 +511,13 @@
     var carPhoto = new $WebUpload("c8");
     carPhoto.setUploadBarId("progressBar");
     carPhoto.init();
-    var carPhoto = new $WebUpload("c9");
-    carPhoto.setUploadBarId("progressBar");
-    carPhoto.init();
+
+    for (let i = 0; i < $('input[name="px9"]').length; i++) {
+        var id = $($('input[name="cupId"]')[i]).val()
+        var carPhoto = new $WebUpload(id);
+        carPhoto.setUploadBarId("progressBar");
+        carPhoto.init();
+    }
     var carPhoto = new $WebUpload("img");
     carPhoto.setUploadBarId("progressBar");
     carPhoto.init();

--
Gitblit v1.7.1