确认收货

pages/account/index/order/detail/module/LogisitcsInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 15:52:51
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 13:50:29
+ * @LastEditTime: 2022-05-16 11:18:10
  * @Description: file content
 -->
 <template>
@@ -19,11 +19,11 @@
 				</p>
 				<p>
 					<label>收货地址：</label>
-					<span>{{logisitcsInfo.recipientAddress}}{{logisitcsInfo.recipientAddress}}{{logisitcsInfo.recipientAddress}}</span>
+					<span>{{logisitcsInfo.recipientAddress}}</span>
 				</p>
 			</div>
 		</UiLineBox>
-		<UiLineBox class="logisitcs--list" v-if="logisitcsList.length">
+		<UiLineBox class="logisitcs--list" v-if="orderInfo.orderStatus > 4">
 			<div slot="head" class="title">
 				<b>物流信息</b>
 				<span>{{logisitcsInfo.companyName}}<small>{{logisitcsInfo.trackingNo}}</small></span>

pages/account/index/order/detail/module/StatusInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 11:08:57
+ * @LastEditTime: 2022-05-16 11:14:11
  * @Description: file content
 -->
 <template>
@@ -24,6 +24,7 @@
 		</div>
 </template>
 <script>
+import {ApiPutOrderReceive}  from '@/plugins/api/order';
 import BsPay from '@/components/BsPay.vue'
 import UiButton from '@/components/UiButton.vue'
 import BsCancelOrder from '../../../../../../components/BsCancelOrder.vue'

pages/account/index/order/detail/module/StatusStep.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 10:43:37
+ * @LastEditTime: 2022-05-16 11:15:29
  * @Description: file content
 -->
 <template>
@@ -96,6 +96,7 @@ export default {
 				let lastLog = logs[logs.length - 1];
 				let lastStep = {
 					type:-1, name: '交易完成', 
+					active : true,
 					icon: require('@/assets/img/account/order/order_status_5.png'),
 					iconActive : require('@/assets/img/account/order/order_status_5_active.png')
 				}

pages/account/index/order/list/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 20:47:29
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 16:55:56
+ * @LastEditTime: 2022-05-16 11:23:15
  * @Description: file content
 -->
 <template>
@@ -137,22 +137,22 @@ export default {
 			this.operationOrder = item;
 			this.cancelVisible = true;
 		},
-		receive(){
+		receive(item){
 			this.$confirm('确认已经收到货了吗？', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
 			}).then(async () => {
-				const {error} = await ApiPutOrderReceive({orderId : this.operationOrder.orderId});
+				const {error} = await ApiPutOrderReceive({orderId : item.orderId});
 				if(error){
-					uni.$toast(error.message);
+					this.$$message.error(error.message);
 					return false;
 				}
 				this.$message({
 					type: 'success',
 					message: '成功收货!'
 				});
-				this.emitStatus()
+				this.getOrderList();
 			});
 		},
 	}