From 78bb47f8fcade30916fd9b73015aa622d55e52c7 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 18 Apr 2022 17:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js                         | 11 ++++-
 pages.json                                  |  7 +++
 pages/order/detail/components/Operation.vue | 23 ++++++++--
 pages/order/logisitcsInfo.vue               |  5 +--
 pages/order/orderSuccess.vue                | 48 +++++++++++++++++++++
 pages/order/saleAfter/saleAfterApply.vue    |  4 +-
 pages/order/saleAfter/saleAfterSelect.vue   | 18 ++++++--
 7 files changed, 103 insertions(+), 13 deletions(-)
 create mode 100644 pages/order/orderSuccess.vue

diff --git a/common/api/order.js b/common/api/order.js
index f67f408..123d286 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-29 17:38:17
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 15:37:05
+ * @LastEditTime: 2022-04-18 17:42:52
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -21,6 +21,7 @@ export const ApiGetOrderList = (params) =>
  */
 export const ApiGetBeforeOrder = (data) =>
 	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/buyAdvanceOrder`, data));
+
 /**
  * 获取购物车预订单
  * @param {*} data 
@@ -44,10 +45,16 @@ export const  ApiGetOrderProductDetail = ({orderProductId}) =>
 
 /**
  * 获取物流信息
- * @param {*} orderProductId 
+ * @param {*} orderId 
  */
 export const  ApiGetOrderLogistics = ({orderId}) =>
 	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/logistics/${orderId}`));	
+/**
+ * 确认收货
+ * @param {*} orderId 
+ */
+export const  ApiPutOrderReceive = (params) =>
+	ToAsyncAwait(MsbRequestTk.put(`${BASE_URL}/app/tradeOrder/receive`, params));	
 /**
  * 提交订单
  * @param {*} data 
diff --git a/pages.json b/pages.json
index ae74b09..622e390 100644
--- a/pages.json
+++ b/pages.json
@@ -162,6 +162,13 @@
 				"navigationBarBackgroundColor" : "#F8F8F8"
 			}
 		},
+		{
+			"path": "pages/order/orderSuccess",
+			"aliasPath" : "/orderSuccess",
+			"style": {
+				"navigationBarTitleText": "交易成功"
+			}
+		},
 		{
 			"path": "pages/order/paySuccess",
 			"aliasPath" : "/paySuccess",
diff --git a/pages/order/detail/components/Operation.vue b/pages/order/detail/components/Operation.vue
index 4d2419a..bef4b73 100644
--- a/pages/order/detail/components/Operation.vue
+++ b/pages/order/detail/components/Operation.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 16:16:26
+ * @LastEditTime: 2022-04-18 17:41:55
  * @Description: file content
 -->
 <template>
@@ -12,7 +12,7 @@
 			<!-- 交易关闭，可以联系客服 -->
 			<UiButton class="footer--btn" v-if="orderInfo.orderStatus === 2">联系客服</UiButton>
 			<!-- 已发货可以确认收货 -->
-			<UiButton class="footer--btn" v-if="orderInfo.orderStatus === 4" type="gradual">确认收货</UiButton>
+			<UiButton class="footer--btn" v-if="orderInfo.orderStatus === 4" type="gradual" @click="receive">确认收货</UiButton>
 			<!-- 待支付可以取消，支付订单 -->
 			<template v-if="orderInfo.orderStatus === 1">
 				<UiButton class="footer--btn" @click="cancelShow = true">取消订单</UiButton>
@@ -42,12 +42,13 @@
 					<UiButton type="gradual" :disabed="cancelValue == 0">确认取消</UiButton>
 				</view>
 			</u-popup>
+
 		</view>
 </template>
 <script>
 import UiButton from '@/components/UiButton.vue'
 import UiCell from '@/components/UiCell.vue'
-import {ApiPutCancelOrder} from '@/common/api/order'
+import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/common/api/order'
 export default {
 	components: { UiButton, UiCell },
 	props : {
@@ -82,6 +83,19 @@ export default {
 				return false;
 			}
 			// 取消成功，跳到订单关闭页
+		},
+		/**
+		 * 确认收货
+		 */
+		async receive(){
+			const {error} = await ApiPutOrderReceive({
+				orderId : this.$Route.query.id
+			});
+			if(error){
+				uni.$toast(error.message);
+				return false;
+			}
+			this.$Router.push('/orderSuccess')
 		}
 	}
 }
@@ -124,4 +138,7 @@ export default {
 	}
 	
 }
+.modal{
+	flex: 0;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/logisitcsInfo.vue b/pages/order/logisitcsInfo.vue
index 02a4de9..2ea3398 100644
--- a/pages/order/logisitcsInfo.vue
+++ b/pages/order/logisitcsInfo.vue
@@ -2,13 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-18 15:28:14
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 17:10:26
+ * @LastEditTime: 2022-04-18 17:13:27
  * @Description: file content
 -->
 <template>
 	<view>
 		<UiWhiteBox>
-
 			<UiGoodsInfo :class="idx === orderInfo.products.length-1 ? 'goods-info__last' : ''" :key="item.orderProductId"
 				 v-for="(item, idx) in orderInfo.products" :data="item"></UiGoodsInfo>
 		</UiWhiteBox>
@@ -96,7 +95,7 @@ page{
 		content: '';
 		border-radius: 50%;
 		border:6rpx solid $color-yellow3;
-		background: #fff;
+		background: $color-grey0;
 		position: absolute;
 		left: 0;
 	}
diff --git a/pages/order/orderSuccess.vue b/pages/order/orderSuccess.vue
new file mode 100644
index 0000000..2b187db
--- /dev/null
+++ b/pages/order/orderSuccess.vue
@@ -0,0 +1,48 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-03-28 17:16:44
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-18 17:39:27
+ * @Description: file content
+-->
+<template>
+	<view>
+		<image class="icon" src="@/static/order/paySuccess.png"/>
+		<view class="title">交易成功</view>
+		<view class="btns">
+			<UiButton class="btn" type="primaryLine" @click="$Router.replaceAll('/')">返回首页</UiButton>
+		</view>
+	</view>
+</template>
+<script>
+import UiButton from '@/components/UiButton.vue'
+export default {
+	components: { UiButton },
+	
+}
+</script>
+<style lang="scss" scoped>
+page{
+	text-align: center;
+}
+.icon{
+	width: 400rpx;
+	height: 256rpx;
+	margin: 169rpx auto 42rpx;
+}
+.title{
+	font-size: $font-size-lg;
+	line-height: 44rpx;
+	color: $color-grey6;
+}
+.desc{
+	font-size: $font-size-sm;
+	line-height: 34rpx;
+	color: $color-grey4;
+}
+.btns{
+	margin: 74rpx 105rpx 0;
+	display: flex;
+	justify-content: space-between;
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterApply.vue b/pages/order/saleAfter/saleAfterApply.vue
index 8de3b57..04078cc 100644
--- a/pages/order/saleAfter/saleAfterApply.vue
+++ b/pages/order/saleAfter/saleAfterApply.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-11 13:51:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 17:59:09
+ * @LastEditTime: 2022-04-18 17:55:17
  * @Description: file content
 -->
 <template>
@@ -15,7 +15,7 @@
 				<input class="input" slot="value" disabled placeholder="请选择" :value="refundSelected.label"/>
 			</UiCell>
 			<UiCell title="退款金额" :rightIcon="false">
-				<text class="price" slot="value">￥36.3</text>
+				<text class="price" slot="value">￥{{$Route.query.amount}}</text>
 			</UiCell>
 			<view class="title">
 				<view>
diff --git a/pages/order/saleAfter/saleAfterSelect.vue b/pages/order/saleAfter/saleAfterSelect.vue
index 0f0a627..83cd815 100644
--- a/pages/order/saleAfter/saleAfterSelect.vue
+++ b/pages/order/saleAfter/saleAfterSelect.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 16:50:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 15:33:42
+ * @LastEditTime: 2022-04-18 17:54:03
  * @Description: file content
 -->
 <template>
@@ -12,11 +12,11 @@
 		</UiWhiteBox>
 		<UiWhiteBox>
 			<view class="title">选择售后类型</view>
-			<view class="item item__first" @click="$Router.push(`/saleAfterApply?type=1`)">
+			<view class="item item__first" @click="select(1)">
 				<view>申请退款</view>
 				<text>没有收到货，或已协商同意不退货只退款</text>
 			</view>
-			<view class="item" @click="$Router.push(`/saleAfterApply?type=2&status=2`)">
+			<view class="item" @click="select(2,2)">
 				<view>申请退货退款</view>
 				<text>已收到货，需要退还收到的货物</text>
 			</view>
@@ -47,6 +47,18 @@ export default {
 				return false;
 			}
 			this.orderInfo = result;
+		},
+		select(type,status){
+			const {orderProductId,realAmount} = this.orderInfo.orderProduct;
+			this.$Router.push({
+				path:'/saleAfterApply',
+				query:{
+					status,
+					type,
+					id: orderProductId,
+					amount : realAmount,
+					}
+				});
 		}
 	}
 }