caojunjie 4 éve
szülő
commit
5b21997d0c

+ 17 - 1
common/locales/zh.js

@@ -8,6 +8,11 @@ export default {
 		mobile: "请输入手机号",
 		code: "请输入验证码"
 	},
+	//页面标题
+	pagetitle:{
+		entertitle:'入库明细',
+		outtitle:'出库明细'
+	},
 	//扫码页面
 	scanenter: {
 		title: '扫码入库',
@@ -36,6 +41,15 @@ export default {
 		tabs_a: '全部',
 		tabs_b: '品牌',
 		tabs_c: '时间',
+		number:'单号',
+		describe:'物料描述',
+		number_d:'轮胎胎号',
+		activity:'参加活动',
+		creationtime:'创建时间',
+		daterange:'请选择日期范围',
+		strip:'条',
+		start:'开始',
+		end:'结束',
 		scrollingtips: [{
 				name: '努力加载中'
 			},
@@ -46,6 +60,8 @@ export default {
 				name: '加载中'
 			}
 		],
-		nodata:'无数据'
+		nodata:'无数据',
+		participation:'参加',
+		noparticipation:'不参加'
 	}
 }

+ 1 - 1
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)

+ 1 - 0
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(() => {

+ 1 - 1
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 => {

+ 322 - 166
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) => {
-					
-					
+
+
 				});
 			}
 		}

+ 265 - 116
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({

+ 1 - 1
pages/me/Warehousing-details/index.vue

@@ -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="开始" end-text="结束"></u-calendar>
 		</view>
 	</view>
 </template>

+ 5 - 2
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() {