|
|
|
@ -61,7 +61,8 @@ |
|
|
|
|
<view class="content padding-tb-sm"> |
|
|
|
|
<view class="text-left"> |
|
|
|
|
<view class="site-icon-sm"> |
|
|
|
|
<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/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> |
|
|
|
@ -113,11 +114,16 @@ |
|
|
|
|
<view class="content padding-tb-sm"> |
|
|
|
|
<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="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> |
|
|
|
|
<image :src="imgURL+'pay-qy.png'" mode="widthFix" width="100upx" |
|
|
|
|
v-if='itemx.companyNature =="0"'></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> |
|
|
|
|
</view> |
|
|
|
|
<view class="text-sm padding-left-xl margin-left-xs"> |
|
|
|
|
{{itemx.name}} {{itemx.shareCompanyQuota==1?'共享额度':'非共享'}} |
|
|
|
@ -143,47 +149,46 @@ |
|
|
|
|
<view class="padding" v-if='type == "oil"'> |
|
|
|
|
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom"> |
|
|
|
|
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)"> |
|
|
|
|
订单编号: |
|
|
|
|
订单编号 |
|
|
|
|
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text |
|
|
|
|
class="cuIcon-copy padding-left-xs"></text></text> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
油站: |
|
|
|
|
油站 |
|
|
|
|
<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> --> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
油品油枪: |
|
|
|
|
油品油枪 |
|
|
|
|
<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"> |
|
|
|
|
加油升数: |
|
|
|
|
<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 class="dashed-top margin-top-xs padding-top-sm"> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
加油金额: |
|
|
|
|
加油金额 |
|
|
|
|
<!-- <text |
|
|
|
|
class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|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">{{ moneyIntercept(order.oilDiscountAmount)}}</text> |
|
|
|
|
<text class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
优惠券: |
|
|
|
|
优惠券 |
|
|
|
|
<text |
|
|
|
|
class="text-red fr">{{order.couponDiscountAmount>0?order.couponDiscountAmount:'xxx.x'|moneyFormat}}</text> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
合计: |
|
|
|
|
合计 |
|
|
|
|
<text |
|
|
|
|
class="text-red text-bold text-lg fr">{{order.realAmount>0? '¥'+ order.realAmount:'xxx.x'|}}</text> |
|
|
|
|
</view> |
|
|
|
@ -191,38 +196,39 @@ |
|
|
|
|
<view class="padding" v-if='type == "urea"'> |
|
|
|
|
<view class="padding-bottom-xs margin-bottom-xs dashed-bottom"> |
|
|
|
|
<view class="padding-tb-xs text-left" @tap="onCopy(order.orderId)"> |
|
|
|
|
订单编号: |
|
|
|
|
订单编号 |
|
|
|
|
<text class="fr">{{order.orderId?order.orderId:''}} <text |
|
|
|
|
class="cuIcon-copy padding-left-xs"></text></text> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
油站: |
|
|
|
|
油站 |
|
|
|
|
<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> --> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<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 class="padding-tb-xs formats_box" v-if='order.formats == "2"'> |
|
|
|
|
<view class="formats_box_list" v-for="(list,i) in order.xoilUreaOrderRelations " :key='i'> |
|
|
|
|
<view class="formats_box_list_left w30"> |
|
|
|
|
{{list.brandName}} |
|
|
|
|
</view> |
|
|
|
|
<view class="formats_box_list_main w30">{{list.options}}/桶<text style="color: red;">X{{list.goodsQuantity}}</text> </view> |
|
|
|
|
<view class="formats_box_list_main w30">{{list.options}}/桶<text |
|
|
|
|
style="color: red;">X{{list.goodsQuantity}}</text> </view> |
|
|
|
|
<view class="formats_box_list_right w30">¥{{list.totalPrice}}</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left" v-if='order.formats != "2"'> |
|
|
|
|
加注量: |
|
|
|
|
加注量 |
|
|
|
|
<text class="fr">{{order.oldRealLiter?order.oldRealLiter :'xxx.x' }}</text> |
|
|
|
|
</view> |
|
|
|
|
<view class="padding-tb-xs text-left"> |
|
|
|
|
合计: |
|
|
|
|
<text class="text-red text-bold text-lg fr">{{order.oldRealAmount>0? '¥'+ order.oldRealAmount:'xxx.x'|}}</text> |
|
|
|
|
合计 |
|
|
|
|
<text |
|
|
|
|
class="text-red text-bold text-lg fr">{{order.oldRealAmount>0? '¥'+ order.oldRealAmount:'xxx.x'|}}</text> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
@ -239,7 +245,8 @@ |
|
|
|
|
<button class="cu-btn margin-top block lg " @tap="ureaCancelOrder(order.orderId)">取消订单</button> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<AbnormalPopup :types='PopupType' :checkType='checkType' @hidenPopup='hidenPopup' :PopupShows='PopupShow' @getureaFinanceApi='getureaFinanceApi'></AbnormalPopup> |
|
|
|
|
<AbnormalPopup :types='PopupType' :checkType='checkType' @hidenPopup='hidenPopup' :PopupShows='PopupShow' |
|
|
|
|
@getureaFinanceApi='getureaFinanceApi'></AbnormalPopup> |
|
|
|
|
</view> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
@ -305,12 +312,18 @@ |
|
|
|
|
computed: { |
|
|
|
|
companyList() { |
|
|
|
|
if (this.isCompany) { |
|
|
|
|
return this.order.companyAccounts |
|
|
|
|
let companyAccounts = this.order.companyAccounts || [] |
|
|
|
|
let filterData = companyAccounts.filter(item => item.companyType != 5) |
|
|
|
|
return filterData |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
companyOtherList() { |
|
|
|
|
if (this.isCompany) { |
|
|
|
|
return this.order.otherAccounts |
|
|
|
|
// return this.order.otherAccounts |
|
|
|
|
let otherAccounts = this.order.otherAccounts || [] |
|
|
|
|
let filterData = otherAccounts.filter(item => item.companyType != 5) |
|
|
|
|
let target = this.sortParticulars(filterData,'balance') |
|
|
|
|
return target |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
@ -329,6 +342,32 @@ |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
sortParticulars(arr, field) { |
|
|
|
|
let map = new Map() |
|
|
|
|
let keys = [], |
|
|
|
|
values = [], |
|
|
|
|
target = [] |
|
|
|
|
arr.forEach(item => { |
|
|
|
|
map.set(item, item[field]) |
|
|
|
|
}) |
|
|
|
|
for (let key of map.keys()) { |
|
|
|
|
keys.push(key) |
|
|
|
|
} |
|
|
|
|
for (let value of map.values()) { |
|
|
|
|
values.push(value) |
|
|
|
|
} |
|
|
|
|
values.sort((a,b)=>{return a - b}) |
|
|
|
|
values.reverse() |
|
|
|
|
values.forEach(value => { |
|
|
|
|
keys.forEach(key => { |
|
|
|
|
if (map.get(key) == value) { |
|
|
|
|
target.push(key) |
|
|
|
|
map.set(key, new Date().getTime()) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
return target |
|
|
|
|
}, |
|
|
|
|
getureaFinanceApi() { |
|
|
|
|
ureaFinanceApi.queryWhetherToHangUp(this.order.orderId).then(res => { |
|
|
|
|
if (res.data == '2') { |
|
|
|
@ -453,7 +492,8 @@ |
|
|
|
|
title: res.msg |
|
|
|
|
}) |
|
|
|
|
uni.redirectTo({ |
|
|
|
|
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod='+this.payMethod, |
|
|
|
|
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' + |
|
|
|
|
this.payMethod, |
|
|
|
|
fail: (err) => { |
|
|
|
|
// console.log(err) |
|
|
|
|
} |
|
|
|
@ -525,7 +565,8 @@ |
|
|
|
|
}) |
|
|
|
|
setTimeout(() => { |
|
|
|
|
uni.redirectTo({ |
|
|
|
|
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod='+this.payMethod, |
|
|
|
|
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' + |
|
|
|
|
this.payMethod, |
|
|
|
|
fail: (err) => { |
|
|
|
|
// console.log(err) |
|
|
|
|
} |
|
|
|
@ -541,7 +582,8 @@ |
|
|
|
|
setTimeout(() => { |
|
|
|
|
let msg = res.msg |
|
|
|
|
uni.redirectTo({ |
|
|
|
|
url: `/BagStation/pages/makeOrder/payResult?status=fail&&errMsg=${msg}payMethod=`+this.payMethod |
|
|
|
|
url: `/BagStation/pages/makeOrder/payResult?status=fail&&errMsg=${msg}payMethod=` + |
|
|
|
|
this.payMethod |
|
|
|
|
}) |
|
|
|
|
}, 1000) |
|
|
|
|
} |
|
|
|
@ -634,6 +676,7 @@ |
|
|
|
|
font-weight: 700; |
|
|
|
|
font-size: 28rpx; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.formats_box { |
|
|
|
|
display: flex; |
|
|
|
|
justify-content: space-between; |
|
|
|
@ -642,6 +685,7 @@ |
|
|
|
|
box-sizing: border-box; |
|
|
|
|
flex-direction: column; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.formats_box_list { |
|
|
|
|
display: flex; |
|
|
|
|
justify-content: space-around; |
|
|
|
@ -652,6 +696,7 @@ |
|
|
|
|
align-items: center; |
|
|
|
|
width: 100%; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.site-icon-sm { |
|
|
|
|
width: 40upx; |
|
|
|
|
vertical-align: middle; |
|
|
|
|