From dfb17a43c0d9f9058d95d8233ea85080b36ad999 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Mon, 23 Sep 2024 18:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8B=B1=E8=AF=AD=E5=8C=BA?= =?UTF-8?q?=E9=87=91=E5=B8=81=E6=94=B6=E7=9B=8A=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/guildAr/css/incomeStatistics.css | 334 +++++++++++++++++ .../modules/guildAr/css/incomeStatistics.scss | 344 ++++++++++++++++++ view/molistar/modules/guildAr/css/index.css | 9 +- view/molistar/modules/guildAr/css/index.scss | 10 +- .../modules/guildAr/images/goldBig.png | Bin 0 -> 2033 bytes .../modules/guildAr/images/loveIcon.png | Bin 0 -> 1201 bytes view/molistar/modules/guildAr/images/xia.png | Bin 0 -> 345 bytes .../modules/guildAr/incomeStatistics.html | 86 +++++ view/molistar/modules/guildAr/index.html | 18 +- .../modules/guildAr/js/incomeStatistics.js | 172 +++++++++ view/molistar/modules/guildAr/js/index.js | 10 +- view/molistar/modules/guildAr/local/ar.js | 16 +- view/molistar/modules/guildAr/local/en.js | 16 +- view/molistar/modules/guildAr/local/zh.js | 14 + 14 files changed, 1013 insertions(+), 16 deletions(-) create mode 100644 view/molistar/modules/guildAr/css/incomeStatistics.css create mode 100644 view/molistar/modules/guildAr/css/incomeStatistics.scss create mode 100644 view/molistar/modules/guildAr/images/goldBig.png create mode 100644 view/molistar/modules/guildAr/images/loveIcon.png create mode 100644 view/molistar/modules/guildAr/images/xia.png create mode 100644 view/molistar/modules/guildAr/incomeStatistics.html create mode 100644 view/molistar/modules/guildAr/js/incomeStatistics.js diff --git a/view/molistar/modules/guildAr/css/incomeStatistics.css b/view/molistar/modules/guildAr/css/incomeStatistics.css new file mode 100644 index 0000000..9a84823 --- /dev/null +++ b/view/molistar/modules/guildAr/css/incomeStatistics.css @@ -0,0 +1,334 @@ +body { + width: 100%; + height: 17.78667rem; + background: #F5F7F9; + padding-top: 2.56rem; +} + +.back { + width: 100%; + height: 2.34667rem; + position: fixed; + left: 0; + top: 0rem; + text-align: center; + color: #FFFFFF; + font-size: 0.50667rem; + font-weight: bold; + z-index: 10; + background: #fff; +} + +.back img { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + top: 1.33333rem; + left: 0.42667rem; + z-index: 2; +} + +.back b { + width: 100%; + text-align: center; + position: absolute; + left: 0; + top: 1.33333rem; + height: 0.58667rem; + line-height: 0.58667rem; + color: #313131; + font-size: 0.42667rem; + font-weight: 500; +} + +.income { + width: 9.14667rem; + height: 3.01333rem; + background: #F2F3F7; + border-radius: 0.21333rem; + margin: 0 auto 0.37333rem; + box-sizing: border-box; + padding: 0.32rem 0.32rem; +} + +.income .time { + width: 100%; + height: 0.48rem; + margin-bottom: 0.24rem; +} + +.income .time b { + display: inline-block; + color: #04D5C6; + font-size: 0.34667rem; + font-weight: 500; + vertical-align: middle; +} + +.income .time img { + display: inline-block; + width: 0.48rem; + height: 0.48rem; + margin: 0 0.10667rem; + vertical-align: middle; +} + +.income h3 { + width: 100%; + height: 0.53333rem; + line-height: 0.53333rem; + color: #313131; + font-size: 0.37333rem; + font-weight: 600; + margin-bottom: 0.29333rem; +} + +.income .gold { + width: 100%; + height: 0.74667rem; + line-height: 0.74667rem; +} + +.income .gold img { + display: inline-block; + width: 0.74667rem; + height: 0.74667rem; + vertical-align: middle; +} + +.income .gold b { + display: inline-block; + vertical-align: middle; + color: #313131; + font-size: 0.64rem; + font-weight: 600; + margin: 0 0.10667rem; +} + +.tab { + width: 9.14667rem; + height: 0.58667rem; + line-height: 0.58667rem; + margin: 0 auto 0.26667rem; +} + +.tab div { + margin-right: 0.82667rem; + float: left; + color: #313131; + font-size: 0.42667rem; + font-weight: 600; +} + +.tab .act { + color: #04D5C6; +} + +.titleInfo { + width: 9.14667rem; + height: 1.01333rem; + line-height: 1.01333rem; + color: #313131; + font-size: 0.37333rem; + font-weight: 500; + display: flex; + justify-content: space-between; + margin: 0 auto 0; + background: #E4F6F1; + padding: 0 0.69333rem; + box-sizing: border-box; +} + +.titleInfo div { + text-align: center; + width: 33%; +} + +.userInfo { + width: 9.14667rem; + margin: 0 auto 1.6rem; + display: none; +} + +.userInfo li { + width: 100%; + height: 1.6rem; + overflow: hidden; + box-sizing: border-box; + padding: 0 0.61333rem 0 0.32rem; +} + +.userInfo li .tx { + width: 1.09333rem; + height: 1.09333rem; + position: relative; + margin-top: 0.24rem; + float: left; + margin-right: 0.10667rem; +} + +.userInfo li .tx img { + width: 100%; + height: 100%; + display: block; + border-radius: 50%; +} + +.userInfo li .tx span { + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0.77333rem; + min-width: 0.61333rem; + height: 0.37333rem; + line-height: 0.37333rem; + text-align: center; + color: #fff; + font-size: 0.26667rem; + font-weight: 500; + background: #04D5C6; + border-radius: 0.37333rem; +} + +.userInfo li .user { + float: left; + width: 1.86667rem; + height: 1.09333rem; + margin-top: 0.24rem; + margin-right: 0.24rem; +} + +.userInfo li .user p { + color: #313131; + font-size: 0.37333rem; + font-weight: 600; + margin-top: 0.12rem; + margin-bottom: 0.2rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.userInfo li .user b { + color: #7B7B7D; + font-size: 0.34667rem; + font-weight: 400; +} + +.userInfo li .incomes { + width: 2.42667rem; + height: 100%; + text-align: center; + color: #313131; + font-size: 0.34667rem; + font-weight: 400; + margin-top: 0.66667rem; + float: left; +} + +.userInfo li .duration { + width: 1.73333rem; + text-align: center; + height: 100%; + color: #313131; + font-size: 0.34667rem; + font-weight: 400; + margin-top: 0.66667rem; + float: right; +} + +.userInfo .act { + background: #F2F3F7; +} + +.dayDate { + width: 9.14667rem; + height: 1.01333rem; + line-height: 1.01333rem; + margin: 0 auto 0; +} + +.dayDate li { + color: #313131; + font-size: 0.37333rem; + font-weight: 500; + display: flex; + justify-content: space-between; + padding: 0 0.69333rem; + box-sizing: border-box; +} + +.dayDate li div { + text-align: center; + width: 33%; +} + +.dayDate .act { + background: #F2F3F7; +} + +.cycle { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + z-index: 999; + background: rgba(0, 0, 0, 0.5); + display: none; +} + +.cycle .cycle_in { + width: 100%; + height: 7.01333rem; + left: 0; + bottom: 0; + border-radius: 0.42667rem 0.42667rem 0 0; + background: #fff; + position: absolute; +} + +.cycle .cycle_in ul { + width: 100%; + text-align: center; + margin-top: 0.53333rem; + height: 5.5rem; + overflow-y: scroll; +} + +.cycle .cycle_in ul::-webkit-scrollbar { + display: none; +} + +.cycle .cycle_in ul li { + height: 0.8rem; + line-height: 0.8rem; + color: #7B7B7D; + font-weight: 400; + font-size: 0.37333rem; +} + +.cycle .cycle_in ul .act { + background: #F4F4F4; + color: #313131; +} + +.arabic .userInfo li .tx { + float: right; + margin-right: 0; + margin-left: 0.10667rem; +} + +.arabic .userInfo li .user { + float: right; + margin-right: 0; + margin-left: 0.24rem; +} + +.arabic .userInfo li .incomes { + float: right; +} + +.arabic .userInfo li .duration { + float: left; +} diff --git a/view/molistar/modules/guildAr/css/incomeStatistics.scss b/view/molistar/modules/guildAr/css/incomeStatistics.scss new file mode 100644 index 0000000..b9cf0fc --- /dev/null +++ b/view/molistar/modules/guildAr/css/incomeStatistics.scss @@ -0,0 +1,344 @@ +@function px2rem($px) { + @return $px / 75+rem; +} + +body { + width: 100%; + height: px2rem(1334); + background: #F5F7F9; + padding-top: px2rem(192); +} + +.back { + width: 100%; + height: px2rem(176); + position: fixed; + left: 0; + top: px2rem(0); + text-align: center; + color: #FFFFFF; + font-size: px2rem(38); + font-weight: bold; + z-index: 10; + background: #fff; + + img { + width: px2rem(44); + height: px2rem(44); + position: absolute; + top: px2rem(100); + left: px2rem(32); + z-index: 2; + } + + b { + width: 100%; + text-align: center; + position: absolute; + left: 0; + top: px2rem(100); + height: px2rem(44); + line-height: px2rem(44); + color: #313131; + font-size: px2rem(32); + font-weight: 500; + } +} + +.income { + width: px2rem(686); + height: px2rem(226); + background: #F2F3F7; + border-radius: px2rem(16); + margin: 0 auto px2rem(28); + box-sizing: border-box; + padding: px2rem(24) px2rem(24); + + .time { + width: 100%; + height: px2rem(36); + margin-bottom: px2rem(18); + + b { + display: inline-block; + color: #04D5C6; + font-size: px2rem(26); + font-weight: 500; + vertical-align: middle; + } + + img { + display: inline-block; + width: px2rem(36); + height: px2rem(36); + margin: 0 px2rem(8); + vertical-align: middle; + } + } + + h3 { + width: 100%; + height: px2rem(40); + line-height: px2rem(40); + color: #313131; + font-size: px2rem(28); + font-weight: 600; + margin-bottom: px2rem(22); + } + + .gold { + width: 100%; + height: px2rem(56); + line-height: px2rem(56); + + img { + display: inline-block; + width: px2rem(56); + height: px2rem(56); + vertical-align: middle; + } + + b { + display: inline-block; + vertical-align: middle; + color: #313131; + font-size: px2rem(48); + font-weight: 600; + margin: 0 px2rem(8); + } + } +} + +.tab { + width: px2rem(686); + height: px2rem(44); + line-height: px2rem(44); + margin: 0 auto px2rem(20); + + div { + margin-right: px2rem(62); + float: left; + color: #313131; + font-size: px2rem(32); + font-weight: 600; + } + + .act { + color: #04D5C6; + } +} + +.titleInfo { + width: px2rem(686); + height: px2rem(76); + line-height: px2rem(76); + color: #313131; + font-size: px2rem(28); + font-weight: 500; + display: flex; + justify-content: space-between; + margin: 0 auto 0; + background: #E4F6F1; + padding: 0 px2rem(52); + box-sizing: border-box; + + div { + text-align: center; + width: 33%; + } +} + +.userInfo { + width: px2rem(686); + margin: 0 auto px2rem(120); + display: none; + + li { + width: 100%; + height: px2rem(120); + overflow: hidden; + box-sizing: border-box; + padding: 0 px2rem(46) 0 px2rem(24); + + .tx { + width: px2rem(82); + height: px2rem(82); + position: relative; + margin-top: px2rem(18); + float: left; + margin-right: px2rem(8); + + img { + width: 100%; + height: 100%; + display: block; + border-radius: 50%; + } + + span { + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(58); + min-width: px2rem(46); + height: px2rem(28); + line-height: px2rem(28); + text-align: center; + color: #fff; + font-size: px2rem(20); + font-weight: 500; + background: #04D5C6; + border-radius: px2rem(28); + } + } + + .user { + float: left; + width: px2rem(140); + height: px2rem(82); + margin-top: px2rem(18); + margin-right: px2rem(18); + + p { + color: #313131; + font-size: px2rem(28); + font-weight: 600; + margin-top: px2rem(9); + margin-bottom: px2rem(15); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + + } + + b { + color: #7B7B7D; + font-size: px2rem(26); + font-weight: 400; + } + } + + .incomes { + width: px2rem(182); + height: 100%; + text-align: center; + color: #313131; + font-size: px2rem(26); + font-weight: 400; + margin-top: px2rem(50); + float: left; + } + + .duration { + width: px2rem(130); + text-align: center; + height: 100%; + color: #313131; + font-size: px2rem(26); + font-weight: 400; + margin-top: px2rem(50); + float: right; + } + } + + .act { + background: #F2F3F7; + } +} + +.dayDate { + width: px2rem(686); + height: px2rem(76); + line-height: px2rem(76); + margin: 0 auto 0; + // display: none; + + li { + color: #313131; + font-size: px2rem(28); + font-weight: 500; + display: flex; + justify-content: space-between; + padding: 0 px2rem(52); + box-sizing: border-box; + + div { + text-align: center; + width: 33%; + } + } + + .act { + background: #F2F3F7; + } +} + +.cycle { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + z-index: 999; + background: rgba(0, 0, 0, .5); + display: none; + + .cycle_in { + width: 100%; + height: px2rem(526); + left: 0; + bottom: 0; + border-radius: px2rem(32) px2rem(32) 0 0; + background: #fff; + position: absolute; + + ul { + width: 100%; + text-align: center; + margin-top: px2rem(40); + height: 5.5rem; + overflow-y: scroll; + + &::-webkit-scrollbar { + display: none; + } + + li { + height: px2rem(60); + line-height: px2rem(60); + color: #7B7B7D; + font-weight: 400; + font-size: px2rem(28); + } + + .act { + background: #F4F4F4; + color: #313131; + } + } + } +} + +.arabic { + .userInfo li { + .tx { + float: right; + margin-right: 0; + margin-left: 0.10667rem; + } + + .user { + float: right; + margin-right: 0; + margin-left: 0.24rem; + } + + .incomes { + float: right; + } + + .duration { + float: left; + } + } +} \ No newline at end of file diff --git a/view/molistar/modules/guildAr/css/index.css b/view/molistar/modules/guildAr/css/index.css index 15fa889..f472db5 100644 --- a/view/molistar/modules/guildAr/css/index.css +++ b/view/molistar/modules/guildAr/css/index.css @@ -145,6 +145,11 @@ body { float: left; } +.header .headerBox .incomeStatistics div img { + width: 0.82667rem; + height: 0.82667rem; +} + .guildList { width: 9.25333rem; height: 11rem; @@ -467,10 +472,6 @@ body { width: 3.9rem; } -.english .header .headerBox div span { - font-size: 0.21333rem; -} - .arabic .header .headerBox { width: 8rem; } diff --git a/view/molistar/modules/guildAr/css/index.scss b/view/molistar/modules/guildAr/css/index.scss index f0f6fc8..04cafee 100644 --- a/view/molistar/modules/guildAr/css/index.scss +++ b/view/molistar/modules/guildAr/css/index.scss @@ -228,6 +228,14 @@ body { float: left; } } + .incomeStatistics{ + div{ + img{ + width: px2rem(62); + height: px2rem(62); + } + } + } } } @@ -557,7 +565,7 @@ body { width: 3.9rem; span { - font-size: px2rem(16); + // font-size: px2rem(16); } } } diff --git a/view/molistar/modules/guildAr/images/goldBig.png b/view/molistar/modules/guildAr/images/goldBig.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6f8548e15e2ae4c3219d56a44dedbf41bc764c GIT binary patch literal 2033 zcmVPx+t4TybR7gvWmV1m`RUOAazjN=rXLt6|ee|&p+6v{7LU|U^)<WD1o#_v4Yr^=f<_H-BKti-EQgZ&dzjqXXeg*A9L@t zwa6pfFRkIM#vk8+fJ z*d`6aj*jIFF55`w_t%g+y%)1fh`$oh0{;Gx`uzuKyz&&qnTO>3vC$7Z^8h5B$DBe@DwVjI+Cb zMK+tq=!Nt(pw0p}L-y}=E4Sq9_R$RRCU5v z#%?sf;y!vR^j*N<(d;eiqQb8!WnmpH zQyF<1ckdW;KanGM(*jf~2|<9KnsI`m(z?X8^^=yK1iJUK%)F?5w{&GQq>=;^4%7D( zIo7j~dDpEa(~<$lM%xXro%kKs2FC%{#htYnfAIhXRiSg!AgVP1o`;^SO~}sTGWi~{ zPh+6oilOt_=Vc&!8KMa5A=UfKloy@Hz}1(dLLZz4IyyW8MzH8ThB;`@1K&gYKE>CL zkg-a1{BQtKK@1IEuRLO2Uccdgz{icxb9UQy3=u+bo|xu{)yKd$uS4koY#SXx>i+pEGESGjeu&v`TxB1(sHZ2RHkD>?)n}R6=->Ne6(g<@l=27h`_GkE?`Y(;I zx|>8lNI@@cdq+AF*~mKoj}?w4&SC!gHAo~`%lXKHE7975&;lCN$3{r(+JdPBwfaYp zJO;jt_FcT{EY&9;!K@u4*Ip#CG8f+?9J3Fo;l>%F|B(JP%ks}g;je2xjfam>TeX3% z#eHbo!E-X`{&l41_Cd#oG5=xgM@ z)(VC~SG>S}-drepd-fI<<$e=ydCR7}-6D7GO{6pCNuSBtw;&yDO<*`p;8dtQ@C)W_ z_yOd`z-z?7qdQ0F@g@;d&`MzsjgY(2L<%O_4{;x#UL|@*{wK`O{4_TE-*qNl)Xcg1 zdJG*!rVUq}H zjAd;+R=!H~-?N*Um%A&raJWWk2-??Og&6}K$n>Kwy$)ygAoYWX=vY#KppIKLNvKH< zzi@>4=XF72isFlV>CJgy7--YL8yO{iiGvKJ;>y(6TE1HJj?C@M%Wa9S5bm!ty~`uD zavhnJYFaqB8nt9GmC-$zSpx|LvDH~_AN z_H5pMdN=*&u7KQlym#_n2k7Ze#=s~^^zL0GuW5zIr`15af3uf}-k$5F#~edTf*>S# zrpmG0LfQvEhRk1yoOcNlj4`u!AK9{lc|jDtW$aRg%I?F=U9|>1vnwtDjj~5NmBt84 z1d~%3)B7+!lZU9DjJriOUh8j`w&$|DFw|x7`?!aF)IfKC3Ul?h@vS$(ucO4H`1G^% zt^Xqa%$pp3c9_0PFUPM95!yDP>!Bp1d~k{dr?(@cL#QP_(rrRQ;q7rAPTpXBJqG&Q z(i@e*L!yW)hd$y{Q~fxV0)`5s6eSEasf>x^f#-T;@@6cZ8%1%#z(|>dBBWYUB%Mi& z+8fBCR1DLibnwFL%ETS)JYKvPWJpbp5b8zR4$-q3X-{F*`$)R2sHiWVc%n;1%ak}8 zBPgbVL=-3n1k)Jx(Wd|BB$~iR@SLo5J}VLrCCx|w-nas-pTyNFC~2fSiS(y&W_wUm z5mZHuX|X@cvOm6LK%l(ypDJQv_zMY2EwJX-rIAsTbzKp_i&#n+=h*y6f)2T zi%kMQMOZArObUspu~lZA;3NgfTd3S5LLCm#k1feo^JeMlROAbg$~IT4f~b<1$45{%0gW`&q84R=TY*LyU9EaS*}u!Y zlb@dodyk~24mW;)#u=jkFXNblzb0b=)ZJ`E$r*Rg}c>ibRTJjli=tKbWk%Olk4~L+V>)Gwufs z!yh_%pN!xrHg9JU^XFVlOUsf_)1yRb0)IT1nBHd;XI_%uG5$f2Q~&=jdI+$w<5t`h P00000NkvXXu0mjfvz_cR literal 0 HcmV?d00001 diff --git a/view/molistar/modules/guildAr/images/loveIcon.png b/view/molistar/modules/guildAr/images/loveIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..a7c10845a5826688b116c34222c59d09d07bbb44 GIT binary patch literal 1201 zcmV;i1Wx;jP)Px(Ye_^wRA@u(nN4V1RTRhn=iZrViXXV>$EHX`1qH#1i0)KeIGIVYfi4=%B<)VI zVgvUwQ?%K?xq>Dfz?M&iA)SXhq2mu8Zi*(cKLi`|;nR)k^`zE7l%$xi1 z-U}t>Z33Bd&pE$)?z{KA|0Qg)hc+1xwt#N-if&cte_5fyi@YP3#iJ@vy#(wb!W|5> z0Mx;_%0hhCYW?xmG{Fej~?d@bm%Pi1iRHq0-giV6DNtzSPe$N zn7Ah1ICq%pK0dvGMrwSwVl_jA2YiAW$1oO%#QyOD{b;mZW8e%lGRseeFu<*@!CdSa z_!AKQl>&Y4GR_I8RO819YA&fIW|3%}Nc4~Q(I*zRp@}t6xXhsD)2__g#C4?v#9rIw zX9c7;0JTe9Mq2NTVfvY|Ag_x@Y&Hrjpy68Z4uDr|%btcE17nqfeA(pN2sHFj{T|9@ zza=1Ja+dP%btS}O6M6ckTO1=$sT!Om!l9ItwQ|p(nMy$ncmo}rUF^+r?)#gdI{z>< zmKt|m7>I6@x>l%E3yv+ryk#|g8)UTHO}t(y$P-cFx&jSXgRiX{&6NnuJST;G-o)2x zEM+K@IYmTylkE+^Gv>=h`H(Zv;Kko}WaTZtxC9GfuFCsr<9VvCmsljwa5Z=dgfSZ$Ul?B~W*n&$>I!rUz!7tWcU3T6ve=BVaV%(u+Mh@-SWP*$SxL;;YN4Nxvpm#)3#v#?tXNmC)Fk zK&@*thuuRWw+*Jk=nFE2$h+vQdU0a3}%m8wdwoJKRStX6ZjBdigP{ znY5%~E&YZt8*!b|p$qly-ReySMibQS>I|Hb*ThjPx$6G=otR5(xVlA%ijVHk&>_wFXEg8m04zs+LWO@x(UGRb?jo3McW|d7Y)XaqlAz z5t+8anw|8Uf4A-1Bd;9=AX}=02vaCyF|tUZ6ejsgE#!~0Jym^*g?UW*y5AA9n|*ib rlhb=9%Fk(+%m!swsGAsqvPFFXD~?PP98sNU00000NkvXXu0mjfnRJr@ literal 0 HcmV?d00001 diff --git a/view/molistar/modules/guildAr/incomeStatistics.html b/view/molistar/modules/guildAr/incomeStatistics.html new file mode 100644 index 0000000..16c3f42 --- /dev/null +++ b/view/molistar/modules/guildAr/incomeStatistics.html @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + +
+ + +
+ +
+
+ +
+

+
+ + 0 +
+
+ +
+
+
+
+ +
+
+
+
+
+ +
    +
  • +
    + + +
    +
    +

    名字

    + ID:0 +
    +
    0
    +
    0h0m0s
    +
    • +
+ +
    +
  • +
    08.00
    +
    0
    +
    0h00m00s
    +
    • +
+ +
+
+
    +
  • 2024.08.01-2024.08.17
    • +
  • 2024.08.01-2024.08.18
    • +
+
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/view/molistar/modules/guildAr/index.html b/view/molistar/modules/guildAr/index.html index 44aa2cb..8c63af3 100644 --- a/view/molistar/modules/guildAr/index.html +++ b/view/molistar/modules/guildAr/index.html @@ -39,26 +39,30 @@
-
+
+ + +
+
- +
- +
-
+
@@ -112,5 +116,5 @@ - + \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/incomeStatistics.js b/view/molistar/modules/guildAr/js/incomeStatistics.js new file mode 100644 index 0000000..7e68a5e --- /dev/null +++ b/view/molistar/modules/guildAr/js/incomeStatistics.js @@ -0,0 +1,172 @@ +let urlPrefix = getUrlPrefix() +let browser = checkVersion() +let env = EnvCheck(); +if (env == 'test') { + new VConsole(); +} +// 封裝layer消息提醒框 +let layerIndex +var langReplace; +var localLang; +const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => { + layer.open({ + type: 2, + shadeClose: false, + content, + success(e) { + layerIndex = $(e).attr('index') + } + }) +} +const hideLoading = (index) => { + layer.close(index) +} +const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => { + layer.open({ + content, + time, + skin: 'msg' + }) +} +var roleTypes = getQueryString().roleTypes; +var index = 0; +var totalGoldIncome = []; +// 初始化函數 +$(function () { + getInfoFromClient(); + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + setTimeout(function () { + // 頁面全屏 + if (browser.app) { + if (browser.android) { + window.androidJsObj.initShowNav(false) + } else { + window.webkit.messageHandlers.initShowNav.postMessage(0) + } + }; + // 頂部返回事件 + $('.back img').click(() => { + window.history.back(); + }) + if (roleTypes != 1) { + $('.Member').hide(); + } + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + langReplace = window.lang.replace; + localLang = window.lang; + translateFun(); + income(); + }, 100) +}) +function translateFun() { + var langReplace = window.lang.replace; + var localLang = window.lang; + $('.text1').text(langReplace(localLang.incomeStatistics.text1)); + $('.text2').text(langReplace(localLang.incomeStatistics.text2)); + $('.text3').text(langReplace(localLang.incomeStatistics.text3)); + $('.text4').text(langReplace(localLang.incomeStatistics.text4)); + $('.text5').text(langReplace(localLang.incomeStatistics.text5)); + $('.text6').text(langReplace(localLang.incomeStatistics.text6)); + $('.text7').text(langReplace(localLang.incomeStatistics.text7)); + $('.text8').text(langReplace(localLang.incomeStatistics.text8)); + $('.text9').text(langReplace(localLang.incomeStatistics.text9)); +} +//接口 +function income(startDate, endDate) { + $('ul li').remove(); + networkRequest({ + type: 'get', + url: urlPrefix + '/family/income', + data: { startDate, endDate }, + success(res) { + if (res.code === 200) { + // 处理当前周期渲染 + $('.income .time b').text(`${res.data.curCycleDate.startDate}-${res.data.curCycleDate.endDate}`); + // 渲染日收益统计 + var dailyIncomeListStr = ''; + res.data.dailyIncome.dailyIncomeList.forEach(res => { + dailyIncomeListStr += ` +
  • +
    ${res.date}
    +
    ${res.goldIncome}
    +
    ${res.micRemainTime}
    +
    • + ` + }) + $('.dayDate').append(dailyIncomeListStr); + // 渲染成员收益统计 + var memberIncomeStr = ''; + res.data.memberIncome.memberIncomeList.forEach(res => { + memberIncomeStr += ` +
  • +
    + + ${langReplace(localLang.incomeStatistics.text8)} +
    +
    +

    ${res.member.nick}

    + ID:${res.member.erbanNo} +
    +
    ${res.goldIncome}
    +
    ${res.micRemainTime}
    +
    • + ` + }) + $('.userInfo').append(memberIncomeStr); + // 渲染周期 + var str = ''; + res.data.cycleDateList.forEach((val, i) => { + str += ` +
  • ${val.intervalFormatter}
    • + ` + }) + $('.cycle .cycle_in ul').append(str); + // 首次处理 + $('.titleInfo div').eq(0).text(index == 0 ? langReplace(localLang.incomeStatistics.text5) : langReplace(localLang.incomeStatistics.text9)); + totalGoldIncome[0] = res.data.dailyIncome.totalGoldIncome; + totalGoldIncome[1] = res.data.memberIncome.totalGoldIncome; + $('.income .gold b').text(totalGoldIncome[index]); + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error(err) { + hideLoading(layerIndex) + toastMsg(langReplace(localLang.demoModule.layerIndex3)) + } + }) + +} +// tab切换 +$('.tab div').click(function () { + index = $(this).index() + 1; + $(this).addClass('act').siblings().removeClass('act'); + $('.dayDate,.userInfo').hide(); + $('.income .gold b').text(totalGoldIncome[index]); + if (index == 1) { + $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text5)); + $('.dayDate').show(); + } else { + $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text9)); + $('.userInfo').show(); + } +}) +// 打开周期选择 +$('.income .time').click(function () { + $('.cycle').show(); +}) +// 选择周期按钮 +$('.cycle .cycle_in ul').on('click', ' li', function () { + var text = $(this).text(); + var startDate = $(this).attr('startDate'); + var endDate = $(this).attr('endDate'); + // $(this).addClass('act').siblings().removeClass('act'); + $('.cycle').hide(); + $('.income .time b').text(text); + income(startDate, endDate); +}) +// 关闭 +$('.cycle').click(function () { + $('.cycle').hide(); +}) \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/index.js b/view/molistar/modules/guildAr/js/index.js index be034b4..280caa9 100644 --- a/view/molistar/modules/guildAr/js/index.js +++ b/view/molistar/modules/guildAr/js/index.js @@ -83,6 +83,9 @@ function translateFun() { $('.texts3').text(langReplace(localLang.demoModule.texts3)); $('.texts4').text(langReplace(localLang.demoModule.texts4)); $('.texts5').text(langReplace(localLang.demoModule.texts5)); + $('.newText1').text(langReplace(localLang.demoModule.newText1)); + $('.newText2').text(langReplace(localLang.demoModule.newText2)); + $('.newText3').text(langReplace(localLang.demoModule.newText3)); } // 判断公会身份函数 function guildFun(type) { @@ -126,8 +129,7 @@ function get() { roleTypes = res.data.roleType; guildFun(roleTypes); if (res.data.wageEnable == false) { - $('.memberFlow2').hide() - $('.header .headerBox .myWages').hide() + // $('.memberFlow2').hide(); } $('.text2').text(res.data.name) // 渲染基本信息 @@ -304,4 +306,8 @@ $('.inveMember').click(function (params) { // 我的工资 $(`.myWages`).click(function (params) { window.location.href = `./memberFlow222.html?familyMemberId=${familyMemberId}` +}) +// 硬币收入统计 +$(`.incomeStatistics`).click(function (params) { + window.location.href = `./incomeStatistics.html?roleTypes=${roleTypes}` }) \ No newline at end of file diff --git a/view/molistar/modules/guildAr/local/ar.js b/view/molistar/modules/guildAr/local/ar.js index f068d7f..39d0c95 100644 --- a/view/molistar/modules/guildAr/local/ar.js +++ b/view/molistar/modules/guildAr/local/ar.js @@ -26,6 +26,9 @@ langAr = { texts3: "إعدادات معلومات الوكالة", texts4: "إعدادات مشرف الوكالة", texts5: "راتبي", + newText1: `إحصائيات دخل العملة`, + newText2: `الوكالة`, + newText3: `المسؤول`, }, adminSet: { text1: `إعدادات المشرف`, @@ -115,7 +118,7 @@ langAr = { text15: `تفاصيل`, text16: `تفاصيل`, text17: `الشهر الحالي `, - textss:`إجمالي راتب العملات الذهبية:` + textss: `إجمالي راتب العملات الذهبية:` }, memberFlow22: { text1: `الراتب الشهري للأعضاء `, @@ -163,5 +166,16 @@ langAr = { ok: 'تأكيد', close: 'إلغاء', departed: 'غادر', + }, + incomeStatistics: { + text1: `إحصائيات الدخل`, + text2: `إجمالي دخل العملات`, + text3: `بيانات يومية`, + text4: `بيانات الأعضاء`, + text5: `التاريخ`, + text6: `دخل العملات`, + text7: `المدة`, + text8: `أنا`, + text9: `عضو`, } } \ No newline at end of file diff --git a/view/molistar/modules/guildAr/local/en.js b/view/molistar/modules/guildAr/local/en.js index 5ffb088..bcb14de 100644 --- a/view/molistar/modules/guildAr/local/en.js +++ b/view/molistar/modules/guildAr/local/en.js @@ -24,6 +24,9 @@ langEn = { texts3: "Agency Settings", texts4: "Administrator Settings", texts5: "My Salary", + newText1: `Coin Income Statistics`, + newText2: `Agency`, + newText3: `Administrator`, }, adminSet: { text1: `Administrator`, @@ -113,7 +116,7 @@ langEn = { text15: `View`, text16: `Details`, text17: `Current`, - textss:'Total Coin Salary：' + textss: 'Total Coin Salary：' }, memberFlow22: { text1: `Member Salary`, @@ -161,5 +164,16 @@ langEn = { ok: 'Confirm', close: 'Cancel', departed: 'Departed', + }, + incomeStatistics:{ + text1:`Income Statistics`, + text2:`Total Coins Income`, + text3:`Daily Data`, + text4:`Member Data`, + text5:`Date`, + text6:`Coins Income`, + text7:`Duration`, + text8:`Me`, + text9:`Member`, } } diff --git a/view/molistar/modules/guildAr/local/zh.js b/view/molistar/modules/guildAr/local/zh.js index 9a9718d..cb81b63 100644 --- a/view/molistar/modules/guildAr/local/zh.js +++ b/view/molistar/modules/guildAr/local/zh.js @@ -26,6 +26,9 @@ langZh = { texts3: `公會信息設置`, texts4: `公會管理員設置`, texts5: `我的工資`, + newText1: `幣收入統計`, + newText2: `機構`, + newText3: `管理員`, }, adminSet: { text1: `管理員設置`, @@ -165,4 +168,15 @@ langZh = { departed: '已离开', placeholder: '请添加', }, + incomeStatistics: { + text1: `收入統計`, + text2: `總幣收入`, + text3: `每日數據`, + text4: `會員數據`, + text5: `日期`, + text6: `幣收入`, + text7: `持續時間`, + text8: `我`, + text9: `會員`, + } } \ No newline at end of file