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

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

Browse Source
This commit is contained in:
caolc
2023-07-05 18:41:41 +08:00
parent 27694e14f4 ec08020202
commit 47600ad2b5
10 changed files with 178 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
App.vue
View File

@@ -58,7 +58,9 @@
let custom = wx.getMenuButtonBoundingClientRect();
Vue.prototype.Custom = custom;
Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
// #endif // #ifdef MP-ALIPAY
// #endif
// #ifdef MP-ALIPAY
Vue.prototype.StatusBar = e.statusBarHeight;
Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;
// #endif
@@ -135,10 +137,27 @@
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'
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)}`)
}
// console.log('jumpUrl',jumpUrl)
if (token && openid) {
if(!white.includes(view.route)){
this.getAmount()
}
this.getAmount()
// if(!white.includes(view.route) ){
// this.getAmount()
// }
// if(target.siteId || !white.includes(view.route) ){
// this.getAmount()
// }
onlineTimer = setTimeout(() => {
if (this.loginStatus == 'offline') {
uni.clearStorageSync()
@@ -149,7 +168,7 @@
success: function(res) {
if (res.confirm) {
uni.redirectTo({
url: '/BagAuth/pages/login/login'
url: jumpUrl
})
}
},
@@ -165,6 +184,9 @@
}, 500)
} else {
target.siteId && uni.redirectTo({
url: jumpUrl
})
// loginTimer = setTimeout(() => {
// uni.showModal({
// title: '请您登录',
@@ -186,9 +208,24 @@
// }
})
},
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() {
getAmount() {
clearTimeout(loginTimer)
<<<<<<< HEAD
// accountApi.getTotalOilCardInfo().then(res => {
// if (res.code == 20000) {
// this.loginStatus = 'online'
@@ -197,6 +234,18 @@
// this.msg = res.msg
// }
// })
=======
accountApi.getTotalOilCardInfo().then(res => {
console.log('res.code',res.code)
console.log(555)
if (res.code == 20000) {
this.loginStatus = 'online'
} else if (res.code == 42011) {
this.loginStatus = 'offline'
this.msg = res.msg
}
})
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
},
},
@@ -205,6 +254,7 @@
},
onShow: function() {
console.log(12388)
uni.getLocation({
type: 'wgs84',
success: function(res) {

24
BagAuth/pages/login/login.vue
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) => {
@@ -224,14 +225,13 @@
},
refuseEmpower() {
uni.navigateTo({
url: '/BagAuth/pages/login/oldLogin'
url: `/BagAuth/pages/login/oldLogin?scanningParams=${this.scanningParams}`
})
},
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,10 +277,15 @@
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'

15
BagAuth/pages/login/oldLogin.vue
View File

@@ -171,7 +171,14 @@
count: 0,
loginRes: {},
checked: false,
next: false
next: false,
scanningParams:null
}
},
onLoad(options) {
if(options.scanningParams) {
// 用于扫码进入油站详情页面
this.scanningParams = options.scanningParams
}
},
onShow() {},
@@ -403,6 +410,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'

4
BagStation/orderDetail/orderDetail.vue
View File

@@ -43,7 +43,7 @@
</view>
</view>
<view class="cu-list menu solid-bottom">
<view class="cu-item arrow" @tap="toDetail(order)">
<view class="cu-item " :class="order.zpDisable === 'DISABLE' ? '' :'arrow'" @tap="toDetail(order)">
油站：
<text class="fr">{{order.siteName?order.siteName:''}}</text>
</view>
@@ -332,6 +332,7 @@
})
},
toDetail(item) {
if(item.zpDisable === 'DISABLE') return
var itemS = JSON.stringify(item)
uni.setStorageSync('siteInfo',itemS)
uni.navigateTo({
@@ -345,6 +346,7 @@
})
},
cancelOrder() {
orderApi.cancelOrder(this.id).then(res => {
if (res.code == 20000) {
uni.showToast({

74
BagStation/pages/stationDetail/stationDetail.vue
View File

@@ -88,7 +88,11 @@
<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
￥{{itm.discountAmount}}</text></text>
</view>
<<<<<<< HEAD
<view class="cu-item no-border" >
=======
<view class="cu-item no-border" v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
暂无
</view>
</view>
@@ -180,23 +184,50 @@
}
},
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) {
// console.log('option',option)
// 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
}
if(!option.item){
let siteInfos = uni.getStorageSync('siteInfo')
var oilItem = JSON.parse(decodeURIComponent(siteInfos))
}else{
var oilItem = JSON.parse(decodeURIComponent(option.item))
}
<<<<<<< HEAD
uni.setStorageSync('oilItem',oilItem);
this.getSiteInfo(oilItem.id)
this.siteId = oilItem.id
=======
uni.setStorageSync('oilItem',oilItem)
this.getSiteInfo(oilItem.siteId)
this.siteId = oilItem.siteId
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
if(oilItem.listTag == '万金油'){
this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
}else if(oilItem.listTag == '星油'){
@@ -209,6 +240,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();
@@ -218,12 +260,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'
})
@@ -232,7 +273,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}`
})
@@ -242,22 +283,19 @@
this.secondChannelCode = sec
},
siteQrPay() {
this.innerAudioContext.stop()
// let siteId =
this.innerAudioContext && 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'),
id: id,
clientBelong: "ZHONGPIN",
"targetApp": "SAAS", // 小程序来源
}
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('进入获取油站信息getSiteDetails',res)
oilSiteApi.getSiteDetails(data2).then(res => {
if (res.code == 20000) {
this.siteInfo = res.data;
console.log(this.siteInfo,'*****')
@@ -265,11 +303,10 @@
})
},
makePay() {
console.log(this.siteInfo.juli)
if(this.siteInfo.juli > 1000 ){
this.showtitle = true
}else{
this.innerAudioContext.stop()
this.innerAudioContext && this.innerAudioContext.stop()
uni.navigateTo({
url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
})
@@ -297,10 +334,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'

4
components/site-item/site-item.vue
View File

@@ -1,5 +1,9 @@
<template>
<<<<<<< HEAD
<view class="cu-item cur padding no-mr-border site-item" >
=======
<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices && siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':''}">
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
<view class="cu-avatar radius lg "
:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
</view>

1
components/three-sites.vue
View File

@@ -78,6 +78,7 @@
...uni.getStorageSync('location'),
...this.filterData,
comprehensiveSort:1,
zpDisable:'ENABLE',
// siteBrand: "", // 备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
// channelCode: "", // 备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
// oilProductCode: "" // 备注：// 油号选择 ( 0# 92# 92#)

23
pages/tabbar/home/home.vue
View File

@@ -489,26 +489,32 @@
},
getSiteList() {
let data1 = {
let params = {
currentPage: 1,
pageSize: 10,
params: { //类型：Object 必有字段 备注：// 筛选对象
<<<<<<< HEAD
clientBelong:'ZHONGPIN',
targetApp:'SAAS',
sort: "juli", //类型：String 必有字段 备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
=======
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
// 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)
@@ -543,10 +549,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
}
})
@@ -554,7 +558,8 @@
},
toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
// console.log(uni.getStorageSync('user'))
// return
if (uni.getStorageSync('user')) {
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,

13
pages/tabbar/station/stationList.vue
View File

@@ -387,17 +387,18 @@
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,
<<<<<<< HEAD
juli:this.filterData.distance,
=======
zpDisable:'ENABLE',
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
comprehensiveSort: this.filterData.comprehensiveSort ? this.filterData.comprehensiveSort : 1
}

13
utils/request.js
View File

@@ -3,8 +3,13 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
// const env = 'production'/* */
<<<<<<< HEAD
const env = 'test'
const testUrl = 'http://192.168.0.20:38080'
=======
const env = 'production'
const testUrl = 'http://192.168.110.230:38080'
>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
// const productUrl = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
@@ -55,8 +60,8 @@ service.interceptors.request.use(
config.data = data
// }
} else {
console.log('\n\n-----------------------')
console.log('参数', config.url, '参数加密前', config.data)
// console.log('\n\n-----------------------')
// console.log('参数', config.url, '参数加密前', config.data)
url = config.url
}
return config
@@ -84,8 +89,8 @@ service.interceptors.response.use(
// console.log('返回', response.config.url, '返回结果',res)
}
} else {
console.log('返回', response.config.url, '返回结果未加密', res)
console.log('-------------------------------------------\n\n')
// console.log('返回', response.config.url, '返回结果未加密', res)
// console.log('-------------------------------------------\n\n')
}
uni.hideLoading();