From 0270abc763a1a2ca1162f2fd49b1734d6c5652b2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 15 十月 2025 00:42:24 +0800
Subject: [PATCH] 首页视频优化

---
 pages/order/myOrder.vue |   85 +++++++++++++++++++++++++++++-------------
 1 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 1a0e7e0..4f7be7d 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -101,8 +101,19 @@
                     @click="waitPay(order)"
                     >绔嬪嵆浠樻</view
                   >
+				  <!-- 鏂板锛氫紭鎯犲埜鍗″寘鎸夐挳 -->
+				  <view
+				    ripple
+				    shape="circle"
+				    class="cancel-btn"
+				    size="mini"
+					v-if="order.couponFlag === 'COUPON'&& order.orderStatus ==='COMPLETED'"
+				    @click="openCouponPackage(order)"
+				  >
+				    浼樻儬鍒稿崱鍖�
+				  </view>
                   <!-- 鍙栨秷璁㈠崟 -->
-                  <view
+<!--                  <view
                     ripple
                     class="cancel-btn"
                     shape="circle"
@@ -111,7 +122,7 @@
                     @click="onCancel(order.sn)"
                   >
                     鍙栨秷璁㈠崟
-                  </view>
+                  </view> -->
                   <!-- 绛夊緟鏀惰揣 -->
                   <view
                     ripple
@@ -138,13 +149,25 @@
                     shape="circle"
                     class="cancel-btn"
                     size="mini"
-                    v-if="order.groupAfterSaleStatus && ( order.groupAfterSaleStatus.includes('NOT_APPLIED') || order.groupAfterSaleStatus.includes('PART_AFTER_SALE'))"
+                    v-if="order.groupAfterSaleStatus &&
+					 ( order.groupAfterSaleStatus.includes('NOT_APPLIED') 
+					 || order.groupAfterSaleStatus.includes('PART_AFTER_SALE')||order.orderStatus === 'UNDELIVERED')"
                     @click="applyService(order)"
                   >
                     閫�娆�/鍞悗
                   </view>
+				  <view
+				    ripple
+				    shape="circle"
+				    class="cancel-btn"
+				    size="mini"
+				    v-if="order.orderStatus === 'COMPLETED'&& order.orderType !=='VIRTUAL'"
+				    @click="buyBack(order)"
+				  >
+				    鍐嶆潵涓�鍗�
+				  </view>
                   <!-- TODO 鍚庣画瀹屽杽 -->
-                  <!-- <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
+<!--                  <u-button ripple shape="circle" class="rebuy-btn" size="mini" v-if="
                       order.orderStatus === 'CANCELLED' ||
                       order.orderStatus === 'COMPLETE'
                     " @click="reBuy(order)">
@@ -213,22 +236,13 @@
 </template>
 
 <script>
-import UEmpty from '@/uview-components/uview-ui/components/u-empty/u-empty.vue';
-import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
-import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
-import URadioGroup from '@/uview-components/uview-ui/components/u-radio-group/u-radio-group.vue';
-import URadio from '@/uview-components/uview-ui/components/u-radio/u-radio.vue';
-import UButton from '@/uview-components/uview-ui/components/u-button/u-button.vue';
-import UToast from '@/uview-components/uview-ui/components/u-toast/u-toast.vue';
-import UModal from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
-import uniLoadMore from "@/components/uni-load-more/uni-load-more.vue";
-import { getOrderList, cancelOrder, confirmReceipt } from "@/api/order.js";
+import '@/components/uview-components/uview-ui';
+import { getOrderXcxList, cancelOrder, confirmReceipt } from "@/api/order.js";
 import { getClearReason } from "@/api/after-sale.js";
 import LiLiWXPay from "@/js_sdk/lili-pay/wx-pay.js";
+import {buyBack} from "@/api/trade.js";
 export default {
-  components: {
-    uniLoadMore,UEmpty,UImage,UPopup,URadioGroup,URadio,UButton,UToast,UModal
-  },
+
   data() {
     return {
       lightColor: this.$lightColor,
@@ -372,6 +386,32 @@
     },
   },
   methods: {
+	  openCouponPackage(order){
+		  console.log(order)
+		uni.navigateTo({
+			url:"/pages/order/cardPack?sn=" + order.sn
+		})  
+	  },
+	  //鍐嶆潵涓�鍗�
+	  buyBack(order){
+      console.log(JSON.stringify(order))
+      const param = order.orderItems.map(item => {
+        return {
+          skuId: item.skuId,
+          num: item.num
+        }
+      })
+      console.log('------------------>',JSON.stringify(param))
+	  	buyBack(param).then(res=>{
+	  		console.log('------------------->',res)
+	  		if(res.data.code==200){
+	  			uni.navigateTo({
+	  				url: "/pages/order/fillorder?way=CART"
+	  			})
+	  		}
+	  	})
+	  	
+	  },
     // 鍞悗
     applyService(order) {
       uni.navigateTo({
@@ -425,18 +465,9 @@
      */
     pay(val) {
       if (val.sn) {
-        // #ifdef MP-WEIXIN
-        new LiLiWXPay({
-          sn: val.sn,
-          price: val.flowPrice,
-          orderType: "ORDER",
-        }).pay();
-        // #endif
-        // #ifndef MP-WEIXIN
         uni.navigateTo({
           url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
         });
-        // #endif
       }
     },
 
@@ -446,7 +477,7 @@
     loadData(index) {
       this.params.pageNumber = this.navList[index].pageNumber;
       // this.params.tag = this.orderStatus[index].orderStatus;
-      getOrderList(this.params).then((res) => {
+      getOrderXcxList(this.params).then((res) => {
         uni.stopPullDownRefresh();
         if (!res.data.success) {
           this.navList[index].loadStatus = "noMore";

--
Gitblit v1.8.0