diff --git a/Activity/pages/index/index.vue b/Activity/pages/index/index.vue
index 26f9183..18c3cc7 100644
--- a/Activity/pages/index/index.vue
+++ b/Activity/pages/index/index.vue
@@ -24,6 +24,7 @@
// sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
siteName: '',
clientBelong:'BAICHUAN',
+ bcDisable:'ENABLE',
...uni.getStorageSync('location'),
// ...this.filterData
// siteBrand: this.siteName ? '' : this.filterDatas
diff --git a/App.vue b/App.vue
index e08a94d..9a674d2 100644
--- a/App.vue
+++ b/App.vue
@@ -99,10 +99,22 @@
if (view.route != 'pages/index/startPage/startPage' && view.route.indexOf('BagAuth') == -1) {
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid')
+
+ let jumpUrl = '/BagAuth/pages/login/login?loginType=true'
+ let urlTarget = this.obtainUrlPathParameterTarget(view.$page.fullPath)
+ console.log('urlTarget',urlTarget)
+ let target = {}
+ if(urlTarget.q) {
+ let originLink = decodeURIComponent(decodeURIComponent(urlTarget.q))
+ target = this.obtainUrlPathParameterTarget(originLink)
+ target.siteId && (jumpUrl += `?scanningParams=${decodeURIComponent(urlTarget.q)}`)
+ }
+
if (token && openid) {
- if(!white.includes(view.route)){
- this.getAmount()
- }
+ this.getAmount()
+ // if(!white.includes(view.route)){
+ // this.getAmount()
+ // }
onlineTimer = setTimeout(() => {
if (this.loginStatus == 'offline') {
uni.clearStorageSync()
@@ -113,7 +125,7 @@
success: function(res) {
if (res.confirm) {
uni.redirectTo({
- url: '/BagAuth/pages/login/login?loginType=true'
+ url: jumpUrl
})
}
},
@@ -125,6 +137,9 @@
}, 1000)
} else {
+ target.siteId && uni.redirectTo({
+ url: jumpUrl
+ })
// loginTimer = setTimeout(() => {
// uni.showModal({
// title: '请您登录',
@@ -146,6 +161,20 @@
// }
})
},
+
+ obtainUrlPathParameterTarget(url) {
+ let target = {}
+ if(url.includes('?')) {
+ let paramsText = url.split("?")[1]
+ let paramsArr = paramsText.split("&")
+ paramsArr.forEach(item => {
+ target[item.split('=')[0]] = item.split('=')[1]
+ })
+ }
+ console.log('11target',target)
+ return target
+ },
+
// 是否token过期或ip更改
getAmount() {
clearTimeout(loginTimer)
diff --git a/BagAuth/pages/login/login.vue b/BagAuth/pages/login/login.vue
index a7026a4..60548e0 100644
--- a/BagAuth/pages/login/login.vue
+++ b/BagAuth/pages/login/login.vue
@@ -89,26 +89,27 @@
loginRes: {},
sessionKey: '',
nickName: '',
- loginOut: uni.getStorageSync('loginOut') ? true : false
+ loginOut: uni.getStorageSync('loginOut') ? true : false,
+ scanningParams:null
}
},
onLoad(e) {
if(e.loginType){
this.loginType = Boolean(e.loginType);
- console.log(e.loginType,'e.loginType')
}
uni.clearStorageSync()
// this.refreshLocation()
uni.login({
provider: 'weixin',
success: (loginRes) => {
- console.log(loginRes, '+++++++')
const code = loginRes.code
- this.onceCode = code
- console.log(this.onceCode, '----------')
+ this.onceCode = code
oilIdentityApi.sendCode(this.onceCode).then(res => {
- console.log(res, '++++++++++++++++')
if (res.code === 20000) {
+ if(e.scanningParams) {
+ // 用于扫码进入油站详情页面
+ this.scanningParams = e.scanningParams
+ }
this.sessionKey = res.data.sessionKey
uni.setStorageSync('openid', res.data.openId)
uni.setStorageSync('unionid', res.data.unionId)
@@ -125,7 +126,6 @@
}
}).catch(err => {
- console.log(err)
uni.reLaunch({
url: '/BagAuth/pages/login/boforeLogin/boforeLogin',
fail: (err) => {
@@ -170,7 +170,7 @@
},
refuseEmpower() {
uni.navigateTo({
- url: '/BagAuth/pages/login/oldLogin'
+ url: `/BagAuth/pages/login/oldLogin?scanningParams=${this.scanningParams}`
})
},
@@ -184,7 +184,6 @@
})
return
}
- // console.log(e.detail)
if (e.detail.errMsg === 'getPhoneNumber:ok') {
const data1 = {
...e.detail,
@@ -204,7 +203,6 @@
bindLoginByPhone(data, url) {
if (this.count < 1) {
oilIdentityApi.bindLoginByPhone(data, url).then(res => {
- console.log(res)
if (res.code == 20000) {
this.loginSuccess(res)
}
@@ -230,20 +228,23 @@
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'
})
}else{
- console.log(this.loginType,'loginTypeloginTypeloginType')
if(!this.loginType){
this.refuseLogin()
}
- console.log('禁摩登录i失败==================')
}
},
}
diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index 4a56641..cf5bc00 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -170,7 +170,14 @@
count: 0,
loginRes: {},
checked: false,
- next: false
+ next: false,
+ scanningParams:null
+ }
+ },
+ onLoad(options) {
+ if(options.scanningParams) {
+ // 用于扫码进入油站详情页面
+ this.scanningParams = options.scanningParams
}
},
onShow() {},
@@ -401,6 +408,12 @@
icon: 'none'
})
}, 1000);
+ if(this.scanningParams) {
+ uni.redirectTo({
+ url: `/BagStation/pages/stationDetail/stationDetail?q=${this.scanningParams}`
+ })
+ return
+ }
// 这里有问题
uni.switchTab({
url: '/pages/tabbar/home/home'
diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 94e9dd8..d066910 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -45,7 +45,7 @@
-->
-
@@ -185,14 +175,22 @@
}
},
onHide() {
- console.log('这里是hiden')
- this.innerAudioContext.stop()
+ this.innerAudioContext && this.innerAudioContext.stop()
},
onUnload() {
- console.log('这里是卸载页面')
- this.innerAudioContext.stop()
+ this.innerAudioContext && this.innerAudioContext.stop()
},
onLoad(option) {
+
+ if(option.q) {
+ let originLink = decodeURIComponent(option.q)
+ let target = this.obtainUrlPathParameterTarget(originLink)
+ if(target.siteId) {
+ this.siteId = target.siteId
+ this.getSiteInfo(target.siteId)
+ }
+ return
+ }
if (!option.item) {
let siteInfos = uni.getStorageSync('siteInfo')
var oilItem = JSON.parse(decodeURIComponent(siteInfos))
@@ -214,6 +212,17 @@
this.ContextAudio(this.audioUrl)
},
methods: {
+ obtainUrlPathParameterTarget(url) {
+ let target = {}
+ if(url.includes('?')) {
+ let paramsText = url.split("?")[1]
+ let paramsArr = paramsText.split("&")
+ paramsArr.forEach(item => {
+ target[item.split('=')[0]] = item.split('=')[1]
+ })
+ }
+ return target
+ },
// 生成音频文件
ContextAudio(url) {
this.innerAudioContext = uni.createInnerAudioContext();
@@ -223,12 +232,11 @@
console.log('开始播放');
});
this.innerAudioContext.onError((res) => {
- console.log(res.errMsg);
- console.log(res.errCode);
+ console.log(res);
});
},
backTohome() {
- this.innerAudioContext.stop()
+ this.innerAudioContext && this.innerAudioContext.stop()
uni.switchTab({
url: '../../../pages/tabbar/home/home'
})
@@ -237,7 +245,7 @@
this.showtitle = false
},
gotoPay() {
- this.innerAudioContext.stop()
+ this.innerAudioContext && this.innerAudioContext.stop()
uni.navigateTo({
url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
})
@@ -247,24 +255,30 @@
this.secondChannelCode = sec
},
siteQrPay() {
- this.innerAudioContext.stop()
+ this.innerAudioContext && this.innerAudioContext.stop()
// let siteId =
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}`
})
},
getSiteInfo(id, item) {
- console.log('进入获取油站信息');
let user = uni.getStorageSync('user');
let data2 = {
...uni.getStorageSync('location'),
- siteId: id
+ siteId: id,
+ clientBelong: "BAICHUAN"
}
if (user) {
oilSiteApi.getSiteDetails(data2).then(res => {
- console.log('进入获取油站信息getSiteDetails', res)
if (res.code == 20000) {
this.siteInfo = res.data
+ }else {
+ setTimeout(()=>{
+ uni.showToast({
+ title:res.msg,
+ icon:'none'
+ })
+ },1000)
}
})
} else {
@@ -274,36 +288,28 @@
},
makePay() {
let user = uni.getStorageSync('user');
- if (this.activePay && user) {
- if (this.siteInfo.juli > 1000) {
- this.showtitle = true
- } else {
- this.innerAudioContext.stop()
- uni.navigateTo({
- url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
- })
- }
- } else {
- if(!user){
- uni.showModal({
- title: '请您登录',
- content: "登录佰川加油才可以加油 |˛˙꒳˙)♡",
- confirmText: '去登陆',
- success: (res) => {
- if (res.confirm) {
- uni.reLaunch({
- url: '../../../BagAuth/pages/login/login?loginType=true'
- })
- }
+ if(!user){
+ uni.showModal({
+ title: '请您登录',
+ content: "登录佰川加油才可以加油 |˛˙꒳˙)♡",
+ confirmText: '去登陆',
+ success: (res) => {
+ if (res.confirm) {
+ uni.reLaunch({
+ url: '../../../BagAuth/pages/login/login?loginType=true'
+ })
}
- })
- }else{
- uni.showToast({
- title:'暂无可选油品',
- icon:'none'
- })
- }
-
+ }
+ })
+ return
+ }
+ if (this.siteInfo.juli > 1000) {
+ this.showtitle = true
+ } else {
+ this.innerAudioContext && this.innerAudioContext.stop()
+ uni.navigateTo({
+ url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
+ })
}
},
@@ -311,6 +317,7 @@
this.qrcodePay = val
},
onChangePay(val, active) {
+ console.log(val)
this.activePay = val
this.activeCur = active
},
@@ -329,10 +336,10 @@
},
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'
diff --git a/components/three-sites.vue b/components/three-sites.vue
index 1acc9bc..1900786 100644
--- a/components/three-sites.vue
+++ b/components/three-sites.vue
@@ -75,7 +75,9 @@
params: { //类型：Object 必有字段 备注：// 筛选对象
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
...uni.getStorageSync('location'),
- ...this.filterData
+ ...this.filterData,
+ clientBelong:'BAICHUAN',
+ bcDisable:'ENABLE',
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "" // 备注：// 油号选择 ( 0# 92# 92#)
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index 5429789..b0e4192 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -560,7 +560,8 @@
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "0#" // 备注：// 油号选择 ( 0# 92# 92#)
- comprehensiveSort: 1
+ comprehensiveSort: 1,
+ bcDisable: 'ENABLE'
}
}
if (!uni.getStorageSync('user')) {
diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue
index b571081..49ff28c 100644
--- a/pages/tabbar/station/stationList.vue
+++ b/pages/tabbar/station/stationList.vue
@@ -384,16 +384,14 @@
siteName: this.siteName,
...uni.getStorageSync('location'),
// ...this.filterData
- siteBrand: this.siteName ? '' : this.filterData
- .siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
- channelCode: this.siteName ? '' : this.filterData
- .channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
- oilProductCode: this.siteName ? '' : this.filterData
- .oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#)
+ siteBrand: this.siteName ? '' : this.filterData.siteBrand, // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
+ channelCode: this.siteName ? '' : this.filterData.channelCode, // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+ oilProductCode: this.siteName ? '' : this.filterData.oilProductCode, // 备注：// 油号选择 ( 0# 92# 92#)
provinceCode: this.filterData.provinceCode,
cityCode: this.filterData.cityCode,
areaCode: this.filterData.areaCode,
distance: this.filterData.distance,
+ bcDisable:'ENABLE',
comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1
}
diff --git a/utils/request.js b/utils/request.js
index 86de926..21a1888 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -37,25 +37,17 @@ service.interceptors.request.use(
config.headers['dataSources'] = 'MP'
if (env === 'production') {
- // 生产环境，加密，不输出任何东西
- // 设置jsessionid和token
const JSESSIONID = utils.uuid()
config.headers['JSESSIONID'] = JSESSIONID
config.headers['token'] = utils.md5Salt(JSESSIONID)
- // if ( encryptWhite.indexOf(config.url) < 0) {
- // if (!notEncrypt && encryptWhite.indexOf(config.url) < 0) {
- // 这是定义在哪的
+
const data = { // 用于存储加密
params: '' // 加密后的密文
}
// 要加密
data.params = utils.encrypt(JSON.stringify(config.data))
- // console.log('参数', config.url, '参数加密前',config.data)
config.data = data
- // }
} else {
- console.log('\n\n-----------------------')
- console.log('参数', config.url, '参数加密前', config.data)
url = config.url
}
@@ -78,15 +70,10 @@ service.interceptors.response.use(
if (env === 'production') {
// 生产环境，进行加密解密，不输出日志
if (res.encrypt == 1) {
- // 加密的数据，需要解密
const dataParam = JSON.parse(utils.decrypt(res.data))
res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
- // console.log('返回', response.config.url, '返回结果',res)
}
- } else {
- console.log('返回', response.config.url, '返回结果未加密', res)
- console.log('-------------------------------------------\n\n')
- }
+ }
uni.hideLoading()
if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){
@@ -95,9 +82,7 @@ service.interceptors.response.use(
title: res.msg,
icon: "none"
})
-
}
-
}
return res
},