实付款
￥0.00
@@ -1160,7 +1175,6 @@
import {getPaymentActive, selectCoupon, selectPreferential, usePaymentActive} from "@/api/cashier/preferential";
import {addHangBill} from "@/api/cashier/hangbill";
import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
- import {getSysConfig} from "@/api/staff/user/sysconfig";
import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder";
import {getLodop} from "@/api/LodopFuncs";
import {giftCardExchange} from "@/api/cashier/giftCard/giftcard";
@@ -1280,7 +1294,7 @@
// 账户余额
balance:0,
// 绑定金额数据
- amount:0,
+ amount:"",
// 找零金额
seekZero:0,
// 等待中
@@ -1346,7 +1360,7 @@
// 查询的商品信息
goods:"",
select:"元",
- form:{ amount : 0,exist:false },
+ form:{ amount : "",exist:false },
form1:{
amount:"",
},
@@ -1659,6 +1673,9 @@
}
})
},
+ inputAmount(){
+ this.$forceUpdate();
+ },
selectOilType(status, oilType) {
this.tabOilType = oilType;
// console.log("453",oilType)
@@ -2387,18 +2404,29 @@
this.consumeRefuelMoney = 0;
// this.hoardAmount = 0;
this.isOilStorageCard = false;
+ if (this.balance>0){
+ this.checkAll4 = true
+ this.payType = "balance"
+ }
}else {
- this.isOilStorageCard = true;
+ this.checkAll4 = false
+ this.payType = "oilCard"
+ // this.isOilStorageCard = true;
this.changeRefuelMoney()
}
this.isDefaultUseCard();
},
handleCheckAllChange4(val) {
if (val==false){
+ this.payType = "WECHAT"
this.countAmountUnBalance();
this.consumeAmount = 0;
this.isUseBalance = true;
}else {
+ this.checkAll3 = false
+ this.isOilStorageCard = false;
+ this.consumeRefuelMoney = 0;
+ this.payType = "balance"
this.countAmountFull();
this.isUseBalance = false;
}
@@ -2420,6 +2448,7 @@
this.couponAmount = 0
if (this.balance>0){
this.checkAll4 = true
+ this.payType = "balance"
}
}
this.countAmountFull();
@@ -2757,17 +2786,20 @@
// this.getCoupon();
// }
// }
- if (this.balance>0 && this.oilAmount>0){
+ if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
this.checkAll4 = true
+ this.payType = "balance"
this.countAmountFull()
}
await this.getGrade(this.member.id,this.member.gradeId)
- if (!this.isFixingLevel){
+ if (!this.isFixingLevel && !this.isOilStorageCard){
await this.getOilCoupon()
}
},
// 选择会员时商品总价的变化
goodsAllAmount(){
+ this.goodsDiscount = 0
+ this.goodsAmount = 0
this.goodsOrder.forEach(item => {
if (this.isMember){
// this.goodsAmount += +(item.memberPrice*item.num).toFixed(2);
@@ -2929,6 +2961,7 @@
// 满减互斥
_this.checkAll1 = false
_this.checkAll4 = true;
+ this.payType = "balance"
_this.fullReduction = 0
_this.isUseFull = true;
}else {
@@ -2949,6 +2982,7 @@
// 使用囤油卡 囤油卡不参与任何优惠
countOilCard(){
if (this.hoardAmount>0){
+ this.checkAll4 = true
if (this.balance!=0 && this.balance >= this.hoardAmount){
this.oilActualPay = 0
this.consumeAmount = this.hoardAmount
@@ -2960,7 +2994,6 @@
this.oilActualPay = 0
this.consumeAmount = 0
}
- console.log("囤油卡",this.isOilStorageCard,this.hoardAmount,this.balance,this.oilAmount,this.oilActualPay,this.consumeAmount)
},
// 不使用囤油卡
countAmountFull(){
@@ -3013,6 +3046,7 @@
isDefaultUseCard(){
if (this.isOilStorageCard){
this.checkAll3 = true;
+ this.payType = "oilCard"
this.checkAll1 = false;
this.fullReduction = 0;
this.checkAll2 = false;
@@ -3241,13 +3275,14 @@
this.dialogVisibleamount = false
this.form.oilType = this.oilNameID;
this.form.type = this.type;
+ let amount = this.form.amount || 0;
// 计算油的升数
if (this.select == "元"){
- let num = this.form.amount/(this.form.oilPrice ? this.form.oilPrice : 1)
+ let num = amount/(this.form.oilPrice ? this.form.oilPrice : 1)
this.form.liters = (Math.ceil(num*100)/100).toFixed(2)
}else {
- this.form.liters = this.form.amount
- this.form.amount = (this.form.oilPrice * this.form.amount).toFixed(2)
+ this.form.liters = amount
+ this.form.amount = (this.form.oilPrice * amount).toFixed(2)
}
// 校验油罐内油是否足够
@@ -3281,12 +3316,18 @@
// this.preferential();
// this.getCoupon();
// }
- if (this.balance>0){
+
+ if (this.refuelMoney){
+ // 使用囤油卡
+ await this.changeRefuelMoney();
+ }
+ if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
this.checkAll4 = true
+ this.payType = "balance"
this.countAmountFull()
}
await this.getGrade(this.member.id,this.member.gradeId)
- if (!this.isFixingLevel){
+ if (!this.isFixingLevel && !this.isOilStorageCard){
await this.getOilCoupon()
}
}
@@ -3310,19 +3351,21 @@
if (_this.refuelMoney){
for (let i = 0;i < _this.refuelMoney.length;i++){
// 囤油卡升数变化
- if (_this.refuelMoney[i].oilType==item.oilType && _this.refuelMoney[i].refuelMoney>0){
+ if (_this.refuelMoney[i].oilType==item.oilName && _this.refuelMoney[i].refuelMoney>0){
id = item.id
_this.isOilStorageCard = true
- if ((_this.refuelMoney[i].refuelMoney-item.liters)>=0){
+ if (_this.refuelMoney[i].refuelMoney >= item.liters){
conRefMon = item.liters
}else {
conRefMon = _this.refuelMoney[i].refuelMoney
// 扣除升数后需要消费的金额
hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
}
- }else {
- hoardAmount = item.amount
}
+ // }else {
+ // _this.$message.error(item.liters)
+ // hoardAmount = item.amount
+ // }
}
}
_this.consumeRefuelMoney += +conRefMon
@@ -3370,12 +3413,11 @@
// 改变加油金额
changeAmount(amount){
if (this.select == "元"){
- this.amount = amount.slice(1)
- this.form.amount = this.amount
+ this.form.amount = amount.slice(1)
}else {
- this.amount = amount.slice(0,3)
- this.form.amount = this.amount
+ this.form.amount = amount.slice(0,3)
}
+ this.$forceUpdate();
},
// 获取油号名称
getName(oilNameList,id){
@@ -3486,6 +3528,7 @@
// JSON.parse()
this.map.seekZero = this.seekZero;
this.map.oilAmount = this.oilAmount;
+ this.map.payType = this.payType;
this.map.goodsAmount = this.goodsAmount;
this.map.oilActualPay = this.oilActualPay;
this.map.goodsActualPay = this.goodsActualPay;
@@ -3846,6 +3889,7 @@
let num = 0;
let amount = 0;
let _this = this;
+ this.goodsDiscount = 0
goods.forEach(item => {
num += item.num
if (_this.isMember){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 4a3fb4c93..f4fb0a5e4 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -215,6 +215,8 @@
微信
支付宝
银联二维码
+
囤油卡
+
储值卡
小程序码
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 91725ec39..5935f4472 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -42,6 +42,8 @@
:label="item.dictLabel"
:value="item.dictValue">
+
+
@@ -189,6 +191,8 @@
{{getType(payList,scope.row.payType)}}
+ 囤油卡
+ 储值卡
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index ae29661db..d190b0b92 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -86,9 +86,9 @@
{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-
+
diff --git a/gasStation-uni/pagesMy/details/details.vue b/gasStation-uni/pagesMy/details/details.vue
index 4b4d3fdda..11ec0d023 100644
--- a/gasStation-uni/pagesMy/details/details.vue
+++ b/gasStation-uni/pagesMy/details/details.vue
@@ -45,12 +45,17 @@
{{oilOrder.payAmount}}元
- 储值卡或囤油卡消费金额
- {{(oilOrder.orderAmount - oilOrder.discountAmount - oilOrder.payAmount).toFixed(2)}}元
+ 储值卡付款金额
+ {{ oilOrder.balanceAmount }}元
-
+
+ 囤油卡付款升数
+ {{ oilOrder.oilCardAmount }}元
+
+ 优惠信息
+
- 优惠金额
+ 优惠合计金额
{{oilOrder.discountAmount}}元
@@ -59,7 +64,7 @@
交易时间
- {{oilOrder.payTime}}升
+ {{oilOrder.payTime}}
@@ -81,6 +86,10 @@
orderId:"",
oilOrder:{},
oilPrice:"",
+ // 优惠券信息
+ cardFavorable:{},
+ // 满减或折扣信息
+ fullOrDiscount:{},
}
},
onLoad(e) {
@@ -117,6 +126,16 @@
})
})
},
+ getCardFavorable(id){
+ if (id){
+ request({
+ url: "business/marketingActivity/cardFavorable/" + id,
+ method: 'get',
+ }).then((res) => {
+
+ })
+ }
+ },
gocomment() {
uni.navigateTo({
url: '/pagesMy/comment/comment?orderId=' + this.orderId