|
|
|
@ -105,11 +105,11 @@ |
|
|
|
|
name="input" /> --> |
|
|
|
|
|
|
|
|
|
<view style="flex-grow: 1; display: flex;" @tap="showModel='show'"> |
|
|
|
|
<view v-if="hz(carNumber.charAt(0))" class="sign"> |
|
|
|
|
<text v-if="carNumber">{{carNumber.charAt(0)||''}}</text> |
|
|
|
|
<view v-if="hz( String(carNumber).charAt(0))" class="sign"> |
|
|
|
|
<text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text> |
|
|
|
|
<uni-icons color="#ffffff" type="forward" size="15"></uni-icons> |
|
|
|
|
</view> |
|
|
|
|
<view class="flexcenter">{{carNumber.substr(1,6)||'请输入车牌号'}}</view> |
|
|
|
|
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
<!-- <text class="cuIcon-roundclosefill text-gray"></text> --> |
|
|
|
@ -1026,8 +1026,62 @@ |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
let location = uni.getStorageSync('location')||{longitude:'',latitude:''}; |
|
|
|
|
// if(!location){ |
|
|
|
|
// let locationChenk = true |
|
|
|
|
// let that = this |
|
|
|
|
// uni.getLocation({ |
|
|
|
|
// type: 'gcj02', |
|
|
|
|
// success: function(res) { |
|
|
|
|
// uni.setStorage({ |
|
|
|
|
// key:'location', |
|
|
|
|
// data:res |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// fail(e) { |
|
|
|
|
// locationChenk = false |
|
|
|
|
// }, |
|
|
|
|
// }); |
|
|
|
|
// if(!locationChenk){ |
|
|
|
|
// uni.showToast({ |
|
|
|
|
// title:'请授权位置', |
|
|
|
|
// icon:'error' |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// console.log(location,'**************************************************') |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
// uni.getLocation({ |
|
|
|
|
// type: 'gcj02', |
|
|
|
|
// success: function(res) { |
|
|
|
|
// uni.setStorage({ |
|
|
|
|
// key:'location', |
|
|
|
|
// data:res |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// fail(e) { |
|
|
|
|
// uni.showModal({ |
|
|
|
|
// title:'获取定位', |
|
|
|
|
// content:'是否重新获取定位?', |
|
|
|
|
// success:function(e){ |
|
|
|
|
// wx.openSetting({ |
|
|
|
|
// success:function(e){ |
|
|
|
|
// if (res.authSetting['scope.userLocation']){ |
|
|
|
|
// console.log('******') |
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
// fail:function(e){ |
|
|
|
|
// console.log(e,'//////') |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// }); |
|
|
|
|
// return |
|
|
|
|
// |
|
|
|
|
console.log(data6, 'data6+++++') |
|
|
|
|
oliSiteApi.xoilPay(data6).then(res => { |
|
|
|
|
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => { |
|
|
|
|
console.log(res) |
|
|
|
|
if (res.code === 20000) { |
|
|
|
|
uni.showToast({ |
|
|
|
@ -1205,7 +1259,7 @@ |
|
|
|
|
oilsStationId: uni.getStorageSync('oilSiteId') //类型:String 必有字段 备注:加油站id |
|
|
|
|
} |
|
|
|
|
// } |
|
|
|
|
console.log(obj) |
|
|
|
|
console.log(obj,'**************'); |
|
|
|
|
oliSiteApi.verifyQrCode(obj).then(res => { |
|
|
|
|
if (res.code === 20000) { |
|
|
|
|
this.siteData = res.data |
|
|
|
|