+
@@ -240,6 +297,7 @@
background-color: #ffffff;
box-sizing: border-box;
padding: 10px;
+ margin-top: 10px;
}
.m-b-box {
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index e01ead1be..4fb855283 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -284,12 +284,12 @@
} else {
this.status = "no-more"
}
- if (this.balanceList.length < this.total1) {
- this.map1.page++;
- this.getBalanceOrder()
- } else {
- this.status = "no-more"
- }
+ // if (this.balanceList.length < this.total1) {
+ // this.map1.page++;
+ // this.getBalanceOrder()
+ // } else {
+ // this.status = "no-more"
+ // }
},
// 查询我的油品订单信息
getMyOrder() {
diff --git a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
index e6ebbd317..c0c6dc29d 100644
--- a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
+++ b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
@@ -17,16 +17,22 @@
已经抵用0.00
-->
-
+
-
+ 全部
+ -->
- 加油站名称
- 充值成功
+
+ {{getStoreName(storeList,item.storeId)}}
+ 已支付
+ 支付失败
+ 已退款
+ 退款中
+ 未支付
油品类型
@@ -48,9 +54,9 @@
订单时间
{{item.createTime}}
-
+
@@ -77,6 +83,8 @@
},
refuelMoney: [],
title: '',
+ // 店铺列表信息
+ storeList: [],
}
@@ -90,8 +98,32 @@
this.list = []
this.getAllOrderList();
this.getUserBalance()
+ this.getStores();
},
methods: {
+ // 查询店铺列表信息
+ getStores() {
+ let _this = this;
+ request({
+ url: "business/storeInformation/store/list",
+ method: 'get',
+ }).then((res) => {
+ _this.storeList = res.data
+ })
+ },
+ getStoreName(list, id) {
+ let name = "";
+ list.forEach(item => {
+ if (item.id == id) {
+ if (item.description != "" && item.description != null) {
+ name = item.name + "(" + item.description + ")"
+ } else {
+ name = item.name
+ }
+ }
+ })
+ return name;
+ },
// 查询全部充值订单
getAllOrderList() {
request({
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 80c2c0c70..5a0861071 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -252,7 +252,7 @@
},
onLoad(e) {
this.orderNo = e.orderNo
- // this.orderNo = "234520240124103747dec173"
+ // this.orderNo = "2345202401261502301206e6"
},
onShow() {
this.getOilOrder();
@@ -469,12 +469,14 @@
}
}
if (falg == false) {
- this.chooseCardBalance(0)
+ // this.chooseCardBalance(0)
// this.chooseGrade(this.user.id,this.user.gradeId)
}
if (this.oilCardRedece==0){
if (!this.isFixingLevel){
this.getPaymentPreferential(this.user.gradeId)
+ }else{
+ this.chooseCardBalance(0)
}
}
},
@@ -491,6 +493,7 @@
this.balanceRedece = this.user.cardBalance
this.deductAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece-this.balanceRedece).toFixed(2)
this.payAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece-this.balanceRedece).toFixed(2)
+ console.log(this.oilOrder.orderAmount, this.fullRedece, this.couponRedece, this.gradeRedece,this.balanceRedece,111);
}
}else{
// 使用囤油卡
@@ -511,6 +514,7 @@
}else{
this.deductAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece).toFixed(2)
this.payAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece).toFixed(2)
+ console.log(this.oilOrder.orderAmount, this.fullRedece, this.couponRedece, this.gradeRedece,this.balanceRedece,222);
}
},
// 查看是否有可使用的会员等级优惠
@@ -734,9 +738,11 @@
_this.refuelMoneyAfter = JSON.parse(res.data.userVo.refuelMoney)
_this.chooseRefuelMoney()
}else{
- _this.chooseCardBalance(0)
+
if (!this.isFixingLevel){
_this.getPaymentPreferential(this.user.gradeId)
+ }else{
+ _this.chooseCardBalance(0)
}
}
console.log("afterGrade");