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

版本1.3.4

Browse Source
This commit is contained in:
xk_yangdeshi
2021-07-19 11:31:38 +08:00
parent 1d7add295e
commit 61a10d1e36
11 changed files with 246 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packageOrders/components/order-item.vue
View File

@@ -3,12 +3,9 @@
<template>
<view class="cu-item radius shadow margin-bottom ">
<!-- <image class="pay-status" :src="baseURL+'static/img/oil-unfinished.png'" alt /> -->
<view class="cu-avatar text-sl" v-if="item.sourceType==='3'"
:style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='4'||item.sourceType==='6'"
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='5'"
:style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='3'" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='4'||item.sourceType==='6'" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar text-sl" v-if="item.sourceType==='5'" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="content">
<view class=" solid-bottom padding-bottom-sm">
<view class="flex-treble" @tap="copyId(item.orderID)">
@@ -19,18 +16,21 @@
</view>
</view>
<view class=" text-content text-df">
{{item.oilSiteName}}
<text class="lin-h-2">
{{item.oilSiteName}}
</text>
</view>
<view class="text-sm padding-top-sm" @tap="toDetails(item.orderID)">
<view class="text-sm " @tap="toDetails(item.orderID)">
<view class="flex">
<view class="details">
<view class="top1 text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/oil-lf.png'" alt />
<text class="padding-left-xs padding-right-xs" v-if="item.vol">
{{item.vol|numberFilter}}升</text>
<text>
<text class="padding-left-xs padding-right-sm">
{{item.oilName}}
</text>
<text class=" text-lg text-bold text-red " v-if="item.vol">
{{item.vol|numberFilter}} L</text>
</view>
<view class="bottom text-left">
@@ -38,14 +38,13 @@
<text class="padding-left-xs">
{{item.createDatetime.substring(0, 10)}}
</text>
</view>
<view class="bottom text-left">
<image class="icon icon-desc " :src="baseURL+'static/img/mini-car.png'" alt />
<text class="padding-left-xs">
加油车牌： {{item.carNo}}
加油车牌： {{item.carNo|plateFilter}}
</text>
</view>
</view>
@@ -56,7 +55,7 @@
{{item.createDatetime.substring(0,19)}}
</view>
<view>
<text class="color-000 text-lg total-money">￥{{item.realamount|numberFilter}}</text>
<text class="text-red text-lg text-bold total-money">￥{{amount|numberFilter}}</text>
<view class="round pay-state light bg-olive bg-transparent text-center state-0" v-if="istate==0">
<text class="inner-istate round">{{istate|formatStr}}</text>
<view class="inner-border">
@@ -109,7 +108,7 @@
console.log(this.item.istate)
switch (parseInt(this.item.istate)) {
// 网页版 0：待支付， 1：已支付 ，-1：支付失败 ，-2：退款，
//小程序 0：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
//小程序 1：待支付， 1：已支付 ，-1：支付失败 ，2：已取消，3：已退款
case 1:
return 1
case -1:
@@ -124,6 +123,14 @@
} else {
return this.item.istate
}
},
amount(){
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
return this.item.sitePrice*this.item.vol
}else{
return this.item.realamount
}
}
},
data() {
@@ -154,6 +161,15 @@
}
},
filters: {
plateFilter(value) {
if (value) {
const numBegin = value.substring(0, 2);
const numEnd = value.substring(5);
return numBegin + '***' + numEnd;
} else {
return '暂无'
}
},
toT(value) {
if (value) {
return value / 1000
@@ -190,6 +206,10 @@
</script>
<style scoped>
.lin-h-2 {
line-height: 2.6rem;
}
.cu-avatar {
background-color: rgba(255, 255, 255, 0);
}

104
packageOrders/pages/orderList/OrderDetail/OrderDetail.vue
View File

@@ -8,14 +8,10 @@
</view>
<view class="text-center margin-top icon-container">
<view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3"
:style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===4||orderItem.sourceType===6"
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===5"
:style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else
:style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-if="orderItem.sourceType===3" :style="'background-image:url('+baseURL+'static/img/order-wjy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===4||orderItem.sourceType===6" :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else-if="orderItem.sourceType===5" :style="'background-image:url('+baseURL+'static/img/order-lv.png)'"></view>
<view class="cu-avatar xl round text-sl" v-else :style="'background-image:url('+baseURL+'static/img/order-xy.png)'"></view>
</view>
<view class="radius margin margin-top bg-white padding-top padding">
<!-- sourceType 万金油3 老吕5 星油4/6 -->
@@ -25,38 +21,52 @@
<view class="margin padding">
<view class="text-lg text-center" v-if="orderSource=='zy'">{{orderItem.istate|formatZyStr}}</view>
<view class="text-lg text-center" v-else>{{istate|formatStr}}</view>
<view class="number text-xl text-center oil-main-color">￥{{orderItem.realamount|numberFormat}}
<view class="number text-xl text-center oil-main-color">￥{{displayMoney|numberFormat}}
</view>
</view>
<view class="margin-bottom-sm" @tap="copyId(orderItem.userName,'加油司机')">
<view class="margin-bottom-sm" @tap="copyId(orderItem.driverID,'司机编号')">
司机编号
<text class="fr">{{orderItem.driverID}}<text :class="orderItem.driverID?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
</text></text>
</view>
<view class="margin-bottom-sm">
加油司机
<text class="fr">{{orderItem.userName}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text></text>
<view class="fr">
<text>{{orderItem.userName|nameFilter}}</text> <text class="padding-left-sm">{{orderItem.carNo|plateFilter}}
</text>
</view>
</view>
<view class="margin-bottom-sm" @tap="copyId(orderItem.carNo,'司机车牌')">
<!-- <view class="margin-bottom-sm" @tap="copyId(orderItem.carNo,'司机车牌')">
司机车牌
<text class="fr">{{orderItem.carNo}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<text class="fr">{{orderItem.carNo?orderItem.carNo:'暂无'}}<text :class="orderItem.carNo?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
</text></text>
</view>
</view> -->
<view class="margin-bottom-sm">
油枪油号
<text class="fr">{{orderItem.bar}}号枪{{orderItem.oilName||orderItem.oilCode}}</text>
</view>
<view class="margin-bottom-sm">
<!-- <view class="margin-bottom-sm">
加油总金额
<text
class="fr">¥{{orderItem.amount?orderItem.amount:(orderItem.xoilDiscountAmount+orderItem.realamount)|numberFormat}}</text>
</view> -->
<view class="margin-bottom-sm">
油机单价
<text class="fr">￥{{orderItem.sitePrice||orderItem.price}} / 升</text>
</view>
<view class="margin-bottom-sm">
加油升数
<text class="fr">{{orderItem.vol|numberFormat}} 升</text>
</view>
<view class="margin-bottom-sm" v-if="orderItem.xoilDiscountAmount">
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
油机总价
<text class="fr">￥{{displayMoney|numberFormat}}</text>
</view>
<!-- <view class="margin-bottom-sm" v-if="orderItem.xoilDiscountAmount">
星卡优惠
<text class="fr">¥ {{(orderItem.xoilDiscountAmount)|numberFormat}}</text>
</view>
@@ -67,11 +77,11 @@
<view class="margin-bottom-sm">
优惠券
<text class="fr">{{orderItem.coupon|couponFormat}}</text>
</view>
<view class="margin-bottom-sm">
</view> -->
<!-- <view class="margin-bottom-sm">
实扣款
<text class="fr oil-main-color">¥ {{orderItem.realamount|numberFormat}}</text>
</view>
</view> -->
</view>
<view class="radius bg-white margin padding ">
@@ -93,8 +103,7 @@
<view class="radius bg-white margin margin-bottom-0 padding">
<view class="margin-bottom-sm" @tap="copyId(orderItem.orderID,'订单号')">
订单号
<text class=" fr">{{orderItem.orderID}}<text
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
<text class=" fr">{{orderItem.orderID}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
</text></text>
</view>
@@ -150,6 +159,14 @@
this.clearStatus()
},
computed: {
displayMoney(){
if(this.orderSource=='mpxoil'){
return this.orderItem.sitePrice*this.orderItem.vol
}else{
// return this.orderItem.price*this.orderItem.vol
return this.orderItem.realamount
}
},
istate() {
let orderType = uni.getStorageSync('orderType')
if (orderType == 1) {
@@ -243,15 +260,18 @@
})
},
copyId(id, name) {
uni.setClipboardData({
data: id,
success: () => {
uni.showToast({
title: name + '已复制',
icon: 'none'
})
}
})
if (id) {
uni.setClipboardData({
data: id,
success: () => {
uni.showToast({
title: name + '已复制',
icon: 'none'
})
}
})
}
},
getOrderDetail() {
cloudSiteApi.getSiteOrderById(this.orderId).then(res => {
@@ -263,6 +283,22 @@
}
},
filters: {
nameFilter(value) {
if (value) {
var arr = value.split('')
arr[1] = "*"
return arr.join('')
}
},
plateFilter(value) {
if (value) {
const numBegin = value.substring(0, 2);
const numEnd = value.substring(5);
return numBegin + '***' + numEnd;
}else{
return '暂无'
}
},
formatZyStr(value) {
switch (parseInt(value)) {
case 1: