pull/12/head
xiaozhiyong 1 year ago
parent 5a73a4e9a6
commit 506d04100c
  1. 2
      BagStation/pages/newRoutePlanning/newRoutePlanning.vue
  2. 5
      BagStation/pages/stationDetail/stieQr.vue
  3. 50
      colorui/components/cu-custom.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) {

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

@ -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
// });
}
}
}

Loading…
Cancel
Save