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

更新

Browse Source
pull/12/head
xiaozhiyong 2 years ago
parent 5408b75b83
commit d0953d12ff
2 changed files with 590 additions and 503 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 193
      BagStation/pages/components/price-select-tab.vue
  2. 6
      BagStation/pages/components/price-tab.vue

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

@ -8,8 +8,9 @@
</view> </view>
</view> </view>
<scroll-view scroll-x class=" nav text-center"> <scroll-view scroll-x class=" nav text-center">
<view class="cu-item" v-for="(item,index) in channelList" v-if="index==activeCur" :class="index==activeCur?'text-red cur':''" :key="item.channelId" <view class="cu-item" v-for="(item,index) in channelList" v-if="index==activeCur"
@tap="tabSelect" :data-id="index" :data-channel-code="item.channelCode"> :class="index==activeCur?'text-red cur':''" :key="item.channelId" @tap="tabSelect" :data-id="index"
:data-channel-code="item.channelCode">
<image class="site-icon margin-right-sm" :src="imgURL+'site-'+item.channelCode+'.png'" mode="widthFix"> <image class="site-icon margin-right-sm" :src="imgURL+'site-'+item.channelCode+'.png'" mode="widthFix">
</image> </image>
{{item.channelCode|channelCodeFamt}} {{item.channelCode|channelCodeFamt}}
@ -19,9 +20,11 @@
</scroll-view> </scroll-view>
<radio-group class="block" @change="changePrice"> <radio-group class="block" @change="changePrice">
<view class="cu-list menu text-left"> <view class="cu-list menu text-left">
<view class="cu-item" v-for="(itemx,index) in oilSitePriceDetailsVo" :key="index" v-if="itemx.sitePrice>0"> <view class="cu-item" v-for="(itemx,index) in oilSitePriceDetailsVo" :key="index"
v-if="itemx.sitePrice>0">
<label class="flex justify-between align-center flex-sub"> <label class="flex justify-between align-center flex-sub">
<radio class="round red" :class="radio=='radio' + index?'checked':''" :checked="radio==index?true:false" :value="index"></radio> <radio class="round red" :class="radio=='radio' + index?'checked':''"
:checked="radio==index?true:false" :value="index"></radio>
<text class="cu-tag my-tag line-red text-lg"> <text class="cu-tag my-tag line-red text-lg">
惠 惠
</text> </text>
@ -29,7 +32,8 @@
<!-- !=0?itemx.sitePrice:'-.--' --> <!-- !=0?itemx.sitePrice:'-.--' -->
<text class="text-bold text-red text-lg">￥{{moneyIntercept(itemx.sitePrice)}}/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-delete">￥{{itemx.oilSitePrice}}/L</text>
<text class="text-sm">预计每100L节省{{(100*(itemx.oilSitePrice - itemx.sitePrice))|moneyForMath}}元</text> <text
class="text-sm">预计每100L节省{{(100*(itemx.oilSitePrice - itemx.sitePrice))|moneyForMath}}元</text>
</label> </label>
</view> </view>
</view> </view>
@ -41,13 +45,16 @@
<view class="padding-top-sm"> <view class="padding-top-sm">
<view class="grid col-5 "> <view class="grid col-5 ">
<view v-for="(item,index) in checkBar" class="padding-xs" :key="index"> <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(item)" :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}} {{item.name}}
<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view> <view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
v-if="item.hot">HOT</view>
</button> </button>
</view> </view>
<view class="padding-xs" style="width:40% ;" v-if="activeChannelCode!='TY'&&!typeChenk()"> <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="" /> <input type="number" @input="onInputBar" v-model="inputBar" class="cu-btn red block"
placeholder="其他油枪" value="" />
</view> </view>
</view> </view>
</view> </view>
@ -59,18 +66,24 @@
<view class="plateNumber_box"> <view class="plateNumber_box">
<view class="text-title">司机车牌</view> <view class="text-title">司机车牌</view>
<view class="text-img"> <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="../../../static/img/upload.png" style="width:260upx;height: 160upx;"
<image :src="PlateNumberImages" style="width:260upx;height:160upx;" mode="aspectFill" v-else></image> v-if='isPlateNumber' @tap='upPlateNumber' 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> <image :src="PlateNumberImages" style="width:260upx;height:160upx;" mode="aspectFill" v-else>
</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>
<view class="text-p">需可识别车牌号</view> <view class="text-p">需可识别车牌号</view>
</view> </view>
<view class="refuellerImages"> <view class="refuellerImages">
<view class="text-title">油机照片</view> <view class="text-title">油机照片</view>
<view class="text-img"> <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="../../../static/img/upload.png" style="width:260upx;height:160upx;"
<image :src="refuellerImages" style="width:260upx;height:160upx;" v-else mode="aspectFill"></image> v-if='isUefueller' @tap='upUefueller' 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> <image :src="refuellerImages" style="width:260upx;height:160upx;" v-else 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>
<view class="text-p">需包含加油升数和价格</view> <view class="text-p">需包含加油升数和价格</view>
</view> </view>
@ -121,7 +134,8 @@
油机金额 油机金额
</view> </view>
<view class="text-center" style="width: 60%;margin: 0 2%;"> <view class="text-center" style="width: 60%;margin: 0 2%;">
<input v-model="vol" @input="checkeNumber" @blur="getMoneyVol" type="digit" class="block" placeholder="请输入油机金额" value=""style="border-bottom: 1px solid #efefef;" /> <input v-model="vol" @input="checkeNumber" @blur="getMoneyVol" type="digit" class="block"
placeholder="请输入油机金额" value="" style="border-bottom: 1px solid #efefef;" />
</view> </view>
<view class=""> <view class="">
<text class=" padding-right-sm"> <text class=" padding-right-sm">
@ -131,9 +145,12 @@
</view> </view>
<view class="grid col-5 padding-sm"> <view class="grid col-5 padding-sm">
<view v-for="(item,index) in checkMoney" class="padding-xs" :key="index"> <view v-for="(item,index) in checkMoney" class="padding-xs" :key="index">
<button class="cu-btn red block" style=" padding: 0;" :class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckMoney(item.value)" :data-value="item.value"> <button class="cu-btn red block" style=" padding: 0;"
:class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckMoney(item.value)"
:data-value="item.value">
{{item.name}}&yen; {{item.name}}&yen;
<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view> <view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
v-if="item.hot">HOT</view>
</button> </button>
</view> </view>
</view> </view>
@ -148,7 +165,8 @@
加油金额 加油金额
</view> </view>
<view class="text-center"> <view class="text-center">
<input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block" placeholder="加油金额" value="" /> <input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block"
placeholder="加油金额" value="" />
</view> </view>
<view class=""> <view class="">
<text class="text-bold padding-right-sm"> <text class="text-bold padding-right-sm">
@ -159,9 +177,11 @@
</view> </view>
<view class="grid col-5 padding-sm" v-if="activeChannelCode!='TY'"> <view class="grid col-5 padding-sm" v-if="activeChannelCode!='TY'">
<view v-for="(item,index) in checkVol" class="padding-xs" :key="index"> <view v-for="(item,index) in checkVol" class="padding-xs" :key="index">
<button class="cu-btn red block" :class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckVol" :data-value="item.value"> <button class="cu-btn red block" :class="item.checked?'bg-red':'line-red'"
@tap="ChooseCheckVol" :data-value="item.value">
{{item.name}} {{item.name}}
<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view> <view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
v-if="item.hot">HOT</view>
</button> </button>
</view> </view>
@ -204,8 +224,10 @@
<view class="margin cu-list pay-bar menu radius solid-top solid-bottom solid-left"> <view class="margin cu-list pay-bar menu radius solid-top solid-bottom solid-left">
<view class="cu-item "> <view class="cu-item ">
<view class=""> <view class="">
合计：<text class="text-red fr" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text> 合计：<text class="text-red fr"
<text class="text-red fr" v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text> v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
<text class="text-red fr"
v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
</view> </view>
<view class="" @tap="showOrderMsg"> <view class="" @tap="showOrderMsg">
明细<text class="cuIcon-unfold padding-left-xs"></text> 明细<text class="cuIcon-unfold padding-left-xs"></text>
@ -233,7 +255,8 @@
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油品油枪： 油品油枪：
<text class="fr">{{oilProductCode?oilProductCode:''}} {{oilBar?(checkBar.filter(item=>oilBar==item.value)[0].name||oilBar)+'号枪':'未选择油枪'}}</text> <text class="fr">{{oilProductCode?oilProductCode:''}}
{{oilBar?(checkBar.filter(item=>oilBar==item.value)[0].name||oilBar)+'号枪':'未选择油枪'}}</text>
</view> </view>
<view class="" v-if="activeChannelCode!='TY'"> <view class="" v-if="activeChannelCode!='TY'">
<view class="padding-tb-xs margin-bottom text-left"> <view class="padding-tb-xs margin-bottom text-left">
@ -258,7 +281,8 @@
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
直降金额： 直降金额：
<text class="text-red fr">{{tyRes.depreciateAmount>0?tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text> <text
class="text-red fr">{{tyRes.depreciateAmount>0?tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
@ -267,15 +291,18 @@
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
合计： 合计：
<text class="text-red fr" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text> <text class="text-red fr"
v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
<text class="text-red fr" v-else>{{ty.realMoney>0?ty.realMoney:'xxx.x' }}</text> <text class="text-red fr" v-else>{{ty.realMoney>0?ty.realMoney:'xxx.x' }}</text>
</view> </view>
</view> </view>
<view class="cu-list margin pay-bar menu radius solid-top solid-bottom solid-left"> <view class="cu-list margin pay-bar menu radius solid-top solid-bottom solid-left">
<view class="cu-item "> <view class="cu-item ">
<view class=""> <view class="">
合计：<text class="text-red" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}元</text> 合计：<text class="text-red"
<text class="text-red" v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}元</text> v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}元</text>
<text class="text-red"
v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}元</text>
</view> </view>
<view class="" @tap="showOrder=''"> <view class="" @tap="showOrder=''">
明细<text class="cuIcon-fold padding-left-xs"></text> 明细<text class="cuIcon-fold padding-left-xs"></text>
@ -291,10 +318,12 @@
<view class=" cu-modal show" v-show="showtitle"> <view class=" cu-modal show" v-show="showtitle">
<view class="cu-dialog overflow-unset dialog-box box-paddings"> <view class="cu-dialog overflow-unset dialog-box box-paddings">
<view class="close-icon" @tap="hidendialog"> <view class="close-icon" @tap="hidendialog">
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/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>
<view class=""> <view class="">
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/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>
<view class="cu-bar box-panding text-centerS"> <view class="cu-bar box-panding text-centerS">
<text class="headShow"> 支付提醒 </text> <text class="headShow"> 支付提醒 </text>
@ -329,8 +358,8 @@
<input style="flex: 1;" 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> <uni-icons v-if="plateNumber" @tap=" plateNumber=''; " type="clear" size="20"></uni-icons>
</view> </view>
<picker-view :indicator-style="indicatorStyle" v-if="plateNumbers.length" :value="plateIndex" @change="pickPlate" <picker-view :indicator-style="indicatorStyle" v-if="plateNumbers.length" :value="plateIndex"
class="picker-view"> @change="pickPlate" class="picker-view">
<picker-view-column> <picker-view-column>
<view class="item" v-for="(item,index) in plateNumbers" :key="index">{{item}}</view> <view class="item" v-for="(item,index) in plateNumbers" :key="index">{{item}}</view>
</picker-view-column> </picker-view-column>
@ -515,7 +544,8 @@
computed: { computed: {
priceId() { priceId() {
if (this.channelList.length && this.channelList[this.activeCur] && this.oilSitePriceDetailsVo[this.radio]) { if (this.channelList.length && this.channelList[this.activeCur] && this.oilSitePriceDetailsVo[this
.radio]) {
return this.oilSitePriceDetailsVo[this.radio].priceId return this.oilSitePriceDetailsVo[this.radio].priceId
} }
}, },
@ -569,7 +599,8 @@
}, },
methods: { methods: {
typeChenk() { typeChenk() {
return this.channelList[this.activeCur]?.secondChannelCode&&this.thirdPartyDynamicData.includes(this.channelList[this.activeCur].secondChannelCode) return this.channelList[this.activeCur]?.secondChannelCode && this.thirdPartyDynamicData.includes(this
.channelList[this.activeCur].secondChannelCode)
}, },
init() { init() {
//生成油枪数据 原来在data里写死的1-8号油枪数据；新加 clc 2022-3-18 //生成油枪数据 原来在data里写死的1-8号油枪数据；新加 clc 2022-3-18
@ -767,10 +798,22 @@
//动态油枪方法 this.checkbox数据格式在我改之前就是这样, clc 2022-3-18 //动态油枪方法 this.checkbox数据格式在我改之前就是这样, clc 2022-3-18
dynamic() { dynamic() {
return new Promise((re, rj) => { return new Promise((re, rj) => {
oilSiteApi.gunList({siteId:this.siteId}).then(res=>{ oilSiteApi.gunList({
siteId: this.siteId
}).then(res => {
if (res.data.length !== 0) { 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 array = res.data.map((item, index) => {
let filterArray = array.filter(item=>item.oilsId==this.oilSitePriceDetailsVo[this.radio]?.priceId); 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) re(filterArray)
} }
}) })
@ -807,7 +850,9 @@
return arry return arry
} }
//返回排序数组 //返回排序数组
return newArry.sort((a,b)=>{a-b}); return newArry.sort((a, b) => {
a - b
});
} }
// clc 2022-3-18 注 // clc 2022-3-18 注
@ -1041,16 +1086,16 @@
this.showtitle = true this.showtitle = true
return return
} }
console.log('这里是beforeMake end') // console.log('这里是beforeMake end')
this.makerOrder() this.makerOrder()
}, },
// 下单 // 下单
makerOrder() { makerOrder() {
console.log('这里是beforeMake') // console.log('这里是beforeMake')
let otherUser = uni.getStorageSync('otherUserInfo') let otherUser = uni.getStorageSync('otherUserInfo')
console.log(otherUser,'+++++++++++++++') // console.log(otherUser, '+++++++++++++++')
if (otherUser) { if (otherUser) {
console.log('这里是卡力+++++++++++') // console.log('这里是卡力+++++++++++')
let PlateNumberImages = this.PlateNumberImages, let PlateNumberImages = this.PlateNumberImages,
refuellerImages = this.refuellerImages refuellerImages = this.refuellerImages
if (PlateNumberImages == '') { if (PlateNumberImages == '') {
@ -1075,10 +1120,12 @@
priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键 priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键
orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单） orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS） orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS）
plateNumber: this.plateNumber ? this.plateNumber : this.plateNumberSel, //类型：String 必有字段 备注：车牌号 plateNumber: this.plateNumber ? this.plateNumber : this
.plateNumberSel, //类型：String 必有字段 备注：车牌号
siteUserName: this.jober, //类型：String 必有字段 备注：加油员 siteUserName: this.jober, //类型：String 必有字段 备注：加油员
oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪 oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪
volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this.vol, //类型：Number 必有字段 备注：加油升数 volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
.vol, //类型：Number 必有字段 备注：加油升数
realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格 realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格
suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单） suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单）
createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET） createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
@ -1095,10 +1142,12 @@
priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键 priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String 必有字段 备注：油价主键
orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单） orderType: "REAL_ORDER", //类型：String 必有字段 备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS） orderSource: "WECHAT_MINIAPPS", //类型：String 必有字段 备注：订单来源（WECHAT_MINIAPPS）
plateNumber: this.plateNumber ? this.plateNumber : this.plateNumberSel, //类型：String 必有字段 备注：车牌号 plateNumber: this.plateNumber ? this.plateNumber : this
.plateNumberSel, //类型：String 必有字段 备注：车牌号
siteUserName: this.jober, //类型：String 必有字段 备注：加油员 siteUserName: this.jober, //类型：String 必有字段 备注：加油员
oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪 oilsBar: this.oilBar, //类型：Number 必有字段 备注：油枪
volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this.vol, //类型：Number 必有字段 备注：加油升数 volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
.vol, //类型：Number 必有字段 备注：加油升数
realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格 realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number 必有字段 备注：实际加油价格
suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单） suppleMark: 0, //类型：Number 必有字段 备注：补录标识（0：实时订单 1：补录订单）
createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET） createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String 必有字段 备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
@ -1108,24 +1157,35 @@
'xoilAmountGun': this.vol 'xoilAmountGun': this.vol
} }
} }
console.log(orderData) // console.log(orderData)
let location = uni.getStorageSync('location')||{longitude:'',latitude:''}; let location = uni.getStorageSync('location') || {
oilOrderApi.createOrder(Object.assign(orderData,{longitude:location.longitude,latitude:location.latitude})).then(res => { longitude: '',
latitude: ''
};
oilOrderApi.createOrder(Object.assign(orderData, {
longitude: location.longitude,
latitude: location.latitude
})).then(res => {
if (res.code == 20000) { 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 let data = (this.typeChenk() && (Object.assign(res.data, {
gunName: this.checkBar.filter(item => this.oilBar == item.value)[0]
.name
}))) || res.data
if (otherUser) { if (otherUser) {
console.log('这里是卡力订单创建') // console.log('这里是卡力订单创建')
console.log(data) // console.log(data)
uni.setStorageSync('orderMade', data) uni.setStorageSync('orderMade', data)
uni.redirectTo({ uni.redirectTo({
url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod='+res.data.payMethod +'&&type=oil' url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod=' + res.data
.payMethod + '&&type=oil'
}) })
return return
} }
console.log(data,'这里是非卡力') // console.log(data, '这里是非卡力')
uni.setStorageSync('orderMade', data) uni.setStorageSync('orderMade', data)
uni.redirectTo({ uni.redirectTo({
url: '/BagStation/pages/makeOrder/orderPaying?payMethod='+res.data.payMethod+'&&type=oil' url: '/BagStation/pages/makeOrder/orderPaying?payMethod=' + res.data
.payMethod + '&&type=oil'
}) })
} }
}) })
@ -1227,6 +1287,7 @@
// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) // 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
switch (value) { switch (value) {
case 'XOIL': case 'XOIL':
case 'ZDC':
return '星油' return '星油'
case 'WJY': case 'WJY':
return '万金油' return '万金油'
@ -1284,14 +1345,17 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.close-icon { .close-icon {
position: absolute; position: absolute;
right: 2%; right: 2%;
top: 2%; top: 2%;
} }
.dialog-box { .dialog-box {
position: relative; position: relative;
} }
.site-icon { .site-icon {
width: 2rem; width: 2rem;
vertical-align: middle; vertical-align: middle;
@ -1320,7 +1384,9 @@
.picker-view { .picker-view {
min-height: 300upx; min-height: 300upx;
}.content { }
.content {
min-height: 100%; min-height: 100%;
position: relative; position: relative;
} }
@ -1413,23 +1479,28 @@
.yu-card-xuan .action { .yu-card-xuan .action {
white-space: nowrap; white-space: nowrap;
} }
.text-centerS { .text-centerS {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
text-align: center; text-align: center;
} }
.red_btn { .red_btn {
color: #FFFFFF; color: #FFFFFF;
background-color: #FF6700; background-color: #FF6700;
} }
.box-paddings { .box-paddings {
padding: 40rpx 0; padding: 40rpx 0;
} }
.headShow { .headShow {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: 600;
} }
.showtext { .showtext {
line-height: 2; line-height: 2;
font-size: 30rpx; font-size: 30rpx;
@ -1439,12 +1510,14 @@
letter-spacing: 3px; letter-spacing: 3px;
text-align: left; text-align: left;
} }
.checklocation_box_button { .checklocation_box_button {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 0 5%; padding: 0 5%;
} }
.btn-box { .btn-box {
width: 45%; width: 45%;
flex: 0 0 auto; flex: 0 0 auto;
@ -1455,9 +1528,11 @@
box-sizing: border-box; box-sizing: border-box;
border: 2rpx solid #bfbfbf; border: 2rpx solid #bfbfbf;
} }
.box-panding { .box-panding {
padding: 10 0; padding: 10 0;
} }
.checklocation { .checklocation {
position: fixed; position: fixed;
top: 50%; top: 50%;
@ -1465,9 +1540,11 @@
right: 20%; right: 20%;
z-index: 999; z-index: 999;
} }
.checklocation_box { .checklocation_box {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.content { .content {
min-height: 100%; min-height: 100%;
position: relative; position: relative;
@ -1512,6 +1589,7 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
} }
.text-img { .text-img {
position: relative; position: relative;
} }
@ -1570,18 +1648,22 @@
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
} }
.text-p { .text-p {
text-align: center; text-align: center;
margin: 4rpx 0; margin: 4rpx 0;
font-size: 22rpx; font-size: 22rpx;
color: #6f6f6fe8; color: #6f6f6fe8;
} }
.refuellerImages { .refuellerImages {
position: relative; position: relative;
} }
.plateNumber_box { .plateNumber_box {
position: relative; position: relative;
} }
.close_Img { .close_Img {
position: absolute; position: absolute;
right: -10px; right: -10px;
@ -1589,6 +1671,7 @@
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
.padding-bottom-40 { .padding-bottom-40 {
padding-bottom: 20%; padding-bottom: 20%;
} }

6
BagStation/pages/components/price-tab.vue
Unescape View File

@ -114,7 +114,9 @@
goFinancial() { goFinancial() {
const user = uni.getStorageSync('user'); const user = uni.getStorageSync('user');
if (user) { if (user) {
Financial.findHomePageReport({customerId:user.id}).then(res=>{ Financial.findHomePageReport({
customerId: user.id
}).then(res => {
if (res.data) { if (res.data) {
uni.navigateTo({ uni.navigateTo({
url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}` url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
@ -179,6 +181,7 @@
// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）) // 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
switch (value) { switch (value) {
case 'XOIL': case 'XOIL':
case 'ZDC':
return '星油' return '星油'
case 'WJY': case 'WJY':
return '万金油' return '万金油'
@ -188,6 +191,7 @@
return '团油' return '团油'
case 'YDJY': case 'YDJY':
return '一点加油（壳牌）' return '一点加油（壳牌）'
} }
} }
} }

Write Preview
Loading…
Cancel
Save