pull/9/head
xiaozhiyong 2 years ago
parent d32d9687f0
commit b49578295d
  1. 79
      BagStation/orderDetail/orderDetail.vue
  2. 34
      BagStation/pages/makeOrder/orderPaying.vue
  3. 28
      BagStation/pages/makeOrder/payResult.vue

@ -13,14 +13,15 @@
<view class="qr-container "> <view class="qr-container ">
<view class="qrimg"> <view class="qrimg">
<view class="qrimg" @tap="newQrString"> <view class="qrimg" @tap="newQrString">
<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" <tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
background="#fff" :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval :foreground="foreground" :pdground="foreground" :icon="iconUrl" iconSize="40" onval
:usingComponents="usingComponents" showLoading /> :usingComponents="usingComponents" showLoading />
</view> </view>
</view> </view>
</view> </view>
<view class="text-center text-sm justify-center align-center flex"> <view class="text-center text-sm justify-center align-center flex">
<image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm"></image> <image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm">
</image>
<text>壳牌 {{test}} {{tsets}}</text> <text>壳牌 {{test}} {{tsets}}</text>
</view> </view>
<view class="text-center padding-top text-sm margin-bottom"> <view class="text-center padding-top text-sm margin-bottom">
@ -43,67 +44,67 @@
</view> </view>
</view> </view>
<view class="cu-list menu solid-bottom"> <!-- <view class="cu-list menu solid-bottom">
<view class="cu-item arrow" @tap="toDetail(order)"> <view class="cu-item arrow" @tap="toDetail(order)">
油站 油站
<text class="fr">{{order.siteName?order.siteName:''}}</text> <text class="fr">{{order.siteName?order.siteName:''}}</text>
</view> </view>
</view> </view> -->
<view class="padding-tb-xs text-left">
<!-- <view class="cu-item arrow" @tap="toDetail(order)">
</view> -->
油站
<text class="fr nowrap">{{order.siteName?order.siteName:''}}</text>
</view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油品油枪 油品油枪
<text class="fr nowrap"> <text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text> {{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
{{order.oilProductType=='GAS'?'加气重量:':'加油升数:'}} {{order.oilProductType=='GAS'?'加气重量:':'加油升数:'}}
<text class="fr">{{order.volume?order.volume:'未输入' |moneyFormath}} {{order.oilProductType=='GAS'?'L':'L'}}</text> <text
class="fr nowrap">{{order.volume?'约':''}}{{order.volume?order.volume:'未输入' |moneyFormath}}{{order.oilProductType=='GAS'?'L':'L'}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油站价格 油站价格
<text class="fr">{{order.sitePrice?order.sitePrice+'¥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text> <text
class="fr">{{order.sitePrice?order.sitePrice+'¥/' +( order.oilProductType=='GAS'?'L':'L') :'暂无'}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠价格 优惠价格
<text class="fr">{{moneyIntercept(order.realPrice) }}/ {{order.oilProductType=='GAS'?'L':'L'}}</text> <text class="fr">{{moneyIntercept(order.realPrice) }}/{{order.oilProductType=='GAS'?'L':'L'}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油员 加油员
<text class="fr">{{order.siteUser}}</text> <text class="fr">{{order.siteUser}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油渠道 加油渠道
<text class="fr">{{order.channelCode|channelCodeFamt}}</text> <text class="fr">{{order.channelCode|channelCodeFamt}}</text>
</view> </view>
<view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油机金额 <text class="fr">{{order.sitePriceAmount |moneyFormat}}</text> 星油优惠
<!-- <text
class="fr">{{order.xoilDiscountAmount>0?order.realAmount+order.xoilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
</view>
</view>
<view class="padding-tb-xs text-left">
星油优惠
<!-- order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat --> <!-- order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat -->
<text <text class="text-red fr">{{ moneyIntercept(order.xoilDiscountAmount)}}</text>
class="text-red fr">{{ moneyIntercept(order.xoilDiscountAmount)}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠券 优惠券
<text class="text-red fr">{{order.couponMark==1?order.couponDiscountAmount:'未使用优惠券'}}</text> <text class="text-red fr">{{order.couponMark==1?order.couponDiscountAmount:'未使用优惠券'}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
合计 合计
<text <text
class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x'|moneyFormat}}</text> class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x'|moneyFormat}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
支付方式 支付方式
<text class=" fr">{{order.payAccountType==0?'星油豆':'企业账户支付'}}</text> <text class=" fr">{{order.payAccountType==0?'星油豆':'企业账户支付'}}</text>
</view> </view>
<view class="padding-tb-xs text-left" v-if="order.payTime"> <view class="padding-tb-xs text-left" v-if="order.payTime">
订单支付时间 订单支付时间
<text class=" fr">{{order.payTime}}</text> <text class=" fr">{{order.payTime}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
@ -113,26 +114,24 @@
<view class="dashed-top margin-top-xs padding-top-sm"> <view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油车牌 加油车牌
<text class=" fr">{{order.plateNumber}}</text> <text class=" fr">{{order.plateNumber}}</text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油司机 加油司机
<text class=" fr">{{order.customerName}} {{order.customerCode}}</text> <text class=" fr">{{order.customerName}} {{order.customerCode}}</text>
</view> </view>
<view class="padding-tb-xs text-left" v-if="order.oilCardNature"> <view class="padding-tb-xs text-left" v-if="order.oilCardNature">
油卡性质 油卡性质
<text class=" fr">{{order.oilCardNature|oilCardNatureF}}</text> <text class=" fr">{{order.oilCardNature|oilCardNatureF}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="padding bg-white fixed-bottom"> <view class="padding bg-white fixed-bottom">
<view class="flex margin-bottom" v-if="order.orderStatus==0"> <view class="flex margin-bottom" v-if="order.orderStatus==0">
<button class="cu-btn block flex-sub lg bg-main-oil " <button class="cu-btn block flex-sub lg bg-main-oil " @tap="makePay">立即支付</button>
@tap="makePay">立即支付</button> <button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
<button class="cu-btn block flex-sub lg margin-left"
@tap="cancelOrder">取消订单</button>
</view> </view>
<view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall"> <view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
<text class="cuIcon-service padding-right-sm">联系客服</text> <text class="cuIcon-service padding-right-sm">联系客服</text>
@ -142,10 +141,8 @@
</view> </view>
<view class="padding placeholder-hidden"> <view class="padding placeholder-hidden">
<view class="flex margin-bottom" v-if="order.orderStatus==0"> <view class="flex margin-bottom" v-if="order.orderStatus==0">
<button class="cu-btn block flex-sub lg bg-main-oil " <button class="cu-btn block flex-sub lg bg-main-oil " @tap="makePay">立即支付</button>
@tap="makePay">立即支付</button> <button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
<button class="cu-btn block flex-sub lg margin-left"
@tap="cancelOrder">取消订单</button>
</view> </view>
<view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall"> <view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
<text class="cuIcon-service padding-right-sm">联系客服</text> <text class="cuIcon-service padding-right-sm">联系客服</text>
@ -398,12 +395,15 @@
} }
</script> </script>
<style scoped>.move-tops{ <style scoped>
.move-tops {
transform: translateY(-17px); transform: translateY(-17px);
} }
.bg-red { .bg-red {
background-color: #FF6700; background-color: #FF6700;
} }
.text-centers { .text-centers {
text-align: center; text-align: center;
width: 90%; width: 90%;
@ -411,6 +411,7 @@
border-radius: 7px; border-radius: 7px;
overflow: hidden; overflow: hidden;
} }
.move-top { .move-top {
margin-top: -2rem; margin-top: -2rem;
} }

@ -149,46 +149,46 @@
<view class="padding" v-if='type == "oil"'> <view class="padding" v-if='type == "oil"'>
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom"> <view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)"> <view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
订单编号 订单编号
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text <text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
class="cuIcon-copy padding-left-xs"></text></text> class="cuIcon-copy padding-left-xs"></text></text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油站 油站
<view class="fr">{{order.siteName?order.siteName:''}} <view class="fr">{{order.siteName?order.siteName:''}}
<!-- <text v-if="order.siteLevel" class="cu-tag text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}</text> --> <!-- <text v-if="order.siteLevel" class="cu-tag text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}</text> -->
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油品油枪 油品油枪
<text <text
class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}</text> class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油升数 加油升数
<text class="fr">{{order.volume?order.volume :'xxx.x' | moneyFormath}} L</text> <text class="fr">{{order.volume?order.volume :'xxx.x' | moneyFormath}} L</text>
</view> </view>
<view class="dashed-top margin-top-xs padding-top-sm"> <view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油金额 加油金额
<!-- <text <!-- <text
class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> --> class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
<text class="fr">{{ moneyIntercept(order.xoilAmountGun )}}</text> <text class="fr">{{ moneyIntercept(order.xoilAmountGun )}}</text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
星油优惠 星油优惠
<!-- order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat --> <!-- order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat -->
<text class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text> <text class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠券 优惠券
<text <text
class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
合计 合计
<text <text
class="text-red text-bold text-lg fr">{{order.realAmount>0? '¥'+ order.realAmount:'xxx.x'|}}</text> class="text-red text-bold text-lg fr">{{order.realAmount>0? '¥'+ order.realAmount:'xxx.x'|}}</text>
</view> </view>
@ -196,19 +196,19 @@
<view class="padding" v-if='type == "urea"'> <view class="padding" v-if='type == "urea"'>
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom"> <view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderId)"> <view class="padding-tb-xs text-left" @tap="onCopy(order.orderId)">
订单编号 订单编号
<text class="fr">{{order.orderId?order.orderId:''}} <text <text class="fr">{{order.orderId?order.orderId:''}} <text
class="cuIcon-copy padding-left-xs"></text></text> class="cuIcon-copy padding-left-xs"></text></text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油站 油站
<view class="fr">{{order.siteName?order.siteName:''}} <view class="fr">{{order.siteName?order.siteName:''}}
<!-- <text v-if="order.siteLevel" class="cu-tag text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}</text> --> <!-- <text v-if="order.siteLevel" class="cu-tag text-xs tag-red" style="margin-left: 20px;">{{order.siteLevel}}</text> -->
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加注类型 加注类型
<text class="fr nowrap">{{order.formats | ureaFormats }}</text> <text class="fr nowrap">{{order.formats | ureaFormats }}</text>
</view> </view>
<view class="padding-tb-xs formats_box" v-if='order.formats == "2"'> <view class="padding-tb-xs formats_box" v-if='order.formats == "2"'>
@ -222,11 +222,11 @@
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left" v-if='order.formats != "2"'> <view class="padding-tb-xs text-left" v-if='order.formats != "2"'>
加注量 加注量
<text class="fr">{{order.oldRealLiter?order.oldRealLiter :'xxx.x' }}</text> <text class="fr">{{order.oldRealLiter?order.oldRealLiter :'xxx.x' }}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
合计 合计
<text <text
class="text-red text-bold text-lg fr">{{order.oldRealAmount>0? '¥'+ order.oldRealAmount:'xxx.x'|}}</text> class="text-red text-bold text-lg fr">{{order.oldRealAmount>0? '¥'+ order.oldRealAmount:'xxx.x'|}}</text>
</view> </view>
@ -312,14 +312,16 @@
computed: { computed: {
companyList() { companyList() {
if (this.isCompany) { if (this.isCompany) {
let filterData = this.order.companyAccounts.filters(item => item.companyType != 5) let companyAccounts = this.order.companyAccounts || []
let filterData = companyAccounts.filter(item => item.companyType != 5)
return filterData return filterData
} }
}, },
companyOtherList() { companyOtherList() {
if (this.isCompany) { if (this.isCompany) {
// return this.order.otherAccounts // return this.order.otherAccounts
let filterData = this.order.otherAccounts.filter(item => item.companyType != 5) let otherAccounts = this.order.otherAccounts || []
let filterData = otherAccounts.filter(item => item.companyType != 5)
let target = this.sortParticulars(filterData,'balance') let target = this.sortParticulars(filterData,'balance')
return target return target
} }

@ -52,28 +52,28 @@
<view class="padding" style="padding-bottom: 200px;"> <view class="padding" style="padding-bottom: 200px;">
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom"> <view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)"> <view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
订单编号 订单编号
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text <text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
class="cuIcon-copy padding-left-xs"></text></text> class="cuIcon-copy padding-left-xs"></text></text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油站 油站
<text class="fr">{{order.siteName?order.siteName:''}}</text> <text class="fr">{{order.siteName?order.siteName:''}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油品油枪 油品油枪
<text class="fr nowrap"> <text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} {{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}
</text> </text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油升数 加油升数
<text class="fr">{{order.volume?order.volume :'未输入' | moneyFormath}} L</text> <text class="fr">{{order.volume?'约':''}}{{order.volume?order.volume :'未输入' | moneyFormath}} L</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油员 加油员
<text class="fr">{{order.siteUserName}}</text> <text class="fr">{{order.siteUserName}}</text>
</view> </view>
<!-- <view class="padding-tb-xs flex text-left"> <!-- <view class="padding-tb-xs flex text-left">
@ -87,40 +87,40 @@
</view> --> </view> -->
<view class="dashed-top margin-top-xs padding-top-sm"> <view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油金额 加油金额
<!-- {{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}} --> <!-- {{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}} -->
<!-- <text class="fr">{{order.realPriceAmount |moneyFormat}}</text> --> <!-- <text class="fr">{{order.realPriceAmount |moneyFormat}}</text> -->
<text class="fr">{{order.xoilAmountGun |moneyFormat}}</text> <text class="fr">{{order.xoilAmountGun |moneyFormat}}</text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
星油优惠 星油优惠
<text <text
class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text> class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
优惠券 优惠券
<text <text
class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
合计 合计
<text <text
class="text-red text-bold text-lg fr">{{order.realAmount>0?'¥'+order.realAmount:'xxx.x'}}</text> class="text-red text-bold text-lg fr">{{order.realAmount>0?'¥'+order.realAmount:'xxx.x'}}</text>
</view> </view>
<view class="dashed-top margin-top-xs padding-top-sm"> <view class="dashed-top margin-top-xs padding-top-sm">
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油车牌 加油车牌
<text class=" fr">{{order.plateNumber}}</text> <text class=" fr">{{order.plateNumber}}</text>
</view> </view>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
加油司机 加油司机
<text class=" fr">{{user.customerCode}}</text> <text class=" fr">{{user.customerCode}}</text>
</view> </view>
<view class="padding-tb-xs text-left"> <view class="padding-tb-xs text-left">
油卡性质 油卡性质
<!-- <text class=" fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> --> <!-- <text class=" fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> -->
<text class="fr">企业</text> <text class="fr">企业</text>
</view> </view>

Loading…
Cancel
Save