Merge branch 'dly_test' into gyq_test

common/common.js

@@ -878,8 +878,8 @@ function formatTimeDifference(timestamp) {
 		hours = Math.round(totalHours % 24); // 剩余小时四舍五入
 		
 		const result = [];
-		if (days > 0) result.push(`${days}天`);
-		if (hours > 0 || result.length === 0) result.push(`${hours}小时`);
+		if (days > 0) result.push(`${days + i18n.t('天')}`);
+		if (hours > 0 || result.length === 0) result.push(`${hours + i18n.t('小时')}`);
 		return result.join("");
 		
 	} else {
@@ -896,9 +896,9 @@ function formatTimeDifference(timestamp) {
 		}
 		days = 0;
 		if (hours) {
-			return `${hours}小时 ${minutes}分钟`;
+			return `${hours + i18n.t('小时')} ${minutes + i18n.t('分钟')}`;
 		}else {
-			return `${minutes}分钟`;
+			return `${minutes + i18n.t('分钟')}`;
 		}
 		
 	}

components/navBar/navigation.vue

@@ -1,171 +1,166 @@
 <template>
-		<view>
-			<view class="top-view flex-row"
-			:style="{'padding-top':`${statusBarHeight1}px`,background:`rgba(255,255,255,${opacity})`}">
-			<view class="navHei" :style="{'height':`calc(${navabarHeight}rpx)`,'width':'100%',}">
-				<view v-if="isback" class="left" @tap="bindReturnView">
-					<img v-if="type" class="return-view" :src="'https://qiniu.bms16.com/'+ (whiteColor?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_')" />
-					<view v-else class="pos">
-						<view   class="car-detail-style">
-							<image  class="return-view"
-								src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFit"></image>
-						</view>
-						<view :style="{opacity:1 - opacity,background:`rgba(0,0,0,0.4)`}" class="car-detail-style">
-							<image  class="return-view"
-								src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG" mode="aspectFit"></image>
-						</view>
+	<view>
+		<view class="top-view flex-row"
+		:style="{'padding-top':`${statusBarHeight1}px`,background:`rgba(255,255,255,${opacity})`}">
+		<view class="navHei" :style="{'height':`calc(${navabarHeight}rpx)`,'width':'100%',}">
+			<view v-if="isback" class="left" @tap="bindReturnView">
+				<img v-if="type" class="return-view" :src="'https://qiniu.bms16.com/'+ (whiteColor?'Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG':'FnHXbzly7aXi8zLghrTU5BZdwH5_')" />
+				<view v-else class="pos">
+					<view   class="car-detail-style">
+						<image  class="return-view"
+							src="https://qiniu.bms16.com/FnHXbzly7aXi8zLghrTU5BZdwH5_" mode="aspectFit"></image>
+					</view>
+					<view :style="{opacity:1 - opacity,background:`rgba(0,0,0,0.4)`}" class="car-detail-style">
+						<image  class="return-view"
+							src="https://qiniu.bms16.com/Fjpnr3cH9ZqTQrGlw3Ywp3qbJGIG" mode="aspectFit"></image>
 					</view>
 				</view>
-				<text class="top-text" :class="whiteColor?'whiteClass':''">{{name}}</text>
 			</view>
+			<text class="top-text" :class="whiteColor?'whiteClass':''">{{name}}</text>
 		</view>
-		<view v-if="type" :style="{'height':`calc(${navabarHeight}rpx + ${statusBarHeight1}px)`}"></view>
-		</view>
+	</view>
+	<view v-if="type" :style="{'height':`calc(${navabarHeight}rpx + ${statusBarHeight1}px)`}"></view>
+	</view>
 </template>
 
 <script>
-	export default {
-		props: {
-			isback:{
-				type: Boolean,
-				default: true
-			},
-			name: {
-				type: String,
-				default: ''
-			},
-			scroll: {
-				default: 0,
-				type: Number
-			},
-			type:{
-				type: Boolean,
-				default: false
-			},
-			whiteColor:{
-				type: Boolean,
-				default: false
-			},
+export default {
+	props: {
+		isback:{
+			type: Boolean,
+			default: true
+		},
+		name: {
+			type: String,
+			default: ''
 		},
-		watch: {
-			scroll(n) {
-				this.opacity = n / 160
-			}
+		scroll: {
+			default: 0,
+			type: Number
 		},
-		data() {
-			return {
-				opacity: 0,
-				statusBarHeight1: 0,
-				navabarHeight: 0,
-			}
+		type:{
+			type: Boolean,
+			default: false
 		},
-		mounted() {
-			this._getCustomBar()
-			this.opacity = this.scroll
+		whiteColor:{
+			type: Boolean,
+			default: false
 		},
-		methods: {
-			_getCustomBar() {
-				const sysinfo = uni.getSystemInfoSync()
-				// let GAP = 8
-				// // #ifdef MP-ALIPAY
-				// GAP = 0
-				// // #endif
-				// // #ifdef APP-PLUS
+	},
+	watch: {
+		scroll(n) {
+			this.opacity = n / 160
+		}
+	},
+	data() {
+		return {
+			opacity: 0,
+			statusBarHeight1: 0,
+			navabarHeight: 0,
+		}
+	},
+	mounted() {
+		this._getCustomBar()
+		this.opacity = this.scroll
+	},
+	methods: {
+		_getCustomBar() {
+			const sysinfo = uni.getSystemInfoSync()
+			// let GAP = 8
+			// // #ifdef MP-ALIPAY
+			// GAP = 0
+			// // #endif
+			// // #ifdef APP-PLUS
 
-				// // #endif
-				// // #ifdef MP-WEIXIN
-				// const clientRect = uni.getMenuButtonBoundingClientRect()
-				// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
-				// this.navabarHeight = navabarHeight
-				// // #endif
+			// // #endif
+			// // #ifdef MP-WEIXIN
+			// const clientRect = uni.getMenuButtonBoundingClientRect()
+			// const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+			// this.navabarHeight = navabarHeight
+			// // #endif
 
-				this.statusBarHeight1 = sysinfo.statusBarHeight
-				this.navabarHeight = 100
-			},
+			this.statusBarHeight1 = sysinfo.statusBarHeight
+			this.navabarHeight = 100
+		},
 
-			bindReturnView() {
-				uni.navigateBack({
-					delta: 1,
-				}) // 返回上一页
-			},
-		}
+		bindReturnView() {
+			uni.navigateBack({
+				delta: 1,
+			}) // 返回上一页
+		},
 	}
+}
 </script>
 
 <style scoped>
-	.navHei {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-	}
+.navHei {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+}
 
-	.left {
-		width: 40rpx;
-		height: 40rpx;
-		position: absolute;
-		left: 0;
-	}
+.left {
+	width: 40rpx;
+	height: 40rpx;
+	position: absolute;
+	left: 0;
+}
 
-	.top-view {
-		width: 100%;
-		position: fixed;
-		z-index: 99999;
-		left: 0;
-		top: 0;
-		align-items: center;
-		padding: 0 26rpx;
-		text-align: center;
+.top-view {
+	width: 100%;
+	position: fixed;
+	z-index: 99999;
+	left: 0;
+	top: 0;
+	align-items: center;
+	padding: 0 26rpx;
+	text-align: center;
 
-	}
+}
 
-	.navHei {
-		position: relative;
-		width: 56rpx;
-		height: 56rpx;
-	}
+.navHei {
+	position: relative;
+	width: 56rpx;
+	height: 56rpx;
+}
 
-	.return-view {
-		width: 40rpx;
-		height: 40rpx;
-		
-		/* margin-top: 24rpx; */
-		/* 		margin-left: 32rpx; */
-	}
+.return-view {
+	width: 40rpx;
+	height: 40rpx;
+	
+	/* margin-top: 24rpx; */
+	/* 		margin-left: 32rpx; */
+}
 
-	.top-text {
-		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%;
-	}
-	.top-text.whiteClass {
-		color: #FFFFFF;
-	}
-	.view-height {
-		/* border-bottom:2rpx solid #060809 ; */
-		/* margin-bottom: 32rpx; */
-	}
+.top-text {
+	color: #060809;
+	font-size: 36rpx;
+	font-weight: 600;
+	line-height: 36rpx;
+	text-align: center;
+	font-style: normal;
+	font-family: PingFangSC, PingFang SC;
+}
+.top-text.whiteClass {
+	color: #FFFFFF;
+}
+.view-height {
+	/* border-bottom:2rpx solid #060809 ; */
+	/* margin-bottom: 32rpx; */
+}
 
-	.car-detail-style {
-		width: 56rpx;
-		height: 56rpx;
-		
-		border-radius: 16rpx 0rpx 16rpx 0rpx;
-		padding-left: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
+.car-detail-style {
+	width: 56rpx;
+	height: 56rpx;
+	
+	border-radius: 16rpx 0rpx 16rpx 0rpx;
+	padding-left: 6rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
 </style>

locale/en.json

@@ -271,7 +271,7 @@
 	"次免费换电数，超出后需要单独支付换电费用；": "Free swaps, extra swaps will require payment;",
 	"我要用车": "I want to use the vehicle",
 	"获取直线距离": "Get Straight-line Distance",
-	"您是否要拨打电话": "Do you want to call?",
+	"您是否要拨打电话": "Do you want to call",
 	"更多功能": "More",
 	"固定导航栏": "Fixed Navigation Bar",
 	"其他功能": "Other Features",
@@ -280,7 +280,7 @@
 	"开机": "Slide to Turn On",
 	"开启车辆": "Start Vehicle",
 	"关机": "Shutdown",
-	"您确认": "Are you sure? ",
+	"您确认": "Are you sure",
 	"吗": "？",
 	"处理修改之后的数据": "Process modified data",
 	"输入注册账号的密码即可解绑": "Enter the registration account password to unbind",

pages/batteryPackage/batteryPackage.vue

@@ -89,7 +89,7 @@ import { fenToYuan, msg } from '../../utils/util.js';
 				}
 				uni.showLoading({
 					mask:true,
-					title:this.$t('提交中...')
+					title:this.$t('提交中')+'...'
 				})
 				let {
 					data

pages/package/package.css

@@ -9,7 +9,7 @@
 }
 
 
-.top-text {
+/* .top-text {
 	margin-left: 230rpx;
 	color: #FFFFFF;
 	font-size: 36rpx;
@@ -18,7 +18,7 @@
 	text-align: center;
 	font-style: normal;
 	font-family: PingFangSC, PingFang SC;
-}
+} */
 
 .package-card {
 	/* margin-top: -100rpx;
@@ -89,7 +89,7 @@
 .box-view {
 	padding-left: 24rpx;
 	padding-right: 24rpx;
-	margin-top: 210rpx;
+	margin-top: 93rpx;
 }
 
 .package-view {

pages/package/package.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="container-view">
 		<view class="top-bg">
-			<Navigation :scroll='scrollTop' :name="$t('我的套餐')"></Navigation>
-			<view :style="{height: `calc(${statusBarHeight}px + 100px)`}"></view>
+			<navigation whiteColor="true" type="true" :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;">
 					<view @click="$srcFn(`/pages/carList/carList`)" class="left-first flex-row">

pages/userManagement/userManagement.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="bgClass">
-		<navigation :whiteColor="true" :type="true" :name="$t('用车人管理')" />
+		<navigation whiteColor="true"  type="true" :name="$t('共享用户')" />
 		<view class="user-card">
 			<view class="flex-row align-center user-card-heard">
 				<img style="width: 48rpx;height: 48rpx;" src="https://qiniu.bms16.com/FieeNq75ybyjIzQO6fmNcdTlRsp5" alt="">
@@ -73,7 +73,7 @@
 		}
 	};
 </script>
-<style scoped>
+<style>
 .bgClass {
 	height: 396rpx;
 	background: url('https://qiniu.bms16.com/Fvu5ulYgrXiB_0cXs715TcvYYnsb') no-repeat;

utils/util.js

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