dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
齐天大圣 2024-05-30 16:09:39 +08:00
parent 350570a56c
commit 6ed397b99b
11 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -59,7 +59,7 @@
</div>
<!-- <div class="center-left-hj" v-show="isMember">-->
<!-- <div>-->
<!-- 储值卡-->
<!-- 电子储值卡-->
<!-- <span>（账户余额：{{ balance }}元）</span>-->
<!-- </div>-->
<!-- <div>-￥{{ allAmout }}</div>-->

4
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -254,7 +254,7 @@
<div>
<el-input placeholder="请输入退款原因" v-model="refundRemark"></el-input>
<br/>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogRefund = false">取 消</el-button>
@ -541,7 +541,7 @@ export default {
'UNIONPAY': '银联二维码',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡',
'balance': '电子储值卡',
'0': '兑换卷核销'
};
let payTypeText = payTypeMap[this.goods.payType] || '小程序码';

4
fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
View File

@ -64,7 +64,7 @@
<!-- <el-table-column label="余额">-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="储值卡"-->
<!-- label="电子储值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
@ -182,7 +182,7 @@
<!-- <el-table-column label="余额">-->
<!-- <el-table-column-->
<!-- prop="name"-->
<!-- label="储值卡"-->
<!-- label="电子储值卡"-->
<!-- width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->

18
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -42,8 +42,8 @@
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
<el-option label="囤油卡" value="oilCard"/>
<el-option label="储值卡" value="balance"/>
<el-option label="电子囤油卡" value="oilCard"/>
<el-option label="电子电子储值卡" value="balance"/>
</el-select>
</el-form-item>
<el-form-item label="手机号">
@ -198,14 +198,14 @@
</el-table-column>
<el-table-column label="付款信息" align="center">
<el-table-column prop="payAmount" label="实付金额" align="center"> </el-table-column>
<el-table-column prop="balanceAmount" label="储值卡付款金额" align="center" width="115"/>
<el-table-column prop="balanceAmount" label="电子储值卡付款金额" align="center" width="115"/>
<!-- <el-table-column prop="oilCardAmount" label="囤油卡付款升数" align="center" width="115"/>-->
<el-table-column prop="payUser" label="付款用户" align="center" width="110"> </el-table-column>
<el-table-column prop="payType" label="付款方式" align="center">
<template slot-scope="scope">
<span>{{getType(payList,scope.row.payType)}}</span>
<span v-if="scope.row.payType=='oilCard'">囤油卡</span>
<span v-if="scope.row.payType=='balance'">储值卡</span>
<span v-if="scope.row.payType=='balance'">电子储值卡</span>
<span v-if="scope.row.payType=='credit'">挂账</span>
</template>
</el-table-column>
@ -287,7 +287,7 @@
<div>
<el-input placeholder="请输入退款原因" v-model="refundRemark"></el-input>
<br/>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogRefund = false">取 消</el-button>
@ -309,7 +309,7 @@
<div v-else-if="oilOrder.payType == 'WECHAT'">微信</div>
<div v-else-if="oilOrder.payType == 'ALIPAY'">支付宝</div>
<div v-else-if="oilOrder.payType == 'UNIONPAY'">银联二维码</div>
<div v-else-if="oilOrder.payType == 'balance'">储值卡</div>
<div v-else-if="oilOrder.payType == 'balance'">电子储值卡</div>
<div v-else-if="oilOrder.payType == 'oilCard'">囤油卡</div>
<div v-else>小程序码</div>
</div>
@ -322,7 +322,7 @@
<div>￥{{ oilOrder.discountAmount }}</div>
</div>
<div class="input-box" v-if="oilOrder.balanceAmount>0">
<div>储值卡付款金额</div>
<div>电子储值卡付款金额</div>
<div>￥{{ oilOrder.balanceAmount }}</div>
</div>
<!-- <div class="input-box" v-if="oilOrder.oilCardAmount>0">-->
@ -534,7 +534,7 @@
'UNIONPAY': '银联二维码',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡'
'balance': '电子储值卡'
};
let payTypeText = payTypeMap[this.oilOrder.payType] || '小程序码';
@ -550,7 +550,7 @@
creditAmount: "",//挂账金额
// 优惠合计
discount:this.oilOrder.discountAmount, // 油惠合计
// 储值卡付款
// 电子储值卡付款
consumeAmount:this.oilOrder.balanceAmount,
// 屯油卡付款
consumeRefuelMoney:this.oilOrder.oilCardAmount,

6
fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
View File

@ -114,7 +114,7 @@
</el-table-column>
<el-table-column label="付款信息" align="center">
<el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
<el-table-column prop="payAmount" label="储值卡或囤油卡付款金额" align="center" width="120">
<el-table-column prop="payAmount" label="电子储值卡或囤油卡付款金额" align="center" width="120">
<template slot-scope="props">
<span v-if="props.row.orderAmount - props.row.discountAmount - props.row.payAmount>0 && props.row.userId && props.row.orderStatus=='paid'">{{ (props.row.orderAmount - props.row.discountAmount - props.row.payAmount).toFixed(2) || 0 }}</span>
<span v-else>0</span>
@ -205,7 +205,7 @@
<div>
<el-input placeholder="请输入密码" v-model="password"></el-input>
<br/>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogRefund = false">取 消</el-button>
@ -238,7 +238,7 @@
<div>￥{{ oilOrder.discountAmount }}</div>
</div>
<div class="input-box" v-if="oilOrder.userId && oilOrder.orderStatus=='paid' &&(oilOrder.orderAmount - oilOrder.discountAmount - oilOrder.payAmount)>0">
<div>储值卡或囤油卡付款</div>
<div>电子储值卡或囤油卡付款</div>
<div>￥{{ (oilOrder.orderAmount - oilOrder.discountAmount - oilOrder.payAmount).toFixed(2) }}</div>
</div>
<div class="input-box">

8
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -151,8 +151,8 @@
<el-table-column prop="mobile" label="会员手机号" align="center"> </el-table-column>
<el-table-column prop="bidBalance" label="到账金额" align="center"> </el-table-column>
<el-table-column prop="amount" label="自定义充值金额" align="center"> </el-table-column>
<el-table-column prop="rechargeBalance" label="储值卡实售金额" align="center"> </el-table-column>
<el-table-column prop="giftBalance" label="储值卡赠送金额" align="center"></el-table-column>
<el-table-column prop="rechargeBalance" label="电子储值卡实售金额" align="center"> </el-table-column>
<el-table-column prop="giftBalance" label="电子储值卡赠送金额" align="center"></el-table-column>
<el-table-column prop="paymentType" label="支付方式" align="center">
<template slot-scope="scope">
<span>{{getType(payList,scope.row.paymentType)}}</span>
@ -230,7 +230,7 @@
<div>
<el-input placeholder="请输入密码" v-model="password" show-password></el-input>
<br/>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogRefund = false">取 消</el-button>
@ -472,7 +472,7 @@ export default {
'UNIONPAY': '银联二维码',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡'
'balance': '电子储值卡'
};
let payTypeText = payTypeMap[this.oilOrder.paymentType]
// let actualPay = this.cardValueForm.paymentType == 'CASH' ? this.authCode:this.realyPayBills

3
fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
View File

@ -201,7 +201,7 @@
<span>{{ scope.row.gradeId ? getName(userGradeList, scope.row.gradeId) : '-' }}</span>
</template>
</el-table-column>
<el-table-column label="储值卡" align="center" prop="cardBalance">
<el-table-column label="电子储值卡" align="center" prop="cardBalance">
<template slot-scope="scope">
<div>{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}</div>
</template>
@ -561,6 +561,7 @@
gradeId: [{ required: true, message: "会员等级", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入手机号", trigger: "blur" },
{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }
],
status: [{ required: true, message: "请选择会员状态", trigger: "blur" }],
},

32
fuintCashierWeb/src/views/details/index.vue
View File

@ -135,7 +135,7 @@
<el-tab-pane label="商品订单" name="shopOrder">
<goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
</el-tab-pane>
<el-tab-pane label="余额记录（储值卡/囤油卡消费、充值记录）" name="balanceRecord">
<el-tab-pane label="余额记录（电子储值卡/囤油卡消费、充值记录）" name="balanceRecord">
<balanceRecord :key="childComponentKey" :pUserId="form.id"></balanceRecord>
</el-tab-pane>
<el-tab-pane label="积分记录" name="pointRecord">
@ -366,7 +366,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="礼品卡兑换电子储值卡余额" name="giftCard">
<el-tab-pane label="礼品卡兑换电子电子储值卡余额" name="giftCard">
<el-form ref="form2" :model="form2" :rules="rules1" label-width="120px">
<el-row>
<el-col :span="24">
@ -550,7 +550,7 @@
<el-table-column prop="date" label="账户ID"/>
<el-table-column prop="date" label="账户名称"/>
<el-table-column label="余额">
<el-table-column prop="name" label="储值卡"/>
<el-table-column prop="name" label="电子储值卡"/>
<el-table-column prop="address" label="升数卡"/>
</el-table-column>
<el-table-column label="会员等级">
@ -961,12 +961,12 @@ export default {
// 充值余额列表
cardValueList: [],
cardValueForm: {
cardValueId: '', // 储值卡id
cardValueId: '', // 电子储值卡id
mtStaffId: '', //
realName: '',
staffMobile: '',
amount: '', // 自定义充值字段
bidBalance: '', // 储值卡面值
bidBalance: '', // 电子储值卡面值
rechargeBalance: '', // 实际支付
giftBalance: '',// 赠送金额
points: '', //赠送积分
@ -980,7 +980,7 @@ export default {
rechargeType: '0'
},
// 存油卡列表
// 电子囤油卡列表
cardFuelDieselList: [],
sourceCardFuelDieselList: [],
cardFuelDieselForm: {
@ -1278,7 +1278,7 @@ export default {
this.openLevel = true;
this.title = '固定等级(原专车认证)'
},
// 储值卡查询
// 电子储值卡查询
async getCardValueList() {
let quy = {
pageNo: 1,
@ -1387,7 +1387,7 @@ export default {
}
})
},
// 存油卡查询
// 电子囤油卡查询
async getCardFuelDieselList() {
let quy = {
pageNo: 1,
@ -1433,7 +1433,7 @@ export default {
this.cardValueForm.realName = ''
this.cardValueForm.staffMobile = ''
},
// 查询参加存油卡油品
// 查询参加电子囤油卡油品
getCountOilType() {
getCountOilTypeApi().then(res => {
this.oilTypeList = res.data
@ -1444,7 +1444,7 @@ export default {
}
})
},
// 根据油品过滤查询存油卡
// 根据油品过滤查询电子囤油卡
async tabOilTypeClick(data) {
// console.log("aaaaaaaaaaaaaa",data)
await this.getCardFuelDieselList()
@ -1474,7 +1474,7 @@ export default {
this.openRecharge = true;
this.title = '会员充值'
// 存油卡列表
// 电子囤油卡列表
},
// 确认充值
async confirm(flag) {
@ -2019,12 +2019,12 @@ export default {
iniz() {
this.cardValueForm = {
cardValueId: '', // 储值卡id
cardValueId: '', // 电子储值卡id
mtStaffId: '', //
realName: '',
staffMobile: '',
amount: '', // 自定义充值字段
bidBalance: '', // 储值卡面值
bidBalance: '', // 电子储值卡面值
rechargeBalance: '', // 实际支付
giftBalance: '',// 赠送金额
points: '', //赠送积分
@ -2117,7 +2117,7 @@ export default {
goBack() {
this.$router.back(-1);
},
// 积分表、储值卡详情表、积分详情表、储值卡表、储值卡模板表、用户储值卡关联表、
// 积分表、电子储值卡详情表、积分详情表、电子储值卡表、电子储值卡模板表、用户电子储值卡关联表、
cardValueReport() {
// 支付方式
@ -2128,7 +2128,7 @@ export default {
'UNIONPAY': '银联二维码',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡'
'balance': '电子储值卡'
};
let payTypeText = payTypeMap[this.cardValueForm.paymentType]
let actualPay = this.cardValueForm.paymentType == 'CASH' ? this.authCode:this.realyPayBills
@ -2190,7 +2190,7 @@ export default {
'UNIONPAY': '银联二维码',
'credit': '挂账',
'oilCard': '囤油卡',
'balance': '储值卡'
'balance': '电子储值卡'
};
let payTypeText = payTypeMap[this.cardFuelDieselForm.paymentType]

2
fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<el-radio-group v-model="tabPosition" size="mini" style="margin-bottom: 30px;" @click="changeCard">
<el-radio-button label="giftCard">储值卡记录</el-radio-button>
<el-radio-button label="giftCard">电子储值卡记录</el-radio-button>
<el-radio-button label="literCard">囤油卡记录</el-radio-button>
</el-radio-group>
<div v-if="tabPosition=='giftCard'">

4
fuintCashierWeb/src/views/details/userInfoOrder/oilOrder.vue
View File

@ -18,7 +18,7 @@
<el-table-column label="订单金额" align="center" prop="orderAmount"/>
<el-table-column label="优惠金额" align="center" prop="discountAmount"/>
<el-table-column label="储值卡消费金额" align="center" prop="balanceAmount"/>
<el-table-column label="电子储值卡消费金额" align="center" prop="balanceAmount"/>
<el-table-column label="囤油卡消费升数" align="center" prop="oilCardAmount"/>
<el-table-column label="实付金额" align="center" prop="payAmount"/>
<el-table-column label="付款类型" align="center" prop="payType">
@ -27,7 +27,7 @@
<span v-else-if="scope.row.payType == 'WECHAT'">微信</span>
<span v-else-if="scope.row.payType == 'ALIPAY'">支付宝</span>
<span v-else-if="scope.row.payType == 'UNIONPAY'">银联二维码</span>
<div v-else-if="scope.row.payType == 'balance'">储值卡</div>
<div v-else-if="scope.row.payType == 'balance'">电子储值卡</div>
<div v-else-if="scope.row.payType == 'oilCard'">囤油卡</div>
<span v-else>小程序码</span>
<!-- <span>{{getName(payTypeList,scope.row.payType)}}</span>-->

65
pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
View File

@ -108,7 +108,7 @@
</view>
</view>
<view class="bottom-b"></view>
<view class="p-bottom" @click="govipjs()">
<view class="p-bottom" @click="scanQrcode()">
<view class="anniu">
确认支付
</view>
@ -172,9 +172,11 @@
},
methods: {
// 自定义金额
custom(val) {
this.order.amount = val
custom() {
console.log(this.value);
this.order.amount = this.value
this.realyPayBills = this.order.amount
this.order.rechargeBalance = this.order.amount
},
// 获取充值金额列表
getRechargeAmount() {
@ -187,6 +189,11 @@
}
}).then((res) => {
this.numList = res.data.records
this.order.amount = this.numList.rechargeBalance
this.order.rechargeBalance = this.numList.rechargeBalance
this.order.points = this.numList.points
this.realyPayBills = this.numList.rechargeBalance
})
},
getmemberId(num, payType) {
@ -207,13 +214,18 @@
url: "/pagesHome/searchVip/searchVip?type=1"
})
},
getindex(index,data) {
getindex(index, data) {
this.listindex = index
if (data){
if (data) {
this.order.amount = data.rechargeBalance
this.order.rechargeBalance = data.rechargeBalance
this.order.points = data.points
this.realyPayBills = data.rechargeBalance
this.order.rechargeBalance = data.rechargeBalance
} else {
this.order.amount = this.value
this.realyPayBills = this.value
this.order.rechargeBalance = this.value
}
},
// 二维码
@ -223,25 +235,32 @@
title: "请先选择会员",
icon: "none"
})
return;
}
if (!this.order.amount){
if (!this.order.amount) {
uni.showToast({
title:"请先选择充值金额",
icon:"none"
title: "请先选择充值金额",
icon: "none"
})
return;
}
if (this.order.paymentType == "CASH") {
this.authCode = this.order.amount
this.govipjs()
} else {
let _this = this
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
_this.authCode = res.result
_this.govipjs()
},
error: (res) => {
console.log('扫描二维码出现错误')
}
})
}
let _this = this
uni.scanCode({
onlyFromCamera: true,
success: (res) => {
console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
_this.authCode = res.result
_this.govipjs()
},
error: (res) => {
console.log('扫描二维码出现错误')
}
})
},
govipjs() {
let actualPayment = 0
@ -254,17 +273,17 @@
this.order.authCode = this.authCode
this.order.realyPayBills = this.realyPayBills
this.order.actualPayment = actualPayment
request({
url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp',
method: 'post',
data:this.order
data: this.order
}).then((res) => {
// uni.navigateTo({
// url: '/pagesHome/PaymentResults/PaymentResults'
// })
})
},
goback() {
uni.navigateBack()