From 754f0eea0b16985a4dc8e8448e1bde7a8aec6f26 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 16:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/driver/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/h5/pages/driver/index.vue b/h5/pages/driver/index.vue
index a7b0bb0..db7e113 100644
--- a/h5/pages/driver/index.vue
+++ b/h5/pages/driver/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="main_app">
 		<view class="title_wrap">
-			<view class="name">{{ driverInfo.realname }}锛屾杩庣櫥褰曪綖</view>
-			<view class="btn" @click="loginOut">閫�鍑虹櫥褰�</view>
+			<view class="name">{{ driverInfo.realname || driverInfo.username }}锛屾杩庣櫥褰曪綖</view>
+			<view class="btn" @click="loginOut">璐﹀彿瑙g粦</view>
 		</view>
 		<!--  -->
 		<view class="banner_wrap">
@@ -64,7 +64,7 @@
 			<view class="left">
 				<view class="img_wrap img1" @click="jump('/pages/driver/notice')">
 					<image src="@/static/driver/wuliu_ic_ruyuanyuyue@2x.png" class="img"></image>
-					<view class="h1">鍏ュ洯棰勭害</view>
+					<view class="h1">鍏ュ洯鍗歌揣棰勭害</view>
 					<view class="h2">RESERVATION</view>
 				</view>
 				<view class="img_wrap img2" @click="jump('/pages/driver/reservedGuide?str=bookingTips')">
@@ -218,9 +218,9 @@
 			width: 144rpx;
 			height: 56rpx;
 			border-radius: 36rpx;
-			border: 1rpx solid $uni-color-primary;
-			font-size: 26rpx;
-			color: $uni-color-primary;
+			border: 1rpx solid #B2B2B2;
+			font-size: 26rpx;
+			color: #666666;
 			display: flex;
 			justify-content: center;
 			align-items: center;

--
Gitblit v1.9.3