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:
caolc
2022-09-09 14:53:48 +08:00
parent a59bf23fd7
commit 26b9d6fe85
18 changed files with 388 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BagStation/orderDetail/orderDetail.vue
View File

@@ -53,7 +53,7 @@
<view class="padding-tb-xs text-left">
油品油枪：
<text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':'' }} {{order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
{{order.oilsCode?order.oilsCode+' ':'' }} {{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
</view>
<view class="padding-tb-xs text-left">
{{order.oilProductType=='GAS'?'加气重量：':'加油升数：'}}
@@ -65,7 +65,7 @@
</view>
<view class="padding-tb-xs text-left">
优惠价格：
<text class="fr">{{order.realPrice |moneyIntercept}} {{order.oilProductType=='GAS'?'L':'L'}}</text>
<text class="fr">{{moneyIntercept(order.realPrice) }}￥/ {{order.oilProductType=='GAS'?'L':'L'}}</text>
</view>
<view class="padding-tb-xs text-left">
加油员：
@@ -84,8 +84,9 @@
</view>
<view class="padding-tb-xs text-left">
星油优惠：
<!-- order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat -->
<text
class="text-red fr">{{order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat}}</text>
class="text-red fr">{{ moneyIntercept(order.xoilDiscountAmount)}}</text>
</view>
<view class="padding-tb-xs text-left">
优惠券：

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

@@ -27,7 +27,7 @@
</text>
<text class="text-bold text-black text-lg">{{itemx.oilProductCode}}</text>
<!-- !=0?itemx.sitePrice:'-.--' -->
<text class="text-bold text-red text-lg">￥{{itemx.sitePrice |moneyIntercept}}/L</text>
<text class="text-bold text-red text-lg">￥{{moneyIntercept(itemx.sitePrice)}}/L</text>
<text class="text-delete">￥{{itemx.oilSitePrice}}/L</text>
<text class="text-sm">预计每100L节省{{(100*(itemx.oilSitePrice - itemx.sitePrice))|moneyForMath}}元</text>
</label>
@@ -41,13 +41,13 @@
<view class="padding-top-sm">
<view class="grid col-5 ">
<view v-for="(item,index) in checkBar" class="padding-xs" :key="index">
<button class="cu-btn red block" :class="item.checked?'bg-red':'line-red'" @tap="ChooseBar" :data-value="item.value">
<button class="cu-btn red block" :class="item.checked?'bg-red':'line-red'" @tap="ChooseBar(item)" :data-value="item.value">
{{item.name}}
<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view>
</button>
</view>
<view class="padding-xs" style="width:40% ;" v-if="activeChannelCode!='TY'">
<input type="number" @input="onInputBar" v-model="inputBar" class="cu-btn red block" placeholder="其他油枪" value="" />
<view class="padding-xs" style="width:40% ;" v-if="activeChannelCode!='TY'&&!typeChenk()">
<input type="number" @input="onInputBar" v-model="inputBar" class="cu-btn red block" placeholder="其他油枪" value="" />
</view>
</view>
</view>
@@ -90,6 +90,7 @@
<view class="">
{{plateNumber?plateNumber:(plateNumberSel?plateNumberSel:'必填项')}}
</view>
<uni-icons type="forward" size="20" color="#8799a3"></uni-icons>
</view>
</view>
<view class="flex-sub padding-left">
@@ -232,7 +233,7 @@
</view>
<view class="padding-tb-xs text-left">
油品油枪：
<text class="fr">{{oilProductCode?oilProductCode:''}} {{oilBar?oilBar+'号枪':'未选择油枪'}}</text>
<text class="fr">{{oilProductCode?oilProductCode:''}} {{oilBar?(checkBar.filter(item=>oilBar==item.value)[0].name||oilBar)+'号枪':'未选择油枪'}}</text>
</view>
<view class="" v-if="activeChannelCode!='TY'">
<view class="padding-tb-xs margin-bottom text-left">
@@ -321,11 +322,12 @@
</view>
<view class="padding-bottom-lg ">
<view class="text-left margin solid radius flex padding bg-gray">
<view class="flex-sub">
输入车牌号
<view style="align-items: center;" class="text-left margin solid radius flex padding bg-gray">
<view class="">
输入车牌号：
</view>
<input type="text" value="" placeholder="请选择或输入车牌号" v-model="plateNumber" />
<input style="flex: 1;" type="text" value="" placeholder="请选择或输入车牌号" v-model="plateNumber" />
<uni-icons v-if="plateNumber" @tap=" plateNumber=''; " type="clear" size="20"></uni-icons>
</view>
<picker-view :indicator-style="indicatorStyle" v-if="plateNumbers.length" :value="plateIndex" @change="pickPlate"
class="picker-view">
@@ -367,10 +369,16 @@
isOther:{
type:Boolean,
default:false
},
siteId:{
type:String,
default:''
}
},
data() {
return {
thirdPartyDynamicData:['LAIYOU'],
vlom:'',
discount:'',
activeSitePrice:'',
@@ -407,7 +415,7 @@
plateNumbers: [],
showPlate: "",
showOrder: '',
radio: '',
radio: 0,
imgURL: this.global.imgURL,
scrollLeft: 0,
checkMoney:[{
@@ -466,8 +474,6 @@
checkbox: [],
activeChannelCode: '',
checkBar: [],
activeChannelCode: '',
checkBar: [],
realMoney:'',
xoilAmountGun:''
}
@@ -482,36 +488,31 @@
}else{
console.log('这里是非卡力')
}
this.showtitles = oilItem.listTag
//生成油枪数据 原来在data里写死的1-8号油枪数据；新加 clc 2022-3-18
for(let i=0;i<30;i++){
this.checkbox.push({
value: i+1,
name: i+1,
checked: false,
hot: false,
})
}
this.showtitles = oilItem.listTag;
this.init()
},
watch: {
activeChannelCode: {
handler(newval) {
console.log('activeChannelCode')
this.oilBar = ''
setTimeout(() => {
this.checkBar = this.calcBar()
setTimeout(async() => {
this.checkBar = (this.typeChenk())? await this.dynamic() : this.calcBar()
}, 2)
}
},
priceId: {
priceId: {
handler(newval) {
console.log('priceId')
this.oilBar = ''
setTimeout(() => {
this.checkBar = this.calcBar()
setTimeout(async() => {
this.checkBar = (this.typeChenk())? await this.dynamic() : this.calcBar()
}, 2)
}
},
},
computed: {
priceId() {
if (this.channelList.length && this.channelList[this.activeCur] && this.oilSitePriceDetailsVo[this.radio]) {
return this.oilSitePriceDetailsVo[this.radio].priceId
@@ -566,6 +567,21 @@
}
},
methods: {
typeChenk(){
return this.channelList[this.activeCur]?.secondChannelCode&&this.thirdPartyDynamicData.includes(this.channelList[this.activeCur].secondChannelCode)
},
init(){
//生成油枪数据 原来在data里写死的1-8号油枪数据；新加 clc 2022-3-18
for(let i=0;i<30;i++){
this.checkbox.push({
value: i+1,
name: i+1,
checked: false,
hot: false,
})
};
},
ifFn(e){
// if(this.oilSitePriceDetailsVo[this.radio].oilsBar==null){
// return true
@@ -628,7 +644,6 @@
}
},
getMoneyVol(e){
console.log(e)
if(e.detail.value == ''){
uni.showToast({
title:'请输入金额',
@@ -749,39 +764,51 @@
this.checkInfo()
},
//动态油枪方法 this.checkbox数据格式在我改之前就是这样, clc 2022-3-18
calcBar() {
//复制一份源数组
let arry = JSON.parse(JSON.stringify(this.checkbox))
//字段等于null或没有字段 默认显示1-8号油枪
if(!this.oilSitePriceDetailsVo[this.radio].oilsBar){
arry.length = 8
return arry
}else{
//声明空数组 保存满足条件的数据
let newArry = []
// 如果有字段并且字段有值 去重 分割数组
new Set(this.oilSitePriceDetailsVo[this.radio].oilsBar.split(',')).forEach((item,i)=>{
//数值不能等于零 数值最大30 不能有小数点 必须是数字 才能添加到数组
if(Number(item)>0&&Number(item)&&Number(item)<=30&&item.indexOf('.')==-1){
newArry.push({
value: Number(item),
name: Number(item),
checked: false,
hot: false,
})
}else{
//不满足条件 跳过
return
dynamic(){
return new Promise((re,rj)=>{
oilSiteApi.gunList({siteId:this.siteId}).then(res=>{
if(res.data.length!==0){
let array = res.data.map((item,index)=>{return {value:item.otherGunId,name:item.gunNum,checked: false,hot: false,oilsType:item.oilsType,oilsId:item.oilsId}})||[]
let filterArray = array.filter(item=>item.oilsId==this.oilSitePriceDetailsVo[this.radio]?.priceId);
re(filterArray)
}
})
// 如果字段 有值且没有一个满足 条件 默认返回 1-8号油枪
if(newArry.length==0){
})
},
calcBar() {
//复制一份源数组
let arry = JSON.parse(JSON.stringify(this.checkbox));
//字段等于null或没有字段 默认显示1-8号油枪
if(!this.oilSitePriceDetailsVo[this.radio]?.oilsBar){
arry.length = 8
return arry
return arry
}else{
//声明空数组 保存满足条件的数据
let newArry = []
// 如果有字段并且字段有值 去重 分割数组
new Set(this.oilSitePriceDetailsVo[this.radio].oilsBar.split(',')).forEach((item,i)=>{
//数值不能等于零 数值最大30 不能有小数点 必须是数字 才能添加到数组
if(Number(item)>0&&Number(item)&&Number(item)<=30&&item.indexOf('.')==-1){
newArry.push({
value: Number(item),
name: Number(item),
checked: false,
hot: false,
})
}else{
//不满足条件 跳过
return
}
})
// 如果字段 有值且没有一个满足 条件 默认返回 1-8号油枪
if(newArry.length==0){
arry.length = 8
return arry
}
//返回排序数组
return newArry.sort((a,b)=>{a-b});
}
//返回排序数组
return newArry.sort((a,b)=>{a-b})
}
// clc 2022-3-18 注
// if (this.activeChannelCode == 'TY') {
// uni.showLoading({
@@ -1084,17 +1111,18 @@
let location = uni.getStorageSync('location')||{longitude:'',latitude:''};
oilOrderApi.createOrder(Object.assign(orderData,{longitude:location.longitude,latitude:location.latitude})).then(res => {
if (res.code == 20000) {
let data = (this.typeChenk()&&(Object.assign(res.data,{gunName:this.checkBar.filter(item=>this.oilBar==item.value)[0].name})))||res.data
if(otherUser){
console.log('这里是卡力订单创建')
console.log(res.data)
uni.setStorageSync('orderMade', res.data)
console.log(data)
uni.setStorageSync('orderMade', data)
uni.redirectTo({
url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod='+res.data.payMethod +'&&type=oil'
})
return
}
console.log(res,'这里是非卡力')
uni.setStorageSync('orderMade', res.data)
console.log(data,'这里是非卡力')
uni.setStorageSync('orderMade', data)
uni.redirectTo({
url: '/BagStation/pages/makeOrder/orderPaying?payMethod='+res.data.payMethod+'&&type=oil'
})
@@ -1144,9 +1172,9 @@
}
},
ChooseBar(e) {
console.log( e.currentTarget.dataset.value)
console.log( e)
let items = this.checkBar;
let values = e.currentTarget.dataset.value;
let values = e.value;
this.oilBar = values
for (let i = 0, lenI = items.length; i < lenI; ++i) {
if (items[i].value == values) {

9
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -56,7 +56,7 @@
</view>
<!-- 价格 -->
<price-select-tab @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
<price-select-tab v-if="siteInfo" :siteId='siteInfo.siteId' @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
:channel-list="siteInfo.oilSiteChannelDetailsVos" :channelJuli="siteInfo.juli"></price-select-tab>
</view>
@@ -77,9 +77,7 @@
imgURL: this.global.imgURL,
active: 0,
ColorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
siteInfo: {
},
siteInfo: null,
activeCur:0,
activePay: null,
qrcodePay: null,
@@ -115,7 +113,8 @@
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('这里是获取油站siteinfo 处',res)
if (res.code == 20000) {
this.siteInfo = res.data
this.siteInfo = res.data;
this.siteInfo = Object.assign(this.siteInfo,{siteId:id})
}else if(res.code == 40000){
this.errMsg = res.msg
}

7
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -155,7 +155,7 @@
<view class="padding-tb-xs text-left">
油品油枪：
<text
class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{order.oilsBar != null ?order.oilsBar+'号枪':'未选择油枪'}}</text>
class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}</text>
</view>
<view class="padding-tb-xs text-left">
加油升数：
@@ -166,13 +166,14 @@
加油金额：
<!-- <text
class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
<text class="fr">{{order.xoilAmountGun |moneyFormat}}</text>
<text class="fr">{{ moneyIntercept(order.xoilAmountGun )}}</text>
</view>
</view>
<view class="padding-tb-xs text-left">
星油优惠：
<!-- order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat -->
<text
class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text>
</view>
<view class="padding-tb-xs text-left">
优惠券：

2
BagStation/pages/makeOrder/payResult.vue
View File

@@ -63,7 +63,7 @@
<view class="padding-tb-xs text-left">
油品油枪：
<text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':''}}&{{order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
</view>
<view class="padding-tb-xs text-left">
加油升数：

4
BagStation/pages/newRoutePlanning/components/screen.vue
View File

@@ -65,8 +65,8 @@
Object.keys(this.selePrice).forEach((item,index)=>{
if(this.selePrice[item]!==null){
this.filterData.push({
lable:item=='middlePrice'?'低于' + Number( this.selePrice.middlePrice).toFixed(2) :'最低价格',
value:item=='middlePrice'? Number(this.selePrice.middlePrice).toFixed(2) : Number(this.selePrice.minPrice).toFixed(2)
lable:item=='middlePrice'?'低于' + this.moneyIntercept(this.selePrice.middlePrice) :'最低价格',
value:item=='middlePrice'? this.moneyIntercept(this.selePrice.middlePrice) : this.moneyIntercept(this.selePrice.minPrice)
})
}
})

182
BagStation/pages/newRoutePlanning/components/serviceStation.vue
View File

@@ -1,11 +1,16 @@
<template>
<view @touchend='touchend' @touchmove='touchmove' @touchstart='onChange' style="display: flex;flex-direction: column;flex-wrap: wrap;z-index: 9999999999999999999999999 !important;" :style="{height:isShow.switchBar?`calc(${styles.height}rpx + ${styles.move}rpx )`: ` calc( ${styles.move}rpx + 150rpx)` }" :class="styles.open? 'serviceStation_body' :'seleServiceStation_body' ">
<view @click="switchBar" class="switchBar"></view>
<view @touchend='touchend' @touchmove='touchmove' @touchstart='onChange'
style="display: flex;flex-direction: column;flex-wrap: wrap;z-index: 9999999999999999999999999 !important;"
:style="{height:isShow.switchBar?`calc(${styles.height}rpx + ${styles.move}rpx )`: ` calc( ${styles.move}rpx + 150rpx)` }"
:class="styles.open? 'serviceStation_body' :'seleServiceStation_body' ">
<view @click="switchBar" class="switchBar"></view>
<view style="flex: 1; overflow: hidden; width: 100%; ">
<view style="" class="information">
<view class="information_left">
<image class="ser_img" :src="details.siteImages" mode="widthFix" ></image>
<view style="width: calc(100% - 80rpx);display: flex; flex-direction: column;justify-content: space-between;" class="serviceStation_text black_color">
<image class="ser_img" :src="details.siteImages" mode="widthFix"></image>
<view
style="width: calc(100% - 80rpx);display: flex; flex-direction: column;justify-content: space-between;"
class="serviceStation_text black_color">
<view class="ovf">{{details.siteName}}</view>
<view style=" " class="ovf samall_text hui_color">{{details.address}}</view>
</view>
@@ -17,26 +22,34 @@
</view>
</view>
</view>
<view class="oli_swiper">
<view class="oli_swiper">
<view class="oli_swiper_title">
<view :style="{borderBottom: seleIndex==index? '#FF6700 solid 3px':''}" @click="seletitle(index)" v-for="(item,index) in details.oilSiteChannelDetailsVos" class="oli_swiper_title_item">{{item.channelCode|channelCode}}</view>
<view :style="{borderBottom: seleIndex==index? '#FF6700 solid 3px':''}" @click="seletitle(index)"
v-for="(item,index) in details.oilSiteChannelDetailsVos" class="oli_swiper_title_item">
{{item.channelCode|channelCode}}</view>
<!-- <view :style="{transform:`translateX( calc(${seleIndex} * 100%) )`,width:`calc(100% / ${details.oilSiteChannelDetailsVos.length})`}" class="tiao"></view> -->
</view>
<swiper class="swiper" next-margin='480rpx' :duration="500">
<swiper-item v-for="(item,index) in (details.oilSiteChannelDetailsVos[seleIndex].oilSitePriceDetailsVos==null?[]:details.oilSiteChannelDetailsVos[seleIndex].oilSitePriceDetailsVos)" :key='index'>
<swiper-item
v-for="(item,index) in (details.oilSiteChannelDetailsVos[seleIndex].oilSitePriceDetailsVos==null?[]:details.oilSiteChannelDetailsVos[seleIndex].oilSitePriceDetailsVos)"
:key='index'>
<view class="swiper-item">
<view class="swiper-item_oliType bag_text black_color">{{item.oilProductCode}}</view>
<view class="bag_text hu_color " style="text-align: start;">{{Number(item.sitePrice).toFixed(2)}}/L</view>
<view class="bag_text hu_color " style="text-align: start;">
{{moneyIntercept(item.sitePrice)}}/L
</view>
<view class="samall_text hui_color" style="text-align: end;text-decoration: line-through;">
{{ Number(item.oilSitePrice).toFixed(2) }}/L</view>
{{ moneyIntercept(item.oilSitePrice) }}/L
</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="serviceStation_footer">
<view @click="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航</view>
<view @click="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
</view>
<view @click="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
</view>
</view>
@@ -47,15 +60,15 @@
export default {
data() {
return {
touchData:null,
styles:{
height:700,
moveY:0,
Y:0,
move:0,
open:false
touchData: null,
styles: {
height: 700,
moveY: 0,
Y: 0,
move: 0,
open: false
},
seleIndex:0,
seleIndex: 0,
isShow: {
switchBar: true
}
@@ -63,7 +76,7 @@
},
created() {
console.log(this.details, '***');
this.$emit('dragMap',this.details,false)
this.$emit('dragMap', this.details, false)
},
mounted() {},
props: {
@@ -74,15 +87,15 @@
}
}
},
filters:{
channelCode(e){
filters: {
channelCode(e) {
switch (e) {
case 'XOIL':
return '星油'
case 'WJY':
return '万金油'
case 'LV':
return '其他'
return '其他'
case 'TY':
return '团油'
case 'YDJY':
@@ -90,20 +103,9 @@
}
}
},
watch:{
// 'isShow.switchBar':{
// handler:function(n){
// console.log(n,'***')
// if(!n){
// this.$emit('dragMap',this.details,false)
// }else{
// this.$emit('dragMap',this.details,true)
// } ;
// }
// }
},
watch: {},
methods: {
jump(){
jump() {
let obj = {
siteId: this.details.id,
// siteCode: this.details.siteCode,
@@ -112,59 +114,59 @@
latitude: this.details.latitude,
}
let itemS = JSON.stringify(obj)
console.log(itemS,this.details,'************');
console.log(itemS, this.details, '************');
// return
uni.navigateTo({
url: `../stationDetail/stationDetail?item=${itemS}&&types=map`
})
},
Navigation(){
Navigation() {
console.log('组件导航')
this.$emit('openMapApp')
},
touchcancel(e){
console.log(this.styles.yd,'touchcancel滑动距离')
console.log(e,'touchcancel')
touchcancel(e) {
console.log(this.styles.yd, 'touchcancel滑动距离')
console.log(e, 'touchcancel')
},
//监听鼠标滑动
touchmove(e){
if(this.isShow.switchBar&&this.styles.Y-e.changedTouches[0].clientY>0) return
touchmove(e) {
if (this.isShow.switchBar && this.styles.Y - e.changedTouches[0].clientY > 0) return
this.styles.moveY = e.changedTouches[0].clientY;
this.styles.move = this.styles.Y - this.styles.moveY;
console.log(this.styles.moveY)
},
//开始滑动
onChange(e){
this.$emit('dragMap',this.details,false)
onChange(e) {
this.$emit('dragMap', this.details, false)
// 这一行为记录滑动位置代码 this.styles.Y = e.changedTouches[0].clientY + this.styles.move;
console.log('禁用');
this.styles.open = true;
this.styles.Y = e.changedTouches[0].clientY;
console.log('onChange')
console.log('禁用');
this.styles.open = true;
this.styles.Y = e.changedTouches[0].clientY;
console.log('onChange')
},
// 滑动完成
touchend(e){
touchend(e) {
this.styles.open = false;
if(this.styles.move > 0){
this.isShow.switchBar =true
}else if(this.styles.move < 0) {
if (this.styles.move > 0) {
this.isShow.switchBar = true
} else if (this.styles.move < 0) {
this.isShow.switchBar = false
}
this.styles.move = 0;
console.log('touchend')
setTimeout(()=>{
this.$emit('dragMap',this.details,true)
},500)
setTimeout(() => {
this.$emit('dragMap', this.details, true)
}, 500)
},
vtouchmove(e){
this.styles.height -= 3 ;
console.log(e,this.styles.height,'vtouchmove')
vtouchmove(e) {
this.styles.height -= 3;
console.log(e, this.styles.height, 'vtouchmove')
},
seletitle(e){
seletitle(e) {
this.seleIndex = e
},
switchBar() {
this.isShow.switchBar = ! this.isShow.switchBar
this.isShow.switchBar = !this.isShow.switchBar
console.log(this.isShow.switchBar)
}
}
@@ -172,15 +174,18 @@
</script>
<style scoped>
.an{
.an {
align-items: flex-end;
}
.flex{
.flex {
display: flex;
}
.ac{
.ac {
align-items: center;
}
.ser_img {
width: 80rpx;
/* height: 80rpx; */
@@ -244,34 +249,37 @@
.oli_swiper {
margin-top: 40rpx;
}
.oli_swiper_title_item{
/* flex: 1; */
text-align: center;
font-size: 28rpx;
/* width: min-intrinsic; */
padding-bottom: 5px;
}
.tiao{
background-color: #FF6700;
border-radius: 10px;
height: 5rpx;
position: absolute;
bottom: 0;
left: 0;
transition: all .3s;
transform: scaleX(100%);
}
.oli_swiper_title_item {
/* flex: 1; */
text-align: center;
font-size: 28rpx;
/* width: min-intrinsic; */
padding-bottom: 5px;
}
.tiao {
background-color: #FF6700;
border-radius: 10px;
height: 5rpx;
position: absolute;
bottom: 0;
left: 0;
transition: all .3s;
transform: scaleX(100%);
}
.oli_swiper_title {
/*
border-bottom: #FF6700 solid;
width: max-content;
margin: 0 auto;
*/
padding-bottom: 10rpx;
margin-bottom: 40rpx;
padding-bottom: 10rpx;
margin-bottom: 40rpx;
display: flex;
justify-content: center;
gap:20rpx;
gap: 20rpx;
flex-wrap: nowrap;
overflow: hidden;
position: relative;
@@ -333,7 +341,8 @@
border-radius: 10px;
margin: 0 auto;
}
.seleServiceStation_body{
.seleServiceStation_body {
height: 700rpx;
width: 750rpx;
background: #FFFFFF;
@@ -341,6 +350,7 @@
padding: 16rpx;
transition: all .3s;
}
.serviceStation_body {
height: 700rpx;
width: 750rpx;

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

@@ -16,7 +16,7 @@
<cover-image style="width: 150rpx;height: 78rpx;position: absolute;"
:src="item.imgCustomCallout">
</cover-image>
<cover-view class="customCallout_text">{{Number(item.enterprisePrice).toFixed(2)}}</cover-view>
<cover-view class="customCallout_text">{{moneyIntercept(item.enterprisePrice) }}</cover-view>
</cover-view>
</cover-view>
</map>

7
BagStation/pages/overviewMap/components/addressSelector.vue
View File

@@ -151,8 +151,6 @@
value:''
});
[this.menuList[0],this.menuList[1],this.menuList[2]]=[this.menuList[2],this.menuList[0],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]];
console.log(this.menuList, '***')
})
},
datassFn(){
@@ -160,7 +158,6 @@
this.menuList.forEach((item,index)=>{
data[item.field] = item.value?item.value.split('/')[1]:''
})
console.log(data,'***************')
return data
},
seleFilter(e, w) {
@@ -172,10 +169,6 @@
this.$emit('closeFooterScroll')
},
chooseLocation(e) {
console.log(this.Route,'******')
// uni.navigateTo({
// url:'/BagStation/pages/newRoutePlanning/chooseLocation=' + `${e}/${this.Route.start.latitude},${this.Route.start.longitude}`
// })
uni.navigateTo({
url: '/BagStation/pages/newRoutePlanning/chooseLocation?type=' +
`${e}/${this.Route.start.latitude},${this.Route.start.longitude}`,

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

@@ -200,7 +200,7 @@
});
},
closeFooterScroll() {
// this.$refs.footerScroll.screenClose();
// this.$refs.footerScroll.screenClose(); /oilSiteInfo/getSiteByGeoHashNewA
// this.$refs.footerScroll.mapIconClose();
},
getMarks() {
@@ -663,7 +663,7 @@
height: 20,
// joinCluster: true,
callout: {
content: `${Number(item.price).toFixed(2)}`,
content: `${this.moneyIntercept(item.price) }`,
color: '#FFFFFF',
fontSize: '25rpx',
bgColor: '#FF4A4A',

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

@@ -9,9 +9,9 @@
</image>
<view class="cu-list menu margin padding-sm radius my-shadow bg-white yu-card-xuan">
<view class="cu-item ">
<view class="content" >
<view class="strong padding-bottom-xs" style="width: 263px;">
{{siteInfo.siteName}}
<view class="content" style="overflow: hidden;" >
<view style="width: 100%; display: flex;" class="strong padding-bottom-xs" >
<text style="width: 100%;flex: 1;" class="text-cut">{{siteInfo.siteName}}</text>
<text v-if="siteInfo.siteLevel" class="cu-tag round bg-self-yellow yu-tag text-xs tag-red" style="margin-left: 20px;">{{siteInfo.siteLevel}}级</text>
</view>
<view class="font-12 color-999 site-label text-cut">
@@ -21,7 +21,7 @@
营业时间 00:00 至 23:59
</view>
</view>
<view class="action " @tap="openMap">
<view style="" class="action " @tap="openMap">
<view class="oil-main-color">
<my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon>
{{siteInfo.juli|distanceFilter}}

7
api/oil-site.js
View File

@@ -10,6 +10,13 @@ export default {
data:data
})
},
gunList(data){
return request({
url: `/oil-site/xoilSiteGun/gunList`,
method:'post',
data:data
})
},
plateNumberRecognition(data) { //车牌图文识别
return request({
url: `/${service_name}/oilSiteAppInfo/plateNumberRecognition`,

9
main.js
View File

@@ -63,7 +63,7 @@ Vue.filter('olitype',(value)=>{
case 'TY':
return '团油'
case 'YDJY':
return '一点加油（壳牌）'
return '一点加油（壳牌'
}
})
@@ -86,6 +86,13 @@ Vue.prototype.olitype = function(value){
return '../../static/img/qp.png'
}
}
Vue.prototype.moneyIntercept = function(value){
if (value != 'xxx.x') {
return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,1)}${ Number(String(value).split('.')[1].substring(1,2)) + 1}`) :Number(value).toFixed(2);
} else {
return Number(value).toFixed(2)
}
}
Vue.config.productionTip = false

9
pages.json
View File

@@ -47,6 +47,15 @@
}
,{
"path" : "pages/tabbar/home/link",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
],
"workers": "static/workers",
"subPackages": [{

1
pages/index/startPage/startPage.vue
View File

@@ -98,6 +98,7 @@
content: '新版本已经准备好，是否重启应用？',
success(res) {
if (res.confirm) {
console.log(res.confirm,'res.confirm版本信息')
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate();
}

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

@@ -15,7 +15,8 @@
</view>
<view class="search-form radius" @tap="InputFocus">
<text class="cuIcon-search"></text>
<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称" confirm-type="search"></input>
<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称"
confirm-type="search"></input>
</view>
<!-- <view class="" @tap='gotoMap'>
<image src="../../../static/img/dt.png" mode="widthFix" style="width: 27px;height: 27px;"></image>
@@ -109,12 +110,13 @@
<!-- 宫格菜单开始 -->
<view class="bg-white padding pagestartthree">
<view class="grid col-5 text-center ">
<view class="text-xxl " v-for="(item,index) in cuIconList" @tap="shadoumeiyou(index)" :key="index" :class="index<5?'margin-bottom':''">
<view class="text-xxl " v-for="(item,index) in cuIconList" @tap="shadoumeiyou(index)" :key="index"
:class="index<5?'margin-bottom':''">
<!-- <view :class="['cuIcon-'+item.icon,'text-' +item.color]">
</view> -->
<view class="text-center">
<view class="my-icon-sm">
<image :src="item.iconUrl?imgURL +item.iconUrl:item.local" mode="widthFix"></image>
<image :src="item.iconUrl?imgURL +item.iconUrl:item.local" mode="widthFix"></image>
</view>
<view class="text-sm">
<text class="text-sm color-333">
@@ -131,8 +133,12 @@
</view>
<!-- 广告图片开始 -->
<view class=" padding" style=" background-color: #f1f1f1;">
<view class="" @tap="goCall">
<image :src="yellowURL+'ad-1.png'" style="width: 100%;" mode="widthFix"></image>
<view class="">
<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular>
<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
<image :src="item.src" style="width: 100%;" mode="widthFix"></image>
</swiper-item>
</swiper>
</view>
</view>
<!-- 筛选开始 -->
@@ -142,11 +148,11 @@
</view> -->
<view class=" ">
<view class="" v-if="siteList.length>0">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0" class="cu-list menu-avatar cu-item"
@tap="toDetail(item)">
<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
</site-item>
</view>
<view class="" v-else >
<view class="" v-else>
<my-empty></my-empty>
</view>
</view>
@@ -172,6 +178,17 @@
},
data() {
return {
swiperArray: [
// {
// src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2etc.png',
// // link: 'https://h5.51etr.com/pro/onlineApply/?type=20220831103626200101811'
// },
{
src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
},
],
siteInfo: {},
yellowURL: this.global.yellowURL + 'xq-ad/',
siteId: '',
@@ -277,7 +294,7 @@
// badge: 0,
// name: '违章查询'
// },
{
iconUrl: 'icon-9.png',
color: 'purple',
@@ -296,63 +313,63 @@
};
},
created() {},
onReady(){
onReady() {
let _that = this
let IsOtherUser = _that.isOther
console.log(IsOtherUser,'这里是判断是否为卡力')
console.log('这里是onShow',IsOtherUser,'++++++')
if(IsOtherUser){
console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是onShow', IsOtherUser, '++++++')
if (IsOtherUser) {
console.log('首页 卡力 进入')
uni.showToast({
title:'卡力用户只支持跳转登录',
icon:'none'
title: '卡力用户只支持跳转登录',
icon: 'none'
})
uni.reLaunc({
url:'../../../BagAuth/pages/login/login'
})
url: '../../../BagAuth/pages/login/login'
})
return
}
}
console.log('首页 非卡力 进入')
},
onShow() {
this.refreshLocation()
let _that = this
let IsOtherUser = _that.isOther
console.log(IsOtherUser,'这里是判断是否为卡力')
console.log('这里是onShow',IsOtherUser,'++++++')
if(IsOtherUser){
console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是onShow', IsOtherUser, '++++++')
if (IsOtherUser) {
console.log('首页 卡力 进入')
uni.showToast({
title:'卡力用户只支持跳转登录',
icon:'none'
title: '卡力用户只支持跳转登录',
icon: 'none'
})
uni.reLaunc({
url:'../../../BagAuth/pages/login/login'
})
url: '../../../BagAuth/pages/login/login'
})
return
}
}
console.log('首页 非卡力 进入')
},
onLoad(e) {
console.log(e,'首页')
console.log(e, '首页')
let _that = this
let IsOtherUser = _that.isOther
console.log(IsOtherUser,'这里是判断是否为卡力')
console.log('这里是onLoad',IsOtherUser,'++++++')
if(IsOtherUser){
console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是onLoad', IsOtherUser, '++++++')
if (IsOtherUser) {
console.log('首页 卡力 进入')
uni.showToast({
title:'卡力用户只支持跳转登录',
icon:'none'
title: '卡力用户只支持跳转登录',
icon: 'none'
})
uni.navigateTo({
url:'../../../BagAuth/pages/login/login'
url: '../../../BagAuth/pages/login/login'
})
return
}
}
console.log('首页 非卡力 进入测试++')
this.reverseGeocoder(this.location)
},
onPullDownRefresh() {
this.refreshLocation()
@@ -386,16 +403,28 @@
// url:'/BagStation/pages/makeOrder/payResult?status=success'
this.getSiteList();
},
mounted() {
},
mounted() {},
beforeCreate() {},
onReady() {
// this.getSiteList()
},
},
methods: {
gotoMap(){
swiperClick(item,index) {
if(!item?.link) return
switch (Number(index)) {
// case 0:
// this.goCall()
// break;
default:
console.log('item.link')
uni.navigateTo({
url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
})
}
},
gotoMap() {
uni.navigateTo({
url:'/BagStation/pages/allMap/allMap'
url: '/BagStation/pages/allMap/allMap'
})
},
goToPage(url) {
@@ -444,7 +473,7 @@
success: function(res) {
uni.setStorageSync('location', res)
},
complete:(res)=> {
complete: (res) => {
// console.log('定位',res)
this.getSiteList()
var msgTip = ''
@@ -479,18 +508,18 @@
if (res.code === 20000) {
let _that = this
let IsOtherUser = _that.isOther
console.log(IsOtherUser,'这里是判断是否为卡力')
console.log('这里是getUserAuthInfo',IsOtherUser,'++++++')
if(IsOtherUser){
console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是getUserAuthInfo', IsOtherUser, '++++++')
if (IsOtherUser) {
uni.showToast({
title:'卡力用户只支持跳转登录',
icon:'none'
title: '卡力用户只支持跳转登录',
icon: 'none'
})
uni.reLaunch({
url:'../../../BagAuth/pages/login/login'
})
url: '../../../BagAuth/pages/login/login'
})
return
}
}
this.getAmount()
this.getSiteList()
// realStatus: 0 vehicleStatus: 0
@@ -541,28 +570,28 @@
// url: 'plugin://routePlan/index?key=' + this.qqMapKey + '&referer=' + referer +
// '&endPoint=' + endPoint
// })
if(!uni.getStorageSync('user')){
uni.showModal({
title: '请您登录',
content: "登录星油加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '../../../BagAuth/pages/login/login'
})
}
}
})
return
}
uni.removeStorageSync("origins")
uni.removeStorageSync("destination")
wx.navigateTo({
// url:'../../../BagStation/pages/routePlain/routePlain',
url:'../../../BagStation/pages/newRoutePlanning/newRoutePlanning'
// url:'../../../BagStation/pages/overviewMap/overviewMap',
})
if (!uni.getStorageSync('user')) {
uni.showModal({
title: '请您登录',
content: "登录星油加油才可以加油 |˛˙꒳​˙)♡",
confirmText: '去登陆',
success: (res) => {
if (res.confirm) {
uni.reLaunch({
url: '../../../BagAuth/pages/login/login'
})
}
}
})
return
}
uni.removeStorageSync("origins")
uni.removeStorageSync("destination")
wx.navigateTo({
// url:'../../../BagStation/pages/routePlain/routePlain',
url: '../../../BagStation/pages/newRoutePlanning/newRoutePlanning'
// url:'../../../BagStation/pages/overviewMap/overviewMap',
})
} else if (index == 9) {
this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
}
@@ -571,8 +600,8 @@
// url: '/BagStation/myCars/myCars'
// })
// }
else if(index == 2){
if(!uni.getStorageSync('user')){
else if (index == 2) {
if (!uni.getStorageSync('user')) {
uni.showModal({
title: '请您登录',
content: "登录星油加油才可以加油 |˛˙꒳​˙)♡",
@@ -588,12 +617,13 @@
return
}
wx.navigateTo({
// url:'../../../BagStation/pages/routePlain/routePlain',
// url:'../../../BagStation/pages/newRoutePlanning/newRoutePlanning'
url:'../../../BagStation/pages/overviewMap/overviewMap',
})
}
else {
// url:'../../../BagStation/pages/routePlain/routePlain',
// url:'../../../BagStation/pages/newRoutePlanning/newRoutePlanning'
url: '../../../BagStation/pages/overviewMap/overviewMap',
})
} else if (index == 7) {
this.swiperClick(this.swiperArray[0],1)
} else {
uni.showToast({
title: '功能暂无',
icon: 'none'
@@ -606,7 +636,7 @@
// uni.navigateTo({
// url: '/BagStation/pages/stationDetail/stieQr'
// })
if(!uni.getStorageSync('user')){
if (!uni.getStorageSync('user')) {
uni.showModal({
title: '请您登录',
content: "登录星油加油才可以加油 |˛˙꒳​˙)♡",
@@ -660,18 +690,18 @@
oilSiteApi.readOnlySites(data1).then(res => {
let _that = this
let IsOtherUser = _that.isOther
console.log(IsOtherUser,'这里是判断是否为卡力')
console.log('这里是readOnlySites',IsOtherUser,'++++++')
if(IsOtherUser){
console.log(IsOtherUser, '这里是判断是否为卡力')
console.log('这里是readOnlySites', IsOtherUser, '++++++')
if (IsOtherUser) {
uni.showToast({
title:'卡力用户只支持跳转登录',
icon:'none'
title: '卡力用户只支持跳转登录',
icon: 'none'
})
uni.reLaunc({
url:'../../../BagAuth/pages/login/login'
})
url: '../../../BagAuth/pages/login/login'
})
return
}
}
this.getCount++
if (res.code == 20000) {
// console.log(res.data.list)
@@ -717,10 +747,10 @@
toDetail(item) {
console.log(item)
let itemS = JSON.stringify(item)
console.log('进入油站详情items',itemS)
console.log('进入油站详情items', itemS)
if (uni.getStorageSync('user')) {
if(item.channelCode==='TY'){
uni.setStorageSync('OtherSiteInfo',item)
if (item.channelCode === 'TY') {
uni.setStorageSync('OtherSiteInfo', item)
uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?channerCode=${item.channelCode}`,
fail: (err) => {
@@ -896,9 +926,10 @@
</script>
<style scoped>
.showBtn{
.showBtn {
padding-right: 3%;
}
.bottom-bar {
position: relative;
padding-top: 50px;

26
pages/tabbar/home/link.vue Normal file
View File

@@ -0,0 +1,26 @@
<template>
<view>
<web-view :src="url"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
url: ''
}
},
methods: {
},
onReady() {},
onLoad(e) {
console.log(decodeURIComponent(e.url ),'111')
this.url = JSON.parse(decodeURIComponent(e.url ));
},
}
</script>
<style>
</style>

10
utils/request.js
View File

@@ -1,14 +1,14 @@
import axios from 'axios'
import utils from '@/utils/encode'
// const env = process.env.NODE_ENV
const env = 'production'/* */
// const env = 'production'/* */
// const env = 'test'
// const env = 'production'
const env = 'production'
// 45
const testUrl = 'http://192.168.0.46:38080'
const productUrl = 'https://www.xingoil.com/adminapi'
const testUrl = 'http://192.168.0.199:38080'
// const productUrl = 'https://www.xingoil.com/adminapi'
// const productUrl = 'http://uat.xingoil.com/adminapi'
const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://192.168.0.191:38080'
// const productUrl = 'http://121.196.213.68/adminapi'
const service = axios.create({