caoliancun
/
zhongPin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
pull/2/head
xiaozhiyong 2 years ago
parent da9ffdb20d
commit 604e9b3bb6
4 changed files with 51 additions and 40 deletions
Split View
  1. 3
      App.vue
  2. 22
      BagAuth/pages/login/login.vue
  3. 45
      BagStation/pages/stationDetail/stationDetail.vue
  4. 21
      pages/tabbar/home/home.vue

3
App.vue
Unescape View File

@ -58,7 +58,8 @@
let custom = wx.getMenuButtonBoundingClientRect();
Vue.prototype.Custom = custom;
Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
// #endif
// #endif
// #ifdef MP-ALIPAY
Vue.prototype.StatusBar = e.statusBarHeight;
Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;

22
BagAuth/pages/login/login.vue
Unescape View File

@ -152,22 +152,24 @@
loginRes: {},
sessionKey: '',
nickName: '',
loginOut: uni.getStorageSync('loginOut') ? true : false
loginOut: uni.getStorageSync('loginOut') ? true : false,
scanningParams:null
}
},
onLoad() {
onLoad(options) {
uni.clearStorageSync()
this.refreshLocation()
uni.login({
provider: 'weixin',
success: (loginRes) => {
console.log(loginRes,'loginRes')
const code = loginRes.code
this.onceCode = code
console.log(this.onceCode,'----------')
oilIdentityApi.sendCode(this.onceCode).then(res => {
console.log(res,'sendCode')
if (res.code === 20000) {
if(options.scanningParams) {
// 用于扫码进入油站详情页面
this.scanningParams = options.scanningParams
}
this.sessionKey = res.data.sessionKey
uni.setStorageSync('openid', res.data.openId)
uni.setStorageSync('unionid', res.data.unionId)
@ -184,7 +186,6 @@
}
}).catch(err => {
console.log(err)
uni.reLaunch({
url: '/BagAuth/pages/login/boforeLogin/boforeLogin',
fail: (err) => {
@ -231,7 +232,6 @@
decryptPhoneNumber(e) {
// console.log(e.detail)
if (e.detail.errMsg === 'getPhoneNumber:ok') {
const data1 = {
...e.detail,
@ -251,7 +251,6 @@
bindLoginByPhone(data, url) {
if (this.count < 1) {
oilIdentityApi.bindLoginByPhone(data, url).then(res => {
console.log(res)
if (res.code == 20000) {
this.loginSuccess(res)
@ -278,11 +277,16 @@
title: res.msg,
icon: 'none',
complete: (err) => {
// console.log(err)
}
})
}, 1000);
// 这里有问题
if(this.scanningParams) {
uni.redirectTo({
url: `/BagStation/pages/stationDetail/stationDetail?q=${this.scanningParams}`
})
return
}
uni.switchTab({
url: '/pages/tabbar/home/home'
})

45
BagStation/pages/stationDetail/stationDetail.vue
Unescape View File

@ -180,21 +180,29 @@
}
},
onHide() {
console.log('这里是hiden')
this.innerAudioContext.stop()
this.audioUrl && this.innerAudioContext.stop()
},
onUnload() {
console.log('这里是卸载页面')
this.innerAudioContext.stop()
this.audioUrl && this.innerAudioContext.stop()
},
onLoad(option) {
console.log(22222)
let userInfo = uni.getStorageSync('user')
if(!userInfo && option.q) {
uni.redirectTo({
url: `/BagAuth/pages/login/login?scanningParams=${option.q}`
})
return
}
if(option.q) {
let originLink = decodeURIComponent(option.q)
let target = this.obtainUrlPathParameterTarget(originLink)
console.log('target',target)
if(target.siteId) {
this.siteId = target.siteId
this.getSiteInfo(target.siteId)
}
return
}
@ -204,6 +212,7 @@
}else{
var oilItem = JSON.parse(decodeURIComponent(option.item))
}
uni.setStorageSync('oilItem',oilItem)
this.getSiteInfo(oilItem.siteId)
this.siteId = oilItem.siteId
@ -239,12 +248,11 @@
console.log('开始播放');
});
this.innerAudioContext.onError((res) => {
console.log(res.errMsg);
console.log(res.errCode);
console.log(res);
});
},
backTohome(){
this.innerAudioContext.stop()
this.audioUrl && this.innerAudioContext.stop()
uni.switchTab({
url:'../../../pages/tabbar/home/home'
})
@ -253,7 +261,7 @@
this.showtitle =false
},
gotoPay(){
this.innerAudioContext.stop()
this.audioUrl && this.innerAudioContext.stop()
uni.navigateTo({
url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
})
@ -263,32 +271,28 @@
this.secondChannelCode = sec
},
siteQrPay() {
this.innerAudioContext.stop()
// let siteId =
this.audioUrl && this.innerAudioContext.stop()
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}`
})
},
getSiteInfo(id) {
console.log('进入获取油站信息')
let data2 = {
...uni.getStorageSync('location'),
siteId: id,
clientBelong: "ZHONGPIN"
}
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('进入获取油站信息getSiteDetails',res)
oilSiteApi.getSiteDetails(data2).then(res => {
if (res.code == 20000) {
this.siteInfo = res.data
}
})
},
makePay() {
console.log(this.siteInfo.juli)
if(this.siteInfo.juli > 1000 ){
this.showtitle = true
}else{
this.innerAudioContext.stop()
this.audioUrl && this.innerAudioContext.stop()
uni.navigateTo({
url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
})
@ -316,10 +320,11 @@
},
goBack() {
this.innerAudioContext.stop()
uni.navigateBack({
// this.innerAudioContext.stop()
})
uni.switchTab({
url: '/pages/tabbar/home/home'
});
},
selectRadio() {
this.radio === 'A' ? this.radio = '' : this.radio = 'A'

21
pages/tabbar/home/home.vue
Unescape View File

@ -489,25 +489,26 @@
},
getSiteList() {
let data1 = {
let params = {
currentPage: 1,
pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象
clientBelong:'ZHONGPIN',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
// longitude: 117.157817, // 必有字段 备注：// 当前位置经度
// latitude: 31.802472, // 必有字段 备注：// 当前位置维度
...uni.getStorageSync('location'),
...this.filterData,
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "0#" // 备注：// 油号选择 ( 0# 92# 92#)
comprehensiveSort:1
clientBelong:'ZHONGPIN',
comprehensiveSort:1,
zpDisable:'ENABLE',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
...uni.getStorageSync('location'),
...this.filterData,
}
}
if (!uni.getStorageSync('user')) {
oilSiteApi.readOnlySites(data1).then(res => {
oilSiteApi.readOnlySites(params).then(res => {
this.getCount++
if (res.code == 20000) {
// console.log(res.data.list)
@ -542,10 +543,8 @@
}
})
} else {
console.log(data1,'dayindata111111111111')
oilSiteApi.getSiteLists(data1).then(res => {
oilSiteApi.getSiteLists(params).then(res => {
if (res.code == 20000) {
// console.log(res.data.list)
this.siteList = res.data.list
}
})
@ -553,6 +552,8 @@
},
toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item))
// console.log(uni.getStorageSync('user'))
// return
if (uni.getStorageSync('user')) {
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,

Write Preview
Loading…
Cancel
Save