From 62a53ad6d1bbe8264788504ab28f74e09a87e62f Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 29 Apr 2024 14:22:54 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):[#1358]=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6=E5=95=86=E5=93=81=E4=BB=8E=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=82=B9=E5=87=BB=E5=95=86=E5=93=81=E5=9B=BE=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E6=8F=90=E7=A4=BA=EF=BC=9A=E5=95=86=E5=93=81=E5=B7=B2?=
 =?UTF-8?q?=E4=B8=8B=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 62 +++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 4d0711c..d90b595 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -35,24 +35,26 @@
           <view class="item-info acea-row row-between row-top" v-for="(cart,cartInfoIndex) in order.cartInfo"
                 :key="cartInfoIndex">
             <view class="pictrue">
-              <image :src="cart.productInfo.image" @click.stop="
-                  $yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:cart.productInfo.id}  })
-                " v-if="cart.combinationId === 0 && cart.bargainId === 0 &&cart.seckillId === 0"/>
-              <image :src="cart.productInfo.image" @click.stop="
-                  $yrouter.push({
-                    path: '/pages/activity/GroupDetails/index',query:{id:cart.combinationId}
-                  })
-                " v-else-if="cart.combinationId > 0"/>
-              <image :src="cart.productInfo.image" @click.stop="
-                  $yrouter.push({
-                    path: '/pages/activity/DargainDetails/index',query:{id:cart.bargainId}
-                  })
-                " v-else-if="cart.bargainId > 0"/>
-              <image :src="cart.productInfo.image" @click.stop="
-                  $yrouter.push({
-                    path: '/pages/activity/SeckillDetails/index',query:{id:cart.seckillId}
-                  })
-                " v-else-if="cart.seckillId > 0"/>
+              <image
+                v-if="cart.combinationId === 0 && cart.bargainId === 0 &&cart.seckillId === 0"
+                :src="cart.productInfo.image"
+                @click.stop="gotoGoodDetail(cart, 1, { id: cart.productInfo.id })"
+              />
+              <image
+                v-else-if="cart.combinationId > 0"
+                :src="cart.productInfo.image"
+                @click.stop="gotoGoodDetail(cart, 2, { id: cart.combinationId })"
+              />
+              <image
+                v-else-if="cart.bargainId > 0"
+                :src="cart.productInfo.image"
+                @click.stop="gotoGoodDetail(cart, 3, { id: cart.bargainId })"
+              />
+              <image
+                v-else-if="cart.seckillId > 0"
+                :src="cart.productInfo.image"
+                @click.stop="gotoGoodDetail(cart, 4, { id: cart.seckillId })"
+              />
             </view>
             <view class="text">
               <view class="acea-row name-wrap">
@@ -238,6 +240,30 @@ export default {
         }
       }
     },
+    gotoGoodDetail(cart, type, query){
+      // isProductStillExist:0-不存在,1-存在
+      const isProductStillExist = cart.isProductStillExist || 0
+      if (isProductStillExist === 0) {
+        this.$dialog.toast({ mes: '商品已下架' })
+        return
+      }
+      let path = ''
+      switch(type) {
+        case 1:
+          path = '/pages/shop/GoodsCon/index'
+          break
+        case 2:
+          path = '/pages/activity/GroupDetails/index'
+          break
+        case 3:
+          path = '/pages/activity/DargainDetails/index'
+          break
+        case 4:
+          path = '/pages/activity/SeckillDetails/index'
+          break
+      }
+      this.$yrouter.push({ path, query })
+    },
     getOrderData() {
       getOrderData().then(res => {
         this.orderData = res.data;