diff --git a/common/js/api.js b/common/js/api.js index d891428..9d8e254 100644 --- a/common/js/api.js +++ b/common/js/api.js @@ -108,6 +108,9 @@ export default { locationdistrict(data) { //获取行政区域(区,街道) return uni.api.get("/location/district", data); }, + queryMemberAccount(data) { //获取行政区域(区,街道) + return uni.api.get("/pay/queryMemberAccount", data); + }, ordermineCoupons(data) { //我的优惠券 return uni.api.get("/order/mineCoupons", data, false); }, diff --git a/pages/member/billDetails.vue b/pages/member/billDetails.vue index 212ff4b..394df07 100644 --- a/pages/member/billDetails.vue +++ b/pages/member/billDetails.vue @@ -4,11 +4,11 @@ 我的余额 - 12 + {{info.amount}} 我的积分 - 12 + {{info.levelConsume}} @@ -21,28 +21,18 @@ - + - 尚美养储值卡 - 2023-04-21 10:32:44 + {{item.biz_name}} + +{{item.amount}} - 尚美养储值卡2 - 2023-04-21 10:32:44 - - - - - - 尚美养储值卡 - 2023-04-21 10:32:44 - - - 尚美养储值卡 - 2023-04-21 10:32:44 + {{item.create_time}} + 充值成功 + @@ -52,28 +42,41 @@ return { active: 1, list: [], - form:{ - page:1, - pageSize:10, - memberId:'' - } + form: { + page: 1, + pageSize: 10, + memberId: null + }, + info: null } }, - onLoad() { + onLoad(e) { + this.info = e + this.form.memberId = e.memberId + this.getlist() + }, + onReachBottom() { this.getlist() }, methods: { - getlist() { - // member/queryMemberAccount - // get - - // memberId string 必需 示例值: 11 - // page string 必需 示例值: 1 - // pageSize string - + async getlist() { + if (this.active == 1) { + let res = await this.api.queryMemberAccount(this.form) + if (res.code == 0) { + if (this.form.page == 1) { + this.list = res.data.list + } else { + this.form.page++ + this.list.push(res.data.list) + } + } + } else { + this.list = [] + } }, clickEvent(i) { this.active = i + this.getlist() } } } @@ -95,7 +98,7 @@ >view, >text { text-align: center; - color: rgba(255, 255, 255, 0.7); + color: #333; } >view { @@ -109,7 +112,7 @@ display: flex; justify-content: space-around; align-items: center; - color: #fff; + color: #333; margin-top: -50rpx; padding: 0 120rpx; diff --git a/pages/member/list.vue b/pages/member/list.vue index e918ceb..3238807 100644 --- a/pages/member/list.vue +++ b/pages/member/list.vue @@ -19,7 +19,7 @@ - + @@ -55,7 +55,7 @@ page: this.form.page, pageSize: this.form.size, userId: uni.cache.get('userInfo').id, - shopId:'' + shopId: '' }) if (res.data.pages < this.form.page) { @@ -79,10 +79,10 @@ } }, eeInfo(item) { - console.log(item,'调试123123') - uni.pro.navigateTo('member/memberdetails',{ - shopId_id:item.shopId, - type:'list' + + uni.pro.navigateTo('member/memberdetails', { + shopId_id: item.shopId, + type: 'list' }) }, } diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue index 728112c..f6c6d3f 100644 --- a/pages/member/memberdetails.vue +++ b/pages/member/memberdetails.vue @@ -133,13 +133,9 @@ this.amount = a.minNum }, goUrl(url){ - uni.pro.navigateTo(url,this.info) - }, - eeInfo(e) { - uni.pro.navigateTo('my/member/memberinfo', { - id: e, - }) + uni.pro.navigateTo(url,this.userInfo) }, + } }