From 7934b046c1f899eed92fdad858021093bf95845e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 27 Apr 2021 22:12:29 +0800
Subject: [PATCH] no message

---
 components/refresh-view/index.wxml                |  1 +
 pages/agent/index/index.js                        |  8 ++++----
 pages/agent/order-detail/item-car-info/index.wxml | 14 ++++++++++----
 pages/agent/order-item/index.wxml                 |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/refresh-view/index.wxml b/components/refresh-view/index.wxml
index 9068d74..eaab87e 100644
--- a/components/refresh-view/index.wxml
+++ b/components/refresh-view/index.wxml
@@ -15,6 +15,7 @@
       <view class="loading" style="border-top:5rpx solid {{color}};border-left:5rpx solid {{color}};border-right:5rpx solid {{color}};" />
     </view>
     <!-- 刷新内容 -->
+    <view style="height:10rpx"></view>
     <slot></slot>
   </view>
 </scroll-view>
\ No newline at end of file
diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js
index a7d7d52..55e4ea6 100644
--- a/pages/agent/index/index.js
+++ b/pages/agent/index/index.js
@@ -15,10 +15,10 @@ Component({
     userInfo: app.userInfo,
     height: app.globalData.safeFragmentHeight,
     tabList: [
-      { status: 1, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
-      { status: 2, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
-      { status: 3, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
-      { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+      { status: 50, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
+      { status: 51, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
+      { status: 53, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
+      { status: 54, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
     ]
   },
   lifetimes: {
diff --git a/pages/agent/order-detail/item-car-info/index.wxml b/pages/agent/order-detail/item-car-info/index.wxml
index ab92665..11e2c12 100644
--- a/pages/agent/order-detail/item-car-info/index.wxml
+++ b/pages/agent/order-detail/item-car-info/index.wxml
@@ -10,9 +10,9 @@
 			<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
 		</view>
 		<view style="padding-top:24rpx">
-			<van-steps direction="column" step-min-height="120">
+			<van-steps direction="column" active-index="{{statusStep(item.orderItemTimeList)}}" status="process" step-min-height="128">
 				<van-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-					title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" describe="{{timeItem.time}}">
+					title="{{timeItem.description}}" describe="{{timeItem.time}}">
 				</van-step>
 			</van-steps>
 		</view>
@@ -20,8 +20,14 @@
 </van-collapse>
 
 <wxs module="statusStep">
-	function statusStep(status) {
-		return status == 1 ? "process" : "wait";
+	function statusStep(timeList) {
+		var step = 0
+		for (var index = 0; index < timeList.length; index++) {
+			if(timeList[index].status === 1){
+				step ++
+			}
+		}
+		return step - 1
 	}
 	module.exports = statusStep
 </wxs>
\ No newline at end of file
diff --git a/pages/agent/order-item/index.wxml b/pages/agent/order-item/index.wxml
index 1ab89dc..21dd924 100644
--- a/pages/agent/order-item/index.wxml
+++ b/pages/agent/order-item/index.wxml
@@ -2,7 +2,7 @@
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
 <view class="flex flex-justify item-content" style="border-bottom:2rpx solid #f3f3f3" bindtap="lookItem">
 	<view class="flex flex-center">
-		<van-image use-loading-slot width="40rpx" height="40rpx" radius="4" lazy-load src="{{item.logoImg}}">
+		<van-image use-loading-slot width="40rpx" height="40rpx" round lazy-load src="{{item.logoImg}}">
 			<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
 		</van-image>
 		<text class="text-sg text-bold" style="margin-left:8rpx">{{item.paperMillName}}</text>