From 29658de29b2eb5292bf0c2fad7427b374b769ebc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 10 五月 2023 20:29:31 +0800
Subject: [PATCH] 样式修改,引入字体,修改逻辑

---
 pages/driver-page/drvier-my/drvier-my.vue |  333 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 258 insertions(+), 75 deletions(-)

diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 59b3200..464ddd6 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -1,23 +1,101 @@
 <template>
 	<view class="driver-my">
-		<!-- <view class="jifen">
-			<view class="zheng">
-				<image src="../../../static/image/鏃犱汉鍊煎畧/缁� 38_1.png"></image>
-				<view class="font">
-					<view class="font-top">100</view>
-					<view class="font-bottom">姝gН鍒�</view>
+		<view class="driver-banner">
+			<view class="navgation">鎴戠殑</view>
+			<view class="avatar">
+				<view class="avatar-imgage" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/avatar.png')no-repeat;background-size: cover;"></view>
+				<view class="avatar-name">{{ userInfo.name || '' }}</view>
+				<view class="edit-button"><u-button type="primary" @click="editBtnClick" shape="circle" plain>缂栬緫涓汉璧勬枡</u-button></view>
+			</view>
+			<view class="personal-information">
+				<view class="personal-information-block">
+					<view class="block-main">
+						<view class="information-line" @click="">
+							<view class="line-label">
+								<image src="https://mx.jzeg.cn:9095/appimg/image/banner/personalicon.png" mode="widthFix"></image>
+								<view class="label-text">韬唤璇佸彿</view>
+							</view>
+							<view class="information-value">
+								{{ userInfo.idCard }}
+								<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon>
+							</view>
+						</view>
+						<view class="information-line">
+							<view class="line-label">
+								<image src="https://mx.jzeg.cn:9095/appimg/image/banner/phonenum.png" mode="widthFix"></image>
+								<view class="label-text">鎵嬫満鍙�</view>
+							</view>
+							<view class="information-value">
+								{{ userInfo.phone }}
+								<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon>
+							</view>
+						</view>
+						<view class="information-line">
+							<view class="line-label">
+								<image src="https://mx.jzeg.cn:9095/appimg/image/banner/carnum.png" mode="widthFix"></image>
+								<view class="label-text">杞︾墝鍙�</view>
+							</view>
+							<view class="information-value">
+								{{ userInfo.carNo }}
+								<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon>
+							</view>
+						</view>
+						<view class="information-line">
+							<view class="line-label">
+								<image src="https://mx.jzeg.cn:9095/appimg/image/banner/axisnum.png" mode="widthFix"></image>
+								<view class="label-text">杞﹁酱鏁�</view>
+							</view>
+							<view class="information-value">
+								{{ userInfo.axleNum }}
+								<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon>
+							</view>
+						</view>
+						<view class="information-line last">
+							<view class="line-label">
+								<image src="https://mx.jzeg.cn:9095/appimg/image/banner/weighnum.png" mode="widthFix"></image>
+								<view class="label-text">浣撻噸</view>
+							</view>
+							<view class="information-value">
+								{{ userInfo.weight }}
+								<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-			<view class="fu">
-				<image src="../../../static/image/鏃犱汉鍊煎畧/缁� 38.png"></image>
-				<view class="font">
-					<view class="font-top">-60</view>
-					<view class="font-bottom">璐熺Н鍒�</view>
+		</view>
+		<view class="car-information">
+			<view class="information-main">
+				<view class="information-body">
+					<view class="car-img">
+						<view class="label-title">
+							<image src="https://mx.jzeg.cn:9095/appimg/image/banner/carimg.png" mode="widthFix"></image>
+							<view class="label-text">杞﹁締鐓х墖</view>
+						</view>
+						<view class="img-container">
+							<u--image :showLoading="true" :src="userInfo.carImg != null ? BaseUrl + userInfo.carImg : ''" width="80px" height="80px" @click="imageClick(1)">
+								<view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+							</u--image>
+						</view>
+					</view>
+					<view class="car-img">
+						<view class="label-title">
+							<image src="https://mx.jzeg.cn:9095/appimg/image/banner/cardimg.png" mode="widthFix"></image>
+							<view class="label-text">琛岄┒璇佺収鐗�</view>
+						</view>
+						<view class="img-container">
+							<u--image :showLoading="true" :src="userInfo.drivingImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(2)">
+								<view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+							</u--image>
+						</view>
+					</view>
 				</view>
 			</view>
-		</view> -->
-
-		<view class="personal-information-form">
+		</view>
+		<view class="loginout">
+			<view class="loginout-main"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout" shape="circle" plain></u-button></view>
+		</view>
+		<!-- <view class="personal-information-form">
 			<u--form labelPosition="left" :model="userInfo" ref="form1">
 				<u-form-item labelWidth="20%" label="濮撳悕" ref="item1">
 					<u--input v-model="userInfo.name" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
@@ -38,22 +116,27 @@
 					<u--input border="none" inputAlign="right" disabled disabledColor="#fff"></u--input>
 				</u-form-item>
 				<u-form-item labelWidth="20%" label="杞﹁締鐓х墖" ref="item1">
-					<u--image :showLoading="true" :src="BaseUrl + userInfo.carImg" width="80px" height="80px" @click="imageClick(1)"></u--image>
+					<u--image :showLoading="true" :src="userInfo.carImg != null ? BaseUrl + userInfo.carImg : ''" width="80px" height="80px" @click="imageClick(1)">
+						<view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+					</u--image>
 				</u-form-item>
 				<u-form-item labelWidth="25%" label="琛岄┒璇佺収鐗�" ref="item1">
-					<u--image :showLoading="true" :src="BaseUrl + userInfo.drivingImg" width="80px" height="80px" @click="imageClick(2)"></u--image>
+					<u--image :showLoading="true" :src="userInfo.drivingImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(2)">
+						<view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+					</u--image>
 				</u-form-item>
 			</u--form>
 			<view class="push-information-button">
-				<u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button>
 				<u-button text="淇敼涓汉璧勬枡" type="primary" @click="editBtnClick"></u-button>
-			</view>
-		</view>
+				<u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button>
+			</view> -->
+		<!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
+		<!-- </view> -->
 
 		<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
 		<view class="previewImage-container">
 			<u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
-				<u--image :src="BaseUrl + previewImageSrc" width="400px" height="400px"></u--image>
+				<u--image :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''" width="400px" height="400px"></u--image>
 			</u-popup>
 		</view>
 
@@ -105,7 +188,8 @@
 				carImg: '',
 				drivingImg: '',
 				axleNum: '',
-				weight: ''
+				weight: '',
+				userId: ''
 			},
 			src: '',
 			fileList1: [],
@@ -134,11 +218,9 @@
 				title: '鍔犺浇涓�...'
 			});
 			this.$reqGet('getUserEntity').then(res => {
-				console.log(res, '鍙告満璇︽儏');
 				uni.hideLoading();
 				this.userInfo = res.data;
 				Object.keys(this.editUserInfo).map(item => {
-					console.log(res.data[item]);
 					if (res.data[item]) {
 						this.editUserInfo[item] = res.data[item];
 					}
@@ -195,7 +277,7 @@
 		uploadFilePromise(url, num) {
 			return new Promise((resolve, reject) => {
 				let a = uni.uploadFile({
-					url: BaseUrl + '/admin/sys-file/uploadUnToken', // 浠呬负绀轰緥锛岄潪鐪熷疄鐨勬帴鍙e湴鍧�
+					url: BaseUrl + '/admin/sys-file/uploadUnToken',
 					filePath: url,
 					name: 'file',
 					// formData: {
@@ -255,79 +337,180 @@
 		},
 		logoutCancel() {
 			this.logoutShow = false;
+		},
+		// 璺宠浆鍙戣繍缁熻椤甸潰
+		statistics() {
+			uni.navigateTo({
+				url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+@mixin flex {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.statistics {
+	margin-top: vww(10);
+	margin-bottom: vww(10);
+}
 ::v-deep.driver-my {
-	width: 90%;
+	width: 100%;
 	margin: 0 auto;
 	padding-bottom: vww(60);
-	// 绉垎
-	.jifen {
-		margin-top: vww(24);
+	.driver-banner {
 		width: 100%;
-		height: vww(120);
-		background: #ffffff;
-		border-radius: 8px;
-		box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		.zheng {
-			width: 50%;
+		height: 430rpx;
+		background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
+		background-size: contain;
+		position: fixed;
+		top: 0;
+		.navgation {
+			width: 80rpx;
+			height: 37rpx;
+			font-size: 40rpx;
+			font-weight: normal;
+			color: #ffffff;
+			line-height: 69rpx;
+			margin: vww(60) auto;
+		}
+		.avatar {
+			width: 100%;
+			height: 430rpx;
 			display: flex;
-			image {
-				margin-left: vww(32);
-				width: vww(48);
-				height: vww(48);
+			align-items: center;
+			position: fixed;
+			top: 0;
+			.avatar-imgage {
+				width: 98rpx;
+				height: 98rpx;
+				margin-left: vww(18);
+				@include flex;
+				justify-content: center;
 			}
-			.font {
-				margin-left: vww(8);
-				&-top {
-					font-size: vww(28);
-					font-weight: 700;
-					text-align: left;
-					color: #1987ff;
-				}
-				&-bottom {
-					font-size: 14px;
-					font-weight: 400;
-					text-align: left;
-					color: #111111;
-				}
+			.avatar-name {
+				width: 136rpx;
+				height: 32rpx;
+				font-size: 34rpx;
+				font-weight: bold;
+				color: #ffffff;
+				margin-left: vww(17);
+			}
+			.edit-button {
+				position: relative;
+				left: vww(94);
+				top: vww(4);
 			}
 		}
-		.fu {
-			width: 50%;
+		.personal-information {
+			width: 100%;
 			display: flex;
-			image {
-				margin-left: vww(32);
-				width: vww(48);
-				height: vww(48);
-			}
-			.font {
-				margin-left: vww(8);
-				&-top {
-					font-size: vww(28);
-					font-weight: 700;
-					text-align: left;
-					color: #ff4233;
+			justify-content: center;
+			position: relative;
+			top: vww(20);
+			&-block {
+				width: 690rpx;
+				height: 478rpx;
+				background: #ffffff;
+				box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+				border-radius: 20rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.block-main {
+					width: 636rpx;
+					margin: vww(10) vww(14);
 				}
-				&-bottom {
-					font-size: 14px;
-					font-weight: 400;
-					text-align: left;
-					color: #111111;
+
+				.information-line {
+					@include flex width: 636rpx;
+					height: vww(45);
+					border-bottom: 1rpx solid #f0f1f6;
+					.line-label {
+						width: 188rpx;
+						height: 90rpx;
+						@include flex image {
+							width: 50rpx;
+							height: 50rpx;
+						}
+						.label-text {
+							width: 120rpx;
+							font-size: 30rpx;
+							font-weight: 400;
+							color: #000000;
+							line-height: 85rpx;
+						}
+					}
+					.information-value {
+						min-width: vww(125);
+						@include flex;
+						font-size: 30rpx;
+						font-weight: 400;
+						color: #000000;
+						line-height: 85rpx;
+					}
+				}
+				.last {
+					border-bottom: 0;
 				}
 			}
 		}
 	}
+	.car-information {
+		width: 100%;
+		position: relative;
+		top: vww(410);
+		@include flex justify-content: center;
+		.information-main {
+			width: 690rpx;
+			height: 552rpx;
+			background: #ffffff;
+			box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+			border-radius: 20rpx;
+			.information-body {
+				width: 636rpx;
+				margin: vww(15) vww(14);
+				@include flex flex-direction: column;
+				.car-img {
+					height: 246rpx;
+					width: 100%;
+					@include flex flex-direction: column;
+					align-items: flex-start;
+					.label-title {
+						@include flex width: 200rpx;
+						height: 100rpx;
+						.label-text {
+							width: 200rpx;
+							height: 50rpx;
+						}
+						image {
+							width: 50rpx;
+							height: 50rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.loginout {
+		width: 100%;
+		height: 74rpx;
+		@include flex;
+		justify-content: center;
+		position: relative;
+		bottom: vww(-430);
+		.loginout-main {
+			width: 84%;
+		}
+	}
 	// 琛ㄥ崟
 	.personal-information-form {
-		// margin-top: vww(24);
+		margin-top: vww(200);
+
 		.push-information-button {
 			display: flex;
 			margin: vww(20) auto 0;

--
Gitblit v1.9.1