From f95606b5d8bf2d7d2368fac9976929c03c35dcb8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 11 Jul 2023 16:42:26 +0800
Subject: [PATCH] 服务卡有添加购物车，但是后台吧服务卡商品删除了，就报错了

---
 pages/cart/cart/cart.js | 64 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 5889794..458bf11 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -900,26 +900,24 @@ Page({
 
             //-- 全部清除不选中 --
             rq.promisePut("/api/weshop/cartService/update", {
-              data: {
-                id: item.id,
-                selected: 0,
-                store_id: oo.stoid
-              }
+                data: {
+                  id: item.id,
+                  selected: 0,
+                  store_id: oo.stoid
+                }
             });
 
-
             await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(res => {
-              good = res.data.data;
+              if(res.data.code==0 && res.data.data){
+                 good = res.data.data;
+              }
             })
             if (!good) {
-              // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-              // getApp().request.delete(url, {
-              //     success: function (t) {}
-              // });
-              th.disInvalid({
-                ...item,
-                original_img: good.imgUrl
-              }, 1, 1);
+              //-- 找不到就要删除 --
+              var url = '/api/weshop/cartService/del/' + oo.stoid + '/' + item.id;
+              getApp().request.delete(url, {
+                  success: function (t) {}
+              });
               continue;
             }
 
@@ -3817,27 +3815,37 @@ Page({
     var th = this;
 
     var ab = 0; //选中
-    var abc = 0; //
-    for (var i = 0; i < this.data.requestData.length; i++) {
-      var i_arr = this.data.requestData[i].goods;
-      for (var j = 0; j < i_arr.length; j++) {
-        if (i_arr[j].selected) {
-          glist += i_arr[j].id + ",";
-          ab = 1;
+    var abc = 0;
+
+    //如果有普通商品的时候
+    if(this.data.requestData && this.data.requestData.length){
+      for (var i = 0; i < this.data.requestData.length; i++) {
+        var i_arr = this.data.requestData[i].goods;
+        for (var j = 0; j < i_arr.length; j++) {
+          if (i_arr[j].selected) {
+            glist += i_arr[j].id + ",";
+            ab = 1;
+          }
         }
       }
     }
 
-    for (var ii = 0; ii < this.data.service_data.length; ii++) {
-      var i_arr = this.data.service_data[ii].goods;
-      for (var jj = 0; jj < i_arr.length; jj++) {
-        if (i_arr[jj].selected) {
-          slist += i_arr[jj].id + ",";
-          abc = 1;
+    //如果有普通服务卡的时候
+    if(this.data.service_data && this.data.service_data.length){
+      for (var ii = 0; ii < this.data.service_data.length; ii++) {
+        var i_arr = this.data.service_data[ii].goods;
+        for (var jj = 0; jj < i_arr.length; jj++) {
+          if (i_arr[jj].selected) {
+            slist += i_arr[jj].id + ",";
+            abc = 1;
+          }
         }
       }
     }
 
+
+
+
     if (ab == 0 && abc == 0) {
       t.my_warnning("未选择商品或者服务卡", 0, th);
       return false;
--
libgit2 0.21.4