From ab255eb5d8c82a34aa7de1a668125c1d07596f7b Mon Sep 17 00:00:00 2001
From: huangzhen <huangzhen@rd3.ngsoft.com>
Date: Thu, 14 Nov 2024 10:22:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20@=E5=95=86=E5=93=81=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=20=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/comProduct/index.vue       |  8 ++++----
 src/views/templates/cmsCash/index.vue      |  2 +-
 src/views/templates/cmsDetail/index.vue    |  2 +-
 src/views/templates/cmsLJJConfig/index.vue |  2 +-
 src/views/templates/cmsList/index.scss     | 14 ++++++++------
 src/views/templates/cmsVoucher/index.vue   |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/pages/comProduct/index.vue b/src/views/pages/comProduct/index.vue
index 69ea8b9..068f914 100644
--- a/src/views/pages/comProduct/index.vue
+++ b/src/views/pages/comProduct/index.vue
@@ -594,17 +594,17 @@ export default {
       if (res && res.code === 200) {
         let data: any = [];
         let errMsg = '';
-        res.data.forEach((item: any) => {
-          if (item.code === 200 ) {
+        !is_retry && res.data.forEach((item: any) => {
+          if (item?.code === 200 ) {
             data.push({
               key: this.key,
               goods_id: item.id
             })
           } else {
-            errMsg = errMsg || item.message;
+            errMsg = errMsg || item?.message;
           }
         })
-        if (data.length) {
+        if (is_retry || data.length) {
           let typeNew = type, itemOnclickNew = itemOnclick, indexNew = index;
           if (type === 'submit') {
             typeNew = this.selectedData.type;
diff --git a/src/views/templates/cmsCash/index.vue b/src/views/templates/cmsCash/index.vue
index 757c66a..21e6858 100644
--- a/src/views/templates/cmsCash/index.vue
+++ b/src/views/templates/cmsCash/index.vue
@@ -409,7 +409,7 @@ export default {
       });
       this.overlayLoad = false;
       if (res && res.code === 200 && res.data) {
-        if (res.data[0].code === 200) {
+        if (is_retry || (res.data[0]?.code === 200)) {
           this.pollStatus = true;
           this.dialogTitle = '兑换成功';
           this.dialogText = '请前往 订单列表 查看订单';
diff --git a/src/views/templates/cmsDetail/index.vue b/src/views/templates/cmsDetail/index.vue
index a09293d..f8293a5 100644
--- a/src/views/templates/cmsDetail/index.vue
+++ b/src/views/templates/cmsDetail/index.vue
@@ -350,7 +350,7 @@ export default {
       });
       this.overlayLoad = false;
       if (res && res.code === 200 && res.data) {
-        if (res.data[0].code === 200) {
+        if (res.data[0]?.code === 200) {
           this.pollStatus = true;
           this.dialogTitle = '兑换成功';
           this.dialogText = '请前往 订单列表 查看订单';
diff --git a/src/views/templates/cmsLJJConfig/index.vue b/src/views/templates/cmsLJJConfig/index.vue
index 6bca69f..edacc32 100644
--- a/src/views/templates/cmsLJJConfig/index.vue
+++ b/src/views/templates/cmsLJJConfig/index.vue
@@ -369,7 +369,7 @@ export default {
       });
       this.overlayLoad = false;
       if (res && res.code === 200 && res.data) {
-        if (res.data[0].code === 200) {
+        if (is_retry || (res.data[0]?.code === 200)) {
           this.pollStatus = true;
           this.dialogTitle = '兑换成功';
           this.dialogText = '请前往 订单列表 查看订单';
diff --git a/src/views/templates/cmsList/index.scss b/src/views/templates/cmsList/index.scss
index 42bc695..fd95139 100644
--- a/src/views/templates/cmsList/index.scss
+++ b/src/views/templates/cmsList/index.scss
@@ -40,7 +40,7 @@
             justify-content: center;
             .swiper-slide-box {
               width: 85px;
-              height: 100px;
+              height: 105px;
               background: #f3f5f7;
               box-shadow: 0 3px 4px 1px rgba(181, 187, 193, 0.41);
               display: flex;
@@ -63,16 +63,18 @@
               .swiper-slide-name {
                 color: #242533;
                 font-size: 10px;
+                line-height: 12px;
                 margin-top: 10px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                max-width: 80px;
+                max-width: 76px;
+                display: -webkit-box;
+                overflow : hidden;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
               }
               .swiper-slide-num {
                 color: #242533;
                 font-size: 10px;
-                margin-top: 5px;
+                margin-top: 4px;
                 text-align: center;
               }
             }
diff --git a/src/views/templates/cmsVoucher/index.vue b/src/views/templates/cmsVoucher/index.vue
index 0d59a1d..d620ea8 100644
--- a/src/views/templates/cmsVoucher/index.vue
+++ b/src/views/templates/cmsVoucher/index.vue
@@ -355,7 +355,7 @@ export default {
       });
       this.overlayLoad = false;
       if (res && res.code === 200 && res.data) {
-        if (res.data[0].code === 200) {
+        if (is_retry || (res.data[0]?.code === 200)) {
           this.pollStatus = true;
           this.pollStatus = true;
           this.dialogTitle = '兑换成功';