From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +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 | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 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 f12ca42..e06a346 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,8 +312,12 @@
};
+TCompetition.close = function() {
+ parent.layer.close(parent.layer.getFrameIndex(window.name));
+};
+
TCompetition.saveAllImg = function (e) {
- var id = $("#id").val()
+ var id1 = $("#id").val()
var px1 = $("#px1").val()
var px2 = $("#px2").val()
var px3 = $("#px3").val()
@@ -322,6 +326,8 @@
var px6 = $("#px6").val()
var px7 = $("#px7").val()
var px8 = $("#px8").val()
+ var px10 = $("#px10").val()
+ var px11 = $("#px11").val()
var c1 = $("#c1").val()
var c2 = $("#c2").val()
var c3 = $("#c3").val()
@@ -330,6 +336,8 @@
var c6 = $("#c6").val()
var c7 = $("#7").val()
var c8 = $("#c8").val()
+ var c10 = $("#c10").val()
+ var c111 = $("#c111").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;
@@ -338,6 +346,30 @@
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 r10 = document.querySelector('input[name="r10"]').checked;
+ var r11 = document.querySelector('input[name="r11"]').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{
@@ -378,10 +410,21 @@
}else{
r8=0
}
+ if(r10){
+ r10 =1
+ }else{
+ r10=0
+ }
+ if(r11){
+ r11 =1
+ }else{
+ r11=0
+ }
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImgAll", function(data){
if(data.code == 200){
Feng.success("保存成功!");
+ TCompetition.close();
}else{
Feng.error(data.msg);
}
@@ -389,7 +432,7 @@
Feng.error("保存失败!" + data.responseJSON.message + "!");
});
- ajax.set("id",id);
+ ajax.set("id",id1);
ajax.set("px1",px1);
ajax.set("px2",px2);
ajax.set("px3",px3);
@@ -398,6 +441,8 @@
ajax.set("px6",px6);
ajax.set("px7",px7);
ajax.set("px8",px8);
+ ajax.set("px10",px10);
+ ajax.set("px11",px11);
ajax.set("c1",c1);
ajax.set("c2",c2);
ajax.set("c3",c3);
@@ -406,6 +451,8 @@
ajax.set("c6",c6);
ajax.set("c7",c7);
ajax.set("c8",c8);
+ ajax.set("c10",c10);
+ ajax.set("c111",c111);
ajax.set("r1",r1);
ajax.set("r2",r2);
ajax.set("r3",r3);
@@ -414,6 +461,9 @@
ajax.set("r6",r6);
ajax.set("r7",r7);
ajax.set("r8",r8);
+ ajax.set("r10",r10);
+ ajax.set("r11",r11);
+ ajax.set("str",JSON.stringify(json1));
ajax.start();
}
@@ -483,6 +533,20 @@
var carPhoto = new $WebUpload("c8");
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
+ var carPhoto = new $WebUpload("c10");
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
+ var carPhoto = new $WebUpload("c111");
+ 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