From 0061b65d6370bee0576343cfa26324ff73f02be9 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 8 May 2024 15:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=8D=E6=AC=A1=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js                        |  5 +++++
 pagesOrder/detail/detail.vue        | 13 +++++++++++--
 pagesOrder/order/component/good.vue |  8 ++++++--
 pagesOrder/order/order.vue          | 13 +++++++++++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/api/order.js b/api/order.js
index 024dbe0..54f282e 100644
--- a/api/order.js
+++ b/api/order.js
@@ -33,4 +33,9 @@ export const cancelOrderApi = (data)=>{
 //订单确认收货
 export const confirmReceiptApi = (data)=>{
   return request.post('/order/RetailOrder/confirm_receipt', data);
+}
+
+//订单再次购买
+export const purchaseAgainApi = (data)=>{
+  return request.get('/order/RetailOrder/purchase_again', data);
 }
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 6578301..844adf5 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -133,7 +133,7 @@
         <view></view>
         <view style="width: 450rpx;">
           <up-button v-if="datas.status==0||datas.status==1" color="#20B128" shape="circle" @click="showTake=true">确认收货</up-button>
-          <up-button v-else color="#20B128" plain shape="circle" @click="">再次购买</up-button>
+          <up-button v-else color="#20B128" plain shape="circle" @click="purchaseAgain">再次购买</up-button>
         </view>
       </block>
     </view>
@@ -153,7 +153,7 @@
   import orderCanclePopup from "@/components/orderCanclePopup.vue";
   import shopListPopupVue from "@/components/shopListPopup.vue";
   import modal from "@/components/modal.vue";
-  import { orderDetailApi, cancelOrderApi, rePaymentApi, confirmReceiptApi } from "@/api/order.js"
+  import { orderDetailApi, cancelOrderApi, rePaymentApi, confirmReceiptApi, purchaseAgainApi } from "@/api/order.js"
   import { addressListsApi, merchantListApi } from "@/api/user.js";
 
   const showCancel = ref(false);
@@ -336,6 +336,15 @@
     })
   }
   
+  // 再次购买
+  const purchaseAgain = ()=>{
+    purchaseAgainApi({
+      order_id: datas.value.id
+    }).then(res=>{
+      uni.$u.toast('已加入购物车');
+    })
+  }
+  
   // 设置目标日期
   let targetDate = "";
   let countDown = ref("");
diff --git a/pagesOrder/order/component/good.vue b/pagesOrder/order/component/good.vue
index a4d22b8..860a751 100644
--- a/pagesOrder/order/component/good.vue
+++ b/pagesOrder/order/component/good.vue
@@ -33,7 +33,7 @@
       <!-- <view style="width: 80px;"><up-button size="small" plain color="#989898" shape="circle">申请售后</up-button></view> -->
       <view @click="takeOrder" v-if="datas.status==1" style="width: 80px;"><up-button size="small" color="#20B128"
           shape="circle">确认收货</up-button></view>
-      <view v-if="datas.status==2||datas.status==3" style="width: 80px;"><up-button size="small" plain color="#20B128"
+      <view @click="purchaseAgain" v-if="datas.status==2||datas.status==3" style="width: 80px;"><up-button size="small" plain color="#20B128"
           shape="circle">再次购买</up-button></view>
       <view @click="navTo" style="width: 80px;"><up-button size="small" plain color="#20B128"
           shape="circle">查看详情</up-button></view>
@@ -67,7 +67,7 @@
     })
   }
   
-  const emit = defineEmits(['cancleOrder', 'rePay', 'takeOrder']);
+  const emit = defineEmits(['cancleOrder', 'rePay', 'takeOrder', 'purchaseAgain']);
   const cancleOrder = ()=>{
     emit('cancleOrder', props.datas)
   }
@@ -76,6 +76,10 @@
     emit('takeOrder', props.datas)
   }
   
+  const purchaseAgain = ()=>{
+    emit('purchaseAgain', props.datas)
+  }
+  
   const rePay = ()=>{
     emit('rePay', props.datas)
   }
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index f21d3b7..1f8792d 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -20,7 +20,7 @@
           <view class="page-box">
             <view v-if="list.length>0" class="list">
               <good v-for="(item, index) in list" :datas="item" :key="index" :type="k" @cancleOrder="cancleOrder" @takeOrder="takeOrder"
-                @rePay="rePay"></good>
+                @rePay="rePay" @purchaseAgain="purchaseAgain"></good>
             </view>
             <view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;">
               <up-empty text="订单空空如也"
@@ -50,7 +50,7 @@
   import good from "./component/good.vue";
   import orderCanclePopup from "@/components/orderCanclePopup.vue"
   import modal from "@/components/modal.vue"
-  import { cancelOrderApi, rePaymentApi, confirmReceiptApi, orderListApi } from "@/api/order.js"
+  import { cancelOrderApi, rePaymentApi, confirmReceiptApi, orderListApi, purchaseAgainApi } from "@/api/order.js"
 
   const tabsActive = ref(0)
   const changeTab = ({ index }) => {
@@ -110,6 +110,15 @@
       reloadAll();
     })
   }
+  
+  // 再次购买
+  const purchaseAgain = (e)=>{
+    purchaseAgainApi({
+      order_id: e.id
+    }).then(res=>{
+      uni.$u.toast('已加入购物车');
+    })
+  }
 
   const rePay = (e) => {
     rePaymentApi({