Merge branch 'feature/task1.0.0-0505-ch' into msb_test

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-16 11:18:10
+ * @LastEditTime: 2022-05-16 14:43:24
  * @Description: file content
 -->
 <template>
@@ -23,7 +23,7 @@
 				</p>
 			</div>
 		</UiLineBox>
-		<UiLineBox class="logisitcs--list" v-if="orderInfo.orderStatus > 4">
+		<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/StatusStep.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 11:15:29
+ * @LastEditTime: 2022-05-16 14:46:43
  * @Description: file content
 -->
 <template>
@@ -96,11 +96,10 @@ 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')
 				}
-				if(lastLog.id === 8){
+				if(lastLog.operationType === 8){
 					lastStep.createTime = lastLog.createTime;
 					lastStep.active = true;
 				}