处理bug

src/views/shopMall/GoodsOrder.vue

@@ -277,9 +277,9 @@ export default {
             return;
           }
           rows.forEach((item) => {
-            console.log(JSON.parse(item.goodsJson));
-            const temp = JSON.parse(item.goodsJson);
+            const temp = item.goodsJson ? JSON.parse(item.goodsJson) : {};
             item.goodsJson = item.goodsJson ? temp.orderItemList : [];
+            item.orderSn = temp.orderSn;
           });
           this.dataList.push(...rows);
           if (params.page >= Math.ceil(result.data.total / params.rows)) {
@@ -312,8 +312,9 @@ export default {
         if (result.code == 200) {
           let rows = result.data.rows;
           rows.forEach((item) => {
-            const temp = JSON.parse(item.goodsJson);
+            const temp = item.goodsJson ? JSON.parse(item.goodsJson) : {};
             item.goodsJson = item.goodsJson ? temp.orderItemList : [];
+            item.orderSn = temp.orderSn;
           });
           if (result.data.pageNo == 1 && this.dataList2.length > 0) {
             return;
@@ -365,7 +366,7 @@ export default {
     async afterPayMent(item) {
       try {
         const body = {
-          orderNo: item.orderNo,
+          orderNo: item.orderSn,
           userId: item.userId,
         };
         const res = await mallGenerateOrder(body);

src/views/shopMall/GoodsSale.vue

@@ -244,7 +244,7 @@
       <m-refund
         @onClose="refundStatus = !refundStatus"
         @onPopupSure="onRefundSure"
-        :ids="[1, 2]"
+        :ids="[1]"
         :showCoupon="false"
         :buyList="buyList"
         :balance="0"
@@ -409,23 +409,28 @@ export default {
       }
     },
     getChoiceGood(item) {
-      console.log(item, "getChoiceGoods");
       let goodsList = this.goodsList;
+      // console.log(item, "getChoiceGoods", goodsList);
       let status = false;
+      let stockStatus = false;
       goodsList.forEach((good) => {
-        if (good.goodsId == item.id) {
-          status = true;
-          ++good.goodsNum;
+        if (good.id == item.id) {
+          const num = good.goodsNum + item.goodsNum;
+          if (num > item.stock) {
+            this.$toast("库存不足");
+            stockStatus = true;
+          } else {
+            status = true;
+            good.goodsNum = good.goodsNum + item.goodsNum;
+          }
         }
       });
-      // 判断是否有同样的商品
-      if (!status) {
+      // 判断是否有同样的商品, 并库存够
+      if (!status && !stockStatus) {
         goodsList.push(item);
       }
       this.goodsStatus = false;
-      // this.resetCoupon();
       this.calcPrice();
-
       this.hashState("goods");
     },
     onGoodDel(goodsList, item) {