bugfix

component/carPlan/carPlan.vue

@@ -9,19 +9,19 @@
 					<!-- <priceTool :price="58" :font_size="40"/> -->
 					<allPrice :amount="((price || 0)/100)"/>
 					<view v-if="params.overdueData && params.overdueData.money" style="align-items: baseline;" class="flex-row">
-						<text>逾期金额：</text>
+						<text>{{ $t('逾期金额')}}：</text>
 						<allPrice  :amount="(params.overdueData.money || 0/100)"/>
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
-						<text>{{ $t('已选择') }}</text>
+						<text style="margin-right: 12rpx;">{{ $t('已选择') }}</text>
 						<text>{{leaseUnitsResult}}</text>
 						<text style="margin-left: 12rpx;">{{ $t('时长') }} {{count}} 
 							<text>{{leaseUnits}}</text>
 						</text>
 						<!-- <text>共计{{tools.countToDay(count,type)}}天</text> -->
 					</view>
-					<view style="margin-top: 10rpx;" class="car-model-tip">现车 随时可到店提车</view>
+					<view style="margin-top: 10rpx;" class="car-model-tip">{{ $t('现车') }}-{{ $t('随时可到店提车') }}</view>
 				</view>
 				<view class="close-img">
 					<image style="width: 24rpx;height: 24rpx;" @tap="closeShowMore"
@@ -47,7 +47,7 @@
 					</view>
 					
 					<view v-if="params.sell_price != 0 && isBuy"  @click="tapSelectType({hire_duration_unit:100,hire_price:params.sell_price})" :class="['flex-row' , (type == 100 ? 'car-plan-list-i' : 'car-plan-list') ]" style="padding:  0rpx 20rpx; min-width: auto; "  >
-						<view :class="(type == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">购买</view>
+						<view :class="(type == 100 ? 'car-plan-unit-i' : 'car-plan-unit') ">{{ $t('购买') }}</view>
 						<view :class="(type == 100 ? 'car-plan-price-i' : 'car-plan-price') ">$<text style="font-size: 48rpx;margin-left: 6rpx;">{{params.sell_price/100}}</text></view>
 					</view>
 				</view>
@@ -67,7 +67,7 @@
 					<view>{{ $t('租车时长') }}</view>
 					<view class="quantity-count flex-row flex-between">
 						<view class="total-time flex-row">
-							 共 
+							 {{ $t('共') }} 
 							<view style="font-weight: 600;margin: 0 10rpx;">{{count}}</view>
 							<!-- <view style="font-weight: 600;margin: 0 10rpx;">{{tools.countToDay(count,isSelectStatus)}}</view> -->
 							<text>{{leaseUnits}}</text>

component/customSwitch.vue

@@ -88,7 +88,7 @@
 				let moveX = e.touches[0].clientX - this.startX;
 				if (Math.abs(moveX) > 10) {
 					this.isSwiping = true;
-					this.isShowSwitchText = false;
+					// this.isShowSwitchText = false;
 				}
 			},
 			onTouchEnd() {

locale/en.json

@@ -619,7 +619,7 @@
 	"退款失败": "Refund Failed",
 	"已退款": "Refunded",
 	"套餐金额": "Plan Amount",
-	"订单金额": "Order Amount",
+	"订单金额": "Amount",
 	"付款金额": "Payment Amount",
 	"租车购车": "Rent/Sell",
 	"请于": "By ",
@@ -630,7 +630,7 @@
 	"已完成": "Completed",
 	"租期剩余": "Lease Left",
 	"逾期时长": "Overdue",
-	"租借周期": "Rental Period",
+	"租借周期": "Period",
 	"逾期金额": "Overdue Amount",
 	"收起": "Collapse",
 	"展开": "Expand",
@@ -859,5 +859,8 @@
 	"购买时间":"Buy Time",
 	"￥": "$",
 	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
-	"正在加载数据":"Loading"
+	"正在加载数据":"Loading",
+	"现车":"Available Vehicle",
+	"随时可到店提车":"Pick up anytime"
+	
 }

locale/zh.json

@@ -859,5 +859,7 @@
 	"购买时间":"购买时间",
 	"￥": "￥",
 	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！",
-	"正在加载数据":"正在加载数据"
+	"正在加载数据":"正在加载数据",
+	"现车":"现车",
+	"随时可到店提车":"随时可到店提车"
 }

mixin/index.js

@@ -94,7 +94,7 @@ export default {
 						http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
-								common.simpleToast(me.popText + '成功');
+								common.simpleToast(me.popText +' '+i18n.t('成功'));
 								const activeTag = me.contrilList.map(item => {
 									if('isLock' in item){
 										item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
@@ -124,7 +124,7 @@ export default {
 						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, {...pData,car_sn: car_info.car_sn}, (resp) => {
 							uni.hideLoading();
 							if (resp.data.code === 200) {
-								common.simpleToast(me.popText + '成功');
+								common.simpleToast(me.popText +' '+i18n.t('成功'));
 							} else {
 								common.simpleToast(resp.data.msg);
 							}
@@ -160,7 +160,7 @@ export default {
 					command(car_sn, () => {
 						uni.hideLoading();
 						if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
-							common.simpleToast('操作成功');
+							common.simpleToast(i18n.t('操作成功'));
 						}
 						console.log(`发送${this.popText}指令结束`);
 					});

pages/carDetail/carDetail.vue

@@ -223,7 +223,7 @@
 				const phone = this.car_detail.link_phone
 				// const phone = 18170410707
 				uni.showModal({
-					content: `${this.$t('您是否要拨打电话')+phone}？`,
+					content: `${this.$t('您是否要拨打电话')+" "+phone}？`,
 					confirmText: this.$t('确定'),
 					success: (res) => {
 						if (res.confirm) {

pages/carFunctionSet/more.vue

@@ -35,7 +35,7 @@
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
 				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
-				<view class="popup-content">{{$t("您确认")+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
+				<view class="popup-content">{{$t("您确认")+' '+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
 					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>

pages/index/components/control/control.vue

@@ -29,7 +29,7 @@
 		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
 				<view class="popup-title">{{($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText))}}</view>
-				<view class="popup-content">{{$t("您确认")+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
+				<view class="popup-content">{{$t("您确认")+' '+(($t(popText)==$t('开机'))?$t('开启车辆'):($t(popText)==$t('关机')?$t('关闭车辆'):$t(popText)))+$t("吗")}}</view>
 				<view class="flex-row modal-footer">
 					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
 					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>

pages/my/my.vue

@@ -222,7 +222,7 @@ var request = require('@/common/request.js');
 						return
 					}
 					uni.showModal({
-						content: `${this.$t('您是否要拨打电话')}${_this.shopInfo.link_phone}？`,
+						content: `${this.$t('您是否要拨打电话')} ${_this.shopInfo.link_phone}？`,
 						confirmText: this.$t('确定'),
 						success: (res) => {
 							if (res.confirm) {

pages/order/order.css

@@ -63,7 +63,7 @@
 	color: #2A3A5A;
 	font-size: 36rpx;
 	font-weight: bold;
-	width: 380rpx;
+	width: 360rpx;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;

pages/order/order.vue

@@ -32,8 +32,6 @@
 			class="order-card">
 			<view class="card-top flex-row">
 				<view v-if="selectOrderType == 1">{{ item.car_name }}</view>
-
-
 				<block v-if="selectOrderType == 0">
 					<view v-if="item.package_type == 1">
 						{{item.total_day}}{{ $t('天') }}

pages/purchaseOrder/purchaseOrder.vue

@@ -19,7 +19,7 @@
 							src="https://qiniu.bms16.com/FlMiRsUF-KZyevFCZDP9DwffOlag" alt="">
 					</view>
 					<view class="car-information">{{leaseUnitsResult}}
-						{{ $t('共计') }}{{tools.countToDay(modelInfo.count,modelInfo.selectType)}}{{ $t('天') }}</view>
+						{{ $t('共计') }} {{tools.countToDay(modelInfo.count,modelInfo.selectType)}}{{ $t('天') }}</view>
 					<allPrice v-if="modelInfo.selectType == 100" :amount="modelInfo.sell_price / 100"></allPrice>
 					<allPrice v-else :amount="price"></allPrice>
 				</view>
@@ -38,7 +38,7 @@
 				<text>{{ $t('车辆押金') }}</text>
 				<text>${{modelInfo.deposit/100}}</text>
 			</view>
-			<view class="deposit-info-text">{{ $t('需要支付') }}{{modelInfo.deposit/100}}{{ $t('元押金，诺无车损、违章及逾期，还车后可退') }}</view>
+			<view class="deposit-info-text">{{ $t('需要支付') }}{{modelInfo.deposit/100}} {{ $t('元押金，诺无车损、违章及逾期，还车后可退') }}</view>
 		</view>
 
 		<view class="method-info">

pages/service/components/carRentalList/carRentalList.vue

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