From 506d04100cd8f27132c2e64175b5c33c7c718b43 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 19 Sep 2023 09:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newRoutePlanning/newRoutePlanning.vue     |  2 +-
 BagStation/pages/stationDetail/stieQr.vue     |  5 +-
 colorui/components/cu-custom.vue              | 50 +++++++++----------
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
index 65bbdd4..91a72da 100644
--- a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
+++ b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
@@ -303,7 +303,7 @@
 				//坐标解压（返回的点串坐标，通过前向差分进行压缩）
 				var kr = 1000000;
 				for (var i = 2; i < coors.length; i++) {
-					coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr;
+					coors[i] = Number(coors[i - 2]) + Number(coors[i]) / kr; 
 				}
 				//将解压后的坐标放入点串数组pl中
 				for (var i = 0; i < coors.length; i += 2) {
diff --git a/BagStation/pages/stationDetail/stieQr.vue b/BagStation/pages/stationDetail/stieQr.vue
index e1c01a7..6e5a2ca 100644
--- a/BagStation/pages/stationDetail/stieQr.vue
+++ b/BagStation/pages/stationDetail/stieQr.vue
@@ -69,7 +69,7 @@
 						<view class="qrimg" @tap="newQrString">
 							<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="400" unit="upx"
 								background="#fff" foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
-								:usingComponents="usingComponents" showLoading @result="qrR" />
+								:usingComponents="usingComponents" showLoading />
 						</view>
 					</view>
 				</view>
@@ -298,9 +298,6 @@
 					})
 				})
 				return target
-			},
-			qrR() {
-
 			},
 			newQrString() {
 				this.getQrString(this.activeCard)
diff --git a/colorui/components/cu-custom.vue b/colorui/components/cu-custom.vue
index 652166d..c8ecab4 100644
--- a/colorui/components/cu-custom.vue
+++ b/colorui/components/cu-custom.vue
@@ -26,8 +26,8 @@
 		name: 'cu-custom',
 		computed: {
 			style() {
-				var StatusBar= this.StatusBar;
-				var CustomBar= this.CustomBar;
+				var StatusBar = this.StatusBar;
+				var CustomBar = this.CustomBar;
 				var bgImage = this.bgImage;
 				var style = `height:${CustomBar}px;padding-top:${StatusBar}px;`;
 				if (this.bgImage) {
@@ -37,7 +37,7 @@
 			}
 		},
 		props: {
-			backCard:{
+			backCard: {
 				type: Boolean,
 				default: false
 			},
@@ -45,9 +45,9 @@
 				type: String,
 				default: ''
 			},
-			callBack:{
-				type:Function,
-				default:()=>null
+			callBack: {
+				type: Function,
+				default: () => null
 			},
 			isBack: {
 				type: [Boolean, String],
@@ -57,35 +57,35 @@
 				type: String,
 				default: ''
 			},
-			isPay:{
+			isPay: {
 				type: Boolean,
 				default: false
 			}
 		},
 		methods: {
-			BackPage() { 
-				if(this.callBack){
+			BackPage() {
+				if (this.callBack) {
 					this.callBack()
-				}else{
-					if(this.backCard  == true){
+				} else {
+					if (this.backCard == true) {
 						uni.redirectTo({
-							url:'/BagMoney/pages/oilCards/oilCards'
-						}) 
-						return 
-					} 
-					if(this.isPay == true){
+							url: '/BagMoney/pages/oilCards/oilCards'
+						})
+						return
+					}
+					if (this.isPay == true) {
 						uni.switchTab({
-							url:'/pages/tabbar/station/stationList'
+							url: '/pages/tabbar/station/stationList'
 						})
-						return 
-					} 
-					uni.navigateBack({})
+						return
+					}
+					uni.navigateBack()
 				}
-				
-					// uni.navigateBack({
-					// 	delta: 1
-					// });
-				 
+
+				// uni.navigateBack({
+				// 	delta: 1
+				// });
+
 			}
 		}
 	}