修改样式翻译

component/carPlan/carPlan.vue

@@ -14,9 +14,9 @@
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
-						<text>已选择</text>
+						<text>{{ $t('已选择') }}</text>
 						<text>{{leaseUnitsResult}}</text>
-						<text style="margin-left: 12rpx;">时长 {{count}} 
+						<text style="margin-left: 12rpx;">{{ $t('时长') }} {{count}} 
 							<text>{{leaseUnits}}</text>
 						</text>
 						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
@@ -29,19 +29,19 @@
 				</view>
 			</view>
 			<view class="car-plan-view">
-				<view class="car-plan-title">用车方案</view>
+				<view class="car-plan-title">{{ $t('用车方案') }}</view>
 				<view class="car-plan-list-view flex-row">
 					<view v-for="(item,index) in params.rental_setting" :key="index" @click="tapSelectType(item)" :class="['flex-row' , (type == item.hire_duration_unit ? 'car-plan-list-i' : 'car-plan-list')] " 
 					>
 					
 						<view :class="(type == item.hire_duration_unit ? 'car-plan-unit-i' : 'car-plan-unit') ">
-							<text v-if="item.hire_duration_unit==1">日租</text>
-							<text v-if="item.hire_duration_unit==2">月租</text>
-							<text v-if="item.hire_duration_unit==3">年租</text>
-							<text v-if="item.hire_duration_unit==4">时租</text>
-							<text v-if="item.hire_duration_unit==5">分租</text>
-							<text v-if="item.hire_duration_unit==6">周租</text>
-							<text v-if="item.hire_duration_unit==7">季租</text>
+							<text v-if="item.hire_duration_unit==1">{{ $t('日租') }}</text>
+							<text v-if="item.hire_duration_unit==2">{{ $t('月租') }}</text>
+							<text v-if="item.hire_duration_unit==3">{{ $t('年租') }}</text>
+							<text v-if="item.hire_duration_unit==4">{{ $t('时租') }}</text>
+							<text v-if="item.hire_duration_unit==5">{{ $t('分租') }}</text>
+							<text v-if="item.hire_duration_unit==6">{{ $t('周租') }}</text>
+							<text v-if="item.hire_duration_unit==7">{{ $t('季租') }}</text>
 						</view>
 						<view :class="(type == item.hire_duration_unit ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{item.hire_price/100}}</text></view>
 					</view>
@@ -64,7 +64,7 @@
 					<view class="flex-row free-num-tip">自费换电：$1/次</view>
 				</view> -->
 				<view v-if="type!=100" class="plan-time flex-row flex-between">
-					<view>租车时长</view>
+					<view>{{ $t('租车时长') }}</view>
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
 							 共 
@@ -92,7 +92,7 @@
 				</view> -->
 			</view>
 			<view class="lift-btn-view">
-				<view @tap="checkOrder" class="lift-btn">确认</view>
+				<view @tap="checkOrder" class="lift-btn">{{ $t('确认') }}</view>
 			</view>
 		</view>
 		

component/returnCar/returnCar.vue

@@ -2,13 +2,13 @@
     	<view v-if="isShowReturnCar" class="return-box">
 			<view class="return-item">
 				<view class="return-title flex-row flex-between">
-					<view>还车到门店</view>
+					<view>{{ $t('还车到门店') }}</view>
 					<view @tap="closeShowReturnCar" class="close-view"><img style="width: 24rpx;height: 24rpx;" src="https://qiniu.bms16.com/FoWVlo-Nmx6wTDpsL2Rf9_BamU7L" alt=""></view>
 				</view>
-				<view class="return-text">系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。</view>
+				<view class="return-text">{{ $t('系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。') }}</view>
 				<view class="return-btn flex-row">
-					<view @tap="navStore">导航到店</view>
-					<view @tap="immediatelyReturn">我已到店</view>
+					<view @tap="navStore">{{ $t('导航到店') }}</view>
+					<view @tap="immediatelyReturn">{{ $t('我已到店') }}</view>
 				</view>
 				<view v-if="typePage=='index'" style="height: 110rpx;"></view>
 			</view>

component/useGuidance/useGuidance.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="tip-view">
 		<view class="tip-title-view flex-row align-center">
-			<image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
-				mode='aspectFit'></image>
+			<!-- <image style="width: 144rpx;height: 40rpx;" src="https://qiniu.bms16.com/FjUW1kuRvXWTEftyn9nH1AbGWuxK"
+				mode='aspectFit'></image> -->
+			<text class="txt-guide">{{ $t('使用指导') }}</text>
 			<image style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
 				mode='aspectFill'></image>
 			<view class="w-bg flex-row"></view>
@@ -13,13 +14,11 @@
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB"
-					mode='aspectFit'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FqDzYwAbnSEgf3yv9SAb92Vq4ZEB" mode='aspectFit'></image>
 			</view>
 			<view class="dashed-line"></view>
 			<view class="icon-list-view">
-				<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un"
-					mode='aspectFit'></image>
+				<image class="img1" src="https://qiniu.bms16.com/FlFMHzco6j9XOpMI21tSnR9500Un" mode='aspectFit'></image>
 			</view>
 		</view>
 		<view class="step-tip-view flex-row  align-center">
@@ -64,12 +63,22 @@
 		/* height: 80rpx; */
 	}
 
+	.txt-guide {
+		font-family: PingFangSC, PingFang SC;
+		height: 40rpx;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+
 	.tip-title-view {
 		padding-left: 24rpx;
 		/* border-radius: 40rpx; */
 	}
+
 	.w-bg {
-		width: 100%;
+
+		flex: 1;
 		height: 80rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 40rpx 0rpx 0rpx;

locale/en.json

@@ -849,5 +849,12 @@
 	"祝您骑行愉快": "Enjoy Your Ride!",
 	"车辆已被租售！": "Vehicle Rented or Sold!",
 	"全部": "All",
-	"立即支付": "Pay Now"
+	"立即支付": "Pay Now",
+	"使用指导": "Usage Guide",
+	"本次消费门店": "Store of this purchase",
+	"已选择": "Selected",
+	"用车方案": "Vehicle Usage Plan",
+	"时长": "Rental Duration",
+	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "The system will determine whether you have arrived at the return location based on your positioning. If you have already arrived at the store, please click the 'I have arrived at the store' button. After the store confirms the return, the car return process will be successfully completed"
+
 }

locale/zh.json

@@ -849,5 +849,11 @@
 	"祝您骑行愉快": "祝您骑行愉快",
 	"车辆已被租售！": "车辆已被租售！",
 	"全部": "全部",
-	"立即支付": "立即支付"
+	"立即支付": "立即支付",
+	"使用指导": "使用指导",
+	"本次消费门店": "本次消费门店",
+	"已选择": "已选择",
+	"用车方案": "用车方案",
+	"时长": "时长",
+	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。"
 }

pages/carDetail/carDetail.css

@@ -163,7 +163,7 @@
 	text-align: center;
 }
 .w-bg{
-	width: 100%;
+	flex: 1;
 	height: 80rpx;
 	background: #FFFFFF;
 	border-radius: 0rpx 40rpx 0rpx 0rpx;

pages/carDetail/carDetail.vue

@@ -52,8 +52,7 @@
 			<useGuidance />
 			<view class="card-car-detail">
 				<view class="step-title-view flex-row align-center">
-					<img style="width: 208rpx;height: 40rpx;" src="https://qiniu.bms16.com/Fms8V0l4bNwGUgWwkdRku4dIx_tt"
-						alt="">
+					<text class="txt-guide">{{ $t('本次消费门店') }}</text>
 					<img style="width: 86rpx;height: 80rpx;" src="https://qiniu.bms16.com/FibAaPERzqi6m95EP2jREUKixjUi"
 						alt="">
 					<view class="w-bg flex-row"></view>
@@ -294,4 +293,12 @@
 		font-size: 28rpx;
 		padding: 34rpx 32rpx 32rpx;
 	}
+
+	.txt-guide {
+		font-family: PingFangSC, PingFang SC;
+		height: 40rpx;
+		color: #FFFFFF;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
 </style>

pages/loginRegister/register.vue

@@ -118,7 +118,7 @@ export default {
             http.postApi(config.API_REGISTER_EMAIL, {
                 ...this.form
             }, res => {
-                const { msg: title } = res.body
+                const { msg: title } = res.data
                 if (res.succeed) {
                     uni.showToast({ title:this.$t('注册邮件发送成功'), icon: 'none' })
                     this.isSendSucceed = true