0402

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); // 剩余小时四舍五入

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/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({

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

@@ -619,6 +619,7 @@
 	"已退款": "Refunded",
 	"套餐金额": "Plan Amount",
 	"订单金额": "Order Amount",
+	"付款金额": "Payment Amount",
 	"租车购车": "Rent/Sell",
 	"请于": "By",
 	"到门店取车": "Pick up at the store",

locale/zh.json

@@ -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/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>

utils/util.js

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