Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/order/index.vue

@@ -26,8 +26,8 @@
 		</view>
 
 		<view class="line-view"></view>
-		<view class="reason-view" v-if="showReason"><text>未通过原因：</text>
-			<text class="reason-text">{{orderData.auditResults.remark}}</text>
+		<view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因：</text>
+			<text>{{orderData.auditResults.remark}}</text>
 		</view>
 		<view class="bottom-view">
 			<view>
@@ -83,7 +83,7 @@
 			 waitAppointment:待预约、
 			 waitCheckIn:待签到、
 			 waitFinish:待完工、
-			 review: 审核中、
+			 audit: 审核中、
 			 exception：异常单、
 			 finish：已完工
 			 */
@@ -158,7 +158,7 @@
 					.orderBusinessType != 'R')
 			},
 			showTime() {
-				return [4, 6].indexOf(this.orderType) != -1
+				return [4, 5, 6].indexOf(this.orderType) != -1
 			},
 			infoTexts() {
 				return {
@@ -224,7 +224,7 @@
 					'waitAppointment': 1, // 待预约、
 					'waitCheckIn': 2, // 待签到、
 					'waitFinish': 3, // 待完工、
-					'review': 4, // 审核中、
+					'audit': 4, // 审核中、
 					'exception': 5, // 异常单、
 					'finish': 6, //已完工
 				}
@@ -369,10 +369,12 @@
 			text-align: left;
 			margin-top: 30rpx;
 			font-size: 26rpx;
-			color: #666666;
-
+			color: #FA5A49;
+			display: flex;
+			align-items: flex-start;
 			.reason-text {
-				color: #FA5A49;
+				flex-shrink: 0;
+				color: #666666;
 			}
 		}
 

src/pages/index/index.vue

@@ -50,7 +50,7 @@
 		</view>
 		<!-- </view> -->
 		<!-- </scroll-view> -->
-		<view class="bottom-view" v-if="needSettled && orderList.length <= 0">
+		<view class="bottom-view" v-if="needSettled || orderList.length <= 0">
 			<view class="bottom-line-view"></view>
 			<view class="bottom-text">我也是有底线哒</view>
 			<view class="bottom-line-view"></view>

src/pages/order/index.vue

@@ -107,7 +107,7 @@
 					'waitAppointment': 0, // 待预约、
 					'waitCheckIn': 1, // 待签到、
 					'waitFinish': 2, // 待完工、
-					'review': 3, // 审核中、
+					'audit': 3, // 审核中、
 					'exception': 4, // 异常单、
 					'finish': 5, //已完工
 				}
@@ -118,7 +118,7 @@
 					0: 'waitAppointment',
 					1: 'waitCheckIn',
 					2: 'waitFinish',
-					3: 'review',
+					3: 'audit',
 					4: 'exception',
 					5: 'finish'
 				}
@@ -134,7 +134,7 @@
 				this.pageNumber = 0
 				this.orderList = []
 				this.loadStatus = 'loading'
-				this.getOrderList(index === 0 ? 0 : 5)
+				this.getOrderList(index === 0 ? this.currentIndex : 5)
 			},
 			// tab栏切换
 			change(index) {