add english package

common/locales/en.js

@@ -4,7 +4,7 @@ export default {
 		login:"Login",
 		sign:"Sign up now",
 		no:"No account?",
-		Lan:"Switch language—English",
+		Lan:"Switch language-English",
 		mobile:"Enter mobile number",
 		code:"Enter verification code",
 	},
@@ -26,8 +26,297 @@ export default {
 		delupload:"",
 		reloadText:""
 	},
+	
+	unified:{
+		networkstate: 'network state',
+		nodata:'nodata',
+		Loading:'Loading',
+		error:'error',
+		error1: '出错了，请稍后再试',
+		search:'search',
+		//下面是日历的周一到周天
+		sun:'Sun',
+		mon:'Mon',
+		tues:'Tues',
+		wed:'Wed',
+		thur:'Thur',
+		fri:'Fri',
+		sat:'Sat',
+		cancel: 'cancel',
+		submit: 'submit'
+	},
+	// 任务统计
+	taskStatistics: {
+		title: 'Task Statistics'
+	},
+	
+	// 月度政策
+	monthlyPolicy: {
+		title: 'Monthly Policy'
+	},
+	
+	// 扫码页面
+	scanenter: {
+		titleIn: 'Scan Enter',
+		titleOut: 'Scan Out',
+		tips: 'tips',
+		tips_a:'tips_a',
+		input: 'input',
+		confirmentry:'confirmentry',
+		number: 'number',
+		Specifications: 'Specifications',
+		operation: 'operation',
+		Delete:'Delete',
+		slide: 'slide',
+		confirm: 'confirm',
+		pleaseenter: 'pleaseenter',
+		pleaseenter_s: 'pleaseenter_s',
+		nodata: 'nodata!',
+		networkstate_s: 'networkstate_s',
+		locationstate: 'locationstate',
+		seekfailed:'seekfailed',
+		repeat: 'repeat',
+		inputsuccess: 'inputsuccess',
+		scansuccess: 'scansuccess',
+		transformation:'transformation',
+		repeatscan:'repeatscan'
+	},
+	//出入库扫码确认
+	scanningconfirm:{
+		titleIn: 'scanning In confirm',
+		titleOut: 'scanning Out confirm',
+		strip:'strip',
+		Successfullypit:'Successfully pit',
+		success:'success',
+		fail:'fail',
+		number:'number',
+		number_s: 'number_s',
+		failreason:'failreason',
+		stateA:'stateA',
+		stateB:'stateB',
+		stateC:'stateC',
+		reward:'reward',
+		yuan:'yuan',
+		integral:'integral',
+		one:'one',
+		materiel:'materiel',
+		estimatereward:'estimatereward',
+		total:'total',
+		attention:'attention',
+		confirm: 'confirm',
+		networkstate:'networkstate',
+		notincluded:'notincluded'
+	},
+	
+	//出入库明细
+	scancodeenter: {
+		titleIn: 'Warehouse Detail',
+		titleOut: 'Delivery Detail',
+		total: 'total',
+		tips: 'tips',
+		tabs_a: 'tabs_a',
+		tabs_b: 'tabs_b',
+		tabs_c: 'tabs_c',
+		number:'number',
+		describe:'describe',
+		number_d:'number_d',
+		activity:'activity',
+		creationtime:'creation time',
+		daterange:'date range',
+		strip:'strip',
+		start:'start',
+		end:'end',
+		loadmore:'load more',
+		loading:'loading',
+		nomore:'no more',
+		nodata:'no data',
+		participation:'participation',
+		noparticipation:'no participation',
+		networkstate:'network state',
+		Loading:'Loading',
+		determine:'determine',
+		delivery:'delivery'
+	},
+	
+	//胎号查询
+	numberquery:{
+		title: "Number Query",
+		clickscancode:'click scan code',
+		input:'input',
+		promptinput:'prompt input',
+		errormessage:'error message',
+		query:'query',
+		pleaseinput:'please input',
+		number:'number',
+		brand:'brand',
+		specifications:'specifications',
+		type:'type',
+		time:'time',
+		success:'success',
+		networkstate:'networkstate',
+	},
+	
+	//我的供应商
+	supplier:{
+		title: "My Supplier",
+		basicInfo: "basic Info",
+		brand: "brand",
+		noLogo: "noLogo"
+	},
+	
+	//我的经营品牌
+	brandmanagement:{
+		title: 'My Brand Management',
+		reason:'reason',
+		rejected:'reject',
+		approved:'approved',
+		deleted:'deleted',
+		notreviewed:'notReviewed'
+	},
+	
+	//我的库存
+	stock:{
+		tips: 'tips',
+		specifications:'specifications',
+		stock:'stock',
+		tabs_a: 'tabs_a',
+		loadmore:'loadmore',
+		loading:'loading',
+		nomore:'nomore',
+	},
+	// 首页
+	index: {
+		scanCodeIn: "扫码入库",
+		scanCodeOut: "扫码出库",
+		notice: "公告",
+		quickService: "快捷服务",
+		statisticalTask: "任务统计",
+		monthlyPolicy: "月度政策",
+		numberquery: "胎号查询",
+		myStock: "我的仓库",
+		monthlyTaskQuery: "每月任务查询",
+		monthlyPolicyUpdate: "每月最新政策",
+		queryTireInformation: "查询轮胎信息",
+		viewTireInventory: "查看轮胎库存",
+		goToSee: "去看看",
+		loginSuc: "登录成功",
+		tips1: "发现新版本",
+		tips2: "立即去AppStore更新",
+		
+	},
+	
+	
+	
 	message: {
 		title: 'info',
-		noData: 'no data'
+		noData: 'no data',
+		deleted: "delete",
+		deletedSuc: "delete success"
+	},
+	// 我的
+	my: {
+		title: "我的",
+		contacts: "contact",
+		region: "region",
+		balanceCenter: "Balance Center",
+		MyReward: "reward",
+		frozenAwards: "frozen awards",
+		waitingForReview: "waiting for review",
+		availablePoints: "available points",
+		myService: "My Service",
+		warehouseDetails: "warehouse details",
+		deliveryDetails: "delivery detail",
+		awardDetails: "award detail",
+		auditRecords: "audit records",
+		brandManagement: "brand management",
+		mySupplier: "my supplier",
+		setUp: "set up",
+		viewAll: "view all"
+	},
+	// 结算中心
+	balanceCenter: {
+		title: "Balance Center",
+		brand: "brand",
+		reward: "reward",
+		checkAll: "check all",
+		rebate: "rebate",
+		tips1: "奖励金额不能为0！",
+		tips2: "核销成功",
+		tips3: "请选择要核销的返利!",
+		unit: "元"
+	},
+	// 设置
+	setUp: {
+		title: "Set Up",
+		modifyAvatar: "modify avatar",
+		addressManagement: "address management",
+		storeName: "store name",
+		storeContact: "store contact",
+		mobile: "mobile",
+		agreement: "agreement",
+		policy: "policy",
+		version: "version",
+		exit: "exit",
+		loadingFail: "loading fail",
+		tips1: "已是最新版",
+		tips2: "发现新版本",
+		tips3: "此功能暂不开放",
+		tips4: "立即去AppStore更新"
+	},
+	
+	// 经销商库存
+	agentStock: {
+		title: "经销商库存",
+		stockStatus: "库存是否充足",
+		status1: "充足",
+		status2: "紧张",
+		all: "全部",
+		brand: "品牌",
+		pattern: "花纹",
+		placeholder: "请输入品牌或规格"
+	},
+	
+	// 奖励明细页面
+	awardDetail: {
+		title: "Award Detail",
+		all: "all",
+		brand: "brand",
+		time: "time",
+		placeholder: "placehoder",
+		rewarded: "rewarded",
+		tireType: "tireType",
+		tireCode: "tireCode",
+		rewardType: "rewardType",
+		time: "time",
+		scanCodeType1: "scanCodeType1",
+		scanCodeType2: "scanCodeType2"
+	},
+	
+	// 搜索页面
+	search: {
+		placeholder: "placeholder",
+		rewarded: "rewarded",
+		tireType: "tire Type",
+		tireCode: "tire Code",
+		rewardType: "reward Type",
+		time: "time",
+		scanCodeType1: "scanCodeType1",
+		scanCodeType2: "scanCodeType2"
+	},
+	
+	// 核销管理
+	auditManagement: {
+		title: "Audit Management",
+		waitingForAudit: "waiting For Audit",
+		audited: "audited",
+		invaild: "invaild",
+		money: "money",
+		createTime: "create Time",
+		auditTime: "audit Time",
+		tire: "tire",
+		currentStatus: "currentStatus",
+		noPass: "noPass",
+		pass: "pass",
+		expired: "expired"
 	}
 }

common/locales/zh.js

@@ -97,6 +97,7 @@ export default {
 		nodata:'暂无数据',
 		Loading:'加载中',
 		error:'出错啦',
+		error1: '出错了，请稍后再试',
 		search:'搜索',
 		//下面是日历的周一到周天
 		sun:'日',
@@ -105,11 +106,24 @@ export default {
 		wed:'三',
 		thur:'四',
 		fri:'五',
-		sat:'六'
+		sat:'六',
+		cancel: '取消',
+		submit: '提交'
 	},
-	//扫码页面
+	// 任务统计
+	taskStatistics: {
+		title: '任务统计'
+	},
+	
+	// 月度政策
+	monthlyPolicy: {
+		title: '月度政策'
+	},
+	
+	// 扫码页面
 	scanenter: {
-		title: '扫码入库',
+		titleIn: '扫码入库',
+		titleOut: '扫码出库',
 		tips: '提示',
 		tips_a:'请扫码入库',
 		input: '手动录入',
@@ -134,6 +148,8 @@ export default {
 	},
 	//出入库扫码确认
 	scanningconfirm:{
+		titleIn: "扫码入库确认",
+		titleOut: "扫码出库确认",
 		strip:'条',
 		Successfullypit:'成功入库轮胎',
 		success:'成功信息',
@@ -158,6 +174,8 @@ export default {
 	},
 	//出入库明细
 	scancodeenter: {
+		titleIn: '入库明细',
+		titleOut: '出库明细',
 		total: '库存总量',
 		tips: '请输入胎号或规格',
 		tabs_a: '全部',
@@ -185,6 +203,7 @@ export default {
 	},
 	//胎号查询
 	numberquery:{
+		title: "胎号查询",
 		clickscancode:'点击扫码',
 		input:'手动录入',
 		promptinput:'请扫码查询或手动录入',
@@ -201,12 +220,14 @@ export default {
 	},
 	//我的供应商
 	supplier:{
+		title: "我的供应商",
 		basicInfo: "供应商基本信息",
 		brand: "经营品牌",
 		noLogo: "暂无logo"
 	},
 	//我的经营品牌
 	brandmanagement:{
+		title: '我的经营品牌',
 		reason:'原因',
 		rejected:'已拒绝',
 		approved:'审核通过',
@@ -237,7 +258,10 @@ export default {
 		monthlyPolicyUpdate: "每月最新政策",
 		queryTireInformation: "查询轮胎信息",
 		viewTireInventory: "查看轮胎库存",
-		goToSee: "去看看"
+		goToSee: "去看看",
+		loginSuc: "登录成功",
+		tips1: "发现新版本",
+		tips2: "立即去AppStore更新",
 		
 	},
 	// 消息
@@ -273,7 +297,11 @@ export default {
 		brand: "品牌",
 		reward: "奖励",
 		checkAll: "全选",
-		rebate: "核销返利"
+		rebate: "核销返利",
+		tips1: "奖励金额不能为0！",
+		tips2: "核销成功",
+		tips3: "请选择要核销的返利!",
+		unit: "元"
 	},
 	// 设置
 	setUp: {
@@ -285,7 +313,69 @@ export default {
 		mobile: "联系电话",
 		agreement: "用户协议",
 		policy: "隐私政策",
-		version: "版本",
-		exit: "安全退出"
+		version: "版本检测",
+		exit: "安全退出",
+		loadingFail: "加载失败",
+		tips1: "已是最新版本",
+		tips2: "发现新版本",
+		tips3: "此功能暂不开放",
+		tips4: "立即去AppStore更新"
+		
+	},
+	
+	// 经销商库存
+	agentStock: {
+		title: "经销商库存",
+		stockStatus: "库存是否充足",
+		status1: "充足",
+		status2: "紧张",
+		all: "全部",
+		brand: "品牌",
+		pattern: "花纹",
+		placeholder: "请输入品牌或规格"
+	},
+	
+	// 奖励明细页面
+	awardDetail: {
+		title: "奖励明细",
+		all: "全部",
+		brand: "品牌",
+		time: "时间",
+		placeholder: "请输入胎号或规格",
+		rewarded: "获得奖励",
+		tireType: "轮胎型号",
+		tireCode: "扫码胎号",
+		rewardType: "奖励类型",
+		time: "时间",
+		scanCodeType1: "门店扫码",
+		scanCodeType2: "车主扫码"
+	},
+	
+	// 搜索页面
+	search: {
+		placeholder: "请输入搜索内容",
+		rewarded: "获得奖励",
+		tireType: "轮胎型号",
+		tireCode: "扫码胎号",
+		rewardType: "奖励类型",
+		time: "获得时间",
+		scanCodeType1: "门店扫码",
+		scanCodeType2: "车主扫码"
+	},
+	
+	// 核销管理
+	auditManagement: {
+		title: "核销管理",
+		waitingForAudit: "待审核",
+		audited: "已审核",
+		invaild: "已失效",
+		money: "核销金额",
+		createTime: "创建时间",
+		auditTime: "审核时间",
+		tire: "轮胎",
+		currentStatus: "当前状态",
+		noPass: "审核未通过",
+		pass: "审核通过",
+		expired: "已过期"
 	}
 }

pages/home/Scan-code-in/index.vue

@@ -101,6 +101,10 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scanningconfirm.titleIn')
+			});
+			
 			uni.getNetworkType({
 				success: function(res) {
 					let none = res.networkType

pages/home/Scan-code-out/index.vue

@@ -75,6 +75,10 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scanningconfirm.titleOut')
+			});
+			
 			uni.$on('update', data => {
 				this.datalist = data.materialList
 				console.log(data)

pages/home/Statistical-task/index.vue

@@ -67,7 +67,9 @@
 			// this.showPie('canvasRing')
 		},
 		created() {
-
+			uni.setNavigationBarTitle({
+			    title: this.$t('taskStatistics.title')
+			});
 		},
 		onShow() {
 			this.getDate()
@@ -76,7 +78,7 @@
 		methods: {
 			getDate() {
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('unified.Loading')
 				});
 				request({
 						url: '/myapp/storeBrandTask',

pages/home/index.vue

@@ -170,16 +170,16 @@
 			// uni.startPullDownRefresh();
 		},
 		onReady() {
-			if (this.loginStatus == "登录成功") {
+			if (this.loginStatus == "登录成功" || this.loginStatus == "login sucess") {
 				this.$refs.ulogin.show({
-					title: "登录成功",
+					title: this.$t('index.loginSuc'),
 				})
 			}
 		},
 		created() {
 			if (this.hasLogin) {
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('unified.Loading')
 				});
 				axios.all([this.getBanners(), this.getTiceList()])
 					.then(axios.spread((one, two) => {
@@ -268,10 +268,10 @@
 								// 
 								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
-									title: "发现新版本",
+									title: this.$t('index.tip1'),
 									content: res.data.msg,
 									showCancel: false,
-									confirmText: "立即去AppStore更新",
+									confirmText: this.$t('index.tip2'),
 									success: function(res) {
 										if (res.confirm) {
 											// 
@@ -290,10 +290,10 @@
 
 								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
-									title: "发现新版本",
+									title: this.$t('index.tip1'),
 									content: res.data.msg,
 									showCancel: true,
-									confirmText: "立即去AppStore更新",
+									confirmText: this.$t('index.tip2'),
 									success: function(res) {
 										if (res.confirm) {
 

pages/home/monthly-policy/monthly-policy.vue

@@ -19,6 +19,11 @@
 		onLoad() {
 			this.handleGetData();
 		},
+		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('monthlyPolicy.title')
+			});
+		},
 		methods: {
 			handleGetData(){
 				uni.showLoading({

pages/home/scancode/index.vue

@@ -97,6 +97,9 @@
 			})
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scanenter.titleIn')
+			});
 			uni.getNetworkType({
 				success: function(res) {
 					let none = res.networkType

pages/home/scancode/scancodeout.vue

@@ -98,6 +98,9 @@
 			})
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scanenter.titleOut')
+			});
 			uni.getNetworkType({
 				success: function(res) {
 					let none = res.networkType

pages/home/scancodequery/result.vue

@@ -86,6 +86,11 @@
 			// })
 
 		},
+		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('numberquery.title')
+			});
+		},
 		methods: {
 			rendering() {
 

pages/me/Delivery-details/index.vue

@@ -138,9 +138,13 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scancodeenter.titleOut')
+			});
 			this.page = 1
 			this.whole()
 		},
+		
 		methods: {
 			content_s() {
 				

pages/me/Reward-details/index.vue

@@ -9,17 +9,17 @@
 			<view style="width: 100%;">
 				<view style="width: 340rpx;height: 80rpx;text-align: center;padding-top: 25rpx;padding-left: 20rpx;float: left;margin-top: 0;margin-left: 30rpx;">
 					<view style="float: left;">
-						<text @tap="$u.throttle(whole, 500)">全部</text>
+						<text @tap="$u.throttle(whole, 500)">{{ $t('awardDetail.all') }}</text>
 						<view v-if="bottoma == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 						<view v-else></view>
 					</view>
 					<view style="float: left;margin-left: 70rpx;">
-						<text @click="brand">品牌</text>
+						<text @click="brand">{{ $t('awardDetail.brand') }}</text>
 						<view v-if="bottomb == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 						<view v-else></view>
 					</view>
 					<view style="float: left;margin-left: 70rpx;">
-						<text @click="time_s">时间</text>
+						<text @click="time_s">{{ $t('awardDetail.time') }}</text>
 						<view v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 						<view v-else></view>
 					</view>
@@ -29,11 +29,18 @@
 						 :is-scroll="false" :current="current" @change="change"></u-tabs> -->
 			<!-- <u-select :mask-close-able="false" @cancel="clear" style=" color: #fff;" @confirm="confirm" v-model="showBrand"
 			 value-name="brandId" label-name="brandName" :list="brandList"></u-select> -->
-			 <u-action-sheet :mask-close-able="false" :list="list_a" @click="click" @close="close" v-model="showBrand"></u-action-sheet>
+			 <u-action-sheet 
+				:mask-close-able="false" 
+				:list="list_a"
+				:cancel-text="$t('unified.cancel')" 
+				@click="click"
+				@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>
 			<view>
-				<u-search style="width: 320rpx;" placeholder="请输入胎号或规格" v-model="input" :clearabled="true" @change="handleSearch"
+				<u-search style="width: 320rpx;" :placeholder="$t('awardDetail.placeholder')" v-model="input" :clearabled="true" @change="handleSearch"
 				 :show-action="false" :animation="true"></u-search>
 			</view>
 		</view>
@@ -41,10 +48,10 @@
 			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
 				</view>
-				<view class="content-one-text">获得奖励：{{item.money}}元</view>
+				<view class="content-one-text">{{ $t('awardDetail.rewarded') }}：{{item.money}}元</view>
 				<view class="content-two">
 					<view class="">
-						轮胎型号
+						{{ $t('awardDetail.tireType') }}
 					</view>
 					<view class="">
 						{{item.tireModel}}
@@ -52,7 +59,7 @@
 				</view>
 				<view class="content-two">
 					<view class="">
-						扫码胎号
+						{{ $t('awardDetail.tireCode') }}
 					</view>
 					<view class="">
 						{{item.tyreNum}}
@@ -60,7 +67,7 @@
 				</view>
 				<view class="content-two">
 					<view class="">
-						奖励类型
+						{{ $t('awardDetail.rewardType') }}
 					</view>
 					<view class="">
 						{{getWay}}
@@ -68,7 +75,7 @@
 				</view>
 				<view class="content-two">
 					<view class="">
-						获得时间
+						{{ $t('awardDetail.time') }}
 					</view>
 					<view class="">
 						{{item.createTime}}
@@ -80,7 +87,7 @@
 
 		</view>
 		<view v-else style="margin-top: 400rpx;">
-			<u-empty text="暂无数据" mode="list"></u-empty>
+			<u-empty :text="$t('unified.nodata')" mode="list"></u-empty>
 		</view>
 		<u-loadmore v-if="datalist.length>3" :status="status" />
 	</view>
@@ -127,6 +134,10 @@
 			};
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('awardDetail.title')
+			});
+			
 			this.whole()
 			this.getBrandList()
 		},
@@ -156,9 +167,9 @@
 						// 判断扫码类型
 						for (var i = 0; i < res.data.data.length; i++) {
 							if (res.data.data[i].getWay == 0) {
-								this.getWay = "门店扫码"
+								this.getWay = this.$t('awardDetail.scanCodeType1')
 							} else {
-								this.getWay = "车主扫码"
+								this.getWay = this.$t('awardDetail.scanCodeType2')
 							}
 						}
 					}).catch(err => {
@@ -204,7 +215,7 @@
 				this.endTime = e.endDate + ' 23:59:59'
 				this.datalist = []
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('unified.Loading')
 				});
 				this.data()
 			},

pages/me/Settlement-center/index.vue

@@ -11,9 +11,9 @@
 				</view>
 
 				<view class="content-four">
-					<text>品牌</text>
-					<text>奖励</text>
-					<text @click="checkedAll(index,item)" :key='index'>全选</text>
+					<text>{{ $t('balanceCenter.brand') }}</text>
+					<text>{{ $t('balanceCenter.reward') }}</text>
+					<text @click="checkedAll(index,item)" :key='index'>{{ $t('balanceCenter.checkAll') }}</text>
 				</view>
 				<checkbox-group @change="checkboxChange($event,index,item.storegentBrandList)">
 					<view class="content-five" v-for="(item,brandIndex) in item.storegentBrandList" :key="brandIndex">
@@ -21,7 +21,7 @@
 							<u-image width="100%" height="80%" scaleType="matrix" :src="item.logoUrl"></u-image>
 						</view>
 						<view class="content-five-view">
-							{{item.usableMoney}}元
+							{{item.usableMoney}} {{ $t('balanceCenter.unit') }}
 						</view>
 						<view>
 							<label>
@@ -70,6 +70,9 @@
 			};
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('balanceCenter.title')
+			});
 			this.getData()
 		},
 		computed: {
@@ -82,7 +85,7 @@
 			// 获取结算中心数据
 			getData() {
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('unified.Loading')
 				});
 				request({
 						url: '/myapp/storeSettlementCenter',
@@ -125,7 +128,7 @@
 			},
 			// 置灰选择框
 			checkbox() {
-				this.$u.toast('奖励金额不能为0！');
+				this.$u.toast(this.$t('balanceCenter.tips1'));
 			},
 			// 选中某个复选框时，由checkbox时触发
 			// ,bollean,index
@@ -162,14 +165,14 @@
 						
 						if (res.data.msg == "success") {
 							uni.showToast({
-								title: '核销成功',
+								title: this.$t('balanceCenter.tips2'),
 								duration: 2000
 							});
 							this.getData()
 
 						} else {
 							uni.showToast({
-								title: '请选择要核销的返利!',
+								title: this.$t('balanceCenter.tips3'),
 								icon: 'none',
 								duration: 2000
 							});

pages/me/Warehousing-details/index.vue

@@ -75,7 +75,14 @@
 			<view style="margin-top: 30rpx;margin-bottom: 30rpx;">
 				<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" />
 			</view>
-			<u-action-sheet :list="list_a" @click="click" v-model="show" :mask-close-able="false" @close="close"></u-action-sheet>
+			<u-action-sheet
+				:list="list_a"
+				:cancel-text="$t('unified.cancel')"
+				@click="click" 
+				v-model="show" 
+				:mask-close-able="false" 
+				@close="close"
+			></u-action-sheet>
 			<u-calendar v-model="show_d" :toolTip="$t('scancodeenter.daterange')" :mode="mode" @change="time" :mask-close-able="false"
 			 :start-text="$t('scancodeenter.start')" :end-text="$t('scancodeenter.end')"></u-calendar>
 		</view>
@@ -129,6 +136,10 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('scancodeenter.titleIn')
+			});
+			
 			this.page = 1
 			this.whole()
 		},

pages/me/Write-off-management/index.vue

@@ -8,7 +8,7 @@
 				<view class="order" v-for="(res,index) in orderList" :key="index">
 					<view class="order-one">
 					</view>
-					<text class="order-one-text">核销金额：￥{{res.amount}}</text>
+					<text class="order-one-text">{{ $t('auditManagement.money') }}：￥{{res.amount}}</text>
 					<view class="order-one-view">
 						{{b2bStatus}}
 					</view>
@@ -16,7 +16,7 @@
 					</view>
 					<view class="order-two">
 						<view class="">
-							创建时间
+							{{ $t('auditManagement.createTime') }}
 						</view>
 						<view class="">
 							{{res.createTime}}
@@ -24,7 +24,7 @@
 					</view>
 					<view class="order-two" v-if="res.agentAuditTime != null">
 						<view class="">
-							审核时间
+							{{ $t('auditManagement.auditTime') }}
 						</view>
 						<view class="">
 							{{res.agentAuditTime}}
@@ -32,7 +32,7 @@
 					</view>
 					<view class="order-two">
 						<view class="">
-							{{res.brandName}}轮胎
+							{{res.brandName}}{{ $t('auditManagement.tire') }}
 						</view>
 						<view class="">
 							￥{{res.amount}}
@@ -40,29 +40,29 @@
 					</view>
 					<view class="order-two">
 						<view class="">
-							当前状态
+							{{ $t('auditManagement.currentStatus') }}
 						</view>
 						<view v-if="res.status == 0">
-							待审核
+							{{ $t('auditManagement.waitingForAudit') }}
 						</view>
 						<view v-else-if="res.status == 1">
-							审核未通过
+							{{ $t('auditManagement.noPass') }}
 						</view>
 						<view v-else-if="res.status == 2">
-							审核通过
+							{{ $t('auditManagement.pass') }}
 						</view>
 						<view v-else-if="res.status == 3">
-							已过期
+							{{ $t('auditManagement.expired') }}
 						</view>
 						<view v-else-if="res.status == 4">
-							已审核
+							{{ $t('auditManagement.audited') }}
 						</view>
 					</view>
 				</view>
 				<u-loadmore :status="status" />
 			</view>
 			<view v-else style="margin-top: 100rpx;">
-				<u-empty text="暂无数据" mode="list"></u-empty>
+				<u-empty :text="$t('unified.nodata')" mode="list"></u-empty>
 			</view>
 
 		</view>
@@ -86,13 +86,13 @@
 				pages: '',
 				b2bStatus: '',
 				list: [{
-					name: "待审核"
+					name: this.$t('auditManagement.waitingForAudit')
 
 				}, {
-					name: "已审核"
+					name: this.$t('auditManagement.audited')
 
 				}, {
-					name: "已失效"
+					name: this.$t('auditManagement.invaild')
 
 				}],
 				current: 0,
@@ -102,6 +102,9 @@
 		},
 		onLoad() {},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('auditManagement.title')
+			});
 			this.getDate()
 		},
 		methods: {
@@ -128,11 +131,11 @@
 						this.orderList = this.orderList.concat(res.data.data.records)
 						for (let i = 0; i < res.data.data.records.length; i++) {
 							if (res.data.data.records[i].status == 0) {
-								this.b2bStatus = "待审核"
+								this.b2bStatus = this.$t('auditManagement.waitingForAudit')
 							} else if (res.data.data.records[i].status == 2) {
-								this.b2bStatus = "已审核"
+								this.b2bStatus = this.$t('auditManagement.audited')
 							} else {
-								this.b2bStatus = "已失效"
+								this.b2bStatus = this.$t('auditManagement.invaild')
 							}
 						}
 
@@ -179,11 +182,11 @@
 						for (let i = 0; i < res.data.data.records.length; i++) {
 							
 							if (res.data.data.records[i].status == 0) {
-								this.b2bStatus = "待审核"
+								this.b2bStatus = this.$t('auditManagement.waitingForAudit')
 							} else if (res.data.data.records[i].status == 2) {
-								this.b2bStatus = "已审核"
+								this.b2bStatus = this.$t('auditManagement.audited')
 							} else {
-								this.b2bStatus = "已失效"
+								this.b2bStatus = this.$t('auditManagement.invaild')
 							}
 						}
 					}).catch(err => {

pages/me/agent-stock/agent-stock.vue

@@ -3,17 +3,17 @@
 	<scroll-view scroll-y @scrolltolower="scrollBottom" class="scroll-view-container">
 		<view class="header">
 			<view class="header-one">
-				库存是否充足：<text>{{total | filterTotal}}</text>
+				{{$t('agentStock.stockStatus')}}：<text>{{total | filterTotal}}</text>
 			</view>
 			<view class="content">
-				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(0)">全部</u-button>
-				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(1)">品牌</u-button>
-				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(2)">花纹</u-button>
+				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(0)">{{ $t('agentStock.all') }}</u-button>
+				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(1)">{{ $t('agentStock.brand') }}</u-button>
+				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="changeTab(2)">{{ $t('agentStock.pattern')}}</u-button>
 				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList" @confirm="confirmBrand"></u-select>
 				<u-select style=" color: #fff;" v-model="showpattern" :list="patternList" @confirm="confirmPattern"></u-select>
 				<!-- <u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar> -->
 				<u-search :show-action="true" v-model="currentSpec" :animation="true" @custom="searchSpec" @search="searchSpec"
-				 :style="inputCustomStyle" @focus="inputFocus" @blur="inputBlur" placeholder="请输入规格"></u-search>
+				 :style="inputCustomStyle" @focus="inputFocus" @blur="inputBlur" :placeholder="$t('agentStock.placeholder')"></u-search>
 			</view>
 
 		</view>
@@ -31,7 +31,7 @@
 					</view>
 				</view>
 			</template>
-			<u-empty v-else text="暂无数据" mode="list"></u-empty>
+			<u-empty v-else :text="$('unified.nodata')" mode="list"></u-empty>
 		</view>
 		<u-loadmore v-if="datalist&&datalist.length" :status="loadStatus" bgColor="#f2f2f2" :load-text="loadText"></u-loadmore>
 	</scroll-view>
@@ -82,18 +82,23 @@
 		},
 		onLoad() {
 			uni.showLoading({
-				title: "加载中"
+				title: this.$t('unified.Loading')
 			});
 			this.handleGetFilterData();
 			this.handleGetData();
 		},
+		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('agentStock.title')
+			});
+		},
 		methods: {
 			scrollBottom(v) {
 				
 				if (this.loadStatus == "loadmore") {
 					this.loadStatus = 'loading';
 					uni.showLoading({
-						title: "加载中"
+						title: this.$t('unified.Loading')
 					});
 					// 模拟数据加载
 					this.first += 1;
@@ -164,7 +169,7 @@
 			// 获取数据
 			handleGetData() {
 				uni.showLoading({
-					title: "加载中"
+					title: this.$t('unified.Loading')
 				});
 				var _this = this;
 				request({
@@ -263,9 +268,9 @@
 			filterTotal: function(val) {
 				var valText;
 				if (val >= 10) {
-					valText = "充足"
+					valText = this.$t('agentStock.status1')
 				} else {
-					valText = "紧张"
+					valText = this.$t('agentStock.status2')
 				};
 				return valText;
 			}

pages/me/index.vue

@@ -35,13 +35,13 @@
 						<view style="font-size: 34rpx; color: #ffffff">
 							{{ userInfo.contactName }}
 						</view>
-						<view style="color: #b3daff; opacity: 0.9"> 联系人 </view>
+						<view style="color: #b3daff; opacity: 0.9"> {{$t('my.contacts')}} </view>
 					</view>
 					<view class="u-text-center u-skeleton-fillet">
 						<view style="font-size: 34rpx; color: #ffffff">
 							{{ userInfo.district }}
 						</view>
-						<view style="color: #b3daff; opacity: 0.9"> 区域 </view>
+						<view style="color: #b3daff; opacity: 0.9">{{ $t('my.region') }} </view>
 					</view>
 				</view>
 			</view>
@@ -49,9 +49,9 @@
 				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false"
 				 :border="false" class="u-skeleton-fillet">
 					<view slot="head" class="u-flex u-row-between u-col-bottom" @click="insettlement">
-						<view style="font-size: 34rpx"> 结算中心 </view>
+						<view style="font-size: 34rpx"> {{ $t('my.balanceCenter') }} </view>
 						<view class="u-col-bottom" style="color: #4b4b4b; font-size: 24rpx">
-							查看全部
+							{{ $t('my.viewAll') }}
 						</view>
 					</view>
 					<view slot="body">
@@ -60,25 +60,25 @@
 								<view style="color: #0095ff; font-size: 30rpx">
 									{{ userInfo.usableMoney | numberFormat }}
 								</view>
-								<view style="color: #333333"> 我的奖励 </view>
+								<view style="color: #333333"> {{ $t('my.MyReward') }} </view>
 							</view>
 							<view class="u-text-center">
 								<view style="color: #0095ff; font-size: 30rpx">
 									{{ userInfo.blockMoney | numberFormat }}
 								</view>
-								<view style="color: #333333"> 冻结奖励 </view>
+								<view style="color: #333333"> {{ $t('my.frozenAwards') }} </view>
 							</view>
 							<view class="u-text-center">
 								<view style="color: #0095ff; font-size: 30rpx">
 									{{ userInfo.allBlockMoney | numberFormat }}
 								</view>
-								<view style="color: #333333"> 待核销 </view>
+								<view style="color: #333333"> {{ $t('my.waitingForReview') }} </view>
 							</view>
 							<view class="u-text-center">
 								<view style="color: #0095ff; font-size: 30rpx">
 									{{ userInfo.storeTotalIntegral | numberFormat }}
 								</view>
-								<view style="color: #333333"> 可用积分 </view>
+								<view style="color: #333333"> {{ $t('my.availablePoints') }} </view>
 							</view>
 						</view>
 					</view>
@@ -86,7 +86,7 @@
 				<u-card padding="20" box-shadow="0rpx 0rpx 24rpx 0rpx rgba(101, 176, 249, 0.41)" border-radius="20" :show-foot="false"
 				 :border="false" class="u-skeleton-fillet">
 					<view slot="head" class="u-flex u-row-between u-col-bottom">
-						<view style="font-size: 34rpx"> 我的服务 </view>
+						<view style="font-size: 34rpx"> {{ $t('my.myService') }} </view>
 					</view>
 					<view slot="body">
 						<view style="height: 300rpx; font-size: 24rpx;display:flex;align-content:space-around;flex-wrap: wrap;width: 100%;">
@@ -96,21 +96,21 @@
 										<u-image width="80rpx" height="80rpx" src="../../static/sailun/instock.png" :lazy-load="true" shape="circle">
 										</u-image>
 									</view>
-									<view style="color: #000000" class="u-m-t-10"> 入库明细 </view>
+									<view style="color: #000000" class="u-m-t-10"> {{ $t('my.warehouseDetails') }} </view>
 								</view>
 								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(1)">
 									<view>
 										<u-image width="80rpx" height="80rpx" src="../../static/sailun/outstock.png" :lazy-load="true" shape="circle">
 										</u-image>
 									</view>
-									<view style="color: #000000" class="u-m-t-10"> 出库明细 </view>
+									<view style="color: #000000" class="u-m-t-10"> {{ $t('my.deliveryDetails') }} </view>
 								</view>
 								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(2)">
 									<view>
 										<u-image width="80rpx" height="80rpx" src="../../static/sailun/reward.png" :lazy-load="true" shape="circle">
 										</u-image>
 									</view>
-									<view style="color: #000000" class="u-m-t-10"> 奖励明细 </view>
+									<view style="color: #000000" class="u-m-t-10"> {{ $t('my.awardDetails') }} </view>
 								</view>
 							</view>
 							<view class="u-flex u-row-around" style="width:100%;">
@@ -119,7 +119,7 @@
 										<u-image width="80rpx" height="80rpx" src="../../static/sailun/write.png" :lazy-load="true" shape="circle">
 										</u-image>
 									</view>
-									<view style="color: #000000" class="u-m-t-10">核销记录</view>
+									<view style="color: #000000" class="u-m-t-10">{{ $t('my.auditRecords') }}</view>
 								</view>
 								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(6)">
 									<view>
@@ -127,7 +127,7 @@
 										</u-image>
 									</view>
 									<view style="color: #000000" class="u-m-t-10">
-										经营品牌
+										{{ $t('my.brandManagement') }}
 									</view>
 								</view>
 								<view class="u-flex u-row-centter" style="flex-direction: column; width: 25%" @click="inPage(7)">
@@ -136,7 +136,7 @@
 										</u-image>
 									</view>
 									<view style="color: #000000" class="u-m-t-10">
-										我的供应商
+										{{ $t('my.mySupplier') }}
 									</view>
 								</view>
 							</view>
@@ -144,7 +144,7 @@
 					</view>
 				</u-card>
 				<u-cell-group>
-					<u-cell-item title="设置" @click="inPage(11)">
+					<u-cell-item :title="$t('my.setUp')" @click="inPage(11)">
 						<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon"></u-icon>
 					</u-cell-item>
 				</u-cell-group>

pages/me/management.vue

@@ -52,8 +52,12 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('brandmanagement.title')
+			});
+			
 			uni.showLoading({
-				title: '加载中...'
+				title: this.$t('unified.Loading')
 			});
 			
 			setTimeout(function() {
@@ -70,7 +74,7 @@
 						if (none == 'none') {
 							uni.showToast({
 								icon: 'none',
-								title: '无网络，请连接网络后再试~',
+								title: this.$t('unified.networkstate'),
 								position: "bottom"
 							})
 						}
@@ -91,7 +95,7 @@
 					} else if (res.data.code == 500) {
 						uni.showToast({
 							icon: 'none',
-							title: '出错了，请稍后再试',
+							title: this.$t('unified.error1'),
 							position: "bottom"
 						})
 					}
@@ -99,7 +103,7 @@
 					
 					uni.showToast({
 						icon: 'none',
-						title: '出错了，请稍后再试',
+						title: this.$t('unified.networkstate'),
 						position: "bottom"
 					})
 				}).finally(() => {

pages/me/search/index.vue

@@ -1,17 +1,17 @@
 <template>
 	<view>
 		<view class="content">
-			<u-search placeholder="请输入搜索内容" @custom="data" v-model="keyword"></u-search>
+			<u-search :placeholder="$t('search.placeholder')" @custom="data" v-model="keyword"></u-search>
 		</view>
 		
 		<view class="content-one" v-for="(item,index) in datalist" :key="index">
 			<view class="content-one-view">
 			</view>
-			<view class="content-one-text">获得奖励：{{item.money}}元</view>
+			<view class="content-one-text">{{ $t('search.rewarded') }}：{{item.money}}元</view>
 			<!-- <view class="content-one-time">2020-10-28</view> -->
 			<view class="content-two">
 				<view>
-					轮胎型号
+					{{ $t('search.tireType') }}
 				</view>
 				<view>
 					{{item.tireModel}}
@@ -19,7 +19,7 @@
 			</view>
 			<view class="content-two">
 				<view>
-					扫码胎号
+					{{ $t('search.tireCode') }}
 				</view>
 				<view>
 					{{item.tyreNum}}
@@ -27,7 +27,7 @@
 			</view>
 			<view class="content-two">
 				<view>
-					奖励类型
+					{{ $t('search.rewardType') }}
 				</view>
 				<view>
 					{{item.getWay}}
@@ -35,7 +35,7 @@
 			</view>
 			<view class="content-two">
 				<view>
-					获得时间
+					{{ $t('search.time') }}
 				</view>
 				<view>
 					{{item.createTime}}
@@ -82,9 +82,9 @@
 						// 判断扫码类型
 						for (var i = 0; i < res.data.data.length; i++) {
 							if (res.data.data[i].getWay == 0) {
-								this.getWay = "车主扫码"
+								this.getWay = this.$t('search.scanCodeType1')
 							} else {
-								this.getWay = "门店扫码"
+								this.getWay = this.$t('search.scanCodeType2')
 							}
 						}
 						

pages/me/setting/setting.vue

@@ -9,7 +9,7 @@
 						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle"
 						 :show-loading="true">
 							<u-loading slot="loading"></u-loading>
-							<view slot="error" style="font-size: 24rpx" :fade="true" duration="450">加载失败
+							<view slot="error" style="font-size: 24rpx" :fade="true" duration="450">{{ $t('setUp.loadingFail') }}
 							</view>
 						</u-image>
 					</view>
@@ -25,32 +25,32 @@
 			<view slot="body">
 				<template>
 					<u-cell-group :border="false">
-						<u-cell-item title="收货地址管理" @click="tishi">
+						<u-cell-item :title="$t('setUp.addressManagement')" @click="tishi">
 							<u-icon slot="icon" size="42" name="location-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="门店名称" :value="userInfo.storeName" :arrow="false">
+						<u-cell-item :title="$t('setUp.storeName')" :value="userInfo.storeName" :arrow="false">
 							<u-icon slot="icon" size="42" name="shop-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="门店联系人" :value="userInfo.contactName" :arrow="false">
+						<u-cell-item :title="$t('setUp.storeContact')" :value="userInfo.contactName" :arrow="false">
 							<u-icon slot="icon" size="42" name="contact" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="联系电话" :value="userInfo.storePhone" :arrow="false">
+						<u-cell-item :title="$t('setUp.mobile')" :value="userInfo.storePhone" :arrow="false">
 							<u-icon slot="icon" size="42" name="phone-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="用户协议" @click="openPdf(1)">
+						<u-cell-item :title="$t('setUp.agreement')" @click="openPdf(1)">
 							<u-icon slot="icon" size="42" name="friends-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="隐私政策" @click="openPdf(2)">
+						<u-cell-item :title="$t('setUp.policy')" @click="openPdf(2)">
 							<u-icon slot="icon" size="42" name="info-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="版本检测" :value="edition_s" :value-style="customStyle" class="value-style" :arrow="false" :border-bottom="false" @click="edition">
+						<u-cell-item :title="$t('setUp.version')" :value="edition_s" :value-style="customStyle" class="value-style" :arrow="false" :border-bottom="false" @click="edition">
 							<u-icon slot="icon" size="42" name="setting-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
 					</u-cell-group>
 				</template>
 			</view>
 		</u-card>
-		<u-button type="primary" @click="exit" style="margin: 20rpx">安全退出</u-button>
+		<u-button type="primary" @click="exit" style="margin: 20rpx">{{ $t('setUp.exit') }}</u-button>
 		<luo-version-upgrade v-if="show_s == true" :version="edition_s" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
@@ -78,6 +78,9 @@
 			};
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('setUp.title')
+			});
 			this.getMyinfo();
 			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 				//版本号
@@ -141,7 +144,7 @@
 								this.show_s = true
 								uni.showToast({
 									icon: 'none',
-									title: '已是最新版本',
+									title: this.$t('setUp.tips1'),
 									position: "bottom"
 								})
 
@@ -149,10 +152,10 @@
 
 								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
-									title: "发现新版本",
+									title: this.$t('setUp.tips2'),
 									content: res.data.msg,
 									showCancel: false,
-									confirmText: "立即去AppStore更新",
+									confirmText: this.$t('setUp.tips4'),
 									success: function(res) {
 										if (res.confirm) {
 
@@ -171,10 +174,10 @@
 
 								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
-									title: "发现新版本",
+									title: this.$t('setUp.tips2'),
 									content: res.data.msg,
 									showCancel: true,
-									confirmText: "立即去AppStore更新",
+									confirmText: this.$t('setUp.tips4'),
 									success: function(res) {
 										if (res.confirm) {
 
@@ -226,7 +229,7 @@
 								this.show_s = false
 								uni.showToast({
 									icon: 'none',
-									title: '已经是最新版本了',
+									title: this.$t('setUp.tips1'),
 									position: "bottom"
 								})
 								this.closeModal();
@@ -278,7 +281,7 @@
 					});
 			},
 			tishi() {
-				this.$u.toast('此功能暂不开放');
+				this.$u.toast(this.$t('setUp.tips3'));
 			}
 		},
 	};

pages/me/suppliers.vue

@@ -36,6 +36,10 @@
 			}
 		},
 		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('supplier.title')
+			});
+			
 			uni.showLoading({
 				title: this.$t('unified.Loading')
 			});