xxq

pages/battery/battery.vue

@@ -47,7 +47,7 @@
 						class="flex-column my_function"
 					>
 						<image class="my_icon" :src="protect_state ? lockIcon : onLockIcon"></image>
-						<view class="my_title">{{ protect_state ? '{{ $t('解锁') }}' : '{{ $t('上锁') }}'}}</view>
+						<view class="my_title">{{ protect_state ?  $t('解锁') : $t('上锁') }}</view>
 					</view>
 					<view @tap="navToPage" data-url="/pages/travelingTrack/travelingTrack" data-index="2"
 						class="flex-column my_function">

pages/batteryPackage/batteryPackage.vue

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

pages/bluetoothUnlock/bluetoothPair.vue

@@ -78,7 +78,7 @@
 				bluetooth.initBluetooth()
 				this.bluetoothClose()
 			}else{
-				common.simpleToast('蓝牙未启用,请先打开蓝牙')
+				common.simpleToast(this.$t('蓝牙未启用')+','+this.$t('请先打开蓝牙'))
 			}
 			
 		},

pages/carDetail/carDetail.vue

@@ -83,7 +83,7 @@
 			</view>
 		</view>
 		<view class="nodes">
-			<rich-text v-if="car_detail.desc" :nodes="car_detail.desc"></rich-text>
+			<rich-text v-if="car_detail.model_desc" :nodes="car_detail.model_desc"></rich-text>
 		</view>
 		<view style="height: 150rpx;"></view>
 		<view class="use-car-view flex-row">
@@ -183,7 +183,7 @@
 				const phone = this.car_detail.link_phone
 				// const phone = 18170410707
 				uni.showModal({
-					content: `您是否要拨打电话${phone}？`,
+					content: `${this.$t('您是否要拨打电话')+phone}？`,
 					confirmText: this.$t('确定'),
 					success: (res) => {
 						if (res.confirm) {

pages/feedback/index.vue

@@ -131,7 +131,7 @@
 			inputContent(e) {
 				const content_text = e.detail.value
 				if (content_text.length >= 300) {
-					common.simpleToast('最多输入300字');
+					common.simpleToast(this.$t('最多输入')+300+this.$t('字'));
 				} else {
 					this.setData({
 						content: content_text

pages/index/index.vue

@@ -6,60 +6,50 @@
 		<view v-if="isConnected">
 			<block v-if="isLogin && car_info.car_sn">
 				<view class="container-view">
-					<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>
+					<!-- #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>
 					</view>
-					<view class="fillClass">
-						<!-- #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('您已逾期') }}
+							<text class="overdue-text-left">{{$t("您已逾期")}}
 								<text class="overdue-num">
 									<block v-if="orderInfo.hire_duration_time">
 										{{orderInfo.hire_duration_time.day > 0 ? orderInfo.hire_duration_time.day :'' }}<text
-											v-if="orderInfo.hire_duration_time.day>0">{{ $t('日') }}</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
-											v-if="orderInfo.hire_duration_time.hour>0">{{ $t('小时') }}</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
-											v-if="orderInfo.hire_duration_time.minute>0">{{ $t('分') }}</text>
+											v-if="orderInfo.hire_duration_time.day>0">{{$t("日")}}</text>{{orderInfo.hire_duration_time.hour > 0 ? orderInfo.hire_duration_time.hour :'' }}<text
+											v-if="orderInfo.hire_duration_time.hour>0">{{$t("小时")}}</text>{{orderInfo.hire_duration_time.minute > 0 ? orderInfo.hire_duration_time.minute :'' }}<text
+											v-if="orderInfo.hire_duration_time.minute>0">{{$t("分")}}</text>
 									</block>
 								</text>
 							</text>
-							<text style="font-size: 24rpx;opacity: 0.5;">{{ $t('请及时续费或归还车辆') }}</text>
+							<text style="font-size: 24rpx;opacity: 0.5;">{{$t("请及时续费或归还车辆")}}</text>
 						</view>
-						<view @click="routerLink('/pages/order/order')" class="renew-btn">{{ $t('去续费') }}</view>
+						<view @click="routerLink('/pages/order/order')" class="renew-btn">{{$t("去续费")}}</view>
 					</view>
 					<view class="car-img-view" >
 						<view v-if="!car_info.sold_time" class="flex-row flex-between" style="align-items: center;">
 							<text class="quantity flex-row">{{car_info.soc}} <text
 									style="font-size: 28rpx;font-weight: 500;">%</text></text>
-							<view v-if="car_info.sold_time==0" @tap.stop="tapReturnCar" class="return-car-btn flex-row">
+							<view @tap.stop="tapReturnCar" class="return-car-btn flex-row">
 								<image style="width: 46rpx;height: 46rpx;" src="https://qiniu.bms16.com/FtyG7Gq2QBaVVrZmTnmZFzXhE5nN" mode=""></image>
-								<view style="margin-left: 12rpx;">{{ $t('我要还车') }}</view>
+								<view style="margin-left: 12rpx;">{{$t("我要还车")}}</view>
 							</view>
 						</view>
 						<view class="quantity-view flex-row">
@@ -67,7 +57,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;">{{car_info.remain_mail }}<text style="font-size: 30rpx;">km</text></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>
 						</view>
 						<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
@@ -90,11 +80,9 @@
 					</view>
 					<Control :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" @loadCarDetail="loadCarDetail"/>
 					
-					<!-- car_info.is_share==1 是别人共享的车 -->
-					<!-- car_info.authority_list.indexOf(4) == -1 共享地图权限 -->
-					<!-- car_info.authority_list.indexOf(5) == -1 共享套餐权限 -->
-					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time&&(car_info.is_share!=1&&car_info.authority_list.indexOf(5) != -1)?'height_362':'height_260']">
-						<MapCard v-if="car_info.is_share==1&&car_info.authority_list.indexOf(4) == -1" :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
+			
+					<view :class="['flex-row', 'flex-between', 'map-card-view',car_info.exchange_package_info && car_info.exchange_package_info.activity_time?'height_362':'height_260']">
+						<MapCard :car_info="car_info" :height="!!(car_info.exchange_package_info && car_info.exchange_package_info.activity_time)"/>
 			
 						<view class="card-right">
 							<view class="card-bg" @tap="navTravelingTrack">
@@ -102,17 +90,17 @@
 									<view class="flex-row align-center">
 										<img style="width: 36rpx;height: 36rpx;"
 											src="https://qiniu.bms16.com/FkrcMCV__HraZ0W0NBNdEZPIlwss" alt="">
-										<text class="margin_l_8">{{isTrackOrAll?$t('最近骑行'):$t('总里程')}}</text>
+										<text class="margin_l_8">{{isTrackOrAll?$t("最近骑行"):$t("总里程")}}</text>
 									</view>
 									<view @tap.stop="isTrackOrAll=!isTrackOrAll"><img
 											style="width: 24rpx;height: 20rpx;"
 											src="https://qiniu.bms16.com/FltPK-o7KGS3dQ2pfQHXGSxOdzaN" alt=""></view>
 								</view>
-								<view class="card-top-text">{{isTrackOrAll?car_info.current_mail:car_info.total_mil}}<text class="font_24">km</text>
+								<view class="card-top-text">{{car_info.current_mail}}<text class="font_24">km</text>
 								</view>
 							</view>
 			
-							<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time&&(car_info.is_share==1&&car_info.authority_list.indexOf(5) == -1)" class="card-bg">
+							<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="card-bg">
 								<view class="flex-row card-top-title">
 									<img style="width: 36rpx;height: 36rpx;"
 										src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
@@ -145,7 +133,7 @@
 							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
 								alt="">
 						</view>
-						<view v-if="car_info.is_share != 1"  @tap="navToPage" data-url="/pages/userManagement/userManagement"
+						<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
 							class="flex-row config-car-view">
 							<view class="margin_r_20"><img class="icon_style_64"
 									src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
@@ -483,8 +471,7 @@
 			loadCarDetail(car_sn) {
 				const me = this
 				http.postApi(config.API_FLK_CAR_DETAIL, {
-					car_sn,
-					time:Math.floor(Date.now() / 1000)
+					car_sn
 				}, (resp) => {
 					uni.hideLoading();
 					console.log(resp.data)
@@ -591,18 +578,7 @@
 
 <style lang="scss" scoped>
 	@import './index.css';
-	.header_view {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		background-color: #c4cad6;
-		// color: white;
-		// text-align: center;
-		// line-height: 50px;
-		z-index: 999; /* 确保在最上层 */
-	}
-	.fillClass {}
+
 	.news {
 		position: relative;
 		margin-right: 20rpx;

pages/login/login.vue

@@ -134,7 +134,7 @@
 							uni.hideLoading()
 							if (resp.data.code == 200) {
 								if (resp.data.data.user === null) {
-									common.simpleToast('一键授权失败,请使用手机号登录')
+									common.simpleToast(me.$t('一键授权失败')+','+me.$t('请使用手机号登录'))
 									uni.navigateTo({
 										url: '/pages/phoneLogin/phoneLogin',
 									})
@@ -146,7 +146,7 @@
 									})
 								}
 							} else {
-								common.simpleToast('一键授权失败,请使用手机号登录')
+								common.simpleToast(me.$t('一键授权失败')+','+me.$t('请使用手机号登录'))
 								uni.navigateTo({
 									url: '/pages/phoneLogin/phoneLogin',
 								})
@@ -197,7 +197,7 @@
 									})
 								}
 							} else {
-								common.simpleToast('一键授权失败,请使用手机号登录')
+								common.simpleToast(me.$t('一键授权失败')+','+me.$t('请使用手机号登录'))
 								uni.navigateTo({
 									url: '/pages/phoneLogin/login',
 								})

pages/loginRegister/forgetPassword.vue

@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         noticeText({ email }) {
-            return `我们已向 <span style="color: #0A59F7;">${email}</span> 发送了一封密码重置邮件，请您登录邮箱操作处理。`
+            return `${this.$t('我们已向')} <span style="color: #0A59F7;">${email}</span> ${this.$t('发送了一封密码重置邮件，请您登录邮箱操作处理。')}`
         }
     },
     methods: {

pages/loginRegister/register.vue

@@ -34,7 +34,7 @@
             type="register"
 			@close='close'
             :email="form.email"
-            :text="`{{ $t('我们已向') }} <span>${this.form.email}</span> {{ $t('发送注册邮件，请您登录邮箱点击链接完成注册。') }}`"
+            :text="`${ $t('我们已向') } <span>${this.form.email}</span> ${ $t('发送注册邮件，请您登录邮箱点击链接完成注册。') }`"
             v-model="isSendSucceed"
         />
     </view>

pages/manualInput/manualInput.vue

@@ -148,7 +148,7 @@
 								if (resp.data.data.is_mine) { //是本人在使用
 									wx.showModal({
 										title: this.$t('提示'),
-										content: '已有正在使用的车辆，是否跳转至车辆详情页?',
+										content: this.$t('已有正在使用的车辆，是否跳转至车辆详情页')+'?',
 										cancelText: this.$t('取消'),
 										confirmText: this.$t('确定'),
 										success: function(res) {

pages/my/my.vue

@@ -95,32 +95,32 @@ var request = require('@/common/request.js');
 			baseTabs() {
 				const lang = t => this.$t(t)
 				return [{
-						name: `${lang(this.$t('我的订单'))}`,
+						name: `${this.$t('我的订单')}`,
 						url: '/pages/order/order',
 						icon: 'FkLJGLo1faYtJWhW4Q0gt5dphI7g',
 						isLogin:1
 					},
 					{
-						name: `${lang(this.$t('换电记录'))}`,
+						name: `${this.$t('换电记录')}`,
 						url: '/pages/batteryRecord/batteryRecord',
 						icon: 'FnSjwcN7Mcpa-WA7Cqx2cGTvX2V1',
 						isLogin:1
 					},
-					{
-						name: `${lang(this.$t('意见反馈'))}`,
-						url: '/pages/feedback/index',
-						icon: 'Fh1tuCqkBQ1A20WTsiizSR9w4tQ4'
-					},
 					//   { name: `${lang(this.$t('关于我们'))}`, url: '/pages/bluetoothUnlock/unlockSet', icon: 'Fmin1_DG6ZkENCdsI1qJZJpDNkhQ' },
 					{
-						name: `${lang(this.$t('客服中心'))}`,
+						name: `${this.$t('客服中心')}`,
 						url: '',
 						statues:'service',
 						icon: 'FhA9TUbTMF0e7ma6NZXqPrkscN6l',
 						isLogin:1
 					},
 					{
-						name: `${lang(this.$t('设置'))}`,
+						name: `${this.$t('意见反馈')}`,
+						url: '/pages/feedback/index',
+						icon: 'Fh1tuCqkBQ1A20WTsiizSR9w4tQ4'
+					},
+					{
+						name: `${this.$t('设置')}`,
 						url: '/pages/my/set',
 						icon: 'Fu3f2iRi5BspRfbVLPcw8ryWc4lu'
 					}
@@ -223,7 +223,7 @@ var request = require('@/common/request.js');
 						return
 					}
 					uni.showModal({
-						content: `您是否要拨打电话${_this.shopInfo.link_phone}？`,
+						content: `${this.$t('您是否要拨打电话')}${_this.shopInfo.link_phone}？`,
 						confirmText: this.$t('确定'),
 						success: (res) => {
 							if (res.confirm) {

pages/openCabinet/openCabinet.vue

@@ -11,7 +11,7 @@
 				<text v-if="list.status == 3">{{ $t('换电成功') }}</text>
 				<text v-if="list.status == 4">{{ $t('换电失败') }}</text> -->
 			</view>
-			<view class="explain-text">{{ $t('请存入更换电池') }},{{ $t('取走满电电池') }},{{ $t('并关好仓门') }}</view>
+			<view class="explain-text">{{ $t('请存入更换电池') +','+ $t('取走满电电池') +','+ $t('并关好仓门') }}</view>
 			<!-- <view class="explain-text">{{ $t('请') }} {{ $t('归还') }} / {{ $t('取出') }} {{ $t('电池并关上仓门') }}</view> -->
 			<!-- <view class="explain-text">{{ $t('请取出电池并关上仓门') }}</view> -->
 			<!-- <view class="explain-text-grap">{{ $t('归还完成后电柜会自动打开可租仓门') }}</view> -->

pages/orderStatus/orderStatus.vue

@@ -522,7 +522,7 @@
 					if (!await this.carDetFn(car_sn)) return
 				}
 				uni.showLoading({
-					title: '识别中....',
+					title: this.$t('识别中')+'....',
 					mask: true
 				})
 				setTimeout(() => {
@@ -782,7 +782,7 @@
 				const me = this
 				const phone = me.shopInfo.link_phone
 				uni.showModal({
-					content: `您是否要拨打电话${phone}？`,
+					content: `${this.$t('您是否要拨打电话')}${phone}？`,
 					confirmText: this.$t('确定'),
 					success: (res) => {
 						if (res.confirm) {
@@ -900,7 +900,7 @@
 								if (resp.data.data.is_mine) { //是本人在使用
 									wx.showModal({
 										title: this.$t('提示'),
-										content: '已有正在使用的车辆，是否跳转至车辆详情页?',
+										content: this.$t('已有正在使用的车辆，是否跳转至车辆详情页')+'?',
 										cancelText: this.$t('取消'),
 										confirmText: this.$t('确定'),
 										success: function(res) {

pages/powerSetting/powerSetting.vue

@@ -117,7 +117,7 @@
 				})
 				uni.showLoading({
 					mask:true,
-					title:'删除中...'
+					title:this.$t('删除中')+'...'
 				})
 				msg(data.msg)
 				if(data.code == 200){
@@ -131,7 +131,7 @@
 			async submit() {
 				uni.showLoading({
 					mask: true,
-					title: '提交中...'
+					title: this.$t('提交中')+'...'
 				})
 				let {
 					data

pages/purchaseOrder/purchaseOrder.vue

@@ -341,7 +341,7 @@
 					uni.hideLoading();
 					if (resp.data.code === 200) {
 						if (!resp.data.data.need_pay) {
-							common.simpleToast(me, me.$t(this.$t('支付成功')));
+							common.simpleToast(this.$t('支付成功'));
 							me.order_sn = resp.data.data.order_sn;
 							me.sub_sn = resp.data.data.sub_sn;
 							me.setData({

pages/service/components/carRentalList/carRentalList.vue

@@ -196,7 +196,7 @@
 			},
 			callFn(tel) {
 				uni.showModal({
-					content: `您是否要拨打电话${tel}？`,
+					content: `${this.$t('您是否要拨打电话')}${tel}？`,
 					confirmText: this.$t('确定'),
 					success: (res) => {
 						if (res.confirm) {

pages/storeDetails/storeDetails.vue

@@ -298,7 +298,7 @@
 			tapPhone() {
 				const me = this
 				uni.showModal({
-					content: `您是否要拨打电话${me.storeInfo.link_phone}？`,
+					content: `${this.$t('您是否要拨打电话')}${me.storeInfo.link_phone}？`,
 					confirmText: this.$t('确定'),
 					success: (res) => {
 						if (res.confirm) {

utils/util.js

@@ -2,8 +2,13 @@ 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 formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;