From 3fd8a13fa5cd843f6a116653711526d580f98330 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:32:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/order/orderDetail.vue | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 1e09c58..ba55edb 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -141,14 +141,17 @@
<view class="title">鏈嶅姟</view>
</view>
<view class="customer-list">
- <view class="customer-service"
+<!-- <view class="customer-service"
v-if="orderDetail.allowOperationVO && orderDetail.allowOperationVO.cancel == true"
- @click="onCancel(order.sn)">鍙栨秷璁㈠崟</view>
+ @click="onCancel(order.sn)">鍙栨秷璁㈠崟</view> -->
<view class="customer-service" v-if="order.orderStatus == 'DELIVERED'" @click="onLogistics(order)">鏌ョ湅鐗╂祦</view>
<view class="customer-service" v-if="order.orderStatus != 'UNPAID' && order.orderPromotionType == 'PINTUAN'"
@click="ByUserMessage(order)">鏌ョ湅鎷煎洟淇℃伅</view>
<view class="customer-service"
@click="contact(order.storeId)">鑱旂郴瀹㈡湇</view>
+ <view class="customer-service" v-if="order.orderStatus==='COMPLETED'"
+ @click="buyBack"
+ >鍐嶆潵涓�鍗�</view>
</view>
</view>
</view>
@@ -260,11 +263,11 @@
</template>
<script>
-import '@/components/uview-components/uview-ui'
-import { getExpress, getPackage } from "@/api/trade.js";
+import '@/pages/subComponents/uview-components/uview-ui'
+import { getExpress, getPackage ,buyBack} from "@/api/trade.js";
import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";
-import shares from "@/components/m-share/index"; //鍒嗕韩
+import shares from "@/pages/order/m-share/index.vue"; //鍒嗕韩
import { getClearReason } from "@/api/after-sale.js";
@@ -320,6 +323,8 @@
rogShow: false,
reason: "",
orderPackage:"",
+ //鍟嗗搧淇℃伅鍐嶆潵涓�鍗曚娇鐢�
+ skuList:[],
};
},
onLoad(options) {
@@ -390,11 +395,31 @@
this.orderGoodsList[0].goodsId,
});
},
+ //鍐嶆潵涓�鍗�
+ buyBack(){
+ console.log(JSON.stringify(this.skuList))
+ buyBack(this.skuList).then(res=>{
+ console.log('------------------->',res)
+ if(res.data.code==200){
+ uni.navigateTo({
+ url: "/pages/order/fillorder?way=CART"
+ })
+ }
+ })
+
+ },
async loadData(sn) {
uni.showLoading({
title: "鍔犺浇涓�",
});
+ // 灏嗗啀娆¤喘涔板晢鍝佺疆绌洪噸鏂拌幏鍙�
+ this.skuList = []
getOrderDetail(sn).then((res) => {
+ this.skuList = res.data.result.orderItems.map(item=>{
+ return{
+ skuId:item.skuId,
+ num:item.num}
+ })
const order = res.data.result;
this.order = order.order;
this.orderGoodsList = order.orderItems;
--
Gitblit v1.8.0