Merge remote-tracking branch 'origin/master'

pages/rescue/initiate.vue

@@ -100,23 +100,26 @@
 					</view>
 				</view>
 			</view>
-		
+
 			<view class="tinput">
 				<view class="text1"> 现场图片</view>
 				<view class="you">
 					<!-- <input type="text" placeholder="请输入现场图片"> -->
-					<text style="color: #929292;font-size: 24rpx">上传图片</text>
+					<!-- 上传图片 -->
+					<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10">
+						<view style="display: flex;align-items: center;justify-content: center;height: 100%;">
+							<text style="color: #929292;font-size: 24rpx">上传图片</text>
+						</view>
+					</u-upload>
 				</view>
 			</view>
 			<view class="tinput">
 				<view class="text1"> 备注</view>
 				<view class="you">
-					<input type="text" placeholder-style="color: #929292;font-size: 24rpx" placeholder="添加备注" v-model="rescueDetail">
+					<input type="text" placeholder-style="color: #929292;font-size: 24rpx" placeholder="添加备注"
+						v-model="rescueDetail">
 				</view>
 			</view>
-			<!-- 上传图片 -->
-			<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
-				:maxCount="10"></u-upload>
 			<u-datetime-picker :show="show" v-model="value1" @confirm="confirms" @cancel="cancels"
 				mode="datetime"></u-datetime-picker>
 
@@ -165,7 +168,8 @@
 				rescueSceneImage: [],
 				rescueTime: '请选择约定时间',
 				carzhi: 0,
-				car: [{
+				car: [
+					{
 						text: '大',
 						id: 1
 					},
@@ -662,10 +666,10 @@
 		box-sizing: border-box;
 		padding: 36rpx;
 		margin-top: 14px;
-		
+
 		background: #FFFFFF;
 		border-radius: 16rpx;
-		border: 2rpx solid rgba(50,125,251,0.05);
+		border: 2rpx solid rgba(50, 125, 251, 0.05);
 	}
 
 	.you {
@@ -706,7 +710,7 @@
 		align-items: center;
 		color: #fff;
 		margin-top: 30rpx;
-		
+
 		background: #327DFB;
 		border-radius: 12rpx;
 	}

pages/rescue/rescue.vue

@@ -2,11 +2,11 @@
 <template>
 	<view class="content">
 		<!-- 顶部 -->
-		<view class="content-top">
+		<view class="content-top" :style="{ paddingTop: homeHeaderPaddingTop + 'px' }">
 			<view class="top-two">
 				<view class="top-left">
 					<view class="left1">
-						<text>当前时间</text>
+						<text>日期</text>
 					</view>
 					<view class="left2">
 						<text>{{currentTime || ''}}</text>
@@ -14,10 +14,11 @@
 				</view>
 				<!-- #ifdef APP-PLUS || H5 -->
 				<view class="top-right">
-					<view class="">
-						<uni-icons type="location-filled" color="#fff" size="16"></uni-icons>
-					</view>
 					<view class="">{{positionInfo}}</view>
+					<!-- <view class=""> -->
+						<image class="top-right-icon" src="@/static/icons/bottom.png" mode="aspectFit"></image>
+						<!-- <uni-icons type="location-filled" color="#fff" size="16"></uni-icons> -->
+					<!-- </view> -->
 				</view>
 				<!-- #endif -->
 			
@@ -239,6 +240,16 @@
 	export default {
 		data() {
 			return {
+				// #ifdef MP
+				homeHeaderPaddingTop: 0,
+				homeHeaderMenuHeight: 0,
+				homeHeaderMenuLeft: 0,
+				// #endif
+				// #ifdef APP || H5
+				homeHeaderPaddingTop: uni.upx2px(90),
+				homeHeaderMenuHeight: 50,
+				homeHeaderMenuLeft: 0,
+				// #endif
 				busiTypeList: [{
 						label: '拖车',
 						icon: require('@/static/icons/order/tuoche.png')
@@ -337,6 +348,14 @@
 			this.register()
 			this.jyPushStart()
 			console.log(require('@/static/icons/homeTopMenu/icon_tenement.png'), "require");
+			
+			// #ifdef MP
+			const {barHeight, barTop, menuButtonLeft} = getWXStatusHeight()
+			console.log('barHeight, barTop, menuButtonLeft: ',barHeight, barTop, menuButtonLeft);
+			this.homeHeaderPaddingTop = barTop || 0
+			this.homeHeaderMenuHeight = barHeight
+			this.homeHeaderMenuLeft = menuButtonLeft - 6
+			// #endif
 		},
 		onShow() {
 			this.timeWeekFormat()
@@ -633,20 +652,21 @@
 	}
 
 	.top-left {
-		width: 180px;
+		height: 58rpx;
-		height: 26px;
 		box-sizing: border-box;
-		border-radius: 50px;
+		// border-radius: 50px;
-		background-color: #D1EDFF;
+		// background-color: #D1EDFF;
 		display: flex;
 		justify-content: space-between;
 		overflow: hidden;
 	}
 
 	.left1 {
-		width: 50%;
+	width: 112rpx;
-		background: linear-gradient(87deg, #B6E1FF 0%, #339DFF 100%);
+	height: 58rpx;
-		font-size: 13px;
+		background: rgba(255, 255, 255, 0.2);
+		border-radius: 200rpx 0rpx 0rpx 200rpx;
+		font-size: 26rpx;
 		color: white;
 		font-weight: 400;
 		text-align: center;
@@ -656,9 +676,11 @@
 	}
 
 	.left2 {
-		width: 50%;
+		width: 146rpx;
-		background: #D1EDFF;
+		height: 58rpx;
-		font-size: 13px;
+		background: #FFFFFF;
+		border-radius: 0rpx 29rpx 29rpx 0rpx;
+		font-size: 26rpx;
 		color: #207EFE;
 		font-weight: 400;
 		text-align: center;
@@ -670,15 +692,20 @@
 	.top-right {
 		display: flex;
 		align-items: center;
-		font-size: 14px;
+		font-size: 34rpx;
 		font-weight: 400;
 		color: #fff;
+		line-height: 1;
+		.top-right-icon {
+			width: 44rpx;
+			height: 44rpx;
+		}
 	}
 	
 	.top-menu {
 		display: flex;
 		justify-content: space-between;
-		padding: 42rpx 0 32rpx;
+		padding: 50rpx 0 36rpx;
 	}
 	.top-menu-item {
 		color: #fff;
@@ -686,6 +713,7 @@
 		flex-direction: column;
 		align-items: center;
 		row-gap: 12rpx;
+		font-size: 28rpx;
 	}
 	.top-menu-item-icon {
 		width: 60rpx;