caoliancun/MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lixuan #7

Merged
lixuan merged 4 commits from lixuan into master 2023-02-14 15:58:59 +08:00
Conversation 0 Commits 4 Files Changed 2 +49 -27
6 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52971beaed - Show all commits

4
App.vue
View File

@@ -75,6 +75,7 @@
},
onShareAppMessage() {
wx.onAppRoute(() => {
let white = ['BagStation/pages/stationDetail/stationDetail']
// console.log('当前页面路由发生变化 触发该事件onShareAppMessage')
const pages = getCurrentPages() //获取加载的页面
const view = pages[pages.length - 1] //获取当前页面的对象
@@ -94,11 +95,14 @@
console.log(view.route)
clearTimeout(loginTimer)
clearTimeout(onlineTimer)
if (view.route != 'pages/index/startPage/startPage' && view.route.indexOf('BagAuth') == -1) {
const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid')
if (token && openid) {
if(!white.includes(view.route)){
this.getAmount()
}
onlineTimer = setTimeout(() => {
if (this.loginStatus == 'offline') {
uni.clearStorageSync()

50
BagStation/pages/components/price-select-tab.vue
View File

@@ -89,7 +89,7 @@
</form>
</view>
<!-- 非团油加油输入框 -->
<view class="margin solid radius" v-if="activeChannelCode!='TY'">
<view class="margin solid radius" v-if="activeChannelCode!='TY'&&radio!==null">
<view class=" menu cu-list ">
<view class="cu-item nowrap">
<view class="text-bold ">
@@ -117,7 +117,7 @@
</view>
<!-- 团油金额输入框 -->
<view class="margin solid radius" v-if="activeChannelCode=='TY'">
<view class="margin solid radius" v-if="activeChannelCode=='TY' && radio!==null">
<view class=" menu cu-list ">
<view class="cu-item nowrap">
<view class="text-bold ">
@@ -144,7 +144,7 @@
</view>
</view>
</view>
<view class="bg-white padding">
<view v-if="radio!==null" class="bg-white padding">
<view class="">
<text class="text-bold">优惠</text>
</view>
@@ -355,7 +355,6 @@
oilBarTy: '',
ty: {
realMoney: ""
},
tyRes: {
liter: '',
@@ -377,7 +376,7 @@
plateNumbers: [],
showPlate: "",
showOrder: '',
radio: '',
radio: null,
imgURL: this.global.imgURL,
scrollLeft: 0,
checkVol: [{
@@ -407,7 +406,6 @@
hot: false,
}],
plateNumber: '',
checkMoney:[{
value: 100,
name: '100 ',
@@ -503,6 +501,15 @@
}, 2)
}
},
radio:{
handler(n,o) {
console.log(n,o,'handler');
this.checkBar.forEach(item=>{
item.checked = false
});
this.oilBar = ''
}
}
},
computed: {
priceId() {
@@ -639,6 +646,7 @@
})
},
checkInfo(){
console.log(this.radio)
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult) {
this.plateNumber=''
@@ -648,10 +656,10 @@
})
// return false
}
if (!this.oilSitePriceDetailsVo[this.radio].priceId) {
if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({
icon: 'none',
title: '未选择油品'
title: '请选择油品'
})
return false
}
@@ -797,7 +805,7 @@
}
},
beforeMake() {
console.log(this.radio,'beforeMake')
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult) {
this.plateNumber=''
@@ -807,10 +815,10 @@
})
// return false
}
if (!this.oilSitePriceDetailsVo[this.radio].priceId) {
if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({
icon: 'none',
title: '未选择油品'
title: '请选择油品'
})
return false
}
@@ -912,11 +920,14 @@
this.oilSitePriceDetailsVo = []
oilSiteApi.getNewSitePrice(channelId).then(res => {
if (res.code == 20000) {
this.radio = 0
this.plateNumbers = res.data.plateNumbers
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo;
this.siteUserNames = res.data.siteUserNames;
if(this.oilSitePriceDetailsVo.length==1){
this.radio = 0
this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId
this.siteUserNames = res.data.siteUserNames
}
}
})
},
@@ -957,11 +968,18 @@
},
changePrice(e) {
this.radio = e.detail.value
console.log(e)
console.log(e,'changePrice')
this.vol =''
this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
this.realMoney ='--'
this.xoilAmountGun = ''
this.xoilAmountGun = '';
Object.keys(this.tyRes).forEach(key=>{
this.tyRes[key]=''
})
Object.keys(this.ty).forEach(key=>{
this.ty[key]=''
})
this.vlom = ''
// // console.log(this.radio)
console.log(this.oilSitePriceDetailsVo[this.radio])
},

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

@@ -189,9 +189,9 @@
onLoad(option) {
if(!option.item){
let siteInfos = uni.getStorageSync('siteInfo')
var oilItem = JSON.parse(siteInfos)
var oilItem = JSON.parse(decodeURIComponent(siteInfos))
}else{
var oilItem = JSON.parse(option.item)
var oilItem = JSON.parse(decodeURIComponent(option.item))
}
uni.setStorageSync('oilItem',oilItem)
this.getSiteInfo(oilItem.siteId)

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

@@ -553,7 +553,7 @@
}
},
toDetail(item) {
let itemS = JSON.stringify(item)
let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS)
if (uni.getStorageSync('user')) {
uni.navigateTo({

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

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

6
utils/request.js
View File

@@ -4,11 +4,11 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
const env = 'production'/* */
// const env = 'test'
const testUrl = 'http://192.168.0.65:38080'
const testUrl = 'http://192.168.0.45:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
// const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl,
// baseURL: testUrl,