diff --git a/agentApp/pages.json b/agentApp/pages.json index ac55744..3800413 100644 --- a/agentApp/pages.json +++ b/agentApp/pages.json @@ -28,15 +28,25 @@ "style": { "navigationBarTitleText": "代理主页", "navigationBarBackgroundColor": "#1783FF", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "", + "fontSrc": "/static/iconfont/iconfont.ttf", + "fontSize": "23", + "float": "right" + }] + } + } } }, { "path": "pages/cash/cash", "style": { "navigationBarTitleText": "代理提现", - "navigationBarBackgroundColor": "#fff", - "navigationBarTextStyle": "black" + "navigationBarBackgroundColor": "#1783FF", + "navigationBarTextStyle": "white" } }, { @@ -51,8 +61,8 @@ "path": "pages/history/history", "style": { "navigationBarTitleText": "代理提现历史", - "navigationBarBackgroundColor": "#fff", - "navigationBarTextStyle": "black" + "navigationBarBackgroundColor": "#1783FF", + "navigationBarTextStyle": "white" } }, { @@ -76,7 +86,17 @@ "style": { "navigationBarTitleText": "商户主页", "navigationBarBackgroundColor": "#F52F3E", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "", + "fontSrc": "/static/iconfont/iconfont.ttf", + "fontSize": "23", + "float": "right" + }] + } + } } }, { @@ -118,14 +138,18 @@ { "path": "pages/merchant-withdrawal-management/merchant-withdrawal-management", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "商户提现", + "navigationBarBackgroundColor": "#F52F3E", + "navigationBarTextStyle": "white", "enablePullDownRefresh": false } }, { "path": "pages/merchant-withdrawal-history/merchant-withdrawal-history", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "商户提现历史", + "navigationBarBackgroundColor": "#F52F3E", + "navigationBarTextStyle": "white", "enablePullDownRefresh": false } } diff --git a/agentApp/pages/agent-index/index.vue b/agentApp/pages/agent-index/index.vue index 624dfe8..7a8ebb8 100644 --- a/agentApp/pages/agent-index/index.vue +++ b/agentApp/pages/agent-index/index.vue @@ -118,6 +118,20 @@ url: '/pages/cash/cash' }); } + }, + onNavigationBarButtonTap(e) { + uni.showModal({ + title: '提示', + content: '确认注销登录吗?', + success: function (res) { + if (res.confirm) { + uni.reLaunch({ + url: "/pages/agent-login/index" + }); + uni.removeStorageSync('agent_token'); + } + } + }); } } @@ -141,6 +155,7 @@ height: 60rpx; line-height: 60rpx; padding-left: 40rpx; + border-top-left-radius: 30rpx; border-bottom-left-radius: 30rpx; color: #fff; font-size: 24rpx; diff --git a/agentApp/pages/cash/cash.vue b/agentApp/pages/cash/cash.vue index 3d20516..3727025 100644 --- a/agentApp/pages/cash/cash.vue +++ b/agentApp/pages/cash/cash.vue @@ -245,6 +245,7 @@ height: 60rpx; line-height: 60rpx; padding-left: 40rpx; + border-top-left-radius: 30rpx; border-bottom-left-radius: 30rpx; color: #fff; font-size: 24rpx; diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue index b208ff4..1bf6685 100644 --- a/agentApp/pages/merchant-index/index.vue +++ b/agentApp/pages/merchant-index/index.vue @@ -165,6 +165,20 @@ share_amount: function(order) { return (parseFloat(order.merchant_income) + parseFloat(order.merchant_fee)).toFixed(2) } + }, + onNavigationBarButtonTap(e) { + uni.showModal({ + title: '提示', + content: '确认注销登录吗?', + success: function (res) { + if (res.confirm) { + uni.reLaunch({ + url: "/pages/merchant-login/index" + }); + uni.removeStorageSync('merchant_token'); + } + } + }); } } diff --git a/agentApp/pages/merchant-withdrawal-management/merchant-withdrawal-management.vue b/agentApp/pages/merchant-withdrawal-management/merchant-withdrawal-management.vue index ee70f42..c89d091 100644 --- a/agentApp/pages/merchant-withdrawal-management/merchant-withdrawal-management.vue +++ b/agentApp/pages/merchant-withdrawal-management/merchant-withdrawal-management.vue @@ -27,7 +27,7 @@
- 待入账:0元 + 待入账:0.00元 @@ -244,6 +244,7 @@ height: 60rpx; line-height: 60rpx; padding-left: 40rpx; + border-top-left-radius: 30rpx; border-bottom-left-radius: 30rpx; color: #fff; font-size: 24rpx; diff --git a/agentApp/static/iconfont/iconfont.ttf b/agentApp/static/iconfont/iconfont.ttf new file mode 100644 index 0000000..b235370 Binary files /dev/null and b/agentApp/static/iconfont/iconfont.ttf differ