解决冲突

common/locales/zh.js

@@ -6,6 +6,27 @@ export default {
 		no:"还没有账号?",
 		Lan:"切换语言—中文",
 		mobile:"请输入手机号",
-		code:"请输入验证码",
+		code:"请输入验证码"
+	},
+	//扫码页面
+	scanenter:{
+		title:'扫码入库',
+		tips:'提示',
+		tips_s:'胎号',
+		input:'手动录入',
+		number:'胎号',
+		Specifications:'规格',
+		operation:'操作',
+		slide:'没有更多啦',
+		confirm:'扫码确认',
+		pleaseenter:'请输入胎号',
+		pleaseenter_s:'请输入轮胎胎号',
+		nodata:'请扫码或录入后再点击!',
+		networkstate:'无网络，请连接网络后再试~',
+		networkstate_s:'网络繁忙请稍后再试',
+		locationstate:'获取地址失败, 请检查是否开启定位权限~',
+		repeat:'请勿重复录入',
+		inputsuccess:'录入成功',
+		scansuccess:'扫码成功'
 	}
 }

pages/home/scancode/index.vue

@@ -47,29 +47,7 @@
 		<view>
 		</view>
 		<u-toast ref="repeat" position="bottom" />
-		<u-popup mode="bottom" v-model="show_s" :mask-close-able="false" :safe-area-inset-bottom="true">
-			<view class="confrim-btn">
-				<u-button @click="show_s = false;" style="float: left;border: none;" :hair-line="false" :plain="false">取消</u-button>
-				<u-button @click="container" style="float: right;border: none;" :hair-line="false" :plain="false">确定</u-button>
-			</view>
-			<view class="content_s">
-				<scroll-view scroll-y="true" style="height: 200rpx;">
-					{{regular}}
-				</scroll-view>
-			</view>
-		</u-popup>
-		<u-popup mode="bottom" v-model="show_d" :mask-close-able="false" :safe-area-inset-bottom="true">
-			<view class="confrim-btn">
-				<u-button @click="show_d = false;" style="float: left;border: none;" :hair-line="false" :plain="false">取消</u-button>
-				<u-button @click="container_s" style="float: right;border: none;" :hair-line="false" :plain="false">确定</u-button>
-			</view>
-			<view class="content_s">
-				<scroll-view scroll-y="true" style="height: 200rpx;">
-					{{regular}}
-				</scroll-view>
-			</view>
-		</u-popup>
-	</view>
+		</view>
 </template>
 
 <script>
@@ -90,7 +68,7 @@
 				content: '请输入轮胎胎号',
 				number_s: '',
 				number_a: '',
-				regular: '轮胎非正规是否入库',
+				// regular: '轮胎非正规是否入库',
 				lisi: [],
 				background: {
 					backgroundColor: '#0094fe',
@@ -157,6 +135,10 @@
 			this.mounteds()
 		},
 		methods: {
+			switchLang() {
+							// 切换为英文
+							this.$i18n.locale = 'en';
+						},
 			mounteds() {
 				let that = this
 				uni.getLocation({
@@ -169,7 +151,7 @@
 					fail: function(e) {
 						uni.showToast({
 							icon: 'none',
-							title: '获取地址失败, 请检查是否开启定位权限~~'
+							title: '获取地址失败, 请检查是否开启定位权限~'
 						})
 					}
 				})
@@ -508,11 +490,11 @@
 							}
 							console.log(this.lisi)
 						}).catch(err => {
-							// this.$refs.repeat.show({
-							// 	title: "网络繁忙，请稍后再试",
-							// 	type: 'default',
-							// 	position: 'bottom'
-							// })
+							this.$refs.repeat.show({
+								title: "网络繁忙，请稍后再试",
+								type: 'default',
+								position: 'bottom'
+							})
 							console.log(err)
 						})
 						.finally(() => {