From b8f3c58c6fcec897e68d8c2bb6443baeca8cc58b Mon Sep 17 00:00:00 2001 From: yangrz Date: Tue, 2 Apr 2024 12:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=B8=BB=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E4=B8=BB=E9=A1=B5=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=94=80=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agentApp/pages.json | 40 ++++++++++++++---- agentApp/pages/agent-index/index.vue | 15 +++++++ agentApp/pages/cash/cash.vue | 1 + agentApp/pages/merchant-index/index.vue | 14 ++++++ .../merchant-withdrawal-management.vue | 3 +- agentApp/static/iconfont/iconfont.ttf | Bin 0 -> 1688 bytes 6 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 agentApp/static/iconfont/iconfont.ttf 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 0000000000000000000000000000000000000000..b2353707b59eeef2f86a1dd8cf65fff27a143738 GIT binary patch literal 1688 zcmd^9O>Y}T7=C7U?SzDyrlmE4Dy%G;15~zaH6Ln14r$_m3Iw%js4A3pW3Sgv*Spqw zQzfASOBF~6BRFzTE)kbribT}|5=aQCoO=KYr}O|vkPrx&XV&8?H2nvRJ?}j4^M1@b zA3G2L2GN3n{QUU~GuB7PHvut0c5&f+t}xYnHA}rs{Yt5BHy(WO#W&P{XK%RPM#a7T z!}EaQ(cZ2)b~$tVr|*b=VIQlK=(}&+Ail%?LbV>P_Y*MoH;R5QDA_0~-6&He>-Ks> zq%cYQGt@2Lt~&>}rf$;yCm`KM(2Q;^T&UCa3hm=y?MAE9!rLZQfKshyZ<8@Y_E2Ks z_~oaj{=i_@_vi2L?kdOb*x4~*yhXJiQirQd5;?6ac7Q*iv&TMwJf8N!HGYVcgcOy9mTIG2u4aI46=`DZ&v2Y z_-c1~cRAh<7(b##xBu>jR1@lwI0sK0IMJoVqV|1*tcp6pk*g(dA`|<=_GG*P$MiPDd!=@YdiNC6J?Aaz>=r^-Lu;wND@SMg5`HaRU@rxQK_<9sHPLh9F;{m*cIgJOIv7v63`2^<~!3~WC z4q``Ri4?xn*dYI{#wPJSjT1PE2O1~I|D*8$mc#*#2QeZ_XF|u0oU*mDVbw~3UkUuE zH=c9cHO~%vYHwU}!e%Y-t&`b&kD7OUC+wwZUULgkRIw^yP`8TA=XhRVHNs%kDMi_8 z6g5uga%vvMXG=jHXAr`Hjfk=g3oF>5tf7PeJ}R+{_UY&7?P3icBg1{xN28bM9imA; zmD9pWUaS1RsCjz%vFD@JG;xiy6