packages/myOrders/groupOrders/index.vue

@@ -8,13 +8,13 @@
     </view>
 
     <view class="content">
-      <view v-if="selectedCategory === '待评价'">
+      <view v-if="selectedTab === 6">
         <awaitRated :orderData="orderData" />
       </view>
-      <view v-else-if="selectedCategory === '已评价'">
+      <view v-else-if="selectedTab === 7">
         <rated :orderData="orderData" />
       </view>
-      <view v-else-if="selectedCategory === '售后'">
+      <view v-else-if="selectedTab === 8">
         <afterSale :afterSaleList="afterSaleList" @revokeApply="revokeApply" :order_cate="2" />
       </view>
       <view v-else>
@@ -152,7 +152,6 @@ export default {
         { category_name: "售后", status: "" },
       ],
       selectedTab: 0,
-      selectedCategory: '',
       // orderData: orderMockData,
       orderData: [],
 
@@ -170,7 +169,6 @@ export default {
   methods: {
     selectTab(index, item) {
       this.selectedTab = index;
-      this.selectedCategory = item.category_name;
       this.selectStatus = item.status || '';
       this.evaluateStatus = item.evaluateStatus || '';
       this.getOrderList();

packages/myOrders/index/index.vue

@@ -5,16 +5,17 @@
         :class="['tabItem', selectedTab === index ? 'active2' : '']" @click="selectTab(index, item)">
         {{ item.category_name }}
       </view>
+
     </view>
 
     <view class="content">
-      <view v-if="selectedCategory === '待评价'">
+      <view v-if="selectedTab === 6">
         <awaitRated :orderData="orderData" />
       </view>
-      <view v-else-if="selectedCategory === '已评价'">
+      <view v-else-if="selectedTab === 7">
         <rated :orderData="orderData" />
       </view>
-      <view v-else-if="selectedCategory === '售后'">
+      <view v-else-if="selectedTab === 8">
         <afterSale :afterSaleList="afterSaleList" @revokeApply="revokeApply" />
       </view>
       <view v-else>
@@ -152,7 +153,6 @@ export default {
         { category_name: "售后", status: "" },
       ],
       selectedTab: 0,
-      selectedCategory: '',
       // orderData: orderMockData,
       orderData: [],
 
@@ -171,7 +171,6 @@ export default {
     selectTab(index, item) {
       console.log("🚀 ~ item:", item)
       this.selectedTab = index;
-      this.selectedCategory = item.category_name;
       this.selectStatus = item.status || '';
       this.evaluateStatus = item.evaluateStatus || '';
       this.getOrderList();

packages/myOrders/orderDetails/index.vue

@@ -30,10 +30,11 @@
       <view class="countdown">订单已取消</view>
       <!-- <view class="tips">您的订单已取消，再来一单吧</view> -->
     </view>
-    <view class="status-bar" v-if="status === '7'">
-      <view class="status">退款中</view>
+    <!-- <view class="status-bar" v-if="status === '退款中'">
+      <view class="status">已完成</view>
+      <view class="countdown">预计到货时间: 2025-09-09 9:59:59</view>
       <view class="tips">感谢对我们的信任，期待下次光临</view>
-    </view>
+    </view> -->
 
     <view class="content">
       <!-- 订单金额 -->

packages/shop/goods/index.vue

@@ -893,7 +893,8 @@ export default {
 					success: (payRes) => {
 						const params = {
 							order_id: orderId,
-							from: 1,
+							from: this.carList.some(item => item.isAdver === true) ? 3 : (isGroupBuyValid ? 2 : 1),
+							adver_id: this.carList.some(item => item.isAdver === true) ? this.carList.find(item => item.isAdver === true).adver_id : ''
 						}
 						request(apiArr.queryOrder, "POST", params).then(res => {
 							this.verifyCode = res.verification_code