diff --git a/pages.json b/pages.json index 9291dcc..9d5a494 100644 --- a/pages.json +++ b/pages.json @@ -162,7 +162,16 @@ "navigationBarTitleText": "账户充值", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#3175f9", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "充值记录", + "fontSize": "15" + }] + } + } } }, { @@ -263,6 +272,15 @@ "navigationBarTextStyle": "white" } + }, { + "path": "topUpList/topUpList", + "style": { + "navigationBarTitleText": "充值记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#3175f9", + "navigationBarTextStyle": "white" + } + }] }], "globalStyle": { diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue index a5affa6..dcc47da 100644 --- a/pages/oaExamine/oaExamine.vue +++ b/pages/oaExamine/oaExamine.vue @@ -36,7 +36,7 @@ getCopyOfMyListAPI } from '@/api/oaApi.js' import { Toast } from '@/libs/uniApi.js' - + // import tabbar from '../components/tabbar' export default { components: { @@ -116,8 +116,8 @@ } }, click(item) { - Toast('开发中') - return + Toast('开发中') + return this.myEventList = [] this.params.page = '1' switch (item.index) { diff --git a/subpkg/noticeList/noticeList.vue b/subpkg/noticeList/noticeList.vue index 3142b1a..0a7b7a2 100644 --- a/subpkg/noticeList/noticeList.vue +++ b/subpkg/noticeList/noticeList.vue @@ -57,6 +57,7 @@ if(this.loadConfig.status=="nomore")return; this.loadConfig.status="loading" const res = await noticeList({ + sort: 'new', keyword: this.searchText, page_no: this.loadConfig.page, page_size: this.loadConfig.limit diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index ebecf48..6a435d8 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -44,6 +44,14 @@ timeCount: 5, } }, + // 点击充值记录 + onNavigationBarButtonTap(res){ + if (res.index === 0) { + uni.navigateTo({ + url: '/subpkg/topUpList/topUpList' + }) + } + }, onLoad() {}, onShow() {}, methods: { diff --git a/subpkg/topUpList/topUpList.vue b/subpkg/topUpList/topUpList.vue new file mode 100644 index 0000000..b54beb9 --- /dev/null +++ b/subpkg/topUpList/topUpList.vue @@ -0,0 +1,143 @@ + + + + +