From e87f8e4c82efd550668f82baa952acd3933fbc71 Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Fri, 5 Jul 2024 19:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98-=E5=B9=B8?=
 =?UTF-8?q?=E8=BF=90=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../luckyTycoon/luckyTycoonCollectSet.vue     | 67 ++++++++++++++-----
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/views/luckyTycoon/luckyTycoonCollectSet.vue b/src/views/luckyTycoon/luckyTycoonCollectSet.vue
index 59c5ece..4b92c2a 100644
--- a/src/views/luckyTycoon/luckyTycoonCollectSet.vue
+++ b/src/views/luckyTycoon/luckyTycoonCollectSet.vue
@@ -794,6 +794,7 @@ export default {
     },
     // 确认新增&编辑
     controlsDialogOut() {
+      var indexArr = 0;
       if (this.conTrolsType == 1) {
         let startTime = "";
         let endTime = "";
@@ -806,13 +807,26 @@ export default {
         }
         var arr = [];
         this.items.forEach((res, i) => {
-          var indexArr = res.options2.findIndex((obj) =>
-            obj.giftId
-              ? obj.giftId
-              : obj.headwearId
-              ? obj.headwearId
-              : obj.id == this.items[i].value2
-          );
+          res.options2.forEach((val, is) => {
+            if (res.value == 2) {
+              if (res.value2 == val.giftId) {
+                indexArr = is;
+              }
+            } else if (
+              res.value == 3 ||
+              res.value == 14 ||
+              res.value == 16 ||
+              res.value == 17
+            ) {
+              if (res.value2 == val.id) {
+                indexArr = is;
+              }
+            } else if (res.value == 4) {
+              if (res.value2 == val.headwearId) {
+                indexArr = is;
+              }
+            }
+          });
           var rewardName =
             res.value == 2
               ? this.JsonFunc(res.options2[indexArr].giftName).zh
@@ -831,7 +845,10 @@ export default {
             rewardPic: this.items[i].options2[indexArr].picUrl
               ? this.items[i].options2[indexArr].picUrl
               : this.items[i].options2[indexArr].pic
-              ?this.items[i].options2[indexArr].pic:this.items[i].options2[indexArr].androidUrl
+              ? this.items[i].options2[indexArr].pic
+              : this.items[i].options2[indexArr].androidUrl
+              ? this.items[i].options2[indexArr].androidUrl
+              : this.items[i].options2[indexArr].iconPic,
           };
         });
         var obj = {
@@ -872,13 +889,26 @@ export default {
         }
         var arr2 = [];
         this.items.forEach((res, i) => {
-          var indexArr = res.options2.findIndex((obj) =>
-            obj.giftId
-              ? obj.giftId
-              : obj.headwearId
-              ? obj.headwearId
-              : obj.id == this.items[i].value2
-          );
+          res.options2.forEach((val, is) => {
+            if (res.value == 2) {
+              if (res.value2 == val.giftId) {
+                indexArr = is;
+              }
+            } else if (
+              res.value == 3 ||
+              res.value == 14 ||
+              res.value == 16 ||
+              res.value == 17
+            ) {
+              if (res.value2 == val.id) {
+                indexArr = is;
+              }
+            } else if (res.value == 4) {
+              if (res.value2 == val.headwearId) {
+                indexArr = is;
+              }
+            }
+          });
           var rewardName =
             res.value == 2
               ? this.JsonFunc(res.options2[indexArr].giftName).zh
@@ -896,7 +926,11 @@ export default {
             rewardName,
             rewardPic: this.items[i].options2[indexArr].picUrl
               ? this.items[i].options2[indexArr].picUrl
-              : this.items[i].options2[indexArr].pic,
+              : this.items[i].options2[indexArr].pic
+              ? this.items[i].options2[indexArr].pic
+              : this.items[i].options2[indexArr].androidUrl
+              ? this.items[i].options2[indexArr].androidUrl
+              : this.items[i].options2[indexArr].iconPic,
           };
         });
         var obj2 = {
@@ -911,7 +945,6 @@ export default {
           rewardJson: JSON.stringify(arr2),
           id: this.endObj.id,
         };
-        console.log(obj2);
         luckyBagCollectSave(obj2).then((res) => {
           if (res.code == 200) {
             this.controlsDialog = false;