update lang

common/locales/en.js

@@ -188,8 +188,8 @@ export default {
 	index: {
 		scanCodeIn: "扫码入库",
 		scanCodeOut: "扫码出库",
-		notice: "公告",
-		quickService: "快捷服务",
+		notice: "Notice",
+		quickService: "Quick Service",
 		statisticalTask: "任务统计",
 		monthlyPolicy: "月度政策",
 		numberquery: "胎号查询",
@@ -215,7 +215,7 @@ export default {
 	},
 	// 我的
 	my: {
-		title: "我的",
+		title: "My",
 		contacts: "contact",
 		region: "region",
 		balanceCenter: "Balance Center",
@@ -258,22 +258,22 @@ export default {
 		version: "version",
 		exit: "exit",
 		loadingFail: "loading fail",
-		tips1: "已是最新版",
-		tips2: "发现新版本",
-		tips3: "此功能暂不开放",
-		tips4: "立即去AppStore更新"
+		tips1: "It's the latest version",
+		tips2: "New version found",
+		tips3: "This function is not available",
+		tips4: "Go to the app store to update now"
 	},
 	
 	// 经销商库存
 	agentStock: {
-		title: "经销商库存",
-		stockStatus: "库存是否充足",
-		status1: "充足",
-		status2: "紧张",
-		all: "全部",
-		brand: "品牌",
-		pattern: "花纹",
-		placeholder: "请输入品牌或规格"
+		title: "Agent Stock",
+		stockStatus: "Is the stock sufficient",
+		status1: "adequate",
+		status2: "short supply",
+		all: "all",
+		brand: "brand",
+		pattern: "pattern",
+		placeholder: "placeholder"
 	},
 	
 	// 奖励明细页面
@@ -318,5 +318,30 @@ export default {
 		noPass: "noPass",
 		pass: "pass",
 		expired: "expired"
+	},
+	
+	// 隐私政策
+	policy: {
+		title: "Privacy Policy"
+	},
+	
+	// 用户协议
+	agreement: {
+		title: "Agreement"
+	},
+	
+	// uView组件内文字
+	uView: {
+		choiceDate: "Choice Date",
+		startTime: "start",
+		endTime: "end",
+		finished: "finished"
+		
+	},
+	
+	tabBar: {
+		index: "index",
+		msg: "message",
+		my: "my"
 	}
 }

common/locales/zh.js

@@ -377,5 +377,30 @@ export default {
 		noPass: "审核未通过",
 		pass: "审核通过",
 		expired: "已过期"
+	},
+	
+	// 隐私政策
+	policy: {
+		title: "隐私政策"
+	},
+	
+	// 用户协议
+	agreement: {
+		title: "用户协议"
+	},
+	
+	// uView组件内文字
+	uView: {
+		choiceDate: "选择日期",
+		startTime: "开始",
+		endTime: "结束",
+		finished: "完成"
+	},
+	
+	// tabBar
+	tabBar: {
+		index: "首页",
+		msg: "消息",
+		my: "我的"
 	}
 }

pages/home/Statistical-task/index.vue

@@ -172,8 +172,9 @@
 						fontSize: 15 * _self.pixelRatio,
 					},
 					title: {
-						name: '完成',
+						name: this.$t('uView.finished'),
 						color: '#666666',
+						offsetX: 12,
 						fontSize: 13 * _self.pixelRatio,
 					},
 					extra: {

pages/home/index.vue

@@ -27,7 +27,7 @@
 			</view>
 			<view class="u-m-t-35">
 				<view class="u-m-l-30 u-m-b-10" style="font-size: 34rpx;">
-					快捷服务
+					{{ $t('index.quickService') }}
 				</view>
 				<!-- <view class="u-flex u-flex-wrap u-row-center">
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/task.png" style="margin:10rpx 10rpx 25rpx 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
@@ -205,11 +205,24 @@
 					} else {
 						this.langIndex = 0
 					}
+					uni.setTabBarItem({
+						index: 0,
+						text: this.$t('tabBar.index')
+					})
+					uni.setTabBarItem({
+						index: 1,
+						text: this.$t('tabBar.msg')
+					})
+					uni.setTabBarItem({
+						index: 2,
+						text: this.$t('tabBar.my')
+					})
 			}
 			
 		},
 		onShow() {
 			this.system()
+			
 		},
 		onPullDownRefresh() {
 			axios.all([this.getBanners(), this.getTiceList()])

pages/login/index.vue

@@ -121,6 +121,7 @@
 					key: "lang",
 					data: this.$i18n.locale
 				})
+
 			},
 			...mapMutations(['login']),
 			judgeIosPermission() {

pages/me/Reward-details/index.vue

@@ -37,7 +37,17 @@
 				@close="close"
 				v-model="showBrand"
 			></u-action-sheet>
-			<u-calendar :mask-close-able="false" style=" color: #fff;" @click="calendar" @change="changetime" v-model="showDate" :mode="mode">
+			<u-calendar 
+				:mask-close-able="false" 
+				:toolTip="$t('uView.choiceDate')"
+				:start-text="$t('uView.startTime')"
+				:end-text="$t('uView.endTime')"
+				style=" color: #fff;" 
+				@click="calendar" 
+				@change="changetime" 
+				v-model="showDate" 
+				:mode="mode"
+			>
 			</u-calendar>
 			<view>
 				<u-search style="width: 320rpx;" :placeholder="$t('awardDetail.placeholder')" v-model="input" :clearabled="true" @change="handleSearch"

pages/pdf/xy.vue

@@ -1,12 +1,40 @@
 <template>
 	<view>
-		<u-image src="../../static/pdf/xy.png" width="750rpx" mode="widthFix"></u-image>
+		<view v-if="switchLang == 'en'">
+			<u-image src="../../static/pdf/xy.png" width="750rpx" mode="widthFix"></u-image>
+		</view>
+		<view v-else>
+			<u-image src="../../static/pdf/xy.png" width="750rpx" mode="widthFix"></u-image>
+		</view>	
 	</view>
 </template>
 
 <script>
 	export default {
+		data() {
+			return {
+				switchLang: true
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('agreement.title')
+			});
+			
+			let self = this
+			uni.getStorage({
+			    key: 'lang',
+			    success: function (res) {
+					if (res.data && res.data === 'en') {
+						self.switchLang = 'en'
+					} else {
+						self.switchLang = 'zh'
+					}
+			    }
+			});
+		}
 	}
+	
 </script>
 
 <style lang="scss">

pages/pdf/zc.vue

@@ -1,11 +1,38 @@
 <template>
 	<view>
-		<u-image src="../../static/pdf/zc.png" width="750rpx" mode="widthFix"></u-image>
+		<view v-if="switchLang == 'en'">
+			<u-image src="../../static/pdf/zc.png" width="750rpx" mode="widthFix"></u-image>
+		</view>
+		<view v-else>
+			<u-image src="../../static/pdf/zc.png" width="750rpx" mode="widthFix"></u-image>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		data() {
+			return {
+				switchLang: 'en'
+			}
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('policy.title')
+			});
+			
+			let self = this
+			uni.getStorage({
+			    key: 'lang',
+			    success: function (res) {
+					if (res.data && res.data === 'en') {
+						self.switchLang = 'en'
+					} else {
+						self.switchLang = 'zh'
+					}
+			    }
+			});
+		}
 	}
 </script>