bugfix_dly-3930

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,7 +126,6 @@
 				};
 			},
 			mounted() {
-				this.bindTime()
 				this.time = this.isNextDay?common.getToDay(1):common.getToDay()
 				//#ifdef MP-ALIPAY
 				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
@@ -142,7 +141,7 @@
 				// #endif
 				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)
@@ -167,7 +166,7 @@
 
 					this.startH = +hour;
 					this.startM = +minute;
-					this.curMonth = `${year}年${month}月`;
+					this.curMonth = `${year}`+'-'+`${month}`;
 					this.startDay = result.takeCar;
 					this.defaultDate = result.dateText;
 				},
@@ -203,29 +202,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

@@ -6,18 +6,18 @@
 	"车辆信息": "Bike Info",
 	"逾期费用：": "lafe fee",
 	"车辆编号：": "Vehicle No:",
-	"车辆名称：": "Vehicle Name:",
+	"车辆名称：": "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",
@@ -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!",
@@ -861,6 +861,16 @@
 	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
 	"正在加载数据":"Loading",
 	"现车":"Available Vehicle",
-	"随时可到店提车":"Pick up anytime"
+	"随时可到店提车":"Pick up anytime",
+	"一":"Mon",
+	"二":"Tue",
+	"三":"Wed",
+	"四":"Thu",
+	"五":"Fri",
+	"六":"Sat",
+	"七":"Sun",
+	"今":"Td",
+	"时小":"H",
+	"取车小":"Pick"
 	
 }

locale/zh.json

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