diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js index d30e6dafc..cdfca48e2 100644 --- a/gasStation-uni/config.js +++ b/gasStation-uni/config.js @@ -2,11 +2,9 @@ module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', - // baseUrl: 'http://192.168.0.196:8081/', - baseUrl: 'http://192.168.1.6:8008/', - + baseUrl: 'http://192.168.0.196:8080/', + // baseUrl: 'http://192.168.1.6:8008/', // baseUrl: 'http://192.168.1.5:8002/cdJdc', - imagesUrl: 'http://www.nuoyunr.com/lananRsc', // 应用信息 appInfo: { diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index c42cd2634..4d6b9945f 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -83,7 +83,7 @@ 我的服务 - + @@ -177,6 +177,11 @@ url: '/pagesMy/myorder/myorder?id=' + id }) }, + goReder() { + uni.navigateTo({ + url: '/pagesHome/RechargeRecords/RechargeRecords' + }) + }, gotodaby() { uni.navigateTo({ url: '/pagesMy/today/today' diff --git a/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue index 54773dfc6..e712ca14d 100644 --- a/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue +++ b/gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue @@ -3,21 +3,78 @@ - 充值记录 + 兑换记录 + + + + {{item.recordName}} + 充值成功 + + + 充值金额 + ¥{{item.rechargeBalance}} + + + + 优惠合计 + ¥{{item.obtain}} + + + 所得升数 + {{item.obtain}} + + + 订单时间 + {{item.createTime}} + + + + + + + + @@ -37,11 +124,12 @@ \ No newline at end of file diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 2ab39315f..7000d11ac 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -321,7 +321,7 @@ }, goRechargeRecords() { uni.navigateTo({ - url: '/pagesMy/Recharge/Recharge' + url: '/pagesHome/RechargeRecords/RechargeRecords' }) }, //获取本店员工列表 @@ -514,4 +514,4 @@ width: 20%; } - + \ No newline at end of file diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index 361d1c21f..12492bb56 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -1,520 +1,324 @@ - \ No newline at end of file +.an-title { + font-size: 16px; + font-weight: bold; + color: #333333; + margin-left: 5px; +} +