diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index 29d2a6a49..30919a922 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -49,6 +49,7 @@
"navigationStyle": "custom"
}
},
+
{
"path": "Address/Address",
"style": {
@@ -156,16 +157,18 @@
}
},
{
- "path": "integral/integral",
+ "path": "Coupons/Coupons",
"style": {
- "navigationBarTitleText": "我的积分",
+ "navigationBarTitleText": "设置",
"navigationStyle": "custom"
}
},
+
+
{
- "path": "Coupons/Coupons",
+ "path": "integral/integral",
"style": {
- "navigationBarTitleText": "我的券",
+ "navigationBarTitleText": "我的积分",
"navigationStyle": "custom"
}
},
diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue
index 4d6b9945f..541a26cfa 100644
--- a/gasStation-uni/pages/my/my.vue
+++ b/gasStation-uni/pages/my/my.vue
@@ -32,7 +32,7 @@
|
-
+
卡券
0
@@ -246,6 +246,11 @@
uni.navigateTo({
url: '/pagesMy/feedback/feedback'
})
+ },
+ toCoupons() {
+ uni.navigateTo({
+ url: '/pagesMy/Coupons/Coupons'
+ })
}
}
}
diff --git a/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue
index fc92dde23..effaa6ee3 100644
--- a/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue
+++ b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue
@@ -17,11 +17,11 @@
兑换卡号
- ¥{{item.number || "暂无"}}
+ {{item.number || "暂无"}}
兑换金额
- {{item.cardAmount || "暂无"}}元
+ ¥{{item.cardAmount || "暂无"}}元
订单时间
@@ -111,6 +111,17 @@
}
})
},
+ /*getGiftRecords() {
+ request({
+ url: '/business/marketingActivity/cardGift/selectAllRecords',
+ method: 'get',
+ }).then(res => {
+ console.log(res)
+ if (res.code == 200) {
+ this.list = res.data.records
+ }
+ })
+ },*/
}
}
@@ -241,4 +252,4 @@
font-size: 14px;
border-radius: 15px;
}
-
\ No newline at end of file
+
diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue
index cec8d6f9f..3628d867f 100644
--- a/gasStation-uni/pagesMy/Coupons/Coupons.vue
+++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue
@@ -57,9 +57,7 @@
list1: [{
name: '全部',
}, {
- name: '抵用券',
- }, {
- name: '折扣券'
+ name: '优惠券',
}, {
name: '兑换券'
}, {
@@ -224,4 +222,4 @@
background: #ecf5ff !important;
color: #8179ff;
}
-
\ No newline at end of file
+