From eadae8814dc4a1b6f8cbd98daf0bfbc0c2cac892 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 15:31:56 +0800
Subject: [PATCH] 我的订单页面相关问题
---
pages/order/myOrder.vue | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 19 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 91e50a5..7e00d25 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)">
@@ -214,9 +237,10 @@
<script>
import '@/components/uview-components/uview-ui';
-import { getOrderList, cancelOrder, confirmReceipt } from "@/api/order.js";
+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 {
data() {
@@ -362,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({
@@ -415,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
}
},
@@ -436,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";
@@ -609,10 +650,14 @@
* 鏌ョ湅鐗╂祦
*/
navigateToLogistics(order) {
- uni.navigateTo({
- url:
- "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
- });
+ // uni.navigateTo({
+ // url:
+ // "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
+ // });
+ uni.navigateTo({
+ url:
+ `/pages/order/deliverDetail?order_sn=${order.sn}`,
+ });
},
},
};
--
Gitblit v1.8.0