From b607dd1a19c8d06f8e4071dd14680211d4312165 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Sat, 25 Sep 2021 16:05:23 +0800 Subject: [PATCH] =?UTF-8?q?'=E7=A2=8E=E7=89=87=E8=AE=B0=E5=BD=95'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 12 +- pages/user/index.vue | 4 +- pages/wallet/extract.vue | 16 +- pages/wallet/fragment.vue | 336 ++++++++++++++++++++++++++++++++++++ pages/wallet/property.vue | 15 +- scss/globa.scss | 2 +- static/imgs/account-bg.png | Bin 0 -> 2921 bytes static/imgs/record-icon.png | Bin 0 -> 1071 bytes 8 files changed, 365 insertions(+), 20 deletions(-) create mode 100644 pages/wallet/fragment.vue create mode 100644 static/imgs/account-bg.png create mode 100644 static/imgs/record-icon.png diff --git a/pages.json b/pages.json index 4c6acb9..0fccc91 100644 --- a/pages.json +++ b/pages.json @@ -184,7 +184,17 @@ "navigationBarTextStyle": "white" }, "name": "ResetPassword" - } ], + },{ + "path": "pages/wallet/fragment", + "style": { + "navigationBarTitleText": "能量碎片记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#774ffd", + "navigationBarTextStyle": "white" + }, + "name": "Fragment" + } + ], "globalStyle": { "navigationStyle": "custom", "backgroundColor": "#F5F5F5" diff --git a/pages/user/index.vue b/pages/user/index.vue index c996934..453afb5 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -135,8 +135,8 @@ 能量球钱包 {{userData.account.coins || 0}} - - 能量碎片 + + 能量碎片 {{userData.account.score || 0}} diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index 1823bf8..afd839a 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -1,7 +1,7 @@ + + + + diff --git a/pages/wallet/property.vue b/pages/wallet/property.vue index 5583158..25d426d 100644 --- a/pages/wallet/property.vue +++ b/pages/wallet/property.vue @@ -266,8 +266,8 @@ } .balance { - font-size: $title-size * 2; - padding: ($padding / 2) 0; + font-size: $title-size * 2.5; + padding: $padding 0; color: white; } @@ -275,18 +275,17 @@ background: rgba($color: #000000, $alpha: .1); color: rgba($color: white, $alpha: .7); display: inline-block; - padding: 0 $padding; - font-size: $title-size-m; - height: 50rpx; - line-height: 50rpx; + font-size: 24rpx; + padding: 6rpx $padding; border-radius: $radius-m; border: solid 1rpx rgba($color: white, $alpha: .4) + } .balance-flex { display: flex; justify-content: center; - margin-top: $margin * 3; + margin-top: $margin * 2; .balance-flex-item { background-color: white; @@ -296,7 +295,7 @@ color: $text-price; margin: 0 $margin; border-radius: $radius-m; - font-size: $title-size; + font-size: 28rpx; } } } diff --git a/scss/globa.scss b/scss/globa.scss index f63b05f..e4906a3 100644 --- a/scss/globa.scss +++ b/scss/globa.scss @@ -76,7 +76,7 @@ $padding: 30rpx; -webkit-line-clamp: 2; } -.ellipsis { +.ellipsis-1 { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; diff --git a/static/imgs/account-bg.png b/static/imgs/account-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..166699cf2c24b180582e03d09d049d39f3aeec51 GIT binary patch literal 2921 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 Q5eA%fbUXd(RM5@;0Q&yWSpWb4 literal 0 HcmV?d00001 diff --git a/static/imgs/record-icon.png b/static/imgs/record-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4480415394419c9f833560fe9e45d01e9273298f GIT binary patch literal 1071 zcmV+~1kn45P)C0000*P)t-s0001k zMBs));DbWpg+k$lL*Ru&;e|utghJtkL*a!(;Dtlsg+t(lL*a!(;Dkftf<@wmL*a%& z;e|uthC$$jL*Ru&;EX6@w*UYD7IachQvg4|e~d@m$Wmdp=&sZ7B@=QpqaB-^P}$@F z00V71j3&BN zcOmzPeGXlnTr?wm2V<*@FUgfPa4g;?{6MlE4#K;DMFi&$Y+c8pNysKOuotmH5mnr$ z`5ML4+ZE;(H_^_p35%PtAg8Hu2kK_y?Q3VAkp@0exq=Jt)JQSzYKH((!=X)8c!7tFjDnr085C&MI#jnsR z1pr|c0-z)eYFy_MXDDa!Q;+YcxdSi(m!;+o!i=i~kl^qgGiL@2AR@D7LX@R0c~*<% z5jca8juD3u*8wRPMi*4?7E)4T`O=_y`$H+FJR2nqfkeObs3Cx!a)yooEsg?Ppcx+8 zYDT_5pb_8-)QI*WjaF;{8Ux1_ur!Zp!W+JTD;R+{x90zPlg)x22s8ra0yJ&&@T+~a zTmiZV%NJO>TaFxQ04;C@=)Wqa09`vhwa*ZsYa>^H^8A(B7YQJR084-d?&mK^1$@C` zy!yC{V?iunDFj$~;6}nb_6{=-(8V)XV8GW*0)Y%LB3EF-*R%ow9Ko;!%#J;P1|nMk zri?GREE0hTjx9huO#!}ugQP2vpw<ZHYyia{lblM0Vmq39iDDO zEZ`-Z)z2|IO9g^#yMDq4MyY@kez2&YUPy!jUi!(VvA>WnO4FG>T0!+)f#>VS?+e7z zPqzW2Oq>#eh^vf;e7cS0pYII_$*e+_SyBfmuV9!tB^(n-SlD$m^}bQi6-FS@>{-O( zdqFjqeWQG_-V_sEi|?>!E#=ZLW>YWc(=TWQxZ=TF6^g2vX|=-x={6Kr{|}|r83>Ky z>T1)IbUO|})xiB*M?CZox#%DB(Ld;Pf}>vghuuza+)w|&;|Y#@p5V~y36A}q;NbHe pZ>x_3Z#^7~UqAdVX