diff --git a/api/dining-hall.js b/api/dining-hall.js index 12a2703..499537a 100644 --- a/api/dining-hall.js +++ b/api/dining-hall.js @@ -7,4 +7,13 @@ export function getOrderList(params) { method: 'get', params }); +} + +// 获取账户余额 +export function getAccountBalance(params) { + return request({ + url: '/leopen/account/balance/query', + method: 'get', + params + }); } \ No newline at end of file diff --git a/pages.json b/pages.json index 239a4f5..56b9568 100644 --- a/pages.json +++ b/pages.json @@ -166,6 +166,13 @@ "style": { "navigationBarTitleText": "皖送e餐" } + }, + { + "path" : "pages/remainingSum/index", + "style" : + { + "navigationStyle": "custom" + } } ], "tabBar": { diff --git a/pages/components/Navbar.vue b/pages/components/Navbar.vue index 8587bcd..b764a0c 100644 --- a/pages/components/Navbar.vue +++ b/pages/components/Navbar.vue @@ -5,9 +5,13 @@ @leftClick="goBack" @rightClick="chickIcon" :autoBack="true" - :rightText="text" placeholder - > + titleStyle="font-size: 16px;font-weight: 700;" + > + + {{ text }} + + @@ -73,4 +77,10 @@ export default { } - + diff --git a/pages/index.vue b/pages/index.vue index ecdf0fd..8c429b0 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -46,7 +46,7 @@ - + 余额/充值 ¥ @@ -101,7 +101,13 @@ uni.navigateTo({ url: '/pages/code/index' }) - } + }, + goToRemainingSum() { + // 跳转到余额/充值页面 + uni.navigateTo({ + url: '/pages/remainingSum/index' + }) + }, } } diff --git a/pages/remainingSum/index.vue b/pages/remainingSum/index.vue new file mode 100644 index 0000000..65d442a --- /dev/null +++ b/pages/remainingSum/index.vue @@ -0,0 +1,203 @@ + + + + + + 总余额(元) + {{ balance.accBal }} + + + 个人钱包 + + ¥ + {{ balance.walletBal }} + + + + 补贴钱包 + + ¥ + {{ balance.subsidyBal }} + + + + + + 快捷充值 + + + ¥ + 50.00 + + + + ¥ + 100.00 + + + + ¥ + 200.00 + + + + ¥ + 300.00 + + + + ¥ + 500.00 + + + + 自定义 + + + + + + 立即充值 + + + + + + + diff --git a/pages/system2.vue b/pages/system2.vue new file mode 100644 index 0000000..a5fa398 --- /dev/null +++ b/pages/system2.vue @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + {{item.name}} + + + + + + + + diff --git a/pages/work/index.vue b/pages/work/index.vue index 5141097..02fec8d 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -1,26 +1,30 @@ - - 订单 - - - 筛选 - + + + 订单 + + + 筛选 + + + + + + - - - + 订单来源:{{ item.sourceType }} @@ -58,7 +62,7 @@ - + @@ -197,11 +201,21 @@ export default {