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

更新

Browse Source
This commit is contained in:
xiaozhiyong
2023-08-31 09:29:38 +08:00
parent 5dfc59b640
commit 7028fde296
4 changed files with 62 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BagStation/pages/newRoutePlanning/components/addressSelector.vue
View File

@@ -21,7 +21,10 @@
<view v-for="(item,index) in menuList" :key='index' class="filter_item">
<view @click="seleFilter(item,index)"> {{ item.value?item.value.split('/')[0]:item.title}} </view>
<view :style="{maxHeight:item.SublistOpen?'200rpx':'0rpx'}" class="conditions">
<view :style="{color:item.value?item.value.split('/')[0] == items.lable?'#666666':'#bbbbbb':'#bbbbbb'}" @click="filterItemSele(index,indexs)" v-for="(items,indexs) in item.Sublist" :key='indexs' style="margin-bottom: 10rpx; font-size: 25rpx;">{{items.lable}}</view>
<view
:style="{color:item.value?item.value.split('/')[0] == items.lable?'#666666':'#bbbbbb':'#bbbbbb'}"
@click="filterItemSele(index,indexs)" v-for="(items,indexs) in item.Sublist" :key='indexs'
style="margin-bottom: 10rpx; font-size: 25rpx;">{{items.lable}}</view>
</view>
</view>
</view>
@@ -84,8 +87,7 @@
value: '全部/2',
field: 'highSpeed',
SublistOpen: false,
Sublist: [
{
Sublist: [{
lable: '全部',
value: '2'
},
@@ -121,7 +123,8 @@
return this.styles.top + this.styles.height + 10 + this.header.height
},
filterItemSele(index, indexs) {
this.menuList[index].value = `${this.menuList[index].Sublist[indexs].lable}/${this.menuList[index].Sublist[indexs].value}`;
this.menuList[index].value =
`${this.menuList[index].Sublist[indexs].lable}/${this.menuList[index].Sublist[indexs].value}`;
this.menuList[index].SublistOpen = false;
console.log(this.datassFn(), '/-/-/');
if (index == 2) {
@@ -154,7 +157,9 @@
value: ''
});
// [this.menuList[1],this.menuList[3]]=[this.menuList[3],this.menuList[1]]
[this.menuList[0],this.menuList[1],this.menuList[2],this.menuList[3]] = [this.menuList[0],this.menuList[3],this.menuList[1],this.menuList[2]];
[this.menuList[0], this.menuList[1], this.menuList[2], this.menuList[3]] = [this.menuList[0],
this.menuList[3], this.menuList[1], this.menuList[2]
];
console.log(this.menuList, '***')
})
},

7
BagStation/pages/newRoutePlanning/newRoutePlanning.vue
View File

@@ -211,6 +211,7 @@
} = this.$refs.addressSelector.datassFn();
let markerList = await this.mapUpdateMarkers(this.polyline[0].points, oilProductCode, juLi,
siteChannel);
//处理油站站点数据并显示
this.spareMarkers = this.locationProcessing(markerList);
let markers = JSON.parse(JSON.stringify(this.spareMarkers));
@@ -369,7 +370,6 @@
latitude: this.coordinate.latitude,
longitude: this.coordinate.longitude
}
console.log(JSON.stringify(data))
let taht = this;
return new Promise(function(re, rj) {
oilSiteApi.getSiteByGeoHashNew(data).then(markerList => {
@@ -456,7 +456,6 @@
},
//移动当前中心点 参数:经纬度
newMapMoveToLocation(longitude, latitude, type) {
console.log('newMapMoveToLocation')
let that = this
this.mapContext.moveToLocation({
longitude: longitude,
@@ -477,9 +476,6 @@
}
})
}
},
fail(ee) {
console.log('ee',ee)
}
})
},
@@ -514,6 +510,7 @@
let copy = JSON.parse(JSON.stringify(highSpeedMarkers))
let sort = that.priceSort(copy);
that.selePrice = sort.length !== 0 ? {
middlePrice: sort[Number.isInteger((sort.length / 2)) ? (sort.length / 2) : ((sort
.length + 1) / 2) - 1].enterprisePrice,

10
BagStation/pages/newRoutePlanning/siteList.vue
View File

@@ -2,7 +2,7 @@
<view class="site-list">
<view class="container" v-if="siteList.length">
<list>
<view class="item" v-for="item,index in siteList" :key="index">
<view class="item" v-for="(item,index) in siteList" :key="index">
<image
:src="item.siteImages || 'https://static.czb365.com/1647787216992.jpg?x-oss-process=image/resize,m_lfit,h_420,w_630/format,png'">
</image>
@@ -10,7 +10,7 @@
<view>
<view>{{item.address || ''}}</view> <text>{{item.juli | adjust}}km</text>
</view>
<view>0# ￥7.94</view>
<view>{{item.oilProductCode}} ￥{{item.enterprisePrice | adjust}}</view>
<view>
<view @click="lookPosition(item)">查看位置</view>
<view @click="jump(item)">查看详情</view>
@@ -41,7 +41,7 @@
filters: {
adjust(val) {
if (!val) return '--'
val = +val/1000
val = +val
return val.toFixed(2)
}
},
@@ -56,9 +56,7 @@
},
jump(item) {
let obj = {
siteId: item.id,
longitude: item.longitude,
latitude: item.latitude,
siteId: item.siteId,
}
let itemS = JSON.stringify(obj)
// return

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

@@ -218,7 +218,6 @@
this.innerAudioContext?.stop()
},
onLoad(option) {
// let siteId = uni.getStorageSync('siteId') ||
if(option.siteId && !option.customerJump) {
this.isShow = false
this.siteId = option.siteId
@@ -226,26 +225,13 @@
uni.setStorageSync('siteId',option.siteId)
return
}
// console.log(option)
// if(option.channerCode == 'TY'){
// var oilItem = uni.getStorageSync('OtherSiteInfo')
// // console.log(oilItem)
// }else{
// let obj = option.item,
// var oilItem = JSON.parse(option.item)
// }
let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(option.item) : {siteId:option.siteId}
// if(oilItem.secondChannelCode === 'SQ'){
// oilItem.listTag = oilItem.sqSiteBelong === 'JKJY' ? '集卡加油' :'上汽联名卡'
// }
uni.setStorageSync('oilItem',oilItem)
this.getSiteInfo(oilItem.siteId)
this.siteId = oilItem.siteId
// if(option.item.ureaNumber!='0'){
// this.ureaNum = true
// }else{
// this.ureaNum = false
// }
if(oilItem.listTag == '万金油'){
this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
}else if(oilItem.listTag == '星油'){
@@ -338,7 +324,6 @@
areaPriceList.push(item.guidePrice)
})
this.areaPrice = Math.min(...areaPriceList)
console.log(Math.min(...areaPriceList),areaPriceList,'对对对对对对多多多多')
}
}else if(res.code == 40000){
uni.showModal({
@@ -347,6 +332,10 @@
showCancel:false,
success: function (res) {
if (res.confirm) {
if(getCurrentPages().length > 1) {
uni.navigateBack()
return
}
uni.switchTab({
url:'../../../pages/tabbar/home/home'
})