Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/order/orderDetail.vue

@@ -177,7 +177,7 @@
 					</view>
 					<view class="btn"
 						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null"
-						@tap="makeMeal">
+						@tap="makeMeal" style="background: rgba(0, 35, 28, 1);color:rgba(166, 255, 234, 1);">
 						立即备餐
 					</view>
 					<view class="btn" style="width: 40%;" v-if="orderDetail.status == 2" @tap="openAddFeePopup">
@@ -1511,7 +1511,7 @@
 		font-size: 32rpx;
 		border-radius: 120rpx;
 		text-align: center;
-		margin: 0 auto;
+		margin: 0 10px;
 		font-weight: 700;
 	}
 

pages/index/index.vue

@@ -256,7 +256,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="daimai-list">
+						<view :style="{'height':lastScrollTop>583?'900px':'auto'}">
 							<view class="list-1" v-for="(item,index) in deliveryItem" :key="index" @tap="goDetail('search',item)">
 								<view class="daoda-time">
 									送达时间：{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}
@@ -1587,7 +1587,7 @@
 		padding-top:20rpx;
 	}
 	.sort-text{
-		height: 70rpx;
+		height: auto;
 		display: flex;
 		position: sticky;
 		top:0;
@@ -1624,11 +1624,11 @@
 	
 	.guize1-qusong {
 		display: flex;
-		margin-left: 40rpx;
+		margin: 0 0 20rpx 40rpx;
 	}
 	
 	.qusong1 {
-		width: 40rpx;
+		width: 40rpx ;
 		height: 40rpx;
 		background: rgba(0, 35, 28, 1);
 		color: #fff;