pull/2/head
xiaozhiyong 2 years ago
parent ea8e9f9eb7
commit 5a6193c34f
  1. 3
      App.vue
  2. 23
      BagStation/pages/stationDetail/stationDetail.vue
  3. 1
      pages/tabbar/home/home.vue
  4. 14
      utils/request.js

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

@ -88,7 +88,7 @@
<text class=" text-black "> {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red"> <text class=" text-black "> {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
{{itm.discountAmount}}</text></text> {{itm.discountAmount}}</text></text>
</view> </view>
<view class="cu-item no-border" v-if="!siteInfo.oilSiteOrderInfoVos.length"> <view class="cu-item no-border" v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
暂无 暂无
</view> </view>
@ -187,7 +187,17 @@
console.log('这里是卸载页面') console.log('这里是卸载页面')
this.innerAudioContext.stop() this.innerAudioContext.stop()
}, },
onLoad(option) { onLoad(option) {
console.log(22222)
if(option.q) {
let originLink = decodeURIComponent(option.q)
let target = this.obtainUrlPathParameterTarget(originLink)
console.log('target',target)
return
}
if(!option.item){ if(!option.item){
let siteInfos = uni.getStorageSync('siteInfo') let siteInfos = uni.getStorageSync('siteInfo')
var oilItem = JSON.parse(decodeURIComponent(siteInfos)) var oilItem = JSON.parse(decodeURIComponent(siteInfos))
@ -209,6 +219,17 @@
this.ContextAudio(this.audioUrl) this.ContextAudio(this.audioUrl)
}, },
methods: { 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){ ContextAudio(url){
this.innerAudioContext = uni.createInnerAudioContext(); this.innerAudioContext = uni.createInnerAudioContext();

@ -576,7 +576,6 @@
}, },
toDetail(item) { toDetail(item) {
let itemS = encodeURIComponent(JSON.stringify(item)) let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
uni.navigateTo({ uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,

@ -2,9 +2,9 @@ import axios from 'axios'
import utils from '@/utils/encode' import utils from '@/utils/encode'
// const env = process.env.NODE_ENV // const env = process.env.NODE_ENV
const env = 'production'/* */ // const env = 'production'/* */
// const env = 'test' const env = 'test'
const testUrl = 'http://192.168.0.45:38080' const testUrl = 'http://192.168.110.230:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new // const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new
@ -54,8 +54,8 @@ service.interceptors.request.use(
config.data = data config.data = data
// } // }
} else { } else {
console.log('\n\n-----------------------') // console.log('\n\n-----------------------')
console.log('参数', config.url, '参数加密前', config.data) // console.log('参数', config.url, '参数加密前', config.data)
url = config.url url = config.url
} }
@ -84,8 +84,8 @@ service.interceptors.response.use(
// console.log('返回', response.config.url, '返回结果',res) // console.log('返回', response.config.url, '返回结果',res)
} }
} else { } else {
console.log('返回', response.config.url, '返回结果未加密', res) // console.log('返回', response.config.url, '返回结果未加密', res)
console.log('-------------------------------------------\n\n') // console.log('-------------------------------------------\n\n')
} }
uni.hideLoading() uni.hideLoading()

Loading…
Cancel
Save