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

pages/home/scancode/index.vue

@@ -81,7 +81,6 @@
 				point: '',
 				coord: '',
 				address: '',
-				addd:''
 			}
 		},
 		onBackPress(options) {
@@ -134,17 +133,12 @@
 			this.mounteds()
 		},
 		methods: {
-			switchLang() {
-							// 切换为英文
-							this.$i18n.locale = 'en';
-						},
 			mounteds() {
 				let that = this
 				uni.getLocation({
 					type: 'gcj02', // 返回国测局坐标
 					geocode: true,
 					success: function(res) {
-						
 						that.tishi(res)
 					},
 					fail: function(e) {
@@ -203,8 +197,6 @@
 			async addreev(res, x) {
 				this.address = x
 				this.degree = res
-				
-				
 			},
 			//手动录入调用
 			manualentry() {
@@ -404,7 +396,7 @@
 				if (this.degree == undefined) {
 					uni.showToast({
 						icon: 'none',
-						title: '获取地址失败, 请检查是否开启定位权限~~',
+						title: '正在转换坐标，请稍候~',
 						position: "bottom"
 					})
 					return

pages/home/scancode/scancodeout.vue

@@ -229,7 +229,7 @@
 					if (this.degree == undefined) {
 						uni.showToast({
 							icon: 'none',
-							title: '获取地址失败, 请检查是否开启定位权限~~',
+							title: '正在转换坐标，请稍候~',
 							position: "bottom"
 						})
 						return