Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

common/locales/zh.js

@@ -33,6 +33,27 @@ export default {
 		delupload:"移除成功",
 		reloadText:"点击重试1"
 	},
+	//页面标题
+	pagetitle:{
+		entertitle:'入库明细',
+		outtitle:'出库明细',
+		numberquery:'胎号查询',
+		supplier:'我的供应商',
+		brandmanagement:'我的经营品牌'
+		
+	},
+	unified:{
+		networkstate: '无网络，请连接网络后再试~',
+		nodata:'暂无数据',
+		Loading:'加载中...',
+		sun:'日',
+		mon:'一',
+		tues:'二',
+		wed:'三',
+		thur:'四',
+		fri:'五',
+		sat:'六'
+	},
 	//扫码页面
 	scanenter: {
 		title: '扫码入库',
@@ -47,30 +68,64 @@ export default {
 		pleaseenter: '请输入胎号',
 		pleaseenter_s: '请输入轮胎胎号',
 		nodata: '请扫码或录入后再点击!',
-		networkstate: '无网络，请连接网络后再试~',
 		networkstate_s: '网络繁忙请稍后再试',
 		locationstate: '获取地址失败, 请检查是否开启定位权限~',
 		repeat: '请勿重复录入',
 		inputsuccess: '录入成功',
 		scansuccess: '扫码成功'
 	},
-	//入库明细
+	//出入库明细
 	scancodeenter: {
 		total: '库存总量',
 		tips: '请输入胎号或规格',
 		tabs_a: '全部',
 		tabs_b: '品牌',
 		tabs_c: '时间',
-		scrollingtips: [{
-				name: '努力加载中'
-			},
-			{
-				name: '没有更多啦'
-			},
-			{
-				name: '加载中'
-			}
-		],
-		nodata:'无数据'
+		number:'单号',
+		describe:'物料描述',
+		number_d:'轮胎胎号',
+		activity:'参加活动',
+		creationtime:'创建时间',
+		daterange:'请选择日期范围',
+		strip:'条',
+		start:'开始',
+		end:'结束',
+		loadmore:'无数据',
+		loading:'努力加载中',
+		nomore:'没有更多啦',
+		nodata:'暂无数据',
+		participation:'参加',
+		noparticipation:'不参加',
+		networkstate:'网络繁忙，请稍后再试~',
+		Loading:'加载中...',
+		determine:'确定'
+	},
+	//胎号查询
+	numberquery:{
+		clickscancode:'点击扫码',
+		input:'手动录入',
+		promptinput:'请扫码查询或手动录入',
+		errormessage:'请扫码或输入胎号',
+		query:'查询',
+		pleaseinput:'请输入胎号',
+		number:'轮胎胎号',
+		brand:'轮胎品牌',
+		specifications:'轮胎规格',
+		type:'操作类型',
+		time:'操作时间',
+		success:'查询成功',
+		networkstate:'网络繁忙，请稍后再试~',
+	},
+	//我的供应商
+	supplier:{
+		//暂无
+	},
+	//我的经营品牌
+	brandmanagement:{
+		reason:'原因',
+		rejected:'已拒绝',
+		approved:'审核通过',
+		deleted:'已删除',
+		notreviewed:'待审核'
 	}
 }

components/mi-map/mi-map.vue

@@ -199,7 +199,7 @@
 				this.$u.toast('正在解析地址，请稍候');
 					return
 				}
-				console.log(this.addressObj)
+				// console.log(this.addressObj)
 				this.controls = []
 				setTimeout(() => {
 					this.$emit('updateAddress', this.addressObj)

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

@@ -133,6 +133,7 @@
 					this.nonRegularTyreNumbers = res.data.data.nonRegularTyreNumbers //非正规胎号
 					this.notScanInTyres = res.data.data.notScanInTyres //未入库轮胎号
 					
+					this.datalist = ''
 				}).catch(err => {
 					
 				}).finally(() => {

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

@@ -29,7 +29,7 @@
 					url: '/homepage/getArticleOne',
 					method: 'post',
 					data: {
-						"displayType": "1" ,//门店1
+						displayType: 1  //门店1
 						// storeId: this.$store.state.storeInfo.storeId,
 					}
 				}).then(res => {

pages/home/scancode/index.vue

@@ -47,7 +47,7 @@
 		<view>
 		</view>
 		<u-toast ref="repeat" position="bottom" />
-		</view>
+	</view>
 </template>
 
 <script>
@@ -84,7 +84,7 @@
 			}
 		},
 		onBackPress(options) {
-			
+
 			if (options.from == 'backbutton') {
 				this.$u.route({
 					type: 'switchTab',
@@ -102,7 +102,7 @@
 			uni.getNetworkType({
 				success: function(res) {
 					let none = res.networkType
-					
+
 					if (none == 'none') {
 						uni.showToast({
 							icon: 'none',
@@ -114,22 +114,22 @@
 			});
 			uni.$on('data', res => {
 				this.lisi = res.lisi
-				
+
 			})
 			//开始扫码
 			const innerAudioContext = uni.createInnerAudioContext();
 			innerAudioContext.autoplay = true;
 			innerAudioContext.src = '../../../static/mp3/start.mp3';
 			innerAudioContext.onPlay(() => {
-				
+
 			});
 			innerAudioContext.onError((res) => {
-				
-				
+
+
 			});
 			this.coord = ''
 		},
-		onShow(){
+		onShow() {
 			this.mounteds()
 		},
 		methods: {
@@ -150,7 +150,7 @@
 				})
 			},
 			async tishi(res) {
-				
+
 				let this_ = this
 				this_.baidu = res
 				qqmapsdk.reverseGeocoder({
@@ -171,19 +171,19 @@
 								latitude: this_.baidu.latitude
 							}
 						}).then(res => {
-							
-							
-							if(res.data.code != 0){
+
+
+							if (res.data.code != 0) {
 								uni.showToast({
 									icon: 'none',
 									title: '获取定位失败，请稍后再试~'
 								})
-							}else{
+							} else {
 								this_.baidu = res.data.data.result
 								this_.addreev(this_.baidu, aress)
 							}
 						}).catch(err => {
-							
+
 							uni.showToast({
 								icon: 'none',
 								title: '网络繁忙请稍后再试~'
@@ -201,7 +201,7 @@
 			//手动录入调用
 			manualentry() {
 				if (this.number_a.length != 0) {
-					
+
 					if (this.degree == undefined) {
 						uni.showToast({
 							icon: 'none',
@@ -209,7 +209,7 @@
 							position: "bottom"
 						})
 						return
-					}else{
+					} else {
 						request({
 								url: '/storeScan/storeScanGetTyre',
 								method: 'Post',
@@ -224,77 +224,154 @@
 									scanAddress: this.address
 								}
 							}).then(res => {
-								
-								if (res.data.code == 513) {
-									
-									let name = 'regular'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 514) {
-									
-									let name = 'nonoperating'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 515) {
-									
-									let name = 'warehousing'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 517) {
-									
-									let name = 'atypism'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 518) {
-									
-									let name = 'gobeyond'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 519) {
-									
-									let name = 'notallow'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 500) {
-									
-									let name = 'error'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 0) {
-									
-									this.res = res
-									
-									for (let i = 0; i < this.lisi.length; i++) {
-										if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
-											
-											let err = {
-												"data": {
-													"msg": "请勿重复录入",
+
+								this.tips = "胎号"
+
+								switch (res.data.code) {
+									case 513:
+										{
+											let name = 'regular'
+											this.tipss(res, name)
+											break;
+										}
+									case 514:
+										{
+											let name = 'nonoperating'
+											this.tipss(res, name)
+											break
+										}
+									case 515:
+										{
+											let name = 'warehousing'
+											this.tipss(res, name)
+											break
+										}
+									case 517:
+										{
+											let name = 'atypism'
+											this.tipss(res, name)
+											break
+										}
+									case 518:
+										{
+											let name = 'gobeyond'
+											this.tipss(res, name)
+											break
+										}
+									case 519:
+										{
+											let name = 'notallow'
+											this.tipss(res, name)
+											break
+										}
+									case 520:
+										{
+											let name = 'repeat-out'
+											this.tipss(res, name)
+											break
+										}
+									case 500:
+										{
+											let name = 'error'
+											this.tipss(res, name)
+											break
+										}
+									case 0:
+										{
+											this.res = res
+
+											for (let i = 0; i < this.lisi.length; i++) {
+												if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+
+													let err = {
+														"data": {
+															"msg": "请勿重复录入",
+														}
+													}
+
+													let name = 'duplicateentry'
+													this.tipss(err, name)
+													return
 												}
 											}
-											
-											let name = 'duplicateentry'
-											this.tipss(err, name)
-											return
+											this.container()
+											break
 										}
-									}
-									this.container()
 								}
-								
+
+
+
+
+								// if (res.data.code == 513) {
+
+								// 	let name = 'regular'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 514) {
+
+								// 	let name = 'nonoperating'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 515) {
+
+								// 	let name = 'warehousing'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 517) {
+
+								// 	let name = 'atypism'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 518) {
+
+								// 	let name = 'gobeyond'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 519) {
+
+								// 	let name = 'notallow'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 500) {
+
+								// 	let name = 'error'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 0) {
+
+								// 	this.res = res
+
+								// 	for (let i = 0; i < this.lisi.length; i++) {
+								// 		if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+
+								// 			let err = {
+								// 				"data": {
+								// 					"msg": "请勿重复录入",
+								// 				}
+								// 			}
+
+								// 			let name = 'duplicateentry'
+								// 			this.tipss(err, name)
+								// 			return
+								// 		}
+								// 	}
+								// 	this.container()
+								// }
+
 							}).catch(err => {
 								// this.$refs.repeat.show({
 								// 	title: "网络繁忙，请稍后再试",
 								// 	type: 'default',
 								// 	position: 'bottom'
 								// })
-								
+
 							})
 							.finally(() => {
 								// Loading.close()
@@ -319,11 +396,11 @@
 				innerAudioContext.autoplay = true;
 				innerAudioContext.src = '../../../static/mp3/' + name + '.mp3';
 				innerAudioContext.onPlay(() => {
-					
+
 				});
 				innerAudioContext.onError((res) => {
-					
-					
+
+
 				});
 			},
 			container() {
@@ -337,17 +414,17 @@
 				innerAudioContext.autoplay = true;
 				innerAudioContext.src = '../../../static/mp3/entered.mp3';
 				innerAudioContext.onPlay(() => {
-					
+
 				});
 				innerAudioContext.onError((res) => {
-					
-					
+
+
 				});
-				
+
 				this.show_s = false
-				
+
 				this.number_a = ''
-				
+
 				this.lisi.push({
 					specs: this.res.data.data[0].specs,
 					flagRegular: this.res.data.data[0].isRegular,
@@ -362,7 +439,7 @@
 					plyRating: this.res.data.data[0].plyRating,
 					scanWay: '0'
 				})
-				
+
 			},
 
 			//获取扫码控件
@@ -370,7 +447,7 @@
 				uni.getNetworkType({
 					success: function(res) {
 						let none = res.networkType
-						
+
 						if (none == 'none') {
 							uni.showToast({
 								icon: 'none',
@@ -381,18 +458,21 @@
 							innerAudioContext.autoplay = true;
 							innerAudioContext.src = '../../../static/mp3/failure.mp3';
 							innerAudioContext.onPlay(() => {
-								
+
 							});
 							innerAudioContext.onError((res) => {
-								
-								
+
+
 							});
 						}
 					}
 				});
-				
+
 				this.number = val
 				this.number_s = val
+				if (val.length != 0) {
+					this.tips = "胎号"
+				}
 				if (this.degree == undefined) {
 					uni.showToast({
 						icon: 'none',
@@ -400,7 +480,7 @@
 						position: "bottom"
 					})
 					return
-				}else{
+				} else {
 					request({
 							url: '/storeScan/storeScanGetTyre',
 							method: 'Post',
@@ -415,78 +495,154 @@
 								scanAddress: this.address
 							}
 						}).then(res => {
-							
+
 							this.tips = "胎号"
-							if (res.data.code == 513) {
-								
-								let name = 'regular'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 514) {
-								
-								let name = 'nonoperating'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 515) {
-								
-								let name = 'warehousing'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 517) {
-								
-								let name = 'atypism'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 518) {
-								
-								let name = 'gobeyond'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 519) {
-								
-								let name = 'notallow'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 500) {
-								
-								let name = 'error'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 0) {
-								
-								this.res = res
-								
-								for (let i = 0; i < this.lisi.length; i++) {
-									if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
-										
-										let err = {
-											"data": {
-												"msg": "请勿重复录入",
+
+							switch (res.data.code) {
+								case 513:
+									{
+										let name = 'regular'
+										this.tipss(res, name)
+										break;
+									}
+								case 514:
+									{
+										let name = 'nonoperating'
+										this.tipss(res, name)
+										break
+									}
+								case 515:
+									{
+										let name = 'warehousing'
+										this.tipss(res, name)
+										break
+									}
+								case 517:
+									{
+										let name = 'atypism'
+										this.tipss(res, name)
+										break
+									}
+								case 518:
+									{
+										let name = 'gobeyond'
+										this.tipss(res, name)
+										break
+									}
+								case 519:
+									{
+										let name = 'notallow'
+										this.tipss(res, name)
+										break
+									}
+								case 520:
+									{
+										let name = 'repeat-out'
+										this.tipss(res, name)
+										break
+									}
+								case 500:
+									{
+										let name = 'error'
+										this.tipss(res, name)
+										break
+									}
+								case 0:
+									{
+										this.res = res
+
+										for (let i = 0; i < this.lisi.length; i++) {
+											if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+
+												let err = {
+													"data": {
+														"msg": "请勿重复录入",
+													}
+												}
+
+												let name = 'duplicateentry'
+												this.tipss(err, name)
+												return
 											}
 										}
-										
-										let name = 'duplicateentry'
-										this.tipss(err, name)
-										return
+										this.container()
+										break
 									}
-								}
-								this.container()
 							}
-							
+
+
+
+
+							// if (res.data.code == 513) {
+
+							// 	let name = 'regular'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 514) {
+
+							// 	let name = 'nonoperating'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 515) {
+
+							// 	let name = 'warehousing'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 517) {
+
+							// 	let name = 'atypism'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 518) {
+
+							// 	let name = 'gobeyond'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 519) {
+
+							// 	let name = 'notallow'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 500) {
+
+							// 	let name = 'error'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 0) {
+
+							// 	this.res = res
+
+							// 	for (let i = 0; i < this.lisi.length; i++) {
+							// 		if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+
+							// 			let err = {
+							// 				"data": {
+							// 					"msg": "请勿重复录入",
+							// 				}
+							// 			}
+
+							// 			let name = 'duplicateentry'
+							// 			this.tipss(err, name)
+							// 			return
+							// 		}
+							// 	}
+							// 	this.container()
+							// }
+
 						}).catch(err => {
 							this.$refs.repeat.show({
 								title: "网络繁忙，请稍后再试",
 								type: 'default',
 								position: 'bottom'
 							})
-							
+
 						})
 						.finally(() => {
 							// Loading.close()
@@ -495,11 +651,11 @@
 			},
 			container_s() {
 				this.show_d = false
-				
-				
+
+
 				this.number_s = ''
-				
-				
+
+
 
 				this.lisi.push({
 					specs: this.res_s.data.data[0].specs,
@@ -515,16 +671,16 @@
 					plyRating: this.res_s.data.data[0].plyRating,
 					scanWay: '1'
 				})
-				
+
 				const innerAudioContext = uni.createInnerAudioContext();
 				innerAudioContext.autoplay = true;
 				innerAudioContext.src = '../../../static/mp3/scansuccess.mp3';
 				innerAudioContext.onPlay(() => {
-					
+
 				});
 				innerAudioContext.onError((res) => {
-					
-					
+
+
 				});
 				this.$refs.repeat.show({
 					title: '扫码成功',
@@ -533,7 +689,7 @@
 				})
 			},
 			confirm(index) {
-				
+
 				this.lisi.splice(index, 1)
 			},
 			scancodein() {
@@ -560,11 +716,11 @@
 				innerAudioContext.autoplay = true;
 				innerAudioContext.src = '../../../static/mp3/rescan.mp3';
 				innerAudioContext.onPlay(() => {
-					
+
 				});
 				innerAudioContext.onError((res) => {
-					
-					
+
+
 				});
 			}
 		}

pages/home/scancode/scancodeout.vue

@@ -249,76 +249,147 @@
 								}
 							}).then(res => {
 								console.log(res)
-								if (res.data.code == 513) {
-									let name = 'regular'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 514) {
+								switch (res.data.code) {
+									case 513:
+										{
+											let name = 'regular'
+											this.tipss(res, name)
+											break;
+										}
+									case 514:
+										{
+											let name = 'nonoperating'
+											this.tipss(res, name)
+											break
+										}
+									case 515:
+										{
+											let name = 'warehousing'
+											this.tipss(res, name)
+											break
+										}
+									case 516:
+										{
+											let name = 'prohibit'
+											this.tipss(res, name)
+											break
+										}
+									case 518:
+										{
+											let name = 'gobeyond'
+											this.tipss(res, name)
+											break
+										}
+									case 519:
+										{
+											let name = 'notallow'
+											this.tipss(res, name)
+											break
+										}
+									case 520:
+									{
+										let name = 'repeat-out'
+										this.tipss(res, name)
+										break
+									}
+									case 500:
+										{
+											let name = 'error'
+											this.tipss(res, name)
+											break
+										}
+									case 0:
+										{
+											this.res = res
 									
-									let name = 'nonoperating'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 515) {
+											for (let i = 0; i < this.lisi.length; i++) {
+												if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
 									
-									let name = 'warehousing'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 516) {
+													let err = {
+														"data": {
+															"msg": "请勿重复录入",
+														}
+													}
 									
-									let name = 'prohibit'
-									this.tipss(res, name)
-									return
+													let name = 'duplicateentry'
+													this.tipss(err, name)
+													return
+												}
+											}
+											this.container()
+											break
+										}
 								}
-								if (res.data.code == 517) {
+								// if (res.data.code == 513) {
+								// 	let name = 'regular'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 514) {
 									
-									let name = 'atypism'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 518) {
+								// 	let name = 'nonoperating'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 515) {
 									
-									let name = 'gobeyond'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 519) {
+								// 	let name = 'warehousing'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 516) {
 									
-									let name = 'notallow'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 520) {
+								// 	let name = 'prohibit'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 517) {
 									
-									let name = 'repeat-out'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 500) {
-									let name = 'error'
-									this.tipss(res, name)
-									return
-								}
-								if (res.data.code == 0) {
-									this.res = res
-									for (let i = 0; i < this.lisi.length; i++) {
-										if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+								// 	let name = 'atypism'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 518) {
+									
+								// 	let name = 'gobeyond'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 519) {
+									
+								// 	let name = 'notallow'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 520) {
+									
+								// 	let name = 'repeat-out'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 500) {
+								// 	let name = 'error'
+								// 	this.tipss(res, name)
+								// 	return
+								// }
+								// if (res.data.code == 0) {
+								// 	this.res = res
+								// 	for (let i = 0; i < this.lisi.length; i++) {
+								// 		if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
 											
-											let err = {
-												"data": {
-													"msg": "请勿重复录入",
-												}
-											}
+								// 			let err = {
+								// 				"data": {
+								// 					"msg": "请勿重复录入",
+								// 				}
+								// 			}
 											
-											let name = 'duplicateentry'
-											this.tipss(err, name)
-											return
-										}
-									}
-									this.container()
-								}
+								// 			let name = 'duplicateentry'
+								// 			this.tipss(err, name)
+								// 			return
+								// 		}
+								// 	}
+								// 	this.container()
+								// }
 								
 							}).catch(err => {
 								// this.$refs.repeat.show({
@@ -449,75 +520,153 @@
 						}).then(res => {
 							this.res_s = res
 							this.tips = "胎号"
-							if (res.data.code == 513) {
+							switch (res.data.code) {
+								case 513:
+									{
+										let name = 'regular'
+										this.tipss(res, name)
+										break;
+									}
+								case 514:
+									{
+										let name = 'nonoperating'
+										this.tipss(res, name)
+										break
+									}
+								case 515:
+									{
+										let name = 'warehousing'
+										this.tipss(res, name)
+										break
+									}
+								case 516:
+									{
+										let name = 'prohibit'
+										this.tipss(res, name)
+										break
+									}
+								case 518:
+									{
+										let name = 'gobeyond'
+										this.tipss(res, name)
+										break
+									}
+								case 519:
+									{
+										let name = 'notallow'
+										this.tipss(res, name)
+										break
+									}
+								case 520:
+								{
+									let name = 'repeat-out'
+									this.tipss(res, name)
+									break
+								}
+								case 500:
+									{
+										let name = 'error'
+										this.tipss(res, name)
+										break
+									}
+								case 0:
+									{
+										this.res = res
 								
-								let name = 'regular'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 514) {
+										for (let i = 0; i < this.lisi.length; i++) {
+											if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
 								
-								let name = 'nonoperating'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 515) {
+												let err = {
+													"data": {
+														"msg": "请勿重复录入",
+													}
+												}
 								
-								let name = 'warehousing'
-								this.tipss(res, name)
-								return
+												let name = 'duplicateentry'
+												this.tipss(err, name)
+												return
+											}
+										}
+										this.container()
+										break
+									}
 							}
-							if (res.data.code == 517) {
+							
+							// if (res.data.code == 513) {
 								
-								let name = 'atypism'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 518) {
+							// 	let name = 'regular'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 514) {
 								
-								let name = 'gobeyond'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 519) {
+							// 	let name = 'nonoperating'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 515) {
 								
-								let name = 'notallow'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 520) {
+							// 	let name = 'warehousing'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 516) {
 								
-								let name = 'repeat-out'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 500) {
+							// 	let name = 'prohibit'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 517) {
 								
-								let name = 'error'
-								this.tipss(res, name)
-								return
-							}
-							if (res.data.code == 0) {
+							// 	let name = 'atypism'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 518) {
+								
+							// 	let name = 'gobeyond'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 519) {
 								
-								this.res = res
+							// 	let name = 'notallow'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 520) {
 								
-								for (let i = 0; i < this.lisi.length; i++) {
-									if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
+							// 	let name = 'repeat-out'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 500) {
+								
+							// 	let name = 'error'
+							// 	this.tipss(res, name)
+							// 	return
+							// }
+							// if (res.data.code == 0) {
+								
+							// 	this.res = res
+								
+							// 	for (let i = 0; i < this.lisi.length; i++) {
+							// 		if (this.lisi[i].tireNumber == res.data.data[0].tirenumber) {
 										
-										let err = {
-											"data": {
-												"msg": "请勿重复扫码",
-											}
-										}
+							// 			let err = {
+							// 				"data": {
+							// 					"msg": "请勿重复扫码",
+							// 				}
+							// 			}
 										
-										let name = 'repeatcode'
-										this.tipss(err, name)
-										return
-									}
-								}
-								this.container_s()
-							}
-							// 
+							// 			let name = 'repeatcode'
+							// 			this.tipss(err, name)
+							// 			return
+							// 		}
+							// 	}
+							// 	this.container_s()
+							// }
+							// // 
 						}).catch(err => {
 							if (err.code == 400) { //谁给我删了......
 								this.$refs.repeat.show({

pages/home/scancodequery/result.vue

@@ -4,18 +4,18 @@
 		<view class="head">
 			<view class="tips" @tap="$u.throttle(scanning, 500)">
 				<view>
-					<view><text>点击扫码</text></view>
+					<view><text>{{$t('numberquery.clickscancode')}}</text></view>
 				</view>
 			</view>
 			<view class="stripe"></view>
 			<view class="roll">
 				<view>
 					<view @click="show =! show">
-						<u-icon name="edit-pen"></u-icon>手动录入
+						<u-icon name="edit-pen"></u-icon>{{$t('numberquery.input')}}
 					</view>
 					<view class="lnput" v-if="show==false">
-						<input type="text" v-model="number" placeholder="请输入胎号" clearable="true" focus="true" />
-						<u-button type="primary" size="medium" @click="query">查询</u-button>
+						<input type="text" v-model="number" :placeholder="$t('numberquery.pleaseinput')" clearable="true" focus="true" />
+						<u-button type="primary" size="medium" @click="query">{{$t('numberquery.query')}}</u-button>
 					</view>
 					<view class="roll_s" v-else>
 						<view>{{datalist}}</view>
@@ -27,13 +27,13 @@
 					<u-line color="#f4f4f4" border-style="dashed" :hair-line="true" length="94%" style="margin: 0 auto;padding-top: 30rpx;" />
 				</view>
 				<view class="Exhibition" v-if="show_s == false">
-					<view><text>轮胎胎号</text><text>{{Information.tireNumber}}</text></view>
-					<view><text>轮胎品牌</text><text>{{Information.brand}}</text></view>
-					<view><text>轮胎规格</text><text>{{Information.specification}}</text></view>
-					<view><text>操作类型</text><text>{{Information.mouldInType}}</text></view>
-					<view><text>操作时间</text><text>{{Information.mouldInTime}}</text></view>
-					<view v-if="Information.mouldOutType != null "><text>操作类型</text><text>{{Information.mouldOutType}}</text></view>
-					<view v-if="Information.mouldOutTime != null "><text>操作时间</text><text>{{Information.mouldOutTime}}</text></view>
+					<view><text>{{$t('numberquery.number')}}</text><text>{{Information.tireNumber}}</text></view>
+					<view><text>{{$t('numberquery.brand')}}</text><text>{{Information.brand}}</text></view>
+					<view><text>{{$t('numberquery.specifications')}}</text><text>{{Information.specification}}</text></view>
+					<view><text>{{$t('numberquery.type')}}</text><text>{{Information.mouldInType}}</text></view>
+					<view><text>{{$t('numberquery.time')}}</text><text>{{Information.mouldInTime}}</text></view>
+					<view v-if="Information.mouldOutType != null "><text>{{$t('numberquery.type')}}</text><text>{{Information.mouldOutType}}</text></view>
+					<view v-if="Information.mouldOutTime != null "><text>{{$t('numberquery.time')}}</text><text>{{Information.mouldOutTime}}</text></view>
 				</view>
 				<view v-else style="margin-top: 100rpx;margin-bottom: 100rpx;">
 					<u-empty :text="text" mode="list"></u-empty>
@@ -51,8 +51,8 @@
 	export default {
 		data() {
 			return {
-				datalist: '请扫码查询或手动录入',
-				number:'',
+				datalist: this.$t('numberquery.promptinput'),
+				number: '',
 				empty: true,
 				mouldOutTime: '',
 				mouldOutType: '',
@@ -61,21 +61,21 @@
 				tireNumber: "",
 				brand: '',
 				specification: '',
-				text: '请扫码或输入胎号',
+				text: this.$t('numberquery.errormessage'),
 				show: true,
-				show_s:true,
-				Information:[]
+				show_s: true,
+				Information: []
 			}
 		},
 		onReady() {
 			uni.getNetworkType({
 				success: function(res) {
 					let none = res.networkType
-					
+
 					if (none == 'none') {
 						uni.showToast({
 							icon: 'none',
-							title: '无网络，请连接网络后再试~',
+							title: this.$t('unified.networkstate'),
 							position: "bottom"
 						})
 					}
@@ -88,7 +88,7 @@
 		},
 		methods: {
 			rendering() {
-				
+
 				request({
 					url: '/myapp/mouldSelect',
 					method: 'Post',
@@ -99,11 +99,11 @@
 					}
 				}).then(res => {
 					this.Information = []
-					
+
 					if (res.data.code == 0) {
 						uni.showToast({
 							icon: 'none',
-							title: '查询成功',
+							title: this.$t('numberquery.success'),
 							position: "bottom"
 						})
 						this.empty = false
@@ -120,10 +120,10 @@
 					}
 					this.text = res.data.msg
 				}).catch(err => {
-					
+
 					uni.showToast({
 						icon: 'none',
-						title: '出错了请联系管理员~',
+						title: this$t('numberquery.networkstate'),
 						position: "bottom"
 					})
 				}).finally(() => {
@@ -134,15 +134,15 @@
 				let this_ = this
 				uni.scanCode({
 					success: function(res) {
-						
-						
+
+
 						this_.datalist = res.result
 						this_.rendering()
 					}
 				})
 			},
 			query() {
-				
+
 				request({
 					url: '/myapp/mouldSelect',
 					method: 'Post',
@@ -153,11 +153,11 @@
 					}
 				}).then(res => {
 					this.Information = []
-					
+
 					if (res.data.code == 0) {
 						uni.showToast({
 							icon: 'none',
-							title: '查询成功',
+							title: this.$t('numberquery.success'),
 							position: "bottom"
 						})
 						this.empty = false
@@ -176,10 +176,10 @@
 					}
 					this.text = res.data.msg
 				}).catch(err => {
-					
+
 					uni.showToast({
 						icon: 'none',
-						title: '出错了请联系管理员~',
+						title: this$t('numberquery.networkstate'),
 						position: "bottom"
 					})
 				}).finally(() => {

pages/me/Delivery-details/index.vue

@@ -2,38 +2,38 @@
 	<!-- 出库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量：<text>{{total}}</text>
+			{{$t('scancodeenter.total')}}：<text>{{total}}</text>
 		</view>
 		<view style="width: 100%;margin-top: 60rpx;">
 			<!-- <u-tabs style="width: 350rpx;float: left;margin-top: 0;" :list="list" :is-scroll="false" :current="current" @change="change"
 			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs> -->
 			<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('scancodeenter.tabs_a')}}</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('scancodeenter.tabs_b')}}</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('scancodeenter.tabs_c')}}</text>
 					<view  v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>
 			</view>
-			<u-search class="inputbox" placeholder="请输入胎号或规格" @change="inputbox" v-model="keyword" :show-action="false"></u-search>
+			<u-search class="inputbox" :placeholder="$t('scancodeenter.tips')" @change="inputbox" v-model="keyword" :show-action="false"></u-search>
 		</view>
 		<view class="nothing" v-if="judge==true">
-			<u-empty text="暂无数据"></u-empty>
+			<u-empty :text="$t('scancodeenter.nodata')"></u-empty>
 		</view>
 		<view style="width: 100%;margin-top: 160rpx;">
 			<view class="block" v-for="(item, index) in itemList" :key="index">
 				<view class="title">
 					<view>|</view>
-					<view>单号：{{item.scanNum}} </view>
+					<view>{{$t('scancodeenter.number')}}：{{item.scanNum}} </view>
 					<view>{{item.scanTime.slice(0,10)}}</view>
 				</view>
 				<u-line color="#f4f4f4"></u-line>
@@ -45,25 +45,25 @@
 									{{item2.tireModel}}
 								</view>
 								<view class="">
-									{{item2.tyreCount}}条
+									{{item2.tyreCount}}{{$t('scancodeenter.strip')}}
 								</view>
 							</view>
 							<view class="details" v-for="(item3,index) in item2.matnrMsgVOS" :key="index">
 								<view class="u-font-25">
-									<view>物料描述</view>
+									<view>{{$t('scancodeenter.describe')}}</view>
 									<view>{{item3.maktx}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>轮胎胎号</view>
+									<view>{{$t('scancodeenter.number_d')}}</view>
 									<view>{{item3.tyreNum}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>参加活动</view>
-									<view v-if="item3.satisfyActivity == 1">参加</view>
-									<view v-else>不参加</view>
+									<view>{{$t('scancodeenter.activity')}}</view>
+									<view v-if="item3.satisfyActivity == 1">{{$t('scancodeenter.participation')}}</view>
+									<view v-else>{{$t('scancodeenter.noparticipation')}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>创建时间</view>
+									<view>{{$t('scancodeenter.creationtime')}}</view>
 									<view>{{item3.createDate}}</view>
 								</view>
 								<u-line color="#f4f4f4"></u-line>
@@ -76,7 +76,7 @@
 				<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-calendar v-model="show_d" toolTip="请选择日期范围" :mode="mode" @change="time" :mask-close-able="false"></u-calendar>
+			<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>
 	</view>
 </template>
@@ -96,18 +96,11 @@
 				show_d: false,
 				mode: 'range',
 				loadText: {
-					loadmore: '无数据',
-					loading: '努力加载中',
-					nomore: '没有更多啦'
+					loadmore: this.$t('scancodeenter.loadmore'),
+					loading: this.$t('scancodeenter.loading'),
+					nomore: this.$t('scancodeenter.nomore')
 				},
 				style: '.5rpx solid #FFFFFF',
-				list: [{
-					name: '全部'
-				}, {
-					name: '品牌'
-				}, {
-					name: '时间'
-				}],
 				brandCode: null,
 				list_a: [],
 				current: 0,
@@ -155,6 +148,9 @@
 			inputbox(e) {
 				this.page = 1
 				
+				this.bottoma = true
+				this.bottomb = false
+				this.bottomc = false
 				
 				this.itemList = []
 				this.brandCode = null
@@ -298,12 +294,8 @@
 			// },
 			getPage() {
 				
-				
-				
-				
-				
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('unified.Loading')
 				});
 				
 				setTimeout(function() {
@@ -346,7 +338,11 @@
 					return this.itemList
 					}
 				}).catch(err => {
-					
+					uni.showToast({
+						icon: 'none',
+						title: this.$t('scancodeenter.networkstate'),
+						position: "bottom"
+					})
 				}).finally(() => {
 					// Loading.close()
 				})

pages/me/Warehousing-details/index.vue

@@ -2,38 +2,38 @@
 	<!-- 入库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量：<text>{{total}}</text>
+			{{$t('scancodeenter.total')}}：<text>{{total}}</text>
 		</view>
 		<view style="width: 100%;margin-top: 60rpx;">
 			<!-- <u-tabs style="width: 350rpx;float: left;margin-top: 0;" :list="list" :is-scroll="false" :current="current" @change="change"
 			 active-color="#fff" inactive-color="#ffffff" bg-color="#ffffff00"></u-tabs> -->
 			<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('scancodeenter.tabs_a')}}</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>
-					<view  v-if="bottomb == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
+					<text @click="brand">{{$t('scancodeenter.tabs_b')}}</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>
-					<view  v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
+					<text @click="time_s">{{$t('scancodeenter.tabs_c')}}</text>
+					<view v-if="bottomc == true" style="width: 100%;height: 1rpx;background-color: #FFFFFF;border-radius: 10rpx;"></view>
 					<view v-else></view>
 				</view>
 			</view>
-			<u-search class="inputbox" placeholder="请输入胎号或规格" @change="inputbox" v-model="keyword" :show-action="false"></u-search>
+			<u-search class="inputbox" :placeholder="$t('scancodeenter.tips')" @change="inputbox" v-model="keyword" :show-action="false"></u-search>
 		</view>
 		<view class="nothing" v-if="judge==true">
-			<u-empty text="暂无数据"></u-empty>
+			<u-empty :text="$t('scancodeenter.nodata')"></u-empty>
 		</view>
 		<view style="width: 100%;margin-top: 160rpx;">
 			<view class="block" v-for="(item, index) in itemList" :key="index">
 				<view class="title">
 					<view>|</view>
-					<view>单号：{{item.scanNum}} </view>
+					<view>{{$t('scancodeenter.number')}}：{{item.scanNum}} </view>
 					<view>{{item.scanTime.slice(0,10)}}</view>
 				</view>
 				<u-line color="#f4f4f4"></u-line>
@@ -45,25 +45,25 @@
 									{{item2.tireModel}}
 								</view>
 								<view class="">
-									{{item2.tyreCount}}条
+									{{item2.tyreCount}}{{$t('scancodeenter.strip')}}
 								</view>
 							</view>
 							<view class="details" v-for="(item3,index) in item2.matnrMsgVOS" :key="index">
 								<view class="u-font-25">
-									<view>物料描述</view>
+									<view>{{$t('scancodeenter.describe')}}</view>
 									<view>{{item3.maktx}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>轮胎胎号</view>
+									<view>{{$t('scancodeenter.number_d')}}</view>
 									<view>{{item3.tyreNum}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>参加活动</view>
-									<view v-if="item3.satisfyActivity == 1">参加</view>
-									<view v-else>不参加</view>
+									<view>{{$t('scancodeenter.activity')}}</view>
+									<view v-if="item3.satisfyActivity == 1">{{$t('scancodeenter.participation')}}</view>
+									<view v-else>{{$t('scancodeenter.noparticipation')}}</view>
 								</view>
 								<view class="u-font-25">
-									<view>创建时间</view>
+									<view>{{$t('scancodeenter.creationtime')}}</view>
 									<view>{{item3.createDate}}</view>
 								</view>
 								<u-line color="#f4f4f4"></u-line>
@@ -76,7 +76,8 @@
 				<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-calendar v-model="show_d" toolTip="请选择日期范围"  :mode="mode" @change="time" :mask-close-able="false"></u-calendar>
+			<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>
 	</view>
 </template>
@@ -96,18 +97,11 @@
 				show_d: false,
 				mode: 'range',
 				loadText: {
-					loadmore: '无数据',
-					loading: '努力加载中',
-					nomore: '没有更多啦'
+					loadmore: this.$t('scancodeenter.loadmore'),
+					loading: this.$t('scancodeenter.loading'),
+					nomore: this.$t('scancodeenter.nomore')
 				},
 				style: '.5rpx solid #FFFFFF',
-				list: [{
-					name: '全部'
-				}, {
-					name: '品牌'
-				}, {
-					name: '时间'
-				}],
 				brandCode: null,
 				list_a: [],
 				current: 0,
@@ -154,12 +148,14 @@
 			},
 			inputbox(e) {
 				this.page = 1
-				// 
-				// 
+				this.bottoma = true
+				this.bottomb = false
+				this.bottomc = false
 				this.itemList = []
 				this.brandCode = null
 				this.beginDate = null
 				this.endDate = null
+				this.beginDate = null
 				this.content = e
 				if (this.itemList.length >= this.length) {
 					this.status = 'nomore';
@@ -238,7 +234,7 @@
 					}).catch(err => {
 						uni.showToast({
 							icon: 'none',
-							title: '网络繁忙，请稍后再试~',
+							title: this.$t('scancodeenter.networkstate'),
 							position: "bottom"
 						})
 					}).finally(() => {
@@ -306,7 +302,7 @@
 				// 
 				// 
 				uni.showLoading({
-					title: '加载中...'
+					title: this.$t('scancodeenter.Loading')
 				});
 				setTimeout(function() {
 					uni.hideLoading();
@@ -327,13 +323,13 @@
 					}
 				}).then(res => {
 					// 
-					if(res.data.code == 500){
+					if (res.data.code == 500) {
 						uni.showToast({
 							icon: 'none',
 							title: res.data.msg,
 							position: "bottom"
 						})
-					}else{
+					} else {
 						this.total = res.data.stock
 						this.length = res.data.count
 						this.itemList = this.itemList.concat(res.data.record)
@@ -351,7 +347,7 @@
 					// 
 					uni.showToast({
 						icon: 'none',
-						title: '网络繁忙，请稍后再试~',
+						title: this.$t('scancodeenter.networkstate'),
 						position: "bottom"
 					})
 				}).finally(() => {

pages/me/management.vue

@@ -5,7 +5,7 @@
 			<view class="behind"></view>
 			<view class="below">
 				<view class="nothing" v-if="judge==true">
-					<u-empty mode="page" text="暂无数据"></u-empty>
+					<u-empty mode="page" :text="$t('unified.nodata')"></u-empty>
 				</view>
 				<view class="content" v-else v-for="(item, index) in supplier_s" :key="index">
 					<view class="content_s">
@@ -30,7 +30,7 @@
 								<u-icon name="orders-o" custom-prefix="van-icon" />
 								<u-input v-model="item.signCount" :disabled="true"/>
 							</u-form-item>
-							<u-form-item label="原因:" v-if="item.cause != null"><u-input v-model="item.cause" :disabled="true"/></u-form-item>
+							<u-form-item :label="$t('brandmanagement.reason')+':'" v-if="item.cause != null"><u-input v-model="item.cause" :disabled="true"/></u-form-item>
 						</view>
 					</view>
 				</view>

pages/me/setting/setting.vue

@@ -43,7 +43,7 @@
 						<u-cell-item title="隐私政策" @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" :arrow="false" :border-bottom="false" @click="edition">
+						<u-cell-item title="版本检测" :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>
@@ -71,7 +71,10 @@
 				show_s: false,
 				url: '',
 				is_force: false,
-				Copywriting: ''
+				Copywriting: '',
+				customStyle: {
+						color: '#0095FF'
+					}
 			};
 		},
 		created() {

pages/me/suppliers.vue

@@ -5,7 +5,7 @@
 			<view class="behind"></view>
 			<view class="below">
 				<view class="nothing" v-if="judge==true">
-					<u-empty mode="page" text="暂无数据"></u-empty>
+					<u-empty mode="page" :text="$t('unified.nodata')"></u-empty>
 				</view>
 				<view class="content" v-for="(item, index) in supplier_s" :key="index">
 					<view class="content_s">
@@ -37,7 +37,7 @@
 		},
 		created() {
 			uni.showLoading({
-				title: '加载中...'
+				title: this.$t('unified.Loading')
 			});
 			
 			setTimeout(function() {

uview-ui/components/u-calendar/u-calendar.vue

@@ -51,7 +51,7 @@
 					<text v-if="endDate">-{{endDate}}</text>
 				</view>
 				<view class="u-calendar__bottom__btn">
-					<u-button :type="btnType" shape="circle" size="default" @click="btnFix(false)">确定</u-button>
+					<u-button :type="btnType" shape="circle" size="default" @click="btnFix(false)">{{$t('scancodeenter.determine')}}</u-button>
 				</view>
 			</view>
 		</view>
@@ -129,12 +129,12 @@
 			// 可切换的最大年份
 			maxYear: {
 				type: [Number, String],
-				default: 2050
+				default: 2100
 			},
 			// 可切换的最小年份
 			minYear: {
 				type: [Number, String],
-				default: 1950
+				default: 2000
 			},
 			// 最小可选日期(不在范围内日期禁用不可选)
 			minDate: {
@@ -251,7 +251,7 @@
 				isStart: true,
 				min: null,
 				max: null,
-				weekDayZh: ['日', '一', '二', '三', '四', '五', '六']
+				weekDayZh: [this.$t('unified.sun'), this.$t('unified.mon'), this.$t('unified.tues'), this.$t('unified.wed'), this.$t('unified.thur'), this.$t('unified.fri'), this.$t('unified.sat')]
 			};
 		},
 		computed: {
@@ -385,7 +385,7 @@
 				this.daysArr=this.generateArray(1,this.days)
 				this.weekday = this.getWeekday(this.year, this.month);
 				this.weekdayArr=this.generateArray(1,this.weekday)
-				this.showTitle = `${this.year}年${this.month}月`;
+				this.showTitle = `${this.year} - ${this.month}`;
 				if (this.isChange && this.mode == 'date') {
 					this.btnFix(true);
 				}