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

11111

Browse Source
This commit is contained in:
caolc
2022-04-22 14:53:23 +08:00
parent 2b72b9be8c
commit 1f04fa9733
5 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
{{item.oilsCode}} {{item.oilsCode}}
</text> </text>
<text class=" text-lg text-bold text-red " v-if="item.volume"> <text class=" text-lg text-bold text-red " v-if="item.volume">
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text> {{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
</view> </view>
<view class="bottom text-left"> <view class="bottom text-left">

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

@@ -55,11 +55,11 @@
</view> --> </view> -->
<view class="margin-bottom-sm"> <view class="margin-bottom-sm">
油机单价 油机单价
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text> <text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
</view> </view>
<view class="margin-bottom-sm"> <view class="margin-bottom-sm">
{{ orderItem.oilProductType=='GAS'?'加气重量':'加油升数' }} {{ orderItem.oilProductType=='GAS'?'加气升数':'加油升数' }}
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text> <text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
</view> </view>
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'"> <view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
油机总价 油机总价
@@ -183,7 +183,7 @@
}, },
filters:{ filters:{
company(e){ company(e){
if(e) return e=='GAS'?'KG':'L'; if(e) return e=='GAS'?'L':'L';
}, },
}, },
computed: { computed: {
@@ -454,7 +454,8 @@
// if( _that.zeyiType == 1){ // if( _that.zeyiType == 1){
// return value // return value
// } // }
let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/)) // let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
let number = Number(value).toFixed(2)
return number return number
} else { } else {
return '0.00' return '0.00'

2
pages/TransactionStatistics/TransactionStatistics.vue
View File

@@ -92,7 +92,7 @@
</view> </view>
<view class="bottom text-left margin-top-xs margin-bottom-xs"> <view class="bottom text-left margin-top-xs margin-bottom-xs">
<text class="padding-left-xs text-lg"> <text class="padding-left-xs text-lg">
<text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text> <text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
<!-- {{item.createTime}} --> <!-- {{item.createTime}} -->
</text> </text>
</view> </view>

66
pages/stationDetail/ZYSite.vue
View File

@@ -168,7 +168,10 @@
v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text> v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
<text class="text-blod oil-main-color" v-else>无价格</text> <text class="text-blod oil-main-color" v-else>无价格</text>
</text> </text>
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥{{insertResult.oilSitePrice }}/{{siteData.siteType|company }}</text> <text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
<text class="text-blod oil-main-color" v-else>无价格</text>
</text>
</view> </view>
@@ -210,7 +213,7 @@
<text class=""> <text class="">
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 --> <!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 -->
<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text> <text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
<text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text> <text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
<!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} --> <!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
</text> </text>
</view> </view>
@@ -228,7 +231,7 @@
</view> </view>
</view> </view>
</view> </view>
<button class="margin round bg-main-oil" @tap="charge">立即下单</button> <button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button>
</view> </view>
</view> </view>
<view class v-show="!beforePay&&isG7"> <view class v-show="!beforePay&&isG7">
@@ -503,10 +506,10 @@
getMoney(e) { getMoney(e) {
console.log(e) console.log(e)
if (e.detail.value == '') { if (e.detail.value == '') {
uni.showToast({ // uni.showToast({
title: '请输入金额', // title: '请输入金额',
icon: 'none' // icon: 'none'
}) // })
return return
} }
let isNumber = this.isNumber(e.detail.value) let isNumber = this.isNumber(e.detail.value)
@@ -630,6 +633,7 @@
this.changTypes = 0 this.changTypes = 0
}, },
charge() { charge() {
//防抖
clearTimeout(this.shake) clearTimeout(this.shake)
this.shake = setTimeout(()=>{ this.shake = setTimeout(()=>{
this.tsetPlate() this.tsetPlate()
@@ -661,12 +665,14 @@
title: '车牌号校验不通过', title: '车牌号校验不通过',
icon: 'none' icon: 'none'
}); });
this.shake=null
} }
} else { } else {
uni.showToast({ uni.showToast({
title: '您选择的油品没有油价，不能加油', title: '您选择的油品没有油价，不能加油',
icon: 'none' icon: 'none'
}); });
this.shake=null
} }
},500) },500)
@@ -690,6 +696,7 @@
title: 'qrCode为空', title: 'qrCode为空',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.siteId) { if (!data6.siteId) {
@@ -697,6 +704,7 @@
title: '请选择油站id', title: '请选择油站id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.companyId) { if (!data6.companyId) {
@@ -704,6 +712,7 @@
title: '请选择企业id', title: '请选择企业id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.customerId) { if (!data6.customerId) {
@@ -711,6 +720,7 @@
title: '请选择司机id', title: '请选择司机id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@@ -718,6 +728,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
oliSiteApi.FYPay(data6).then(res => { oliSiteApi.FYPay(data6).then(res => {
@@ -744,7 +755,7 @@
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
this.shake=null
} }
}) })
}, },
@@ -767,6 +778,7 @@
title: 'qrCode为空', title: 'qrCode为空',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.siteId) { if (!data6.siteId) {
@@ -774,6 +786,7 @@
title: '请选择油站id', title: '请选择油站id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.companyId) { if (!data6.companyId) {
@@ -781,6 +794,7 @@
title: '请选择企业id', title: '请选择企业id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.customerId) { if (!data6.customerId) {
@@ -788,6 +802,7 @@
title: '请选择司机id', title: '请选择司机id',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@@ -795,6 +810,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
oliSiteApi.sfPay(data6).then(res => { oliSiteApi.sfPay(data6).then(res => {
@@ -821,7 +837,7 @@
// this.getPayStatus(this.orderId) // this.getPayStatus(this.orderId)
// }, 400) // }, 400)
// } // }
this.shake=null
} }
}) })
}, },
@@ -860,6 +876,7 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@@ -867,6 +884,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
oliSiteApi.RrsPay(data6).then(res => { oliSiteApi.RrsPay(data6).then(res => {
@@ -906,7 +924,7 @@
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
this.shake=null
} }
}) })
}, },
@@ -916,6 +934,7 @@
let PlateNumberImages = this.PlateNumberImages, let PlateNumberImages = this.PlateNumberImages,
refuellerImages = this.refuellerImages refuellerImages = this.refuellerImages
if (PlateNumberImages == '') { if (PlateNumberImages == '') {
this.shake=null
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请上传车辆照片' title: '请上传车辆照片'
@@ -927,6 +946,7 @@
icon: 'none', icon: 'none',
title: '请上传油机照片' title: '请上传油机照片'
}) })
this.shake=null
return return
} }
var data6 = { var data6 = {
@@ -953,7 +973,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number 必有字段 备注：版本号 version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
} }
} else { } else {
@@ -978,7 +998,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number 必有字段 备注：版本号 version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
} }
} }
@@ -988,13 +1008,22 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.volume) { if (!Number(data6.volume)) {
if(this.siteData.siteType=='2'){
uni.showToast({ uni.showToast({
title: '请输入加油体积', title: '请输入加油升数',
icon: 'none' icon: 'none'
}); });
}else{
uni.showToast({
title: '请输入加油金额',
icon: 'none'
});
}
this.shake=null
return false return false
} }
console.log(data6, 'data6+++++') console.log(data6, 'data6+++++')
@@ -1020,7 +1049,6 @@
// createDatetime: res.data.orderTime, // createDatetime: res.data.orderTime,
// realamount: res.data.payRealAmount, // realamount: res.data.payRealAmount,
// istate: res.data.orderStatus // istate: res.data.orderStatus
// } // }
// uni.setStorageSync('tempOrderInfo', data8) // uni.setStorageSync('tempOrderInfo', data8)
uni.setStorageSync('orderSource', 'mpxoil') uni.setStorageSync('orderSource', 'mpxoil')
@@ -1036,8 +1064,8 @@
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
} }
this.shake=null
}) })
}, },
// 收费则yi // 收费则yi
@@ -1064,6 +1092,7 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@@ -1071,6 +1100,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null
return false return false
} }
oliSiteApi.zeyiPay(data6).then(res => { oliSiteApi.zeyiPay(data6).then(res => {
@@ -1111,7 +1141,7 @@
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
this.shake=null
} }
}) })
}, },
@@ -1319,7 +1349,7 @@
if(e){ if(e){
return e=='2' ?'KG':'L'; return e=='2' ?'KG':'L';
} else { } else {
return 'L' return ''
} }
}, },
moneyVolm(value) { moneyVolm(value) {

2
utils/request.js
View File

@@ -9,7 +9,7 @@ import utils from '@/utils/encode'
const testUrl = 'http://192.168.0.31:38080' const testUrl = 'http://192.168.0.31:38080'
// const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
// const productionUrl = 'http://121.196.213.68/adminapi' //预生产 // const productionUrl = 'http://121.196.213.68/adminapi' //预生产
// const env = process.env.NODE_ENV // 环境 // const env = process.env.NODE_ENV // 环境
const service = axios.create({ const service = axios.create({