From 1c3462f7c7cbb769025b91a6ae827ce71b2f2b40 Mon Sep 17 00:00:00 2001
From: wangzhen <37717239@qq.com>
Date: Tue, 20 Apr 2021 19:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6.wz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agent/detail/index.js   | 19 +++----------------
 pages/agent/detail/index.wxml | 35 ++++++-----------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js
index fcb1246..4a499b8 100644
--- a/pages/agent/detail/index.js
+++ b/pages/agent/detail/index.js
@@ -19,7 +19,7 @@ Page({
     id: null,
     cancel: true,
     orderInfo: null,
-    orderInfoStep: null,
+    orderInfoStepLs:null
   },
   /**
    * 生命周期函数--监听页面加载
@@ -66,23 +66,10 @@ Page({
       })
       var orderInfoStepLs = result.data.orderItems
       result.data.orderItems.forEach((element1, index1) => {
-        var dataLength=0;
-        for (let i = 0; i < 5; i++) {
-            if (element1.orderItemTimeList[i]) {//有数据
-              dataLength=i;
-              orderInfoStepLs[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
-              orderInfoStepLs[index1].orderItemTimeList[i].rank= i
-            } else {
-              orderInfoStepLs[index1].orderItemTimeList[i] = {
-                description: this.getStr(i),
-                time: "",
-                rank: i
-              }
-            }
+        for (let i = 0; i <element1.orderItemTimeList.length; i++) {
+          orderInfoStepLs[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
         }
-        orderInfoStepLs[index1].datalength=dataLength;
       });
-      console.log('hhhh', orderInfoStepLs)
       this.setData({
         orderInfoStep: orderInfoStepLs
       })
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index e088f06..8decae5 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -30,7 +30,7 @@
 				</view>
 				<wux-steps direction="vertical">
 					<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-					title="{{timeItem.description}}" status="{{statusStep(oindex, item.orderItemTimeList.length, item.datalength)}}" content="{{timeItem.time}}"/>
+					title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}"/>
 				</wux-steps>
 			</wux-accordion>
 		</wux-accordion-group>
@@ -289,7 +289,7 @@
 			</view>
       <wux-steps direction="vertical">
 				<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-				title="{{timeItem.description}}" status="{{statusStep(oindex, item.orderItemTimeList.length,item.datalength)}}" content="{{timeItem.time}}"/>
+				title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}"/>
       </wux-steps>
 		</wux-accordion>
 	</wux-accordion-group>
@@ -337,7 +337,7 @@
 			</view>
       <wux-steps direction="vertical">
 				<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-				title="{{timeItem.description}}" status="{{statusStep(oindex, item.orderItemTimeList.length,item.datalength)}}" content="{{timeItem.time}}"/>
+				title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}"/>
       </wux-steps>
 		</wux-accordion>
 	</wux-accordion-group>
@@ -451,7 +451,7 @@
 			</view>
       <wux-steps direction="vertical">
 				<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-				title="{{timeItem.description}}" status="{{statusStep(oindex, item.orderItemTimeList.length, item.datalength)}}" content="{{timeItem.time}}"/>
+				title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}"/>
       </wux-steps>
 		</wux-accordion>
 	</wux-accordion-group>
@@ -486,31 +486,8 @@
 <wux-dialog id="wux-dialog" />
 
 <wxs module="statusStep">
-	function statusStep(step, size, datalength) {
-		// console.log("step=",step);
-		// console.log("size=",size);
-		// console.log("datalength=",datalength);
-		return step<datalength?"finish":(step==datalength?"process":"wait");
-		// if(status == 54 || status == 55){
-		// 	return 'finish'
-		// }
-		// if(size == 1){
-    //   return 'wait'
-		// } else if(size == 2){
-    //   if(step == 0){
-		// 		return 'process'
-		// 	} else {
-		// 		return 'wait'
-		// 	}
-    // } else {
-		// 	if(step == size - 2){
-		// 		return 'process'
-		// 	} else if(step == size - 1){
-		// 		return 'wait'
-		// 	} else {
-		// 		return 'finish'
-		// 	}
-		// }
+	function statusStep(status) {
+		return status==1?"process":"wait";
 	}
 	module.exports = statusStep
 </wxs>
\ No newline at end of file