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
2023-02-13 15:43:06 +08:00
parent 41c2629561
commit d6e55390f3
51 changed files with 5176 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@
<view class="text-img">
<image src="../../../static/img/upload.png" style="width:260upx;height: 160upx;" v-if='isPlateNumber' @tap='upPlateNumber'mode="aspectFill"></image>
<image :src="PlateNumberImages" style="width:260upx;height:160upx;" mode="aspectFill" v-else></image>
<image src="../../../static/img/close_red.png" v-if='!isPlateNumber' @tap='cleraPlateNumber' class="close_Img" mode="aspectFill"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png" v-if='!isPlateNumber' @tap='cleraPlateNumber' class="close_Img" mode="aspectFill"></image>
</view>
<view class="text-p">需可识别车牌号</view>
</view>
@@ -70,7 +70,7 @@
<view class="text-img">
<image src="../../../static/img/upload.png" style="width:260upx;height:160upx;" v-if='isUefueller' @tap='upUefueller' mode="aspectFill"></image>
<image :src="refuellerImages" style="width:260upx;height:160upx;" v-else mode="aspectFill"></image>
<image src="../../../static/img/close_red.png" v-if='!isUefueller' @tap='cleraUefueller' class="close_Img" mode="aspectFill"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png" v-if='!isUefueller' @tap='cleraUefueller' class="close_Img" mode="aspectFill"></image>
</view>
<view class="text-p" >需包含加油升数和价格</view>
</view>
@@ -291,10 +291,10 @@
<view class=" cu-modal show" v-show="showtitle">
<view class="cu-dialog overflow-unset dialog-box box-paddings">
<view class="close-icon" @tap="hidendialog">
<image src="../../../static/img/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
</view>
<view class="">
<image src="../../../static/img/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
</view>
<view class="cu-bar box-panding text-centerS" >
<text class="headShow"> 支付提醒 </text>

6
BagStation/pages/components/tki-qrcode/tki-qrcode.vue
View File

@@ -1,6 +1,6 @@
<template xlang="wxml" minapp="mpvue">
<view class="tki-qrcode">
<image src="../../../../static/img/qr-bg.png" mode="" class="bgs"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/qr-bg.png" mode="" class="bgs"></image>
<!-- #ifndef MP-ALIPAY -->
<canvas class="tki-qrcode-canvas" :canvas-id="cid" :style="{width:cpSize+'px',height:cpSize+'px'}" />
<!-- #endif -->
@@ -13,7 +13,7 @@
<script>
import QRCode from "./qrcode.js"
import indexBackgroundImage from "@/static/img/qr-bg.png"
// import indexBackgroundImage from "@/static/img/qr-bg.png"
let qrcode
export default {
@@ -225,7 +225,7 @@ export default {
.tki-qrcode {
position: relative;
padding:8%;
background-image:indexBackgroundImage ;
background-image:url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/qr-bg.png') ;
background-repeat: no-repeat;
}
.tki-qrcode-canvas {

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

@@ -61,7 +61,7 @@
<view class="content padding-tb-sm">
<view class="text-left">
<view class="site-icon-sm">
<image src="../../../static/img/gr.png" mode="widthFix" width="100upx"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/gr.png" mode="widthFix" width="100upx"></image>
</view>
<text class="padding-left-sm">自营企业油卡支付 <text
v-if="item.shareCompanyQuota==0">（余额：{{item.balance|moneyFormat}}）</text></text>
@@ -114,7 +114,7 @@
<view class="text-left">
<view class="site-icon-sm">
<image :src="imgURL+'pay-qy.png'" mode="widthFix" width="100upx" v-if='itemx.companyNature =="0"'></image>
<image src="../../../static/img/gr.png" mode="widthFix" width="100upx" v-if='itemx.companyNature =="1"'></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/gr.png" mode="widthFix" width="100upx" v-if='itemx.companyNature =="1"'></image>
</view>
<text class="padding-left-sm" v-if='itemx.companyNature =="0"'>外请油卡支付（余额：{{itemx.balance|moneyFormat}}）</text>
<text class="padding-left-sm" v-if='itemx.companyNature =="1"'>企业油卡支付 {{itemx.companyNature =="1" ? itemx.shareCompanyQuota==0? '(余额:'+itemx.balance+')' :'':''}} </text>

1
BagStation/pages/newRoutePlanning/components/footerScroll.vue
View File

@@ -158,6 +158,7 @@
},
dragMap(e,w){
console.log('组件内触发')
this.$emit('dragMap',e,w)
},
//点击最近开始路线规划

14
BagStation/pages/newRoutePlanning/components/mapIcon.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="mapIcon">
<view class="Position">
<image @click="$emit('reset')" v-if="polyline.length==0" src="../../../../static/img/myPosition.png" ></image>
<image @click="$emit('reset')" v-if="polyline.length==0" src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/myPosition.png" ></image>
<image @click="$emit('swich',true);isShow.strategy=!isShow.strategy" v-else src="../../../static/img/trajectory.png" ></image>
</view>
<!-- <uni-icons v-if="polyline.length!==0" @click=" isShow.strategy=!isShow.strategy" type="map-pin-ellipse" size='25'></uni-icons> -->
@@ -151,12 +151,14 @@
}
.mapIcon {
text-align: end;
padding-right: 30rpx;
padding-bottom: 15rpx;
// padding-bottom: 15rpx;
position: relative;
height: 80rpx;
margin-bottom: 10rpx;
// height: 80rpx;
// margin-bottom: 10rpx;
position: absolute;
width: min-content;
top: -90rpx;
right: 30rpx;
}
.filterBox {

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

@@ -1,56 +1,58 @@
<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 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">
<view class="ovf">{{details.siteName}}</view>
<view style=" " class="ovf samall_text hui_color">{{details.address}}</view>
</view>
</view>
<view class="information_right">
<uni-icons type="paperplane-filled" size="20"></uni-icons>
<view class="samall_text hui_color">
{{ Number(details.juli/1000).toFixed(2) }}km
</view>
</view>
</view>
<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="{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'>
<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;">
{{moneyIntercept(item.sitePrice)}}/L
</view>
<view class="samall_text hui_color" style="text-align: end;text-decoration: line-through;">
{{ moneyIntercept(item.oilSitePrice) }}/L
</view>
<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.stop="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">
<view class="ovf">{{details.siteName}}</view>
<view style=" " class="ovf samall_text hui_color">{{details.address}}</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="serviceStation_footer">
<view @click="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
</view>
<view class="information_right">
<uni-icons type="paperplane-filled" size="20"></uni-icons>
<view class="samall_text hui_color">
{{ Number(details.juli/1000).toFixed(2) }}km
</view>
</view>
</view>
<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="{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'>
<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;">
{{moneyIntercept(item.sitePrice)}}/L
</view>
<view class="samall_text hui_color" style="text-align: end;text-decoration: line-through;">
{{ moneyIntercept(item.oilSitePrice) }}/L
</view>
</view>
</swiper-item>
</swiper>
</view>
<view class="serviceStation_footer">
<view @click.stop="Navigation" style="background-color: #8B583E;" class="serviceStation_footer_butten">导航
</view>
<view @tap.stop="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
</view>
<view @click="jump" style="background-color: #FF6700;" class="serviceStation_footer_butten">详情</view>
</view>
</view>
</view>
@@ -76,7 +78,7 @@
},
created() {
console.log(this.details, '***');
this.$emit('dragMap', this.details, false)
// this.$emit('dragMap', this.details, false)
},
mounted() {},
props: {
@@ -137,15 +139,16 @@
},
//开始滑动
onChange(e) {
console.log('开始滑动');
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(e,'onChange')
},
// 滑动完成
touchend(e) {
console.log('滑动完成');
this.styles.open = false;
if (this.styles.move > 0) {
this.isShow.switchBar = true
@@ -165,9 +168,9 @@
seletitle(e) {
this.seleIndex = e
},
switchBar() {
switchBar(e) {
this.isShow.switchBar = !this.isShow.switchBar
console.log(this.isShow.switchBar)
console.log(this.isShow.switchBar,']]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]')
}
}
}

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

@@ -83,6 +83,11 @@
key: 'UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN'
});
},
watch:{
enableScroll:function(n,o){
console.log('全局是否可拖动',n)
}
},
methods: {
bindregionchange(e){
console.log(e,'***********')
@@ -407,9 +412,7 @@
assembly() {},
//点击气泡事件
async callouttap(e) {
console.log(e, this.markers, this.markers[e.detail.markerId], '*****')
let seleMark = this.markers.filter(item => item.id == e.detail.markerId);
console.log(seleMark[0].siteId, '筛选的id')
// this.enableScroll = true
let details = await oilSiteApi.getSiteDetails({
latitude: String(this.coordinate.latitude),
@@ -450,7 +453,6 @@
//移动当前中心点 参数:经纬度
newMapMoveToLocation(longitude, latitude, type) {
let that = this
this.mapContext.moveToLocation({
longitude: longitude,
latitude: latitude,
@@ -466,7 +468,6 @@
setTimeout(() => {
that.mapScale = 13
}, 500)
}, 500)
}
})
@@ -533,10 +534,13 @@
},
//拖动辅助控件
dragMap(e, w) {
this.enableScroll = w
let that = this
this.enableScroll = w;
console.log('辅助控件触发;是否可以拖动地图1>',that.enableScroll)
this.newMapMoveToLocation(e.longitude, e.latitude)
uni.$on('dragMap', function(e) {
this.enableScroll = e
that.enableScroll = e
console.log('辅助控件触发;是否可以拖动地图>',that.enableScroll)
})
}
}

2
BagStation/pages/overviewMap/components/footer.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="footer_body">
<view @click="$emit('reset')" class="myPosition">
<image src="@/static/img/myPosition.png"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/myPosition.png"></image>
</view>
<view v-if="!details" class="selector">
<view class="selector_left" >

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

@@ -152,10 +152,10 @@
<view class=" cu-modal show" v-show="showtitle">
<view class="cu-dialog overflow-unset dialog-box box-paddings">
<view class="close-icon" @tap="hidendialog">
<image src="../../../static/img/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
</view>
<view class="">
<image src="../../../static/img/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
</view>
<view class="cu-bar box-panding text-centerS" >
<text class="headShow"> 支付提醒 </text>