From 65bb0ea1e3b77e9f77ac34e3cbd9a85696c8105f Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 18 Apr 2022 11:09:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=94=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js                             |  4 ++--
 common/utils/requset.js                         |  6 +++---
 manifest.json                                   | 14 ++++----------
 pages/order/detail/index.vue                    | 13 +++++++++----
 pages/order/saleAfter/saleAfterDetail/index.vue |  6 ++++--
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 00141fc..cf4085d 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-15 11:29:32
+ * @LastEditTime: 2022-04-18 11:04:14
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -98,7 +98,7 @@ export const ApiGetSaleAfterOrderList = (params) =>
  * @param {*} data 
  */
 export const ApiGetSaleAfterOrderDetail = (params) => 
-	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/refundOrder/${params.refundId}`));
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/refundOrder/refundInfo`, params));
 /**
  * 售后物流公司
  * @param {*} data 
diff --git a/common/utils/requset.js b/common/utils/requset.js
index 54d4520..82611e1 100644
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 19:13:32
+ * @LastEditTime: 2022-04-18 10:04:10
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
@@ -11,8 +11,8 @@ import $store from '@/common/store';
 
 const ENV = 'test';
 const BASE_URL = {
-	'test' : 'http://k8s-horse-gateway.mashibing.cn',
-	// 'test' : '',
+	// 'test' : 'http://k8s-horse-gateway.mashibing.cn',
+	'test' : '',
 	'release' : '',
 	'prod' : ''
 };
diff --git a/manifest.json b/manifest.json
index 670834c..69c42d1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -77,19 +77,13 @@
         "devServer" : {
             "proxy" : {
                 "/uc/" : {
-                    "target" : "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.109:8090/"
                 },
-                "/mall/trade/" : {
-                    "target" : "http://192.168.10.52:8090/"
-                },
-                "/mall/base/" : {
-                    "target" : "http://192.168.10.52:8090/"
+                "/mall/" : {
+                    "target" : "http://192.168.10.109:8090/"
                 },
                 "/pay/" : {
-                    "target" : "http://192.168.10.52:8090/"
-                },
-                "/mall/product/" : {
-                    "target" : "http://192.168.10.52:8090/"
+                    "target" : "http://192.168.10.109:8090/"
                 }
             }
         }
diff --git a/pages/order/detail/index.vue b/pages/order/detail/index.vue
index 41dc082..efc6d53 100644
--- a/pages/order/detail/index.vue
+++ b/pages/order/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 18:42:30
+ * @LastEditTime: 2022-04-18 11:00:17
  * @Description: file content
 -->
 <template>
@@ -13,9 +13,14 @@
 				v-for="(item, index) in orderInfo.products" :data="item" :key="index">
 				<template slot="operation">
 					<view class="goods-info-operation">
-						<UiButton size="min" type="primaryLine"
-							v-if="item.afterSaleApplyFlag" 
-							@click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
+						<UiButton size="min" type="primaryLine" v-if="item.afterSaleApplyFlag" 
+						 @click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
+						<template v-else>
+							<UiButton size="min" type="line" v-if="item.detailStatus === 3"
+								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">已退款</UiButton>
+							<UiButton size="min" type="line" v-if="item.detailStatus === 4"
+								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">退款关闭</UiButton>
+						</template>
 					</view>
 				</template>
 			</UiGoodsInfo>
diff --git a/pages/order/saleAfter/saleAfterDetail/index.vue b/pages/order/saleAfter/saleAfterDetail/index.vue
index ce654d4..1a0f71f 100644
--- a/pages/order/saleAfter/saleAfterDetail/index.vue
+++ b/pages/order/saleAfter/saleAfterDetail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 11:17:04
+ * @LastEditTime: 2022-04-18 11:01:25
  * @Description: file content
 -->
 <template>
@@ -54,7 +54,9 @@ export default {
 		 * 获取订单最新信息
 		 */
 		async getOrderInfo(){
-			const {error, result} = await ApiGetSaleAfterOrderDetail({refundId:this.$Route.query.id});
+			const refundId = this.$Route.query.id;
+			const orderProductId = this.$Route.query.orderProductId;
+			const {error, result} = await ApiGetSaleAfterOrderDetail({refundId,orderProductId});
 			if(error){
 				uni.$u.toast(error.message);
 				return false;

From dcfe4376cfcbf415b3dc6265afa44105b7d3b9dd Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 18 Apr 2022 17:11:34 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js                           |   9 +-
 pages.json                                    |   8 ++
 .../order/detail/components/LogisitcsInfo.vue |  62 +++++++--
 pages/order/detail/components/Operation.vue   |  27 +++-
 pages/order/detail/components/OrderInfo.vue   |  20 ++-
 pages/order/detail/index.vue                  |   9 +-
 pages/order/list.vue                          |  10 +-
 pages/order/logisitcsInfo.vue                 | 129 ++++++++++++++++++
 pages/order/saleAfter/saleAfterSelect.vue     |   3 +-
 static/order/dw2.png                          | Bin 0 -> 761 bytes
 static/order/fj.png                           | Bin 0 -> 759 bytes
 11 files changed, 250 insertions(+), 27 deletions(-)
 create mode 100644 pages/order/logisitcsInfo.vue
 create mode 100644 static/order/dw2.png
 create mode 100644 static/order/fj.png

diff --git a/common/api/order.js b/common/api/order.js
index cf4085d..f67f408 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 11:04:14
+ * @LastEditTime: 2022-04-18 15:37:05
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -41,6 +41,13 @@ export const  ApiGetOrderDetail = (id) =>
  */
 export const  ApiGetOrderProductDetail = ({orderProductId}) =>
 	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/product/${orderProductId}`));
+
+/**
+ * 获取物流信息
+ * @param {*} orderProductId 
+ */
+export const  ApiGetOrderLogistics = ({orderId}) =>
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/app/tradeOrder/logistics/${orderId}`));	
 /**
  * 提交订单
  * @param {*} data 
diff --git a/pages.json b/pages.json
index 933101c..ae74b09 100644
--- a/pages.json
+++ b/pages.json
@@ -154,6 +154,14 @@
 				"navigationBarBackgroundColor" : "#F8F8F8"
 			}
 		},
+		{
+			"path": "pages/order/logisitcsInfo",
+			"aliasPath" : "/logisitcsInfo",
+			"style": {
+				"navigationBarTitleText": "物流详情",
+				"navigationBarBackgroundColor" : "#F8F8F8"
+			}
+		},
 		{
 			"path": "pages/order/paySuccess",
 			"aliasPath" : "/paySuccess",
diff --git a/pages/order/detail/components/LogisitcsInfo.vue b/pages/order/detail/components/LogisitcsInfo.vue
index c099b21..6fe1dac 100644
--- a/pages/order/detail/components/LogisitcsInfo.vue
+++ b/pages/order/detail/components/LogisitcsInfo.vue
@@ -2,14 +2,28 @@
  * @Author: ch
  * @Date: 2022-04-15 16:36:02
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 17:00:16
+ * @LastEditTime: 2022-04-18 16:31:12
  * @Description: file content
 -->
 <template>
 		<UiWhiteBox>
-			<u-cell class="address" title="是的发生的" label="陈先生 190****2342" 
-				:border="false" isLink @click="$Router.push('/addressList')">
-				<image class="address--icon" slot="icon" src="@/static/order/dw.png" />
+			<u-cell class="address" isLink v-if="lastLogisitcs" @click="$Router.push('/addressList')">
+				<view slot="title" class="address--title">{{lastLogisitcs.context}}</view>
+				<image class="address--icon" slot="icon" src="@/static/order/fj.png" />
+				<view slot="label" class="address--label">
+					<text>{{lastLogisitcs.time}}</text>
+				</view>
+			</u-cell>
+			<u-cell class="address" :border="false">
+				<view slot="title" :class="lastLogisitcs ? 'address--title__grey' :''">
+					{{logisitcsInfo.recipientAddress}}
+				</view>
+				<image class="address--icon" slot="icon" v-if="lastLogisitcs" src="@/static/order/dw2.png" />
+				<image class="address--icon" slot="icon" v-else src="@/static/order/dw.png" />
+				<view slot="label" class="address--label">
+					<text>{{logisitcsInfo.recipientName}}</text>
+					<text>{{logisitcsInfo.recipientPhone}}</text>
+				</view>
 			</u-cell>
 		</UiWhiteBox>
 </template>
@@ -22,15 +36,47 @@ export default {
 			type : Object,
 			defalut : () => ({})
 		}
+	},
+	computed : {
+		lastLogisitcs (){
+			const list = this.logisitcsInfo && this.logisitcsInfo.logisticsDataList
+			if(list && list.length > 0){
+				return list[0]
+			}else{
+				return null
+			}
+			
+		}
 	}
 	
 }
 </script>
 <style lang="scss" scoped>
+.address{
+	/deep/.u-cell__body__content{
+		padding: 10rpx 0;
 
-.address--icon{
-	width: 28rpx;
-	height: 34rpx;
-	margin-right: 30rpx;
+	}
+	&--title{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		width: 500rpx;
+		&__grey{
+			color: $color-grey4;
+		}
+	}
+	&--icon{
+		width: 28rpx;
+		height: 34rpx;
+		margin-right: 30rpx;
+	}
+	&--label{
+		margin-top: 26rpx;
+		text{
+			color: $color-grey4;
+			margin-right: 40rpx;
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/order/detail/components/Operation.vue b/pages/order/detail/components/Operation.vue
index 8231321..4d2419a 100644
--- a/pages/order/detail/components/Operation.vue
+++ b/pages/order/detail/components/Operation.vue
@@ -2,15 +2,23 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 18:02:18
+ * @LastEditTime: 2022-04-18 16:16:26
  * @Description: file content
 -->
 <template>
 		<view class="footer">
-			<UiButton>查看物流</UiButton>
-			<UiButton class="footer--btn" @click="cancelShow = true">取消订单</UiButton>
-			<UiButton class="footer--btn" type="gradual">去支付</UiButton>
-			<u-popup :show="cancelShow" @close="closeCancel" round="16rpx" closeable>
+			<!-- 支付过后都可查看物流 -->
+			<UiButton class="footer--btn" v-if="orderInfo.orderStatus >= 4" @click="$Router.push(`/logisitcsInfo?orderId=${orderInfo.orderId}`)">查看物流</UiButton>
+			<!-- 交易关闭，可以联系客服 -->
+			<UiButton class="footer--btn" v-if="orderInfo.orderStatus === 2">联系客服</UiButton>
+			<!-- 已发货可以确认收货 -->
+			<UiButton class="footer--btn" v-if="orderInfo.orderStatus === 4" type="gradual">确认收货</UiButton>
+			<!-- 待支付可以取消，支付订单 -->
+			<template v-if="orderInfo.orderStatus === 1">
+				<UiButton class="footer--btn" @click="cancelShow = true">取消订单</UiButton>
+				<UiButton class="footer--btn" type="gradual">去支付</UiButton>
+			</template>
+			<u-popup class="cancel" :show="cancelShow" @close="closeCancel" round="16rpx" closeable>
 				<view class="cancel--title">取消订单原因</view>
 				<radio-group class="cancel--cell" @change="cancelChange">
 					<UiCell title="我不想买了">
@@ -42,6 +50,12 @@ import UiCell from '@/components/UiCell.vue'
 import {ApiPutCancelOrder} from '@/common/api/order'
 export default {
 	components: { UiButton, UiCell },
+	props : {
+		orderInfo : {
+			type : Object,
+			default : () => ({})
+		}
+	},
 	data(){
 		return {
 			// 取消订单弹窗
@@ -86,11 +100,12 @@ export default {
 	justify-content: flex-end;
 	align-items: center;
 	&--btn{
-		display: block;
+		display: inline-block;
 		margin: 0 0 0 30rpx;
 	}
 }
 .cancel{
+	flex: 0;
 	&--title{
 		text-align: center;
 		font-size: 34rpx;
diff --git a/pages/order/detail/components/OrderInfo.vue b/pages/order/detail/components/OrderInfo.vue
index a518615..cf1b2ee 100644
--- a/pages/order/detail/components/OrderInfo.vue
+++ b/pages/order/detail/components/OrderInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 16:04:28
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 16:16:36
+ * @LastEditTime: 2022-04-18 14:48:59
  * @Description: file content
 -->
 <template>
@@ -29,12 +29,16 @@
 		<UiWhiteBox class="cell-box">
 			<view class="cell">
 				<text class="cell--title">商品总额:</text>
-				<text class="cell--value">{{orderInfo.totalAmount}}</text>
+				<text class="cell--value">￥{{orderInfo.totalAmount}}</text>
 			</view>
 			<view class="cell">
 				<text class="cell--title">运费:</text>
 				<text class="cell--value">{{orderInfo.shippingAmount}}</text>
 			</view>
+			<view class="amount-box">
+				<text class="amount-label">实付款：</text>
+				<text class="amount">￥{{orderInfo.payAmount}}</text>
+			</view>
 			
 		</UiWhiteBox>
 	</view>
@@ -69,4 +73,16 @@ export default {
 		font-size: $font-size-sm;
 	}
 }
+.amount-box{
+	text-align: right;
+	margin-top: 30rpx;
+}
+
+.amount-label{
+	font-size: $font-size-sm;
+}
+.amount{
+	color: $color-yellow4;
+	font-size: $font-size-lg;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/detail/index.vue b/pages/order/detail/index.vue
index efc6d53..f4f3b85 100644
--- a/pages/order/detail/index.vue
+++ b/pages/order/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 11:00:17
+ * @LastEditTime: 2022-04-18 16:16:44
  * @Description: file content
 -->
 <template>
@@ -12,7 +12,7 @@
 			<UiGoodsInfo :class="index === orderInfo.products.length - 1 && 'goods-info__last'"
 				v-for="(item, index) in orderInfo.products" :data="item" :key="index">
 				<template slot="operation">
-					<view class="goods-info-operation">
+					<view class="goods-info-operation" v-if="item.afterSaleApplyFlag || [3,4].includes(item.detailStatus)">
 						<UiButton size="min" type="primaryLine" v-if="item.afterSaleApplyFlag" 
 						 @click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
 						<template v-else>
@@ -27,7 +27,7 @@
 		</UiWhiteBox>
 		<LogisitcsInfo :logisitcsInfo="orderInfo.logistics" />
 		<OrderInfo :orderInfo="orderInfo" />
-		<Operation></Operation>
+		<Operation :orderInfo="orderInfo" v-if="orderInfo.orderStatus !== 3"></Operation>
 	</view>
 </template>
 <script>
@@ -44,7 +44,8 @@ export default {
 	data(){
 		return {
 			orderInfo : {
-				products:[]
+				products:[],
+				logistics:{}
 			},
 		}
 	},
diff --git a/pages/order/list.vue b/pages/order/list.vue
index c648bca..421994f 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:53
+ * @LastEditTime: 2022-04-18 16:33:42
  * @Description: file content
 -->
 <template>
@@ -21,7 +21,7 @@
 				<text class="orders--name">官方自营</text>
 				<text class="orders--status" :class="[1,3].includes(item.orderStatus) && 'orders--status__warn'">{{item.orderStatusDesc}}</text>
 			</view>
-			<view class="orders--item" v-for="i in item.products" :key="i.productId" @click="$Router.push(`/orderDetail?id=${item.orderId}`)">
+			<view class="orders--item" v-for="i in item.products" :key="i.orderProductId" @click="$Router.push(`/orderDetail?id=${item.orderId}`)">
 				<image class="orders--item-image" mode="widthFix" :src="i.productImageUrl" />
 				<view >
 					<view class="orders--item-con">
@@ -42,8 +42,10 @@
 			</view>
 			<view class="orders--footer">
 				<button class="orders--footer-btn orders--footer-btn__red" v-if="item.orderStatus === 1">去支付</button>
-				<button class="orders--footer-btn" v-if="item.orderStatus === 2">查看详情</button>
-				<button class="orders--footer-btn" v-if="[3,4,7].includes(item.orderStatus)">查看物流</button>
+				<button class="orders--footer-btn" v-if="item.orderStatus === 2" 
+					@click="$Router.push(`/orderDetail?id=${item.orderId}`)">查看详情</button>
+				<button class="orders--footer-btn" v-if="item.orderStatus >= 4" 
+					@click="$Router.push(`/logisitcsInfo?orderId=${item.orderId}`)">查看物流</button>
 				<button class="orders--footer-btn orders--footer-btn__red"  v-if="item.orderStatus == 4">确认收货</button>
 			</view>
 		</view>
diff --git a/pages/order/logisitcsInfo.vue b/pages/order/logisitcsInfo.vue
new file mode 100644
index 0000000..02a4de9
--- /dev/null
+++ b/pages/order/logisitcsInfo.vue
@@ -0,0 +1,129 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-18 15:28:14
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-18 17:10:26
+ * @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>
+		<UiWhiteBox class="company">
+			<text class="company--name">{{orderInfo.companyName}}</text>
+			<view class="company--no">{{orderInfo.trackingNo}}</view>
+		</UiWhiteBox>
+		<UiWhiteBox>
+			<view class="title">
+				<text>物流信息</text>
+				<text class="title--desc">本服务有快递100提供</text>
+			</view>
+			<view class="group">
+				<view class="item" :class="idx === orderInfo.logisticsDataList.length - 1 ? 'item__last' : ''" 
+					v-for="(item, idx) in orderInfo.logisticsDataList" :key="idx">
+					<view class="item--time">{{item.time}}</view>
+					<view class="item--ctx">{{item.context}}</view>
+				</view>
+			</view>
+		</UiWhiteBox>
+	</view>
+</template>
+<script>
+import UiGoodsInfo from '@/components/UiGoodsInfo.vue'
+import UiWhiteBox from '@/components/UiWhiteBox.vue'
+import {ApiGetOrderLogistics} from '@/common/api/order';
+export default {
+	components: { UiWhiteBox, UiGoodsInfo },
+	data(){
+		return {
+			orderInfo : {}
+		}
+	},
+	mounted(){
+		this.getOrderProductInfo()
+	},
+	methods : {
+		async getOrderProductInfo(){
+			const {error, result} = await ApiGetOrderLogistics({
+				orderId : this.$Route.query.orderId
+			});
+			if(error){
+				uni.$u.toast(error.message);
+				return false;
+			}
+			this.orderInfo = result;
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+page{
+	background: $color-grey1;
+}
+.company{
+	height: 100rpx;
+	padding: 0 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.title{
+	height: 98rpx;
+	line-height: 98rpx;
+	border-bottom: 2rpx solid $color-grey2;
+	padding: 0 30rpx;
+	color: $color-grey5;
+	display: flex;
+	justify-content: space-between;
+	&--desc{
+		color: $color-grey4
+	}
+}
+.group{
+	padding: 30rpx;
+}
+.item{
+	padding-bottom: 44rpx;
+	position: relative;
+	padding-left: 58rpx;
+	&::before{
+		display: block;
+		width: 10rpx;
+		height: 10rpx;
+		content: '';
+		border-radius: 50%;
+		border:6rpx solid $color-yellow3;
+		background: #fff;
+		position: absolute;
+		left: 0;
+	}
+	&::after{
+		display: block;
+		content: '';
+		height: calc(100% - 38rpx);
+		width: 1px;
+		left: 10rpx;
+		top: 28rpx;
+		border-left: 1px dashed $color-grey4;
+		position: absolute;
+	}
+	&__last::after{
+		display: none;
+	}
+	&--time{
+		font-size: $font-size-sm;
+		color: $color-grey4;
+	}
+	&--ctx{
+		line-height: 42rpx;
+		color: $color-grey5;
+		margin-top: 20rpx;
+	}
+}
+.goods-info__last{
+	border: 0;
+}
+</style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterSelect.vue b/pages/order/saleAfter/saleAfterSelect.vue
index bb0e7e3..0f0a627 100644
--- a/pages/order/saleAfter/saleAfterSelect.vue
+++ b/pages/order/saleAfter/saleAfterSelect.vue
@@ -2,13 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-14 16:50:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 11:33:42
+ * @LastEditTime: 2022-04-18 15:33:42
  * @Description: file content
 -->
 <template>
 	<view>
 		<UiWhiteBox>
-			<!-- <ui-goods-info -->
 			<UiGoodsInfo class="goods-info" :data="orderInfo.orderProduct"></UiGoodsInfo>
 		</UiWhiteBox>
 		<UiWhiteBox>
diff --git a/static/order/dw2.png b/static/order/dw2.png
new file mode 100644
index 0000000000000000000000000000000000000000..31dd1769184bd111aa3c155ebee7fdefc46fa73a
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3-p;7kgF%DaPU;cPEB*=VV?2Ip+g>LR^7#
z0~k!5I(6pEnLu*-^y!l(O`0=j4um^x+B6^oC^%!rj9Ig0&7M6Q$bbj}xo~lyAhI$b
z7g+=-1yl?X0kYu?h#-&z3c|%9vTzcv7|wvJ#AFoAS$zZOC6|&QzhDLy4jvH+X&HHC
z6?F|AeFI|?3mba}XBQ7|AOGNx@c4w}^!)Pb_Wu6K)924$ynOZg&Aay>K7RW2`ODXD
z-+%u4{pZi$e~YW{>;(o}ho_5Uh=gS6LEh*~0Ss*q%X>V9E;F%Q5-2ut7Za6tTEiS&
z{qKMNt2qacnx1$U?S8i+@qo^wb>}J;Pgz{@WaXoxqn%fm_EkwHOmd7}#V^F1Vk`TF
z>%?(W*(=8^MQo?elFV@mZIM1PYttUlC5?V8(h;Ym9OYj5%sA{3#FhMZ@9zD(FWi#|
zTFJaj?YVQ;*T=ncW;OODc|5V%w7phay)mL#;sh7B!Tmb152q)aHtgiNl4^VS(DXyH
zcTTQq7F1Agownw@!9-?`3Ct%X4{erlh~`LH`XMfiM>vu(XKRymWc-7tPOs7~OgC+q
zswQwc>)C{}aSc=FNC<sBSh1;%b?JTHNK@w8O3j){m*W`f_g#Bx<D{k86zjb7!LrAz
zuiS7{IT?NU(sj;y&TRi{rHsY?qW5^ZvZu;5yk9kgiQlTDL0#6Cablm4!X-x*6`;^}
zty-34t3IU#d`T(go>6J_aJ}O0N$ZRvep?AINtor!oVlQW3r~(&LR6Kj_3=};tFGoU
j9$ot{dB<J8(2wE|og)9s$0>aW#xaAZtDnm{r-UW|CsAZo

literal 0
HcmV?d00001

diff --git a/static/order/fj.png b/static/order/fj.png
new file mode 100644
index 0000000000000000000000000000000000000000..911b1959ee52e5994ff628974b2cab4b26be8bd0
GIT binary patch
literal 759
zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3-p;7kgF%DaPU;cPEB*=VV?2Ij;hILR^6~
z5GW`pXlZE~7#NtDnHd`!>*(kJx%&G0dU|?>hK4|KBO@cAIGPAh3MdE!Km{fyCO|Gw
z83X{iKyjc5L=c&Th(nZtG=l*$7sv*R5h()I4^|J+g)9Ow3L>(5(bPDgSA9!@{DK)+
zICunvMZ_hfW#ko9G_-Z}4UA39Z5$k2+&z5!1A-%BlG8JC^2@91o7=nlCr_U}fBxd-
ztJiPdynXln!^e-GK7aZ8?c4VsKY#uH^Y`Biy&O*igEq<2#W6%ea__;nPL~)M94_uo
z^iZ9U;x;K`;+IAT&k3rUSxn7$zt_(-TYiq~e;MEZn~V83pI;O9RzEcC=FhyWQ}&0h
z?Ob`nus-s?iTTDiQ``A|9DbINne?lU_uQL;^Y1!WZvNYF<V^V;tu6Y#M-Jz%c;~Q!
z*QlRgSvatqd4=AZfQwu!#Sh;&vi_S?=O>?R6O)#N_sdrn8Y_hEx}cn4*?f0pXGMT=
zu*KEK3|8};mYlOz&111IiD6*lOI);Vhw+terOu7*0rOVGbEWLE(w;c0ilL?U>mILF
zYd>?XbcmmPEB?hI*Q7^Dv$Iock8S<rBFnIMhv&1YVkcT^OSv_Q9<LQF|F-p<t^C{x
zm#u7gcNRYBm~-v=?~hN_W(x0q@+EtTUUbavO}^)%7n=&*Qb~Uly>xY)Z9DH>CG*lx
zLK$vS+gD~!jCt$pkoDL{R(40i)CG%=&D$K6yiV?OgL?AYj}sOc-)F01_Iee_5uqov
Q29#tyUHx3vIVCg!05s7SlK=n!

literal 0
HcmV?d00001


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 3/6] =?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,
+					}
+				});
 		}
 	}
 }

From 4c5e4b829f33065d87baccda8d45ac70d032c758 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 18 Apr 2022 18:57:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/account/address/list.vue                |  6 +--
 pages/account/setting/index.vue               |  4 +-
 .../order/detail/components/LogisitcsInfo.vue |  5 ++-
 .../components/LogisticsInfo.vue              | 11 +++--
 .../components/SubmitLogistics.vue            | 41 +++++++++++++++----
 pages/order/submit.vue                        |  4 +-
 6 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/pages/account/address/list.vue b/pages/account/address/list.vue
index 10ad7fa..87aaf47 100644
--- a/pages/account/address/list.vue
+++ b/pages/account/address/list.vue
@@ -2,19 +2,17 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:39
+ * @LastEditTime: 2022-04-18 18:36:28
  * @Description: file content
 -->
 <template>
 	<view class="container">
 		<view class="address">
-			
 			<u-loadmore v-if="isLoading" status="loading" />
 			<BsEmpty tips="暂无收货地址呢~" v-if="!isLoading && !addresList.length"></BsEmpty>
 			<view class="addressItem" v-for="(item, index) in addresList" :key="item.id"
 				:class="{'addressItem__last' : index === addresList.length - 1,'addressItem__default':item.isDefault}">
-				
-				<radio :checked="item.id === selectedId" @click="changeAds(item)"/>
+				<radio v-if="query.source" :checked="item.id === selectedId" @click="changeAds(item)"/>
 				<view>
 					<view class="addressItem--city">{{item.province}}{{item.city}}{{item.area}}</view>
 					<view class="addressItem--detail">{{item.detailAddress}}</view>
diff --git a/pages/account/setting/index.vue b/pages/account/setting/index.vue
index d9cb63c..ab39f0a 100644
--- a/pages/account/setting/index.vue
+++ b/pages/account/setting/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 15:09:06
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:40
+ * @LastEditTime: 2022-04-18 18:40:02
  * @Description: file content
 -->
 <template>
@@ -28,7 +28,7 @@ export default {
 	},
 	methods:{
 		logout(){
-			// this.$store.commit('SET_TOKEN');
+			this.$store.commit('SET_TOKEN');
 			this.$Router.replace('/login')
 		}
 	}
diff --git a/pages/order/detail/components/LogisitcsInfo.vue b/pages/order/detail/components/LogisitcsInfo.vue
index 6fe1dac..1e25fe6 100644
--- a/pages/order/detail/components/LogisitcsInfo.vue
+++ b/pages/order/detail/components/LogisitcsInfo.vue
@@ -2,12 +2,13 @@
  * @Author: ch
  * @Date: 2022-04-15 16:36:02
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 16:31:12
+ * @LastEditTime: 2022-04-18 18:38:25
  * @Description: file content
 -->
 <template>
 		<UiWhiteBox>
-			<u-cell class="address" isLink v-if="lastLogisitcs" @click="$Router.push('/addressList')">
+			<u-cell class="address" isLink v-if="lastLogisitcs" 
+				@click="$Router.push(`/logisitcsInfo?orderId=${orderInfo.orderId}`)">
 				<view slot="title" class="address--title">{{lastLogisitcs.context}}</view>
 				<image class="address--icon" slot="icon" src="@/static/order/fj.png" />
 				<view slot="label" class="address--label">
diff --git a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue b/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
index 25b5462..751e5ad 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 14:19:41
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 11:17:27
+ * @LastEditTime: 2022-04-18 18:14:30
  * @Description: file content
 -->
 <template>
@@ -12,8 +12,8 @@
 			<view class="info--cell">
 				<text class="info--cell-label">收货信息：</text>
 				<view class="info--cell-value">
-					<view>{{data.recipientName}} {{data.recipientPhone}}</view>
-					<view>{{data.recipientAddress}}</view>
+					<view class="recipient">{{data.recipientName}} {{data.recipientPhone}}</view>
+					<view class="recipient">{{data.recipientAddress}}</view>
 				</view>
 			</view>
 			<view class="info--cell">
@@ -68,4 +68,9 @@ export default {
 		text-align: right;
 	}
 }
+.recipient{
+	color: $color-grey5;
+	font-size: $font-size-sm;
+	margin-bottom: 10rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
index 60f3d59..eb38ed8 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
@@ -2,16 +2,20 @@
  * @Author: ch
  * @Date: 2022-04-14 13:44:30
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 11:08:54
+ * @LastEditTime: 2022-04-18 18:08:29
  * @Description: file content
 -->
 <template>
 	<view>
 		<UiWhiteBox>
 			<view class="title">商家已同意退货申请，请尽早退货。</view>
-			<u-cell class="address" :title="data.refundLogistics.recipientAddress" :label="`收货人：${data.refundLogistics.recipientName} ${data.refundLogistics.recipientPhone}`" 
-				:border="false">
+			<u-cell class="address" :border="false">
+				<view slot="title" class="address--title">{{data.refundLogistics.recipientAddress}}</view>
 				<image class="address--icon" slot="icon" src="@/static/order/dw.png" />
+				<view slot="label" class="address--label">
+					<text>收货人：{{data.refundLogistics.recipientName}}</text>
+					<text>{{data.refundLogistics.recipientPhone}}</text>
+				</view>
 			</u-cell>
 		</UiWhiteBox>
 		<UiWhiteBox>
@@ -164,10 +168,33 @@ export default {
 .box{
 	padding: 0 30rpx;
 }
-.address--icon{
-	width: 40rpx;
-	height: 48rpx;
-	margin-right: 10rpx;
+.address{
+	/deep/.u-cell__body__content{
+		padding: 10rpx 0;
+
+	}
+	&--title{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		width: 500rpx;
+		&__grey{
+			color: $color-grey4;
+		}
+	}
+	&--icon{
+		width: 28rpx;
+		height: 34rpx;
+		margin-right: 30rpx;
+	}
+	&--label{
+		margin-top: 26rpx;
+		text{
+			font-size: $font-size-sm;
+			color: $color-grey4;
+			margin-right: 40rpx;
+		}
+	}
 }
 .title{
 	height: 98rpx;
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index 81d51b9..3bc583a 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-04-11 18:08:06
+ * @LastEditTime: 2022-04-18 18:33:51
  * @Description: file content
 -->
 <template>
 	<view>
 		<u-cell class="address" :title="address.province + address.city + address.area" :label="address.name + address.phone" 
-			:border="false" isLink @click="$Router.push('/addressList')">
+			:border="false" isLink @click="$Router.push('/addressList?source=submitOrder')">
 			<image class="address--icon" slot="icon" src="@/static/order/dw.png" />
 		</u-cell>
 

From c4fad44718e5e095c561bcb2d57053c1a5006de9 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 19 Apr 2022 11:07:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E7=A7=92=E6=9D=80=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js                        |  5 +++--
 pages.json                                 |  6 ++++++
 pages/goods/detail/components/SkuPopup.vue | 11 +++++++---
 pages/goods/detail/index.vue               | 24 ++++++++++++++++------
 pages/order/submit.vue                     | 16 +++++++++------
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 123d286..5b8a587 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 17:42:52
+ * @LastEditTime: 2022-04-19 10:55:44
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -74,7 +74,8 @@ export const ApiPutCancelOrder = (data) =>
  * @param {*} data 
  */
 export const ApiPostWxPay = (data) => 
-	ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));
+	// ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));
+	ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/payTest`, data));
 	
 
 
diff --git a/pages.json b/pages.json
index 622e390..889a339 100644
--- a/pages.json
+++ b/pages.json
@@ -266,6 +266,12 @@
 			}
 		]
 	},
+	"style": {
+		"app-plus": {
+			"animationType": "slide-in-right",
+			"animationDuration": 300
+		}
+	},
 	"globalStyle": {
 		"navigationBarBackgroundColor": "#fff",
 		"navigationBarTextStyle" : "black",
diff --git a/pages/goods/detail/components/SkuPopup.vue b/pages/goods/detail/components/SkuPopup.vue
index f28ee71..c3c29f1 100644
--- a/pages/goods/detail/components/SkuPopup.vue
+++ b/pages/goods/detail/components/SkuPopup.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-11 10:37:46
+ * @LastEditTime: 2022-04-19 10:51:46
  * @Description: file content
 -->
 <template>
@@ -76,6 +76,11 @@ export default {
 		skuInfo : {
 			type : Array,
 			default : []
+		},
+		// 活动状态
+		activityStatus : {
+			type : String,
+			default : 'noActivity'
 		}
 	},
 	data() {
@@ -201,13 +206,13 @@ export default {
 		 * 立即购买
 		 */
 		buyNow(){
-			console.log(this.curSku)
 			this.$Router.push({
 				path : '/orderSubmit',
 				query: {
 					mode : 'buyNow',
 					skuId : this.curSku.skuId,
-					num : this.curBuyNum
+					num : this.curBuyNum,
+					activityType : this.activityStatus === 'startActivity' ? 2 : 1
 				}
 			})
 		},
diff --git a/pages/goods/detail/index.vue b/pages/goods/detail/index.vue
index 58385a9..42f01dd 100644
--- a/pages/goods/detail/index.vue
+++ b/pages/goods/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-04-13 11:33:46
+ * @LastEditTime: 2022-04-19 10:48:00
  * @Description: file content
 -->
 <template>
@@ -24,7 +24,7 @@
 			<Service></Service>
 			<u-cell label="选择" :value="curSku.name" :border="false" isLink @click="onShowSkuPopup(1)"></u-cell>
 			<SkuPopup v-model="curSku" :visible.sync="showSkuPopup" :mode="skuMode" 
-				:goodsInfo="goods" :skuInfo="skuInfoData">
+				:goodsInfo="goods" :skuInfo="skuInfoData" :activityStatus="activityStatus">
 			</SkuPopup>
 		</view>
 		<view class="goods-desc">
@@ -36,10 +36,9 @@
 				<view class="icon cart" @click="$Router.push('/cart')">购物车</view>
 			</view>
 			<view class="footer--btns">
-				<UiButton class="btn" @click="onShowSkuPopup(2)">加入购物车</UiButton>
-				<UiButton class="btn btn--buy" @click="onShowSkuPopup(3)">
-					{{(!productActivityVO.isStartActivity && productActivityVO.isActivity) ? '原价购买' : '立即购买'}}
-				</UiButton>
+				<UiButton class="btn" v-if="activityStatus !== 'startActivity' " @click="onShowSkuPopup(2)">加入购物车</UiButton>
+				<UiButton class="btn btn--buy" v-if="activityStatus === 'noStartActivity'" @click="onShowSkuPopup(3)">原价购买</UiButton>
+				<UiButton class="btn btn--buy" v-else @click="onShowSkuPopup(3)"> 立即购买</UiButton>
 			</view>
 		</view>
 	</view>
@@ -72,6 +71,19 @@ export default {
 			productActivityVO : {}
 		}
 	},
+	computed:{
+		activityStatus(){
+			// noActivity 没有活动 noStartActivity有活动，未开始 startActivity活动已开始
+			let status = 'noActivity';
+			if(this.productActivityVO.isActivity){
+				status = 'noStartActivity';
+			}
+			if(this.productActivityVO.isStartActivity){
+				status = 'startActivity';
+			}
+			return status;
+		}
+	},
 	onLoad(){
 		this.getGoodsDetail();
 	},
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index 3bc583a..af51b18 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 18:33:51
+ * @LastEditTime: 2022-04-19 10:58:00
  * @Description: file content
 -->
 <template>
@@ -108,7 +108,9 @@ export default {
 			if(query.mode === 'buyNow'){
 				res = await ApiGetBeforeOrder({
 					productSkuId : query.skuId,
-					quantity : query.num
+					quantity : query.num,
+					// 1正常购买 2活动购买
+					activityType : query.activityType
 				});
 			}
 			if(res.error){
@@ -123,13 +125,15 @@ export default {
 		 * 提交订单
 		 */
 		async submit(){
+			const {query} = this.$Route;
 			const {error, result} = await ApiPostSubmitOrder({
 				orderSource : 2,
 				recipientAddressId : this.address.id,
 				products : this.orderInfo.products.map(i => ({
 					productId : i.productId,
 					productSkuId : i.productSkuId,
-					quantity : i.quantity
+					quantity : i.quantity,
+					activityType : query.activityType
 				})),
 				userMessage : this.userMessage
 			});
@@ -140,11 +144,11 @@ export default {
 			this.wxpay(result.orderId);
 		},
 		async wxpay(orderId){
-			const {error, result} = await ApiPostWxPay({orderId});
+			const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
 			if(error){
-				this.$Router.push(`/payFail?ordId=${orderId}`)
+				this.$Router.replace(`/payFail?ordId=${orderId}`)
 			}else{
-				this.$Router.push(`/paySuccess?ordId=${orderId}`)
+				this.$Router.replace(`/paySuccess?ordId=${orderId}`)
 			}
 
 		}

From e146bb4858224cbd5a736e29bb286f77dd559ab6 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 19 Apr 2022 11:17:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E7=A7=92=E6=9D=80=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/order.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 5b8a587..faeda26 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-19 10:55:44
+ * @LastEditTime: 2022-04-19 11:10:55
  * @Description: file content
  */
 import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@@ -75,7 +75,7 @@ export const ApiPutCancelOrder = (data) =>
  */
 export const ApiPostWxPay = (data) => 
 	// ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));
-	ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/payTest`, data));
+	ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/pay/payTest`, data));