From cebe0c75d48f9a609ce98624e311f6c5607a2c5d Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sat, 1 Nov 2025 12:38:50 +0800
Subject: [PATCH] =?UTF-8?q?Fxi=EF=BC=9A4311=20=E3=80=90=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9B=A2=E8=B4=AD=E5=9B=BE=E7=89=87=EF=BC=8C=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E7=AD=89=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=AD=A4=E5=A4=84?=
 =?UTF-8?q?UI=E8=B7=9F=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7=E5=B0=B1=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 107 +++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 41 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index dc8bcf5..fdc6120 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -87,51 +87,76 @@
               />
             </view>
           </view>
-          <view
-            v-for="(cart,cartInfoIndex) in order.cartInfo"
-            :key="cartInfoIndex"
-            class="item-info acea-row row-between row-top"
-          >
-            <view class="pictrue">
-              <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">
-                <view class="name more-t v12-font-bold">{{ cart.productInfo.storeName }}</view>
-                <view class="money">
-                  <view>
-                    <text class="v12-font-22">￥</text>
-                    <text class="v12-font-28">{{ force2Decimal(cart.truePrice) }}</text>
+          <view v-if="order.isTravelGroup === 1">
+            <view
+              class="item-info acea-row row-between row-top"
+            >
+              <view class="pictrue">
+                <image
+                  :src="order.travelGroupOrderInfo.travelGroupProduct.mainImage"
+                />
+              </view>
+              <view class="text">
+                <view class="acea-row name-wrap">
+                  <view class="name more-t v12-font-bold">{{ order.travelGroupOrderInfo.travelGroupProduct.name }}</view>
+                  <view class="money">
+                    <view>
+                      <text class="v12-font-22">￥</text>
+                      <text class="v12-font-28">{{ force2Decimal(order.travelGroupOrderInfo.travelGroupProduct.price) }}</text>
+                    </view>
                   </view>
                 </view>
+                
               </view>
-              <view class="acea-row attr-wrap ">
-                <view
-                  v-if="cart.productInfo.attrInfo"
-                  class="attr v12-secondary-dark-text v12-font-24 "
-                >
-                  {{ cart.productInfo.attrInfo.sku }}
+            </view>
+          </view>
+          <view v-else> 
+            <view
+              v-for="(cart,cartInfoIndex) in order.cartInfo"
+              :key="cartInfoIndex"
+              class="item-info acea-row row-between row-top"
+            >
+              <view class="pictrue">
+                <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">
+                  <view class="name more-t v12-font-bold">{{ cart.productInfo.storeName }}</view>
+                  <view class="money">
+                    <view>
+                      <text class="v12-font-22">￥</text>
+                      <text class="v12-font-28">{{ force2Decimal(cart.truePrice) }}</text>
+                    </view>
+                  </view>
+                </view>
+                <view class="acea-row attr-wrap ">
+                  <view
+                    v-if="cart.productInfo.attrInfo"
+                    class="attr v12-secondary-dark-text v12-font-24 "
+                  >
+                    {{ cart.productInfo.attrInfo.sku }}
+                  </view>
+                  <view class="v12-dark-text v12-font-22">x{{ cart.cartNum }}</view>
                 </view>
-                <view class="v12-dark-text v12-font-22">x{{ cart.cartNum }}</view>
               </view>
             </view>
           </view>