common/common.js

@@ -873,7 +873,6 @@ function formatTimeDifference(timestamp) {
 	const totalHours = diff / (1000 * 60 * 60)
 	let days = 0;
 	let hours;
-	
 	if (totalHours >= 24) {
 		days = Math.floor(totalHours / 24); // 计算完整天数
 		hours = Math.round(totalHours % 24); // 剩余小时四舍五入

common/constant.js

@@ -2,7 +2,7 @@
 export const QINIU_URL = 'https://qiniu.bms16.com/';
 export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
 export const defaultHeadImg = `${QINIU_URL}/FpzmRTePsa2QSxemAbc-xWdzSsn1`
-
+import i18n from '../locale/index.js';
 // 租赁周期
 export const LEASE_TYPE = {
 	'day': 1, // 日租
@@ -15,14 +15,14 @@ export const LEASE_TYPE = {
 	'buy': 100, // 购买
 }
 export const LEASE_TYPE_ARR = [
-	{ label: '日租', value: LEASE_TYPE.day, type: 'day', unit: '天' ,sort:3},
-	{ label: '月租', value: LEASE_TYPE.month, type: 'month', unit: '月' ,sort:5},
-	{ label: '年租', value: LEASE_TYPE.year, type: 'year', unit: '年' ,sort:7},
-	{ label: '时租', value: LEASE_TYPE.hour, type: 'hour', unit: '小时',sort:2 },
-	{ label: '分租', value: LEASE_TYPE.minute, type: 'minute', unit: '分钟',sort:1 },
-	{ label: '周租', value: LEASE_TYPE.week, type: 'week', unit: '周' ,sort:4},
-	{ label: '季租', value: LEASE_TYPE.quarter, type: 'quarter', unit: '季',sort:6 },
-	{ label: '购买', value: LEASE_TYPE.buy, type: 'buy', unit: '买' ,sort:8}
+	{ label: i18n.t('日租'), value: LEASE_TYPE.day, type: 'day', unit: i18n.t('天') ,sort:3},
+	{ label: i18n.t('月租'), value: LEASE_TYPE.month, type: 'month', unit: i18n.t('月') ,sort:5},
+	{ label: i18n.t('年租'), value: LEASE_TYPE.year, type: 'year', unit: i18n.t('年') ,sort:7},
+	{ label: i18n.t('时租'), value: LEASE_TYPE.hour, type: 'hour', unit: i18n.t('小时'),sort:2 },
+	{ label: i18n.t('分租'), value: LEASE_TYPE.minute, type: 'minute', unit: i18n.t('分钟'),sort:1 },
+	{ label: i18n.t('周租'), value: LEASE_TYPE.week, type: 'week', unit: i18n.t('周') ,sort:4},
+	{ label: i18n.t('季租'), value: LEASE_TYPE.quarter, type: 'quarter', unit: i18n.t('季'),sort:6 },
+	{ label: i18n.t('购买'), value: LEASE_TYPE.buy, type: 'buy', unit: i18n.t('买') ,sort:8}
 ]
 export const MAX_LIMITS = {
   4: { max: 24, message: '最多可以选择24小时' },

common/storage.js

@@ -53,7 +53,7 @@ const activeTabs = [
 		iconUrl: `${QINIU_URL}FppwhbFzrEmDeJQgZJtDTu6WOoMZ`
 	},
 	{
-		name: i18n.t('打开尾箱锁'),
+		name: i18n.t('打开尾箱'),
 		type:'openTailBox',
 		iconUrl: `${QINIU_URL}Fv3KLuYWEeV5IM4_2sMbmur7yZtz`
 	},

component/comPopup/Notice.vue

@@ -5,8 +5,8 @@
             <view class="title">{{ title }}</view>
             <view class="tips">
                 <text v-if="type=='bluetoothPail'">{{text}}</text>
-                <text v-else-if="type=='register'">我们已向 <span style="color: #0A59F7;">{{email}}</span> 发送注册邮件，请您登录邮箱点击链接完成注册。</text>
-                <text v-else-if="type=='forgetPassword'">我们已向 <span style="color: #0A59F7;">{{email}}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。</text>
+                <text v-else-if="type=='register'">{{$t('我们已向')}} <span style="color: #0A59F7;">{{email}}</span> {{$t('发送注册邮件，请您登录邮箱点击链接完成注册。')}}</text>
+                <text v-else-if="type=='forgetPassword'">{{$t('我们已向')}} <span style="color: #0A59F7;">{{email}}</span> {{$t('发送了一封密码重置邮件，请您登录邮箱操作处理。')}}</text>
             </view>
             <view class="btn" @tap="close">{{ btnText }}</view>
         </view>

component/customSwitch.vue

@@ -158,7 +158,8 @@
 
 	.switch_text_on {
 		position: relative;
-		width: 158rpx;
+		width: 200rpx;
+		text-align: center;
 		height: 80rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -167,7 +168,7 @@
 		line-height: 80rpx;
 		text-align: left;
 		font-style: normal;
-		margin-left: 200rpx;
+		margin-left: 170rpx;
 	}
 
 	.switch_text_off {

component/payTypeModel/payTypeModel.vue

@@ -7,14 +7,14 @@
 					<img class="close-icon" src="https://qiniu.bms16.com/FtoTEHOJiUf_gjPCJGGHMsAtHI5M" alt="">
 				</view>
 				<view class="pay-moneu-view">
-					<view class="pay-money-text">付款金额/￥</view>
+					<view class="pay-money-text">{{$t('付款金额')}}/￥</view>
 					<view class="pay-money"><allPrice :amount="(free_price/100)"/></view>
 				</view>
 			</view>
 			<view class="pay-type-view">
 				<view @tap="changePayType" :data-type="1" class="pay-view flex-row">
 					<img class="pay-icon" src="https://qiniu.bms16.com/FjtmRXUBGOrPGYOD6wcNhc0Z39IW" alt="">
-					<view class="pay-view-text">线下支付</view>
+					<view class="pay-view-text">{{$t('线下支付')}}</view>
 					<img class="wx-pay-icon"
 						:src="payType==1?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/FkmDjxBNZhFGFU5inza2usdtDlX8'"
 						alt="">

component/scanBtn/scanBtn.vue

@@ -3,14 +3,14 @@
 		<view class="cabinet-bottom">
 			<view @tap="navToGuild" class="guide-view flex-row">
 				<img class="battery-img" src="https://qiniu.bms16.com/FkJlBRAxbGzR85wOO8WB_bAUTp-i" alt="">
-				<view class="guide-text">电池换电指南</view>
+				<view class="guide-text">{{$t('电池换电指南')}}</view>
 				<img class="arrow-img" src="https://qiniu.bms16.com/FtC9Hb8y1QEOidsI2UySz85iUQHy" alt="">
 			</view>
 			<view class="scan-btn-view">
 				<view v-if="num>0" class="free-num-view">
-					免费换电<text class="free-num"> {{num}} </text>次
+					{{$t('免费换电')}}<text class="free-num"> {{num}} </text>次
 				</view>
-				<view @tap="sacnBtn" class="scan-btn"><text>扫码换电</text></view>
+				<view @tap="sacnBtn" class="scan-btn"><text>{{$t('扫码换电')}}</text></view>
 			</view>
 		</view>
 		
@@ -22,7 +22,7 @@
 						<img class="close-icon" src="https://qiniu.bms16.com/FtoTEHOJiUf_gjPCJGGHMsAtHI5M" alt="">
 					</view>
 					<view class="pay-moneu-view">
-						<view class="pay-money-text">付款金额/￥</view>
+						<view class="pay-money-text">{{$t('付款金额')}}/￥</view>
 						<view class="pay-money">{{free_price}}</view>
 					</view>
 				</view>
@@ -31,20 +31,20 @@
 						<view class="fee-rules-title flex-row">
 							<img class="fee-rules-icon" src="https://qiniu.bms16.com/FjJ70vT8ydLEGfeABSFYWFe-zosV"
 								alt="">
-							<text style="margin-left:16rpx;">换电收费规则</text>
+							<text style="margin-left:16rpx;">{{$t('换电收费规则')}}</text>
 						</view>
 						<view class="fee-rules-money-view">
 							<text class="fee-rules-money">￥{{free_price}}</text>
 							<text>/1次</text>
 						</view>
 					</view>
-					<view class="open-result-tip">您的免费换电次数已用完，后续换电需要支付</view>
+					<view class="open-result-tip">{{$t('您的免费换电次数已用完，后续换电需要支付')}}</view>
 				</view>
 				<view class="pay-type-view">
 					<!-- #ifdef MP-WEIXIN  -->
 					<view class="pay-view flex-row">
 						<img class="pay-icon" src="https://qiniu.bms16.com/FkmtlfJrmGfAh9n1138KC1WloQkZ" alt="">
-						<view class="pay-view-text">微信支付</view>
+						<view class="pay-view-text">{{$t('微信支付')}}</view>
 						<img @tap="changePayType" :data-type="0" class="wx-pay-icon"
 							:src="payType==0?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/FkmDjxBNZhFGFU5inza2usdtDlX8'"
 							alt="">
@@ -53,7 +53,7 @@
 					<!-- #ifdef MP-ALIPAY-->
 					<view class="pay-view flex-row">
 						<img class="pay-icon" src="https://qiniu.bms16.com/Fk4YmG_RbdH0LNo1s8qHKDtpCTXl" alt="">
-						<view class="pay-view-text">支付宝支付</view>
+						<view class="pay-view-text">{{$t('支付宝支付')}}</view>
 						<img @tap="changePayType" :data-type="2" class="wx-pay-icon"
 							:src="payType==2?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/FkmDjxBNZhFGFU5inza2usdtDlX8'"
 							alt="">
@@ -61,14 +61,14 @@
 					<!-- #endif  -->
 					<view class="pay-view flex-row">
 						<img class="pay-icon" src="	https://qiniu.bms16.com/FiGNLQ5lqhEK5im_mUVgRrE8PJMB" alt="">
-						<view class="pay-view-text">钱包余额支付(¥{{wallet_money}})</view>
+						<view class="pay-view-text">{{$t('钱包余额支付')}}(¥{{wallet_money}})</view>
 						<img @tap="changePayType" :data-type="9" class="wx-pay-icon"
 							:src="payType==9?'https://qiniu.bms16.com/FhWimtmWybKlYMB6mgIReVWArbfq':'https://qiniu.bms16.com/FkmDjxBNZhFGFU5inza2usdtDlX8'"
 							alt="">
 					</view>
 				</view>
 				<view class="over-btn-view">
-					<view class="over-btn flex-row" @tap="toPayOrFreeExchange">立即支付</view>
+					<view class="over-btn flex-row" @tap="toPayOrFreeExchange">{{$t('立即支付')}}</view>
 				</view>
 			</view>
 		</view>
@@ -79,10 +79,10 @@
 						src="https://qiniu.bms16.com/FtoTEHOJiUf_gjPCJGGHMsAtHI5M" alt=""></view>
 				<view class="bluetooth-view flex-row"><img class="bluetooth-icon"
 						src="https://qiniu.bms16.com/FjWK8ZBtxCmspiOtHJWrNEoPRA0M" alt=""></view>
-				<view class="need-bluetooth-text">本次换电需要连接蓝牙</view>
-				<view class="need-bluetooth-tip">请开启手机蓝牙，点击 (蓝牙换电) 按钮</view>
+				<view class="need-bluetooth-text">{{$t('本次换电需要连接蓝牙')}}</view>
+				<view class="need-bluetooth-tip">{{$t('请开启手机蓝牙，点击 (蓝牙换电) 按钮')}}</view>
 				<view class="bluetooth-connect-view">
-					<view class="bluetooth-connect-btn" @tap="tapOpenBluetooth">蓝牙换电</view>
+					<view class="bluetooth-connect-btn" @tap="tapOpenBluetooth">{{$t('蓝牙换电')}}</view>
 				</view>
 			</view>
 		</view>
@@ -186,9 +186,9 @@
 							if(me.carInfo.battery_sn&&me.carInfo.remain){
 								me.loadNowCabinetDetail(cabinet_dev_id)
 							}else if(!me.carInfo.battery_sn){
-								common.simpleToast('车辆未绑定电池')
+								common.simpleToast(me.$t('车辆未绑定电池'))
 							}else if(!me.carInfo.remain){
-								common.simpleToast('车辆已到期，请及时前往续费')
+								common.simpleToast(me.$t('车辆已到期，请及时前往续费'))
 							}
 							
 						}
@@ -348,7 +348,7 @@
 			   var order_sn = this.payResp.data.data.order_sn;
 			   user.wxPay(order_sn, payParams, function (isSuccess) {
 			     if (isSuccess) {
-			       common.simpleToast('支付成功')
+			       common.simpleToast(me.$t('支付成功'))
 					//跳转换电流程页面
 					me.orderInfo = {
 						order_sn: me.payResp.data.data.order_sn,
@@ -369,7 +369,7 @@
 			   	tradeNO: me.payResp.data.data.trade_no,
 			   	success: function(res) {
 			   		if (res.resultCode == 9000) {
-						common.simpleToast('支付成功')
+						common.simpleToast(me.$t('支付成功'))
 			   			me.orderInfo = {
 			   				order_sn: me.payResp.data.data.order_sn,
 			   				empty_door_id: me.payResp.data.data.empty_door_id,
@@ -403,7 +403,7 @@
 											if (data.state === DF_CAB_INFO_DONE) {
 												me.reportCabintInfo(me.cabinetInfo.dev_id, data.commandList);
 												uni.hideLoading();
-												common.simpleToast('蓝牙连接成功')
+												common.simpleToast(me.$t('蓝牙连接成功'))
 												me.setData({
 													isOpenBluetooth: false,
 													isBluetooth:true
@@ -430,7 +430,7 @@
 												isBluetooth:false
 											});
 										} else {
-											common.simpleToast('蓝牙连接成功',2000)
+											common.simpleToast(me.$t('蓝牙连接成功'),2000)
 											// 蓝牙已连接
 											me.setData({
 												isOpenBluetooth: false,
@@ -457,9 +457,9 @@
 												isOpenBluetooth: false
 											});
 											uni.showModal({
-												title: '提示',
-												confirmText: '重新连接',
-												content: '连接失败，请尝试重新连接',
+												title: me.$t('提示'),
+												confirmText: me.$t('重新连接'),
+												content: me.$t('连接失败，请尝试重新连接'),
 												success: function(res) {
 													if (res.confirm) {
 														me.loadBluetooth();
@@ -478,21 +478,21 @@
 									var showContent = ""
 									if (res && ("errCode" in res)) {
 										if (res.errCode == 9000001) {
-										   var showContent= "观察周围是否有其他骑手连接，请等待对方完成 或 微信是否开启了蓝牙权限！！"
+										   var showContent= me.$t('观察周围是否有其他骑手连接，请等待对方完成') + me.$t('或') + me.$t('微信是否开启了蓝牙权限')！！
 										}else{
-											var showContent= "连接失败，请尝试重新连接"
+											var showContent= me.$t('连接失败，请尝试重新连接')
 										}
 									  }
 									  else {
-										 var showContent= "连接失败，请尝试重新连接"
+										 var showContent= me.$t('连接失败，请尝试重新连接')
 									  }
 									me.setData({
 										isOpenBluetooth: false,
 										isBluetooth:false
 									});
 									uni.showModal({
-										title: '提示',
-										confirmText: '重新连接',
+										title: me.$t('提示'),
+										confirmText: me.$t('重新连接'),
 										content: showContent,
 										success: function(res) {
 											if (res.confirm) {
@@ -510,9 +510,9 @@
 											isOpenBluetooth: false
 										});
 										uni.showModal({
-											title: '提示',
-											confirmText: '我知道了',
-											content: '蓝牙未打开或请在右上角设置授权小程序使用蓝牙',
+											title: me.$t('提示'),
+											confirmText: me.$t('我知道了'),
+											content: me.$t('蓝牙未打开或请在右上角设置授权小程序使用蓝牙'),
 											success: function(res) {
 												if (res.confirm) {
 													me.loadBluetooth();
@@ -531,10 +531,10 @@
 					//蓝牙连接未成功
 					uni.hideLoading();
 					uni.showModal({
-						confirmText: '我知道了',
-						content: '当前机柜未找到符合的蓝牙类型',
+						confirmText: me.$t('我知道了'),
+						content: me.$t('当前机柜未找到符合的蓝牙类型'),
 						showCancel: false,
-						title: '提示',
+						title: me.$t('提示'),
 						complete: (res) => {
 							// uni.navigateBack({
 							// 	delta: 1
@@ -612,7 +612,7 @@
 			changePayType(e){
 				const type = e.currentTarget.dataset.type
 				if(this.wallet_money<this.free_price){
-					common.simpleToast('钱包余额不足')
+					common.simpleToast(this.$t('钱包余额不足'))
 					return
 				}
 				this.setData({

component/useGuidance/useGuidance.vue

@@ -25,15 +25,15 @@
 		<view class="step-tip-view flex-row  align-center">
 			<view class="step-tip-text">
 				<image class="step-num-1" src="https://qiniu.bms16.com/Fm4gMRmW6UOwLcU-eW8LDLNfiUJe" mode='aspectFill'>
-				</image>线上选择用车方案生成待支付订单
+				</image>{{$t('线上选择用车方案生成待支付订单')}}
 			</view>
 			<view class="step-tip-text">
 				<image class="step-num-2" src="https://qiniu.bms16.com/FvYN7SxOYIhXEqSAJZrQIBQuTx79" mode='aspectFill'>
-				</image>导航到店向商家支付订单金额
+				</image>{{$t('导航到店向商家支付订单金额')}}
 			</view>
 			<view class="step-tip-text">
 				<image class="step-num-3" src="https://qiniu.bms16.com/FhZ7w0X8iVuxFPdetEF9C3YYkJ7Z" mode='aspectFill'>
-				</image>支付完成后直接现场取车
+				</image>{{$t('支付完成后直接现场取车')}}
 			</view>
 		</view>
 	</view>

components/navBar/navigation.vue

@@ -122,13 +122,18 @@
 	}
 
 	.top-text {
-		color: #060809;
+		color: #FFFFFF;
 		font-size: 36rpx;
 		font-weight: 600;
 		line-height: 36rpx;
 		text-align: center;
 		font-style: normal;
 		font-family: PingFangSC, PingFang SC;
+		/* position: absolute;
+		transform: translate(-50%,50%); */
+		position: fixed;
+		/* transform: translate(-90%,50%); */
+		left: 10%;
 	}
 
 	.view-height {

locale/en.json

@@ -35,7 +35,7 @@
 	"该用户不存在！": "User Not Found!",
 	"免费": "Free",
 	"次": "Times",
-	"车辆换电": "Swap Battery",
+	"车辆换电": "Swap",
 	"响铃找车": "Find Vehicle",
 	"开座桶锁": "Open Seat Lock",
 	"关闭头盔锁": "Close Helmet Lock",
@@ -94,10 +94,10 @@
 	"车辆已开始鸣笛": "Car honking",
 	"您确定打开座桶锁？": "Open seat box lock?",
 	"打开座桶": "Open Seat",
-	"滑动开机": "Slide to Power On",
+	"滑动开机": "Slide On",
 	"开机中": "Powering On",
 	"关机中": "Powering Off",
-	"滑动关机": "Slide to Power Off",
+	"滑动关机": "Slide Off",
 	"座桶锁已打开": "Seat box unlocked",
 	"您确定给车辆上锁？": "Lock the vehicle?",
 	"正在上锁": "Locking",
@@ -228,10 +228,10 @@
 	"无可用电池": "No available batteries",
 	"营业中": "Open",
 	"已休息": "Resting",
-	"直线距您": "Straight-line Distance",
+	"直线距您": " ",
 	"千米": "km",
 	"米": "m",
-	"导航": "Navigation",
+	"导航": "Nav",
 	"格口详情": "Box Detail",
 	"电柜编号：": "Cabinet ID:",
 	"已预约": "Reserved",
@@ -263,7 +263,7 @@
 	"仓体": "Cabinet Body",
 	"月租": "Monthly",
 	"年租": "Yearly",
-	"分租": "Sub-lease",
+	"分租": "Minute",
 	"季租": "Quarterly",
 	"购买": "Buy",
 	"免费换电次数": "Free Swap Count",
@@ -272,7 +272,7 @@
 	"我要用车": "I want to use the vehicle",
 	"获取直线距离": "Get Straight-line Distance",
 	"您是否要拨打电话": "Do you want to call?",
-	"更多功能": "More Features",
+	"更多功能": "More",
 	"固定导航栏": "Fixed Navigation Bar",
 	"其他功能": "Other Features",
 	"长按拖动可调整顺序，可增减固定导航栏内容": "Long press to adjust order, add or remove items from fixed navigation bar",
@@ -292,7 +292,7 @@
 	"返回首页": "Return to Home",
 	"解绑成功！": "Unbind Successful!",
 	"请选择设备": "Select Device",
-	"当前选择": "Current Selection",
+	"当前选择": "CurSel",
 	"租赁设备": "Leased Device",
 	"绑定设备": "Bind Device",
 	"是否确定": "Are you sure?",
@@ -303,8 +303,8 @@
 	"气泡内容": "Bubble content",
 	"已驻车": "Parked",
 	"分钟": "Minutes",
-	"更新于": "Updated at",
-	"闪灯鸣笛": "Flash light & Horn",
+	"更新于": "Updated",
+	"闪灯鸣笛": "Horn Boost",
 	"使用": "Use",
 	"点击事件": "Click Event",
 	"需要填写": "Required",
@@ -353,7 +353,7 @@
 	"为保证": "To ensure",
 	"感应解锁": "Sensor Unlock",
 	"闪电鸣笛": "Flash Horn",
-	"打开尾箱锁": "Open trunk lock",
+	"打开尾箱": "Open trunk",
 	"请先链接蓝牙": "Connect Bluetooth First",
 	"的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗": "For normal use, please enable the following permissions to improve unlock success rate without significant battery drain",
 	"授权引导": "Authorization Guide",
@@ -423,8 +423,8 @@
 	"您已逾期": "You are Overdue",
 	"请及时续费或归还车辆": "Please Extend Rental or Return the Vehicle",
 	"去续费": "Go to Extend Rental",
-	"车辆已开机": "Vehicle Powered On",
-	"车辆已关机": "Vehicle Powered Off",
+	"车辆已开机": "Powered On",
+	"车辆已关机": "Powered Off",
 	"最近骑行": "Recent Rides",
 	"总里程": "Total Mileage",
 	"蓝牙配对成功": "Bluetooth Pairing Successful",
@@ -594,18 +594,18 @@
 	"待激活": "Pending Activation",
 	"使用中": "In Use",
 	"已逾期": "Overdue",
-	"还车申请中": "Return Application Pending",
+	"还车申请中": "Return Pending",
 	"还车中": "Returning Vehicle",
 	"车辆已归还": "Vehicle Returned",
 	"订单已支付": "Order Paid",
 	"订单未支付": "Order Not Paid",
 	"已完结": "Finished",
 	"支付中": "Paying",
-	"支付成功": "Payment Successful",
+	"支付成功": "Payment Success",
 	"支付失败": "Payment Failed",
 	"支付取消": "Payment Cancelled",
-	"线下待审核": "Offline Pending Review",
-	"线下审核拒绝": "Offline Review Rejected",
+	"线下待审核": "Offline Pending",
+	"线下审核拒绝": "Offline Rejected",
 	"下单时间": "Order Time",
 	"有效期至": "Valid Until",
 	"有效时长": "Valid Duration",
@@ -619,15 +619,16 @@
 	"已退款": "Refunded",
 	"套餐金额": "Plan Amount",
 	"订单金额": "Order Amount",
-	"租车购车": "Rent or Purchase",
+	"付款金额": "Payment Amount",
+	"租车购车": "Rent/Sell",
 	"请于": "By",
 	"到门店取车": "Pick up at the store",
 	"请上传车辆图片激活车辆": "Please upload vehicle picture to activate vehicle",
 	"待门店确认": "Pending Store Confirm",
 	"等待门店取车": "Waiting store pick up vehicle",
 	"已完成": "Completed",
-	"租期剩余": "Remaining Rental Period",
-	"逾期时长": "Overdue Duration",
+	"租期剩余": "Lease Left",
+	"逾期时长": "Overdue",
 	"租借周期": "Rental Period",
 	"逾期金额": "Overdue Amount",
 	"收起": "Collapse",
@@ -644,7 +645,7 @@
 	"租车金额": "Rental Amount",
 	"租车押金": "Rental Deposit",
 	"订单结束后随时退": "Return anytime after order ends",
-	"自行去门店取还": "Pick up and return at the store",
+	"自行去门店取还": "Pickup Store",
 	"未知地址": "Unknown Address",
 	"重量": "Weight",
 	"换电信息": "Battery Swap Information",
@@ -656,7 +657,7 @@
 	"次免费换电，": "free battery swap,",
 	"当前免费换电剩余": "Remaining free swaps",
 	"次，超出后需要单独支付换电费用": "times, extra swaps will incur a charge",
-	"取还时间": "Pickup and Return Time",
+	"取还时间": "Rental Time",
 	"逾期规则": "Late Policy",
 	"逾期后还可用车吗": "Can I still use the vehicle after overdue?",
 	"如果逾期将触发智能锁车逻辑，可能导致您无法正常用车，请及时续费或联系商家处理。": "If overdue, the smart lock will be triggered, and you may not be able to use the vehicle. Please renew or contact the merchant.",
@@ -746,8 +747,8 @@
 	"车辆押金": "Vehicle Deposit",
 	"需要支付": "Amount to Pay",
 	"元押金，诺无车损、违章及逾期，还车后可退": "Deposit, refundable upon return if no damage, violations, or overdue.",
-	"前往门店取还": "Go to Store to Pick Up/Return",
-	"门店距您": "Store is X km away",
+	"前往门店取还": "Pickup/Return Shop",
+	"门店距您": " ",
 	"确认下单": "Confirm Order",
 	"价格明细": "Price Breakdown",
 	"车辆租金": "Vehicle Rental Fee",
@@ -773,7 +774,7 @@
 	"您的手机未授权定位权限，请前往手机设置开启权限": "Your phone has not authorized location services, please enable it in settings.",
 	"车牌": "License Plate",
 	"读取图片数据": "Reading Image Data",
-	"款车型": "Model Type",
+	"款车型": "Models",
 	"城市代码": "City Code",
 	"我的位置": "My Location",
 	"取车时间": "Pickup Time",
@@ -797,8 +798,8 @@
 	"请输入搜索内容": "Please enter search content",
 	"清空": "Clear",
 	"搜索": "Search",
-	"门店": "Pickup Store",
-	"换电柜": "Swap Cabinet",
+	"门店": "Shop",
+	"换电柜": "Cabinet",
 	"筛选": "Filter",
 	"上下文": "Context",
 	"是否处于搜索状态": "Is search active?",

locale/zh.json

@@ -353,7 +353,7 @@
 	"为保证": "为保证",
 	"感应解锁": "感应解锁",
 	"闪电鸣笛": "闪电鸣笛",
-	"打开尾箱锁": "打开尾箱锁",
+	"打开尾箱": "打开尾箱",
 	"请先链接蓝牙": "请先链接蓝牙",
 	"的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗": "的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗",
 	"授权引导": "授权引导",
@@ -619,6 +619,7 @@
 	"已退款": "已退款",
 	"套餐金额": "套餐金额",
 	"订单金额": "订单金额",
+	"付款金额": "付款金额",
 	"租车购车": "租车购车",
 	"请于": "请于",
 	"到门店取车": "到门店取车",

pages.json

@@ -15,13 +15,7 @@
 		{
 			"path": "pages/my/my",
 			"style": {
-				"navigationStyle": "custom",
-				"app-plus" : {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-				
+				"navigationStyle": "custom"
 			}
 		},
 		{

pages/addUser/addUser.vue

@@ -3,7 +3,7 @@
 		<navBar :name="$t('添加成员')" left="0"/>
 		<view class="flex-row email-input-view">
 			<input class="email-input-style" type="email" v-model="email" :placeholder="$t('请输入被邀人邮箱号')"  placeholder-style="font-size: 32rpx; font-weight: 400; color: #BAC1D0;">
-			<img class="clear-btn" src="https://qiniu.bms16.com/Fjpf2YnHUK1_CFf20kKRvjX9YdC3" alt="">
+			<img @click="clearInput" class="clear-btn" src="https://qiniu.bms16.com/Fjpf2YnHUK1_CFf20kKRvjX9YdC3" alt="">
 		</view>
 		<view @click="nextFn" class="next-btn" :class="{'next-btn-i':!isEmailFn(email)}">{{ $t('下一步') }}</view>
 	</view>
@@ -45,6 +45,10 @@
 				}else{
 					msg(data.msg)
 				}
+			},
+			
+			clearInput() {
+				this.email = ''
 			}
 		}
 	};

pages/loginRegister/register.vue

@@ -102,7 +102,7 @@ export default {
             }
 			
 			if(!this.validatePassword(this.form.passwd) || !this.validatePassword(this.form.second_passwd)){
-				 uni.showToast({ title: this.$t('请输入8-18位密码，包含字母数字'), icon: 'none' })
+				 uni.showToast({ title: this.$t('请输入')+'8-18'+this.$t('位密码，包含字母数字'), icon: 'none' })
 				return
 			}
 			

pages/my/my.vue

@@ -6,7 +6,7 @@
 		<!-- #ifdef APP -->
 		<view :style="{height: `${statusBarHeight}px`}"></view>
 		<!-- #endif -->
-		<view style="position: relative;z-index: 999999;"  class="user-switch-row">
+		<view style="position: fixed;z-index: 999999;right: 40rpx;"  class="user-switch-row">
 			<view  @click="routerLink({ url: '/pages/message/index?isSys=1',isLogin:1 })" class="news">
 				<view v-if="newsList.plate_count> 0" class="num">{{newsList.plate_count}}</view>
 				<image :src="QINIU_URL + 'FlL5BtEdMES2-mntjR9D3CX_LWYv'" class="message"

pages/order/order.vue

@@ -19,7 +19,7 @@
 		</view> -->
 		<view  class="order-type-view flex-row flex-between">
 			<view style="justify-content: space-around;width: 100%;" class="order-package-type-view flex-row">
-				<view style="width: 128rpx;" v-for="(type, index) in orderTypes" :key="index" @tap="checkOrderType" :data-type="type.value"
+				<view v-for="(type, index) in orderTypes" :key="index" @tap="checkOrderType" :data-type="type.value"
 					:class="['package-type-list', 'flex-row', {'package-type-list-i': selectOrderType === type.value}]"
 					>
 					<view class="package-type-text">{{ type.text }}</view>

pages/package/package.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container-view">
 		<view class="top-bg">
-			<Navigation :scroll='scrollTop'></Navigation>
+			<Navigation :scroll='scrollTop' :name="$t('我的套餐')"></Navigation>
 			<view :style="{height: `calc(${statusBarHeight}px + 100px)`}"></view>
 			<view class="package-card flex-row flex-between">
 				<view class="flex-row flex-column" style="align-items: flex-start;">
@@ -58,6 +58,7 @@
 				</view>
 				<view v-if="item.package_type == 3" class="package-item">
 					<view class="item-title">{{ $t('免费换电数') }}</view>
+					<!-- <view style="color: #060809;" class="item-info">{{item.last_num}}{{ $t('次') }}/{{item.total_num}}{{ $t('次') }}</view> -->
 					<view style="color: #060809;" class="item-info">{{item.total_day}}{{ $t('天') }}/{{item.last_num}}{{ $t('次') }}</view>
 				</view>
 			</view>

pages/service/service.css

@@ -16,6 +16,7 @@
 }
 .store-type{
 	margin-right: 20rpx;
+	width: 200rpx;
 }
 .store-type,
 .cabinet-type{

pages/service/service.vue

@@ -58,7 +58,7 @@
 				</view>
 				<view class="config-view flex-row">
 					<view @click='openSelectType' class="flex-row selectFlex">
-						<text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? $t('购买') : ''}}</text>
+						<text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? '+' + $t('购买') : ''}}</text>
 						<text v-if="selectType === 'cabinet'" class="text">{{cabinetType ? cabinetType : $t('全部')}}</text>
 						<u-icon v-if="showLeaseType" name="arrow-down" color="#9FA7B7" size="26"></u-icon>
 						<u-icon v-else name="arrow-up" color="#9FA7B7" size="26"></u-icon>

pages/storeDetails/storeDetails.css

@@ -51,8 +51,9 @@
 	font-weight: 600;
 	font-size: 24rpx;
 	color: #0A59F7;
-	width: 88rpx;
 	margin-right: 12rpx;
+	margin-bottom: 10rpx;
+	padding: 0 14rpx;
 }
 .store-num-type{
 	border-radius: 8rpx;
@@ -149,9 +150,13 @@
 	color: #2A3A5A;
 	line-height: 32rpx;
 	font-style: normal;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	width: 240rpx;
 }
 .cab_address {
-	width: 280rpx;
+	width: 240rpx;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -167,6 +172,8 @@
 .icon_grid_1 {
 	width: 48rpx;
 	height: 48rpx;
+	display: block;
+	margin: auto;
 }
 
 .grid_nav {

pages/storeDetails/storeDetails.vue

@@ -19,11 +19,13 @@
 			<view class="store-info-view">
 				<view class="store-name">{{storeInfo.shop_name}}</view>
 				<view class="flex-row align-center" style="margin-bottom: 24rpx;">
-					<view v-for="(item,index) of storeInfo.service_type_list" :key="index" class="store-type">
-						{{item.title}}
-					</view>
-					<view class="store-num-type"> <text class="store-num">{{storeInfo.model_list.length || 0}}</text>
-						{{ $t('款车型') }}
+					<view style="width: 600rpx;display: flex;flex-wrap: wrap;">
+						<view v-for="(item,index) of storeInfo.service_type_list" :key="index" class="store-type">
+							{{item.title}}
+						</view>
+						<view class="store-num-type"> <text class="store-num">{{storeInfo.model_list.length || 0}}</text>
+							{{ $t('款车型') }}
+						</view>
 					</view>
 					<view class="store-phone" @tap="tapPhone"><img style="width: 84rpx;height: 64rpx;"
 							src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa" alt=""></view>

utils/util.js

@@ -3,7 +3,7 @@ import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
 // const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
-const Language = 'zh' // 'zh' | 'en'
+const Language = 'en' // 'zh' | 'en'
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;