diff --git a/fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue b/fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue
index 61075827b..32e83cbab 100644
--- a/fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue
+++ b/fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue
@@ -100,7 +100,7 @@
-
+
diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue
index 22eb00808..aea8868fe 100644
--- a/gasStation-uni/pagesHome/MyCard/MyCard.vue
+++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue
@@ -1,6 +1,6 @@
-
+
储值卡
@@ -17,10 +17,10 @@
NO.xxxxxxxxxxxxxxxxxx
-->
-
+
囤油卡
-
+
汽油92# 7.28元/L
@@ -94,9 +94,9 @@
url: '/pagesHome/oilRecharge/oilRecharge?id=' + id
})
},
- goDetails() {
+ goDetails(val) {
uni.navigateTo({
- url: '/pagesHome/cardDetails/index'
+ url: '/pagesHome/cardDetails/index?type='+val
})
},
s_() {
diff --git a/gasStation-uni/pagesHome/cardDetails/detailed.vue b/gasStation-uni/pagesHome/cardDetails/detailed.vue
index 69f245d88..be9b6276a 100644
--- a/gasStation-uni/pagesHome/cardDetails/detailed.vue
+++ b/gasStation-uni/pagesHome/cardDetails/detailed.vue
@@ -1,60 +1,78 @@
-
+
储值卡
当前余额（元）
{{cardBalance.cardBalance || 0}}
+
+ 囤油卡
+ 剩余升数（L）
+ {{cardBalance.cardBalance || 0}}
+
类型筛选
全部时间
-
-
-
-
-
-
-
- 会员消费
- 会员充值
- {{item.giveBalance ? (item.balance + item.giveBalance) : item.balance}}
+
+
+
+
+
+
+
+
+
+ 会员消费
+ 会员充值
+ {{item.giveBalance ? (item.balance + item.giveBalance) : item.balance}}
+
+
+
+ 储值卡
+ 余额{{item.afterTheChange || 0}}
+
+
+ {{item.storeName}}
+ {{item.createTime}}
-
- 储值卡
- 余额{{item.afterTheChange}}
-
-
- {{item.storeName}}
- {{item.createTime}}
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ 会员消费
+ 会员充值
+ {{item.balance || 0}}
+
+
+
+ 囤油卡
+ 余额{{item.afterTheChange || 0}}
+
+
+ {{item.storeName}}
+ {{item.createTime}}
+
+
+
+
+
+
+
-
@@ -67,6 +85,7 @@
export default {
data() {
return {
+ type: "balance",
query: {
chainStoreId: '',
couponType: '',
@@ -86,37 +105,72 @@
pageSize: 30,
storeId: uni.getStorageSync('storeId'),
changeType: '',
- startTime: ''
+ startTime: '',
+ createTime: ''
},
orderList: [],
- total: 0
+ total: 0,
+ oilCardList: []
+ }
+ },
+ onLoad(e) {
+ this.type = e.type
+ if (this.type == 'oilCard') {
+ this.getOilCardList()
+ } else {
+ this.getOrderList()
}
},
onShow() {
this.query.chainStoreId = uni.getStorageSync('chainStoreId');
this.getUserBalance()
- this.getOrderList()
},
onPullDownRefresh() {
console.log("刷新");
this.orderList = []
+ this.oilCardList = []
this.queryParams = {
pageNo: 1,
pageSize: 30,
storeId: uni.getStorageSync('storeId'),
changeType: '',
- startTime: ''
+ startTime: '',
+ createTime: ''
}
- this.getOrderList()
- },
- onReachBottom() {
- // 触底加载
- if (this.orderList.length < this.total) {
- this.queryParams.pageNo++
+ if (this.type == 'oilCard') {
+ this.getOilCardList()
+ } else {
this.getOrderList()
}
},
+ onReachBottom() {
+ // 触底加载
+ if (this.type == 'oilCard') {
+ if (this.oilCardList.length < this.total) {
+ this.queryParams.pageNo++
+ this.getOilCardList()
+ }
+ } else {
+ if (this.orderList.length < this.total) {
+ this.queryParams.pageNo++
+ this.getOrderList()
+ }
+ }
+ },
methods: {
+ getOilCardList() {
+ request({
+ url: '/business/marketingActivity/cardFuelChange/queryByPageUni',
+ method: 'get',
+ params: this.queryParams
+ }).then(res => {
+ if (res.code == 200) {
+ this.oilCardList = res.data.records
+ this.total = res.data.total
+ console.log(res, 130);
+ }
+ })
+ },
// 获取订单信息
getOrderList() {
request({
@@ -127,7 +181,6 @@
if (res.code == 200) {
this.orderList = res.data.records
this.total = res.data.total
- console.log(res,130);
}
})
},
@@ -152,7 +205,11 @@
} else {
this.queryParams.changeType = ""
}
- this.getOrderList()
+ if (this.type == 'oilCard') {
+ this.getOilCardList()
+ } else {
+ this.getOrderList()
+ }
this.show1 = false
},
cancel() {
@@ -165,12 +222,16 @@
const dateString = date.toLocaleDateString()
const timeString = date.toLocaleTimeString();
// 返回日期和时间的组合
- return date.getFullYear() + '-' + (date.getMonth()+1);
+ return date.getFullYear() + '-' + (date.getMonth() + 1);
},
confirm1(e) {
this.queryParams.startTime = this.timestampToString(e.value)
this.queryParams.pageNo = 1
- this.getOrderList()
+ if (this.type == 'oilCard') {
+ this.getOilCardList()
+ } else {
+ this.getOrderList()
+ }
this.show = false
},
cancel1() {
diff --git a/gasStation-uni/pagesHome/cardDetails/index.vue b/gasStation-uni/pagesHome/cardDetails/index.vue
index 6bfaa9fe7..9470c87c3 100644
--- a/gasStation-uni/pagesHome/cardDetails/index.vue
+++ b/gasStation-uni/pagesHome/cardDetails/index.vue
@@ -1,61 +1,63 @@
-
-
-
-
- 储值卡
- 主卡
-
-
-
- 可用余额
- ¥{{cardBalance.cardBalance || 0}}
-
-
- ¥{{cardBalance.cardBalance - cardBalance.giveAmount}}
- ¥{{cardBalance.cardBalance || 0}}
- 本金金额
-
-
- ¥{{cardBalance.giveAmount || 0}}
- 赠送金额
-
-
-
-
- 立即充值
-
-
-
-
-
- 余额明细
-
-
-
-
-
-
- 权益说明
-
-
-
-
-
-
- 规则说明
-
-
-
-
-
-
- 规则说明
-
-
-
- {{equity.gzDetail}}
-
+
+ {{equity.gzDetail}}
+
-
-
+
+
-
-
-
-
- 权益说明
-
-
-
- {{equity.qyDetail}}
-
+
+ {{equity.qyDetail}}
+
-
-
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/memberRecharge/index.vue b/gasStation-uni/pagesHome/memberRecharge/index.vue
index ed38c2330..88b4bf6c6 100644
--- a/gasStation-uni/pagesHome/memberRecharge/index.vue
+++ b/gasStation-uni/pagesHome/memberRecharge/index.vue
@@ -1,475 +1,488 @@
-
-
- 储值卡
- 当前余额（元）
- {{cardBalance.cardBalance || 0}}
-
-
- {{storeName || "--"}}
-
-
-
- 充值金额
-
-
-
- {{staff.realName || "--"}}
-
-
-
-
-
- 充{{item.rechargeBalance}}元
- 赠{{item.giftBalance}}元
-
-
- 自定义金额
-
-
-
- 赠送金额
-
-
-
-
-
- 充值备注
-
-
-
-
-
- 充值有礼
- {{item.discountActiveDescribe}}
-
-
- 充值规则
- 活动时间：{{describe[0].time}}
- 暂无规则
-
+
+
+ 储值卡
+ 当前余额（元）
+ {{cardBalance.cardBalance || 0}}
+
+
+ 囤油卡
+ 剩余油量（L）
+ {{cardBalance.cardBalance || 0}}
+
+
+ {{storeName || "--"}}
+
+
+
+ 充值金额
+
+
+
+ {{staff.realName || "--"}}
+
+
+
+
+
+ 充{{item.rechargeBalance}}元
+ 赠{{item.giftBalance}}元
+
+
+ 自定义金额
+
+
+
+ 赠送金额
+
+
+
+
+
+ 充值备注
+
+
+
+
+
+ 充值有礼
+ {{item.discountActiveDescribe}}
+
+
+ 充值规则
+ 活动时间：{{describe[0].time}}
+ 暂无规则
+
-
-
-
- 立即充值{{rechargeOrder.balance}}元
-
-
-
-
- 选择油站
-
-
-
-
-
- 测试A店
- 129.9km
-
+
+
+
+ 立即充值{{rechargeOrder.balance}}元
+
+
+
+
+ 选择油站
+
+
+
+
+
+ 测试A店
+ 129.9km
+
-
-
-
+
+
+
\ No newline at end of file