common/common.js

@@ -150,7 +150,7 @@ function alert(title, content, successCallBack) {
 
 function loading() {
 	uni.showLoading({
-		title: '正在加载数据 ...',
+		title: i18n.t('正在加载数据')+'...',
 		mask: true
 	});
 }
@@ -160,7 +160,7 @@ function loading() {
 
 function successToast(title, duration) {
 	uni.showToast({
-		title: title || '成功',
+		title: title || i18n.t('成功'),
 		icon: 'success',
 		duration: duration || 1500,
 		mask: true
@@ -172,7 +172,7 @@ function successToast(title, duration) {
 
 function simpleToast(title, duration) {
 	uni.showToast({
-		title: title || '成功',
+		title: title || i18n.t('成功'),
 		icon: 'none',
 		duration: duration || 1500
 	});
@@ -215,8 +215,8 @@ function uploadImg(callback) {
 						callback(rtDataObj.data[0].url);
 					} else {
 						uni.showModal({
-							title: '错误',
-							content: '上传图片错误[' + rtDataObj.message + ']'
+							title: i18n.t('错误'),
+							content: i18n.t('上传图片错误')+'[' + rtDataObj.message + ']'
 						});
 					}
 				}
@@ -256,7 +256,7 @@ function upLoadImgQiNiu(callback, type = ['album', 'camera']) {
 							callback(config.QINIU_SITE + key);
 						},
 						fail: function(res) {
-							simpleToast('上传失败');
+							simpleToast(i18n.t('上传失败'));
 							uni.hideLoading();
 						}
 					});
@@ -307,7 +307,7 @@ function upLoadImgQiNiu2(callback, filePath) {
 					callback(config.QINIU_SITE + key);
 				},
 				fail: function(res) {
-					simpleToast('上传失败');
+					simpleToast(i18n.t('上传失败'));
 					uni.hideLoading();
 				}
 			});
@@ -845,7 +845,7 @@ async function callPhone(phone) {
 	// const text=that.$t()+phone+'?'
 	let res = await uni.showModal({
 		content: text,
-		confirmText: '确定',
+		confirmText: i18n.t('确定'),
 	})
 	if (res[1].confirm) {
 		uni.makePhoneCall({

component/customSwitch.vue

@@ -78,11 +78,9 @@
 			},
 			handleClick() {
 				if (this.isSwiping) return;
-				this.isShowSwitchText = false;
 				this.triggerRequest();
 			},
 			onTouchStart(e) {
-				this.isShowSwitchText = false;
 				this.isSwiping = false;
 				this.startX = e.touches[0].clientX;
 			},
@@ -90,6 +88,7 @@
 				let moveX = e.touches[0].clientX - this.startX;
 				if (Math.abs(moveX) > 10) {
 					this.isSwiping = true;
+					this.isShowSwitchText = false;
 				}
 			},
 			onTouchEnd() {
@@ -136,6 +135,7 @@
 		justify-content: center;
 		align-items: center;
 		position: absolute;
+		z-index: 9;
 		/* top: 6rpx; */
 		left: 6rpx;
 	}

locale/en.json

@@ -827,11 +827,11 @@
 	"车辆激活": "Vehicle activation",
 	"车辆品牌：": "Vehicle brand",
 	"车辆颜色：": "Vehicle color",
-	"车牌号": "Plate Number",
+	"车牌号：": "Plate Number",
 	"上传照片": "Upload Photo",
 	"你确定要删除吗？": "Confirm Deletion?",
 	"还车成功！": "Return Successful!",
-	"秒换电，瞬间满电，畅享骑行新体验！": "Instant Swap, Full Charge, Smooth Ride!",
+	"秒换电，瞬间满电，畅享骑行新体验！": "Instant Swap,Full Charge,Smooth Ride!",
 	"不限次数": "Unlimited",
 	"部分成功": "Partially Successful",
 	"是否切换到车辆": "Switch Vehicle?",
@@ -858,5 +858,6 @@
 	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "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",
 	"购买时间":"Buy Time",
 	"￥": "$",
-	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!"
+	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
+	"正在加载数据":"Loading"
 }

locale/zh.json

@@ -858,5 +858,6 @@
 	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。",
 	"购买时间":"购买时间",
 	"￥": "￥",
-	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！"
+	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！",
+	"正在加载数据":"正在加载数据"
 }

pages/batteryPackage/batteryPackage.css

@@ -19,7 +19,7 @@
 	color: #060809;
 	background: rgba(255,255,255,0.4);
 	border-radius: 0rpx 38rpx 38rpx 0rpx;
-	padding: 16rpx 0 16rpx 32rpx ;
+	padding: 16rpx 0 16rpx 13rpx ;
 	flex-grow: 1;
 	text-align: justify;
 	letter-spacing: 2rpx;

pages/batteryPackage/batteryPackage.vue

@@ -1,10 +1,9 @@
 <template>
 	<view class="battery-package-main">
-		<navigation :type="true" :name="$t('换电套餐')" />
-		
+		<navigation :scroll='scrollTop' :type="true" :name="$t('换电套餐')" />
 		<view class="package-icon-view flex-row">
 			<img src="https://qiniu.bms16.com/FqF7erLOB8OutmFnre7-mbTkwpZr" alt="">
-			<view class="package-icon-text flex-row">5{{ $t('秒换电，瞬间满电，畅享骑行新体验！') }}</view>
+			<view class="package-icon-text flex-row">5 {{ $t('秒换电，瞬间满电，畅享骑行新体验！') }}</view>
 		</view>
 		<view v-for="(item,index) of list" @click="selectItem(item)" :key="index" class="package-list-view" :class="{'active' : item.package_code == form.package_code }">
 			<view class="package-num-view flex-row"><text class="package-num">{{item.total_day || 0}}</text> {{ $t('天') }} <text
@@ -60,6 +59,9 @@ import { fenToYuan, msg } from '../../utils/util.js';
 	import payTypeModel from '@/component/payTypeModel/payTypeModel';
 	export default {
 		components:{payTypeModel},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		data() {
 			return {
 				isShowToBuy:false,

pages/index/index.vue

@@ -6,27 +6,37 @@
 		<view v-if="isConnected">
 			<block v-if="isLogin && car_info.car_sn">
 				<view class="container-view">
-					<!-- #ifdef MP-WEIXIN -->
-					<view :style="{height: `${statusBarHeight + 30}px`}"></view>
-					<!-- #endif -->
-					<!-- #ifdef APP -->
-					<view :style="{height: `${statusBarHeight}px`}"></view>
-					<!-- #endif -->
-					<!-- <navBar type="index" /> -->
-					<view class="flex-row flex-between align-center padding_about_40">
-						<view class="car-name-view" @tap="navSwitchCar">
-							<text class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
-							<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
-								style="width: 14rpx;height: 14rpx;" alt="">
-						</view>
-						<view @click="routerLink('/pages/message/index?isSys=0')" class="news">
-							<view v-if="newsList.device_count > 0" class="num">
-								{{ newsList.device_count}}
+					<view class="header_view">
+						<!-- #ifdef MP-WEIXIN -->
+						<view :style="{height: `${statusBarHeight + 30}px`}"></view>
+						<!-- #endif -->
+						<!-- #ifdef APP -->
+						<view :style="{height: `${statusBarHeight}px`}"></view>
+						<!-- #endif -->
+						<!-- <navBar type="index" /> -->
+						<view class="flex-row flex-between align-center padding_about_40">
+							<view class="car-name-view" @tap="navSwitchCar">
+								<text class="text" style="margin-right: 10rpx;">{{car_info.car_name}}</text>
+								<img src="https://qiniu.bms16.com/FoSXDpVGvbdmwbX3CMUBvR7X4IzI"
+									style="width: 14rpx;height: 14rpx;" alt="">
+							</view>
+							<view @click="routerLink('/pages/message/index?isSys=0')" class="news">
+								<view v-if="newsList.device_count > 0" class="num">
+									{{ newsList.device_count}}
+								</view>
+								<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
+									style="width: 48rpx;height: 48rpx;" mode=""></image>
 							</view>
-							<image src="https://qiniu.bms16.com/FtlfBtBE5-TeTI5EdrciX_u8u_Sx"
-								style="width: 48rpx;height: 48rpx;" mode=""></image>
 						</view>
 					</view>
+					<view>
+						<!-- #ifdef MP-WEIXIN -->
+						<view :style="{height: `${statusBarHeight + 80}px`}"></view>
+						<!-- #endif -->
+						<!-- #ifdef APP -->
+						<view :style="{height: `${statusBarHeight + 50}px`}"></view>
+						<!-- #endif -->
+					</view>
 					<view v-if="isOverdueShow" class="overdue-view flex-row flex-between">
 						<view class="overdue-view-text flex-row">
 							<text class="overdue-text-left">{{$t("您已逾期")}}
@@ -57,7 +67,7 @@
 								:show-percent="false" :percent="car_info.soc"></u-line-progress>
 							<view class="quantity-text flex-row">
 								<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
-								<view style="font-size: 36rpx;">{{formatDistance(car_info.remain_mail) }}<text style="font-size: 30rpx;">{{car_info.remain_mail ? car_info.remain_mail>1000?'km':'m' :'km'}}</text></view>
+								<view style="font-size: 36rpx;">{{car_info.remain_mail}}<text style="font-size: 30rpx;">km</text></view>
 							</view>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
@@ -95,7 +105,7 @@
 											style="width: 24rpx;height: 20rpx;"
 											src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
 								</view>
-								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text>
+								<view class="card-top-text">{{isTrackOrAll?car_info.current_mail:car_info.total_mil}}<text class="font_24">km</text>
 								</view>
 							</view>