更新

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) {

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)

colorui/components/cu-custom.vue

@@ -26,8 +26,8 @@
 		name: 'cu-custom',
 		computed: {
 			style() {
-				var StatusBar= this.StatusBar;
+				var StatusBar = this.StatusBar;
-				var CustomBar= this.CustomBar;
+				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:{
+			callBack: {
-				type:Function,
+				type: Function,
-				default:()=>null
+				default: () => null
 			},
 			isBack: {
 				type: [Boolean, String],
@@ -57,35 +57,35 @@
 				type: String,
 				default: ''
 			},
-			isPay:{
+			isPay: {
 				type: Boolean,
 				default: false
 			}
 		},
 		methods: {
-			BackPage() { 
+			BackPage() {
-				if(this.callBack){
+				if (this.callBack) {
 					this.callBack()
-				}else{
+				} else {
-					if(this.backCard  == true){
+					if (this.backCard == true) {
 						uni.redirectTo({
-							url:'/BagMoney/pages/oilCards/oilCards'
+							url: '/BagMoney/pages/oilCards/oilCards'
-						}) 
-						return 
-					} 
-					if(this.isPay == true){
-						uni.switchTab({
-							url:'/pages/tabbar/station/stationList'
 						})
-						return 
+						return
-					} 
+					}
-					uni.navigateBack({})
+					if (this.isPay == true) {
+						uni.switchTab({
+							url: '/pages/tabbar/station/stationList'
+						})
+						return
+					}
+					uni.navigateBack()
 				}
-				
+
-					// uni.navigateBack({
+				// uni.navigateBack({
-					// 	delta: 1
+				// 	delta: 1
-					// });
+				// });
-				 
+
 			}
 		}
 	}