语音格式化修改

common/lang/en.js

@@ -2,31 +2,31 @@ export default {
 	lang: 'en',
 	login: {
 		title: 'backstage management',
-		username:'Please enter a user name',
-		password:'Please enter your password',
+		username:'please enter a user name',
+		password:'please enter your password',
 		login:'login'
 	},
 	tabs:{
 		tab1:"home",
-		tab2:"machine sales",
+		tab2:"single",
 		tab3:"ranking",
-		tab4:"machine status",
+		tab4:"status",
 		tab5:"me"
 	},
 	mainStatistics:{
 		title:'Statistical charts',
-		name:'Name',
+		name:'name',
 		company:'sunzee',
-		dayTotalMoney:'Total income today',
-		dayTotalNum:'Quantity sold today',
-		weekTotalMoney:'week money',
-		weekTotalNum:'week number',
+		dayTotalMoney:'todayMoney',
+		dayTotalNum:'todayNumber',
+		weekTotalMoney:'weekMoney',
+		weekTotalNum:'weekNumber',
 		monthTotalMoney:'monthMoney',
 		monthTotalNum:'monthNumber',
-		yearTotalMoney:'year money',
-		yearTotalNum:'year number',
-		machineTotalNum:'machine number',
-		machineUseNum:'working machine',
+		yearTotalMoney:'yearMoney',
+		yearTotalNum:'yearNumber',
+		machineTotalNum:'machineNumber',
+		machineUseNum:'workingMachine',
 		day:'Sales today',
 		week:'Sales this week',
 		month:'Sales of this month',
@@ -38,10 +38,13 @@ export default {
 		week4:'THU',
 		week5:'FRI',
 		week6:'SAT',
-		oclock:'oclock',
-		mon:'m',
+		// oclock:'oclock',
+		oclock:':00',
+		// mon:'m',
+		mon:'-',
+		y:'',
 		saleNum:'saleNum',
-		saleroom:'saleroom',
+		saleroom:'salemoney',
 	},
 	merchantList:{
 		title:'Machine Sales',

common/lang/zh.js

@@ -40,6 +40,7 @@ export default {
 		week6:'星期六',
 		oclock:'点',
 		mon:'月',
+		y:'月',
 		saleNum:'销售个数',
 		saleroom:'销售额',
 	},

pages/Charts/mainStatistics.vue

@@ -452,7 +452,12 @@
 							return this.$t('mainStatistics.week'+weekNum);
 						}
 						if(e.indexOf('月') >= 0){
-							return e.replace('月',this.$t('mainStatistics.mon'));
+							var res = e.toString();
+							if(res.length>3){
+								return e.replace('月',this.$t('mainStatistics.mon'));
+							}else{
+								return e.replace('月',this.$t('mainStatistics.y'));
+							}
 						}
 						return e;
 					});