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

江投页面

Browse Source
This commit is contained in:
zhangyouji
2024-04-26 17:07:39 +08:00
parent 9aebbade3c
commit cecacfc7c7
6 changed files with 177 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,21 +569,16 @@
otherUser = uni.getStorageSync('otherUserInfo'),
companyId = JSON.parse(uni.getStorageSync('companyCard')).companyId
if (otherUser) {
// console.log('这里是卡里')
this.isOtherUser = true
} else {
// console.log('这里是非卡力')
}
console.log('oilItem', oilItem)
this.showtitles = oilItem.listTag;
this.init()
console.log(companyId)
this.getCompanyConfig(companyId)
},
watch: {
activeChannelCode: {
handler(newval) {
// console.log('activeChannelCode')
this.oilBar = ''
setTimeout(async () => {
this.checkBar = (this.typeChenk()) ? await this.dynamic() : this.calcBar()
@@ -592,7 +587,6 @@
},
priceId: {
handler(newval) {
// console.log('priceId')
this.oilBar = ''
setTimeout(async () => {
this.checkBar = (this.typeChenk()) ? await this.dynamic() : this.calcBar()
@@ -628,14 +622,8 @@
}
},
totalMoney() {
// // console.log('this.oilSitePriceDetailsVo[this.radio]', this.oilSitePriceDetailsVo[this.radio])
if (this.vol > 0 && this.oilSitePriceDetailsVo[this.radio]) {
// console.log('+++++++++++')
// console.log(this.vol)
// console.log(this.oilSitePriceDetailsVo[this.radio])
// console.log('+++++++++++')
let numb = this.vol * this.oilSitePriceDetailsVo[this.radio].oilSitePrice
// console.log('++++++',numb)
return this.vol * this.oilSitePriceDetailsVo[this.radio].oilSitePrice
}
},
@@ -767,7 +755,6 @@
})
},
checkMoneyVol(e) {
console.log(e)
if (e == '') {
uni.showToast({
title: '请输入金额',
@@ -791,14 +778,12 @@
}
this.xoilAmountGun = e
oilSiteApi.getOrderDiscountInfo(number).then(res => {
console.log(res)
this.realMoney = res.data.payRealAmount
this.discount = res.data.oilDiscountAmount
this.vlom = res.data.volume
})
},
ChooseCheckMoney(e) {
console.log(e)
this.vol = e + ''
this.checkMoneyVol(this.vol)
},
@@ -840,7 +825,6 @@
}
this.xoilAmountGun = e.detail.value
oilSiteApi.getOrderDiscountInfo(number).then(res => {
console.log(res)
this.realMoney = res.data.payRealAmount
this.discount = res.data.oilDiscountAmount
this.vlom = res.data.volume
@@ -868,8 +852,6 @@
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
// sourceType: ['album'], //从相册选择
success: function(res) {
console.log(res)
console.log('进入1')
const JSESSIONID = utils.uuid()
uni.uploadFile({
// https://www.xingoil.com/adminapi
@@ -892,8 +874,6 @@
'token': utils.md5Salt(JSESSIONID)
},
success(e) {
console.log('进入2')
console.log(e)
let obj = JSON.parse(e.data),
url = obj.data.publicUrl
if (type == 'car') {
@@ -901,17 +881,14 @@
plateNumberImage: obj.data.publicUrl
}
_that.PlateNumberImages = url
console.log('这里是司机车牌', url)
_that.isPlateNumber = false
oilSiteApi.plateNumberRecognition(data).then((res) => {
let obj = JSON.parse(res.data)
console.log(obj)
_that.plateNumber = obj.NUMBER
})
} else {
_that.refuellerImages = url
_that.isUefueller = false
console.log('这里是油站图片', _that.refuellerImages, url)
}
}
@@ -1079,7 +1056,6 @@
},
checkInfo() {
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
console.log(this.plateNumber)
if (!this.testPlateResult) {
this.plateNumber = ''
uni.showToast({
@@ -1224,14 +1200,11 @@
this.showtitle = true
return
}
// console.log('这里是beforeMake end')
this.makerOrder()
},
// 下单
makerOrder() {
// console.log('这里是beforeMake')
let otherUser = uni.getStorageSync('otherUserInfo')
// console.log(otherUser, '+++++++++++++++')
if (otherUser) {
// console.log('这里是卡力+++++++++++')
let PlateNumberImages = this.PlateNumberImages,
@@ -1327,7 +1300,6 @@
}
}
// console.log(orderData)
let location = uni.getStorageSync('location') || {
longitude: '',
latitude: ''
@@ -1343,7 +1315,6 @@
}))) || res.data
if (otherUser) {
// console.log('这里是卡力订单创建')
// console.log(data)
uni.setStorageSync('orderMade', data)
uni.redirectTo({
url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod=' + res.data
@@ -1369,7 +1340,6 @@
getNewSitePrice(channelId) {
this.oilSitePriceDetailsVo = []
oilSiteApi.getNewSitePrice(channelId).then(res => {
console.log('getNewSitePrice ++++= ', res)
if (res.code == 20000) {
this.radio = 0
this.plateNumbers = res.data.plateNumbers
@@ -1385,7 +1355,6 @@
pickPlate(e) {
this.plateIndex = e.detail.value
this.plateNumber = this.plateNumberSel
console.log(this.plateIndex, this.plateNumber)
},
showOrderMsg() {
this.showOrder = 'show'
@@ -1403,7 +1372,6 @@
}
},
ChooseBar(e) {
console.log(e)
let items = this.checkBar;
let values = e.value;
this.oilBar = values
@@ -1416,7 +1384,6 @@
}
},
changePrice(e) {
console.log(e)
this.radio = e.detail.value
this.ty.realMoney = null
this.tyRes.liter = 0
@@ -1424,12 +1391,9 @@
this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
this.realMoney = '--'
this.xoilAmountGun = ''
// // console.log(this.radio)
// // console.log(this.oilSitePriceDetailsVo[this.radio])
},
tabSelect(e) {
this.activeChannelCode = e.currentTarget.dataset.channelCode;
// console.log('ty activeChannelCode', this.activeChannelCode)
this.activeCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
}
@@ -1437,9 +1401,7 @@
filters: {
moneyIntercept(value) {
if (value != 'xxx.x') {
console.log(value)
let valus = (parseInt(value * 100) / 100).toFixed(2)
console.log(valus)
return valus
} else {
return value
@@ -1479,18 +1441,6 @@
}
},
moneyFormat(value) {
console.log(value)
// if (value != 'xxx.x') {
// console.log('old:',value)
// let realAmount = Math.floor(value * 100) / 100
// console.log('new:',realAmount)
// return realAmount
// } else {
// // console.log('old:',value)
// let realAmount = Math.floor(value * 100) / 100
// // console.log('new:',realAmount)
// return realAmount
// }
if (value != 'xxx.x') {
let realAmount = (parseInt(value * 100) / 100).toFixed(2)
return realAmount

138
BagStation/pages/makeOrder/JXPayResult.vue Normal file
View File

@@ -0,0 +1,138 @@
<template>
<view>
<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
<block slot="backText">返回</block>
<block slot="content">支付结果</block>
</cu-custom>
<view style="background-color: #F9F9F9;height: calc(100vh - 140rpx);">
<view style="text-align: center;font-size: 28rpx;color: #000000;opacity: 0.49;margin-top: 20rpx;">
请告知加油员使用江投能源支付
</view>
<view style="text-align: center;margin: 60rpx 0;">
<image src="https://xoil-public.oss-cn-beijing.aliyuncs.com/miniProgram/xingyou/jt-logo.png"
style="width: 220rpx;height: 160rpx;"></image>
</view>
<view style="text-align: center;color: #000000;font-weight: bold;">
<view style="font-size: 64rpx;">-{{order.xoilAmountGun |moneyFormat}}</view>
<view style="font-size: 40rpx;" v-if="status=='success'">交易成功</view>
<view style="font-size: 40rpx;color: #FF0000;" v-if="status!='success'">交易失败</view>
</view>
<view style="margin-top: 100rpx;padding: 0 30rpx;font-size: 28rpx; font-weight: bold;">
<view style="background-color: #fff;border-radius: 20rpx;">
<view class="padding-tb-xs text-left paddingLR">
订单号
<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}}</text>
</view>
<view class="padding-tb-xs text-left paddingLR">
油品类型
<text class="fr">
{{order.oilsCode?order.oilsCode+' ':''}}
<!-- <text>{{order.oilProductType=="DIESEL"?'柴油':order.oilProductType=="PETROL"?'汽油':order.oilProductType=="GAS"?'天然汽':''}}</text> -->
<text v-if="order.oilsBar">({{order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}})</text>
</text>
</view>
<view class="padding-tb-xs text-left paddingLR">
加油升数
<text class="fr">{{order.volume?order.volume :'未输入' | moneyFormath}} L</text>
</view>
<view class="padding-tb-xs text-left paddingLR">
单价
<text class="fr">{{order.sitePrice?order.sitePrice :'' | moneyFormath}} 元/L</text>
</view>
<view class="padding-tb-xs text-left paddingLR">
加油金额
<text class="fr" style="color: #FF0000;">￥{{order.xoilAmountGun |moneyFormat}}</text>
</view>
</view>
</view>
<view style="display: flex;margin-top: 60rpx;">
<button class="btnJX" @tap="backToOrderList">查看订单</button>
<button class="btnJX" @tap="backToIndex">返回首页</button>
</view>
</view>
</view>
</template>
<script>
import toilApi from '@/api/toil.js'
import oilSiteApi from '@/api/oil-site.js'
export default {
data() {
const now = new Date()
return {
status: "",
textstatus: '正在支付中',
status: 'fail',
order: uni.getStorageSync('orderMade')
}
},
onLoad(option) {
let _that = this
if (option.status == 'success') {
if (option.status == 'success') {
this.textstatus = '支付成功'
this.status = option.status
} else {
this.textstatus = '支付失败'
this.status = option.status
}
return
}
if (option.status == 'fail') {
this.textstatus = '支付失败'
this.status = option.status
return
}
},
methods: {
backToOrderList() {
uni.redirectTo({
url: `/BagStation/orderDetail/orderDetail?id=${this.order.orderSerialNumber}`
})
},
backToIndex() {
uni.switchTab({
url: '/pages/tabbar/home/home'
})
}
},
filters: {
moneyFormath(value) {
if (value != 'xxx.x') {
let number = value.toFixed(2)
return number
} else {
return value
}
},
moneyFormat(value) {
if (value != 'xxx.x') {
let realAmount = (parseInt(value * 100) / 100).toFixed(2)
return realAmount
} else {
return value
}
},
},
}
</script>
<style>
.btnJX {
width: 180rpx;
height: 60rpx;
border-radius: 20rpx;
background-color: #2E53B2;
color: #fff;
font-size: 32rpx;
line-height: 60rpx;
padding: 2rpx;
}
.paddingLR{
padding: 20rpx 40rpx;
}
</style>

54
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -286,10 +286,12 @@
type: '',
ureaCompanyOtherList: [],
companyNature: '',
shareCompanyQuota: ''
shareCompanyQuota: '',
secondChannelCode: ''
}
},
onLoad(option) {
if (option.type == 'urea') {
this.order = uni.getStorageSync('ureaOrderMade')
this.order.companyStatus = true
@@ -297,13 +299,12 @@
this.findUreaAccount()
} else {
let oilItem = uni.getStorageSync('oilItem')
// console.log
this.order = uni.getStorageSync('orderMade')
this.type = 'oil'
this.showtitles = oilItem.listTag
this.secondChannelCode = oilItem.secondChannelCode
if (option.payMethod == null) {
this.payMethod = oilItem.payMethod
// console.log(this.payMethod )
} else {
this.payMethod = option.payMethod
}
@@ -312,7 +313,7 @@
computed: {
companyList() {
if (this.isCompany) {
let companyAccounts = this.order.companyAccounts || []
let companyAccounts = this.order.companyAccounts || []
let filterData = companyAccounts.filter(item => item.companyType != 5)
return filterData
}
@@ -320,9 +321,9 @@
companyOtherList() {
if (this.isCompany) {
// return this.order.otherAccounts
let otherAccounts = this.order.otherAccounts || []
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
}
}
@@ -356,7 +357,9 @@
for (let value of map.values()) {
values.push(value)
}
values.sort((a,b)=>{return a - b})
values.sort((a, b) => {
return a - b
})
values.reverse()
values.forEach(value => {
keys.forEach(key => {
@@ -376,12 +379,10 @@
})
},
hidenPopup(e) {
console.log(e)
this.PopupShow = e
},
findUreaAccount() {
ureaFinanceApi.findUreaAccount(this.order.driverId).then(res => {
console.log(res)
this.ureaCompanyOtherList = res.data
})
},
@@ -392,9 +393,7 @@
return timestampDeadline
},
ureaCancelOrder(id) {
console.log(id)
ureaFinanceApi.cancelTheOrder(id).then(res => {
console.log(res)
if (res.code == 20000) {
uni.showToast({
title: res.msg,
@@ -442,7 +441,6 @@
this.shareCompanyQuota = card.shareCompanyQuota
},
selectCompanyCard(card) {
console.log(card)
this.card = card
this.checked = card.accountCardCode
this.accountCardCode = card.accountCardCode
@@ -487,7 +485,6 @@
// this.getPayStatus(this.outTradeNo)
// this.getLastMoney()
// this.getCards()
// console.log('success:' + JSON.stringify(res));
uni.showToast({
title: res.msg
})
@@ -531,7 +528,6 @@
return false
}
if (this.card.balance < this.order.realAmount && this.card.shareCompanyQuota != 1) {
console.log(this.type)
if (this.type == 'urea') {
this.PopupShow = true
this.PopupType = 2
@@ -564,13 +560,23 @@
title: res.msg
})
setTimeout(() => {
uni.redirectTo({
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
this.payMethod,
fail: (err) => {
// console.log(err)
}
})
if (this.secondChannelCode == 'JX_INVEST') {
uni.redirectTo({
url: '/BagStation/pages/makeOrder/JXPayResult?status=success&&payMethod=' +
this.payMethod,
fail: (err) => {
// console.log(err)
}
})
} else {
uni.redirectTo({
url: '/BagStation/pages/makeOrder/payResult?status=success&&payMethod=' +
this.payMethod,
fail: (err) => {
// console.log(err)
}
}) }
}, 1000)
} else {
@@ -585,6 +591,7 @@
url: `/BagStation/pages/makeOrder/payResult?status=fail&&errMsg=${msg}payMethod=` +
this.payMethod
})
}, 1000)
}
@@ -605,7 +612,6 @@
companyShared: this.shareCompanyQuota
}
ureaFinanceApi.orderPay(payData).then(res => {
console.log(res)
if (res.code == 20000) {
uni.setStorageSync('ureaOrderMade', res.data)
if (res.data.formats == '2') {
@@ -623,7 +629,6 @@
_that.PopupType = 2
this.isdisabled = false
}
console.log(res)
})
}
},
@@ -648,7 +653,6 @@
}
},
moneyFormath(value) {
console.log(value)
if (value != 'xxx.x') {
let number = value.toFixed(2)
return number
@@ -715,4 +719,4 @@
position: fixed;
bottom: 0;
}
</style>
</style>