Signed-off-by: liuboyan <632697560@qq.com>

1

pagesMain/orderList.vue

@@ -5,34 +5,34 @@
 			 inactive-color="#666666" :bold="false" height="90"></u-tabs>
 		</view>
 		<scroll-view class="order-list" scroll-y="true" @scrolltolower="handleLoadMore(1)" v-if="tabIndex==0">
-			<view style="padding-top: 10px" v-if="!orderList1.length">
+			<orderItem v-for="(item, index) in orderList1" :key="index" :orderData="item" :tabIndex="tabIndex + 1"></orderItem>
+			<view style="padding: 10px 0" v-if="!orderList1.length || isOver1">
 				<u-divider color="#909399" border-color="#909399" bg-color="#f7f7f7">没有更多了</u-divider>
 			</view>
-			<orderItem v-for="(item, index) in orderList1" :key="index" :orderData="item" :tabIndex="tabIndex + 1"></orderItem>
 		</scroll-view>
 		<scroll-view class="order-list" scroll-y="true" @scrolltolower="handleLoadMore(2)" v-else-if="tabIndex==1">
-			<view style="padding-top: 10px" v-if="!orderList2.length">
+			<orderItem v-for="(item, index) in orderList2" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
+			<view style="padding: 10px 0" v-if="!orderList2.length || isOver2">
 				<u-divider color="#909399" border-color="#909399" bg-color="#f7f7f7">没有更多了</u-divider>
 			</view>
-			<orderItem v-for="(item, index) in orderList2" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
 		</scroll-view>
 		<scroll-view class="order-list" scroll-y="true" @scrolltolower="handleLoadMore(3)" v-else-if="tabIndex==2">
-			<view style="padding-top: 10px" v-if="!orderList3.length">
+			<orderItem v-for="(item, index) in orderList3" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
+			<view style="padding: 10px 0" v-if="!orderList3.length || isOver3">
 				<u-divider color="#909399" border-color="#909399" bg-color="#f7f7f7">没有更多了</u-divider>
 			</view>
-			<orderItem v-for="(item, index) in orderList3" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
 		</scroll-view>
 		<scroll-view class="order-list" scroll-y="true" @scrolltolower="handleLoadMore(4)" v-else-if="tabIndex==3">
-			<view style="padding-top: 10px" v-if="!orderList4.length">
+			<orderItem v-for="(item, index) in orderList4" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
+			<view style="padding: 10px 0" v-if="!orderList4.length || isOver4">
 				<u-divider color="#909399" border-color="#909399" bg-color="#f7f7f7">没有更多了</u-divider>
 			</view>
-			<orderItem v-for="(item, index) in orderList4" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
 		</scroll-view>
 		<scroll-view class="order-list" scroll-y="true" @scrolltolower="handleLoadMore(5)" v-else-if="tabIndex==4">
-			<view style="padding-top: 10px" v-if="!orderList5.length">
+			<orderItem v-for="(item, index) in orderList5" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
+			<view style="padding: 10px 0" v-if="!orderList5.length || isOver5">
 				<u-divider color="#909399" border-color="#909399" bg-color="#f7f7f7">没有更多了</u-divider>
 			</view>
-			<orderItem v-for="(item, index) in orderList5" :key="index" :orderData="item" :tabIndex="tabIndex + 1" @reasetList="reasetList()"></orderItem>
 		</scroll-view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
@@ -137,15 +137,18 @@
 
 	.container {
 		width: 100%;
-		height: 100%;
+		// height: 100%;
 		float: left;
+		padding-top: 45px;
 		background-color: #f7f7f7;
-		position: absolute;
+		position: relative;
 
 		.order-tab {
 			width: 100%;
 			height: 45px;
 			float: left;
+			position: fixed;
+			top: 0;
 		}
 
 		.order-list {
@@ -154,7 +157,7 @@
 			float: left;
 			margin: 0 15px;
 			box-sizing: border-box;
-			padding-top: 15px;
+			padding-top: 10px;
 		}
 	}
 </style>