Merge branch 'dly_test' into gyq_test

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>
-						<allPrice  :amount="(params.overdueData.money/100)"/>
+						<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() {

component/smartCalendar/components/uni-calendar-item.vue

@@ -23,7 +23,7 @@
 				  style="display: block;
 				  text-align: center;"
 				>
-				 {{ weeks.isDay ? '今' : weeks.date}}
+				 {{ weeks.isDay ? $t('今') : weeks.date}}
 			    </text>
 				<text 
 				  v-if="calendar.fullDate === weeks.fullDate"
@@ -98,7 +98,7 @@
 		},
 		computed: {
 			todayText() {
-				return '今日'
+				return this.$t('今日')
 			},
 		},
 		methods: {

component/smartCalendar/components/uni-calendar.vue

@@ -152,34 +152,34 @@
 			 */
 
 			okText() {
-				return '确定'
+				return this.$t('确定')
 			},
 			cancelText() {
-				return '取消'
+				return this.$t('取消')
 			},
 			todayText() {
-				return '今日'
+				return this.$t('今日')
 			},
 			monText() {
-				return '一'
+				return this.$t('一')
 			},
 			TUEText() {
-				return '二'
+				return this.$t('二')
 			},
 			WEDText() {
-				return '三'
+				return this.$t('三')
 			},
 			THUText() {
-				return '四'
+				return this.$t('四')
 			},
 			FRIText() {
-				return '五'
+				return this.$t('五')
 			},
 			SATText() {
-				return '六'
+				return this.$t('六')
 			},
 			SUNText() {
-				return '日'
+				return this.$t('日')
 			},
 		},
 		watch: {

component/smartCalendar/index.vue

@@ -15,7 +15,7 @@
 			:show="show"
 			:date="defaultDate"
 			:show-month="false"
-			toText="取车"
+			:toText="$t('取车')"
 			:show-header="false"
 			mode="date"
 			@change="onChange"
@@ -27,7 +27,7 @@
 		</view>
   
 		<view class="time-wrap">
-		  <view class="picker-text">取车时间</view>
+		  <view class="picker-text">{{ $t('取车时间') }}</view>
 		  <view class="flex-row flex-between">
 			<picker-view
 			  :value="[startH,startM]"
@@ -37,13 +37,13 @@
 			  <picker-view-column>
 				<view v-for="(item, index) in hours" :key="index" class="item-picker">
 				  {{ item }}
-				  <text class="unit">时</text>
+				  <text class="unit">{{ $t('时小') }}</text>
 				</view>
 			  </picker-view-column>
 			  <picker-view-column>
 				<view v-for="(item, index) in minutes" :key="index" class="item-picker">
 				  {{ item }}
-				  <text class="unit">分</text>
+				  <text class="unit">{{ $t('分') }}</text>
 				</view>
 			  </picker-view-column>
 			</picker-view>
@@ -51,8 +51,8 @@
 		</view>
   
 		<view class="bottom-row">
-		  <view class="text">{{ '取车:'+startDay }}</view>
-		  <button :loading="isPaickerLoading" class="custom-button" @tap="navToHireCar" >确定</button>
+		  <view class="text">{{ $t('取车小')+'：'+startDay }}</view>
+		  <button :loading="isPaickerLoading" class="custom-button" @tap="navToHireCar" >{{ $t('确定') }}</button>
 		</view>
 	  </view>
 	</u-popup>
@@ -126,13 +126,12 @@
 				};
 			},
 			mounted() {
-				this.bindTime()
 				this.time = this.isNextDay?common.getToDay(1):common.getToDay()
 				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
 				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
 				this.startDate = this.time+'T'+_startH+':'+_startM
 				const DATE = new Date()
-				this.curMonth = `${DATE.getFullYear()}年${DATE.getMonth()+1}月`
+				this.curMonth = `${DATE.getFullYear()}`+'-'+`${DATE.getMonth()+1}`
 				this.startDay = common.formatDate(this.time)+' '+_startH+':'+_startM
 				this.endDate = common.loadAugmentTime(this.duration_unit,this.startDate,this.startN+1)
 				this.endDay = common.formatTimeDate(this.endDate)
@@ -157,7 +156,7 @@
 
 					this.startH = +hour;
 					this.startM = +minute;
-					this.curMonth = `${year}年${month}月`;
+					this.curMonth = `${year}`+'-'+`${month}`;
 					this.startDay = result.takeCar;
 					this.defaultDate = result.dateText;
 				},
@@ -193,29 +192,13 @@
 							this.$refs.uniCalendar && this.$refs.uniCalendar.next()
 						}
 						const { nowDate } = this.$refs.uniCalendar
-						this.curMonth = `${nowDate.year}年${nowDate.month}月`
+						this.curMonth = `${nowDate.year}`+'-'+`${nowDate.month}`
 					}
 				},
 				nextMonth() {
 					this.$refs.uniCalendar && this.$refs.uniCalendar.next()
 					const { nowDate } = this.$refs.uniCalendar
-					this.curMonth = `${nowDate.year}年${nowDate.month}月`
-				},
-				bindTime() {
-					if (this.rentalUnit == '小时') {
-						for (let i = 1; i < 25; i++) {
-							this.number.push(i);
-						}
-					} else if (this.rentalUnit == '天') {
-						for (let i = 1; i < 31; i++) {
-							this.number.push(i);
-						}
-					} else if (this.rentalUnit == '周') {
-						for (let i = 1; i < 5; i++) {
-							this.number.push(i);
-						}
-					}
-
+					this.curMonth = `${nowDate.year}`+'-'+`${nowDate.month}`
 				},
 
 				onChange(e) {

locale/en.json

@@ -5,19 +5,19 @@
 	"我的订单": "My Orders",
 	"车辆信息": "Bike Info",
 	"逾期费用：": "lafe fee",
-	"车辆编号：": "Vehicle No:",
-	"车辆名称：": "Vehicle Name:",
+	"车辆编号：": "Vehicle No：",
+	"车辆名称：": "Vehicle Name：",
 	"设备": "Device",
 	"服务": "Service",
 	"活动": "Activity",
 	"我的": "Mine",
-	"车型：": "Model:",
-	"续航：": "Range:",
-	"重量：": "Weight:",
-	"照片：": "Photo:",
+	"车型：": "Model：",
+	"续航：": "Range：",
+	"重量：": "Weight：",
+	"照片：": "Photo：",
 	"门店信息": "Store Info",
-	"门店名称：": "Store Name:",
-	"门店地址：": "Store Address:",
+	"门店名称：": "Store Name：",
+	"门店地址：": "Store Address：",
 	"车辆照片": "Vehicle Photo",
 	"归还车辆": "Return Vehicle",
 	"激活车辆": "Activate Vehicle",
@@ -420,9 +420,9 @@
 	"租赁设备编号": "Leased Device ID",
 	"子组件": "Subcomponent",
 	"更新": "Update",
-	"您已逾期": "You are Overdue",
-	"请及时续费或归还车辆": "Please Extend Rental or Return the Vehicle",
-	"去续费": "Go to Extend Rental",
+	"您已逾期": "Overdue",
+	"请及时续费或归还车辆": "Renew or return promptly",
+	"去续费": "Renew",
 	"车辆已开机": "Powered On",
 	"车辆已关机": "Powered Off",
 	"最近骑行": "Recent Rides",
@@ -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",
@@ -825,9 +825,9 @@
 	"家人、朋友长期共用车辆，授权账户可以使用感应解锁，寻车定位，查看设置等功能；": "Family/Friends Share – Authorized accounts can use functions like unlock, locate, and settings.",
 	"您还未绑定车辆": "You have not bound a vehicle yet.",
 	"车辆激活": "Vehicle activation",
-	"车辆品牌：": "Vehicle brand",
-	"车辆颜色：": "Vehicle color",
-	"车牌号：": "Plate Number",
+	"车辆品牌：": "Vehicle brand：",
+	"车辆颜色：": "Vehicle color：",
+	"车牌号：": "Plate Number：",
 	"上传照片": "Upload Photo",
 	"你确定要删除吗？": "Confirm Deletion?",
 	"还车成功！": "Return Successful!",
@@ -860,6 +860,19 @@
 	"￥": "$",
 	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
 	"正在加载数据":"Loading",
+	"现车":"Available Vehicle",
+	"随时可到店提车":"Pick up anytime",
+	"一":"Mon",
+	"二":"Tue",
+	"三":"Wed",
+	"四":"Thu",
+	"五":"Fri",
+	"六":"Sat",
+	"七":"Sun",
+	"今":"Td",
+	"时小":"H",
+	"取车小":"Pick",
 	"小时1":"Hour",
 	"分钟1":"Minute"
+	
 }

locale/zh.json

@@ -860,6 +860,18 @@
 	"￥": "￥",
 	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！",
 	"正在加载数据":"正在加载数据",
+	"现车":"现车",
+	"随时可到店提车":"随时可到店提车",
+	"一":"一",
+	"二":"二",
+	"三":"三",
+	"四":"四",
+	"五":"五",
+	"六":"六",
+	"七":"七",
+	"今":"今",
+	"时小":"时",
+	"取车小":"取车",
 	"小时1":"小时",
 	"分钟1":"分钟"
 }

mixin/index.js

@@ -93,7 +93,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
@@ -123,7 +123,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);
 							}
@@ -159,7 +159,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/index/index.vue

@@ -115,15 +115,14 @@
 										src="https://qiniu.bms16.com/FtalApKa3STyruaBxxRB4O9hHXyE" alt="">
 									<text class="margin_l_8">{{$t("换电套餐")}}</text>
 								</view>
-								<view v-if="car_info.package_type == 1" class="card-top-text">
+								<view v-if="car_info.exchange_package_info.package_type == 1" class="card-top-text">
 									{{calculateRemainingDays(car_info.exchange_package_info.expire_time)}} <text
 										class="font_24">{{$t("天")}}</text>
 								</view>
-								<view v-if="car_info.package_type == 2" class=" card-top-text">{{item.last_num}} <text
+								<view v-if="car_info.exchange_package_info.package_type == 2" class=" card-top-text">{{car_info.exchange_package_info.last_num}} <text
 										class="font_24">{{$t("次")}}</text></view>
-								<view v-if="car_info.package_type == 3" class=" card-top-text">
-									{{item.total_day}}{{$t("天")}}/{{item.last_num}} <text
-										class="font_24">{{$t("次")}}</text>
+								<view v-if="car_info.exchange_package_info.package_type == 3" class="card-top-text">
+									{{car_info.exchange_package_info.total_day}}<text class="font_24" style="margin-right: 8rpx;">{{$t("天")}}</text>{{car_info.exchange_package_info.last_num}} <text class="font_24">{{$t("次")}}</text>
 								</view>
 							</view>
 						</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) {