diff --git a/App.vue b/App.vue index 8718b2d..4e1d136 100644 --- a/App.vue +++ b/App.vue @@ -23,7 +23,9 @@ cityId: '', cityName:'', longitude : '', - latitude : '' + latitude : '', + balancePrice : '', + balanceCardNo:'' }, onLaunch: function() { }, diff --git a/pages.json b/pages.json index a2f5cf6..3525afd 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,17 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { + "path" : "pages/user/bindingCardList/bindingCardList", + "style" : + { + "navigationBarTitleText": "卡列表", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false + } + + },{ "path": "pages/tabBar/home/home", "style": { "navigationBarTextStyle": "white", @@ -487,23 +498,12 @@ "enablePullDownRefresh": false } - },{ - "path" : "pages/user/bindingCardList/bindingCardList", - "style" : - { - "navigationBarTitleText": "卡列表", - "navigationBarBackgroundColor": "#0083f5", - "backgroundColorTop": "#0083f5", - "navigationBarTextStyle": "white", - "enablePullDownRefresh": false - } - },{ "path" : "pages/user/unionCard/unionCard", "style" : { "enablePullDownRefresh": false, - "navigationBarTitleText": "工会卡", + "navigationBarTitleText": "卡记录", "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#0083f5", "backgroundColorTop": "#0083f5", diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue index edb0673..735f6ae 100644 --- a/pages/tabBar/user/user.vue +++ b/pages/tabBar/user/user.vue @@ -210,9 +210,14 @@ ], //操作列表 czList: [ + { + url: '../../user/bindingCardList/bindingCardList', + text: '卡列表', + img: '../../../static/img/pas.png' + }, { url: '../../user/unionCard/unionCard', - text: '工会卡', + text: '卡记录', img: '../../../static/img/pas.png' }, { diff --git a/pages/user/bindingCard/bindingCard.vue b/pages/user/bindingCard/bindingCard.vue index 438758d..97a4b7d 100644 --- a/pages/user/bindingCard/bindingCard.vue +++ b/pages/user/bindingCard/bindingCard.vue @@ -109,8 +109,8 @@ getHuiLianTongCardByCardNo(params).then(res => { uni.hideLoading() if (res.return_code == '000000') { - // this.phoneNumber = res.return_data.userMobile; - this.phoneNumber = 15583658692; + this.phoneNumber = res.return_data.userMobile; + // this.phoneNumber = 15583658692; this.disStute = true } else { uni.showToast({ diff --git a/pages/user/bindingCardList/bindingCardList.vue b/pages/user/bindingCardList/bindingCardList.vue index 0d4c41f..6716f25 100644 --- a/pages/user/bindingCardList/bindingCardList.vue +++ b/pages/user/bindingCardList/bindingCardList.vue @@ -1,25 +1,97 @@ - diff --git a/pages/user/unionCard/unionCard.vue b/pages/user/unionCard/unionCard.vue index fa8a7f8..131c619 100644 --- a/pages/user/unionCard/unionCard.vue +++ b/pages/user/unionCard/unionCard.vue @@ -38,7 +38,6 @@ 立即查询 - 添加工会卡 @@ -168,12 +167,7 @@ this.getHuiLianTongCardConsume(); this.getHuiLianTongCardBalance(); }, - //跳转绑定工会卡 - goBingCard(){ - uni.navigateTo({ - url:'../bindingCard/bindingCard' - }) - }, + //查询消费记录 getHuiLianTongCardConsume() { uni.showLoading({