From 2587b0a822caa627424879a3d7d7723f4c48fa81 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 20 Jul 2023 17:31:20 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=8F=98=E6=9B=B4?= =?UTF-8?q?21=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/notice-img.png | Bin 0 -> 446 bytes assets/images/tab-back-img-left.png | Bin 0 -> 5373 bytes assets/images/tab-back-img-right.png | Bin 0 -> 4989 bytes pages/home/home.js | 14 ++++++++-- pages/home/home.wxml | 32 ++++++++++++++++----- pages/home/home.wxss | 40 +++++++++++++++++---------- 6 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 assets/images/notice-img.png create mode 100644 assets/images/tab-back-img-left.png create mode 100644 assets/images/tab-back-img-right.png diff --git a/assets/images/notice-img.png b/assets/images/notice-img.png new file mode 100644 index 0000000000000000000000000000000000000000..badc02dc9924196a869b37647d081aabb17dd057 GIT binary patch literal 446 zcmV;v0YUzWP)8UNag?+eDHSLS8q%}RE=kN-b za2yZnve?v>IGz%?8~1Qx+5G}DSnTU~9j@Sc2Q>5(OOqUjtBsi$YY(pC&@`V^m&GZZ zi8579`y;^HF^{AFyl5%i_E8wQh>y4#rMQEW>2{o}FEsQJufuU&7Bc}pxC+P$RZaUj zF4&6G0sb`vIQ25iINP_6C+QR3VgI1us%fMB-edF7j%8^_gM#a_80BtU9NO_V?2S4H zceLO9L8MLvK93fzjZO=VxZvsf8q=Av%=x>z@)B-U339w@wOu#&qs@O2By)I99DPplmF^_u2q9W oUvN1G|FayC*Q=)ex*`*Q054EfCchYitN;K207*qoM6N<$f?ToIF#rGn literal 0 HcmV?d00001 diff --git a/assets/images/tab-back-img-left.png b/assets/images/tab-back-img-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0d033f081312ff11a6345c61b7fbdd4eb6e13598 GIT binary patch literal 5373 zcmZu#dpwl+8rK}cC{!4=MHrVbqe78HBQb~xuR$1{bP<&`BywrCopnlwymli=rVBGK zAr+ySW@}q#a;r7tlEm4_Ipca{SftK7yUlMZ{=vulyx-^g{XWm zanbwRiq0x^T`z6cZwZW#{F!;3(Y&S3w(4Nx@mk}bEK>yZ!ogI>LHhc%fe)b_)6@2Y zSts;j3r%fbR1`;s`9V%GGp!Qn{%wR;kA$6`X|3@Wm71=hSz;7bG}k+y;fE;lLLgcx za+vsWW*V7Ih8!WNq}z$iv&n6|kZpayGUd+IJ#En(WGhuPiqvtC<7`CGf8~76+P?r4 z7!0L+B+zv2!mq(K$wo7URZ#yKt(b17T*yhD&AH)#G4 z#N{>A>+U)8DUOXiej6llfFy2Y-j39Q5344F*;k4q(`v^lP*3MaC>pKLU#58%`G-rz zSIIAFheA4NTrF{NB=0Vw_wfC*I4g&CNy5{CKZ}VP54jYjq+gt-iYiRex_^5M_xk#~ zs&1R+*U0P> zlaR;_LFUuic(V8uRYE-bG9XDiK8rT=v;F&d52@=KNTiI2y9Z-}R;x;6ApKsD z9}4w$4m21+(=dortl-TsY^`ggA${ zW5#?YGHYM;0Rr2zqwP=_Y=z3~NIrLXuyz)9Oa zlc9t5GYo=0QlPC(uEE})_^ZH(-!Q&w&YO;ou&A5s&)PwO9yy7g#{vh@W(=Cggt8y^ ze`?tHHk;l6$R|KFRI(m=GX}_^7neb=PGuHA%R<;Zk9* zw2Xz8lX`uvN!tb5jl#C*D^oKJcWhnkg&f8GgQEs=1({ zBku2K(kqC<21Hz<+!>`LXTyDLvZbKEPW(|ixM5UiB<+vmy_-Mh3rF?diL29&<;xC$5onSIg^SX*T|Ed=24`=!z`#b!$jc z99E<24T3A$$7q1xyVn@yUTN16o0f`a2QnR8!Q*f(MhX0I|Bua7!Z9_8H6%)%d|)LH zoxbAK7C}^rW;H=LGB?dl!tRd%yjWjZ#HW)@UhMBC_3$=TfA-ehmF}C*X_)x44@(Xh z$(3CjvkxxN-?xjUH|G%UBukKAg>lF!2%d_e4r+w%RY=1 z7SLi3fbJ-@m~?G9slrSe9y>D+CaDn{f*^ayM504c1|1uZJAVi$+y&!GN5SPgmugOH zi#JI|Ok}|ZLg7B}n^N_lfrljS`NF#Z>wwx?uh=6^npjER?8#NK;+2_?Q{Z~)x~gZ1 z%p`5c!(bYI)v>!2F_veb^%Z(w9K3E(^bq%|#IMog3@U8}wZx?aYZq47?&j4X-wmq6 z9sJDid1VI<;iMh}vquWhJspq-;QM~Ewnh(BoZ87WVh>>hW{^Qx_3_nR(PGzTG zx)1av{0KuCe&sOfTS3tv9M_jc?@YtEAvM?R^}60e7ogagr_uRZ2xk4B{Ru=e?3r`AG98r z3eLI^C%;CCu@f+Oxu?Fiw#$x~zNp3}Io_-e1vE%eE7((Yd(1ct_1G!*XrP3Ob}=58 z9xO&fzc~V$t?Lnf8n$*J__5RB>U0^C!_63uW<_BO)J%p|kO z)AG1io-z~kECO+WJf*%6!rQcK(?W;`7bD(L8nwQR%{M#>rn^}Bv(qWnV8ft|3?+N3 z-|=VZk-F67u_;ZN+Hd~Fmzkt;&_N!X&I2pKyo)9DHG~m)N@F2}w@H`nLI}Iuh#^f+ zZLz_RBQjmlL|cw>D#a>*J*Tq;C}6mylvC5(5Z36v&SVhV9mOdV`}XNrX5ESX@4#69 zy7GaA;7N)V^=k+hvij6Qh)mP2wuKOOIT5FO8@0teX0xe`0J@%ie}|5F#By2{u<_UG z4gsCHK#&q?hl`moMVv1`?yLVK(lQohniI7}Mht!@Mj2i^YW+Q_r=+|K%+~?6?HBuB zF9PubKR3G&q68iuUIf%8lxgEABFNfb5#3bnR9$AB zRS+Gts@O1wBUPtPxAn|A4ai#lz(l&Hc91p*Q`q@rnKW&*mC|Q=g$HZYMdSs>fTN18 zD0UVF8?TQX0?LPqKMS9*n6YP7%_7F=f=c<`mpw>#)d|hfj!NwXuCS6v(WzAk#sW&;{inI9LAITo_8ucL7s? zWBiS*o}eAT8uj>XEl9jpMarN>jBk*q;ujhhcvRgjt;EJt;kV#8YI5yMh6$leh+Plc z$VJ;*diRYPR+4&{*H?oo(N}d|?)S&B(8RTxfqvy(;q&lr^(wb139KVaLE^6z(Tgv9 z5#xX3mFpH7d*i!$T#qp8)LgCQ#W0E4BB&;kEQFzE`QUipxRv1v-QOU13Z1nOmSVU0 zfGSZLBjlE{HR#0%J(r(2wb)^DY_ez^D?z?%0Rq+p^-*&ko>=7HKJcqMN6{4t?HmN; zd}}`5h2L7f5c=NO;Vxf!xZ&=CZ05g?f&vOmf&MN zVINDn0W)c}?O{;I_AC67oL3Kl)|2O2Q1SJtmmisi;j^$c(cMB3ReL}DF!nt0z~y6aBPsVz>Dulg3a+qv-ifFY~*#&p-J5oO6EP^F7~l?zwk=Xt3XW z{eS6eX=%+z{e9MHX%TwC-`90N0zca}Usw%(X{WFATdh^sZ8@T)W$KRlFg9dIKamui zjme6-IeusF>cvh$?njaqH*WRS>-Ig}v3tHK?j>W+x{tRrPaW`IKJpbY?%MIK7Zx>s zS#kT3a<7%XpRC{XmFeHdgSHvC9r9X~n*MO%50P18PiA;y zQ!lgguoq!%gJUyStcPdEM@1^$?XPInbY^AM<~sx8GidY)DG81KS^2aAS=R3VwU#!4 zsB3IfPvR7;ov1=vTa`~s&|v$Vm7>8NUc#o-q!IUL&mQ*O9zLv$t(9Fvym(SSE~{MH zfK>SA`XpDp@h{s)C*^!58s=ICro|*a={1fsJ%HB8P9v#k+LH*MREuj@f13OHBKp@_ zoJM_W>nC@t*G`Q04OG`QoJbB0`=b#X4Q}ufSz!AfF=rM|x2Qp>ZH0On|H)6qj1Z53 zh!=f*o+;^LyeMF=L{dX0?jy?vEla~p)t2f!3|K=x*j;X(ph;=n`RC)L!pk+hN~smP zizXs=*HtVY(#%8tjvl>0{-^K({!x*1uzDmFIN)Hj=R%WkckYprZ8I=d3h zvY;M(%P{?Gde+I7m;|BKCgc|>Kz4bq@Z}CHtGVEr?W+xWpS-C9o&7OE(k~l~p+rh( z{&Ag&>ljhYL9UdCoEvB;HhPz+aalvVS#$i6^L?{l)_Moq3uk9r6yAB7;!kpepYhs7l@we-vaFhIky8s!p2sC2An)p0!h? zqID_4{4cB5RnL>vOy5V05LMkF!;#FloCCVt7WYVI9{kof&|#4y7N{8||6Ub1@!KJT z;T6!T`-`Eg$hj0@<)*Qj*m*LejFN+_)X!c8zr#akYZI)Kge|cxV)L~?Sdmy>QVZuL zv2&jlSAk9{E#-g(8F-+2l!Oyi+ zbw(x*PFD@C=;iP7#zLI6ub(x!eBrz$}xp*-Wy`e5!UJ6z8}3hIfRkPCgSlA0ol zcNEi%G~)bRo>CrfqVZmIf}ZvG%2!LP)hp-Jh}Xt)IQ!8N3W)bGZoM%rl#pvcC|F7^e_|6EYuCXyUBf}SS2 zSDKo3O!X9A&h5&c`uRVwS=)Pb%uJD- zch7>}z1&eN6Q1y64NcFVg9scXY^6QC&lgebUaT`2#$~N~FRnrXY#*bS{YoOC@eNy- z3cr%DKish^Y^O9O)R2v6WO3ywc}j6It|-UaZ9rQ&`==#rNOKF+)Pnt4iK?!~I%tCA z_YKs~pTs?Bd!`4Fsp9$KT~OWzBtfcwT5Sgdx+f95^<+h;vgAX<64Ip`e`%7nadG3E zB2J1B%8fnoZ7_$8pY}4FXrglDuBG9-XNoo<)^yS8&^9O0V9ES$-1Qj*Z(Z3PlIkcP zK(YF84l1{_DhvBz~8N~oHcVkI?1DFx=`?n=D!RL^>>V@H3LbF2rMtRs)T=|9VONyos zp`OblJS<=@AK842F~dVHQuJ|wo$7z%x7vv^V{bHO!ML>svTAe(h4_J?=eL`O%f?45 zVNL-+W*0~v+|AA2njWCDy9l-VGAlIruzB}=$W(^Z|BhDUO0urufy3gcd{FC_+Bgi zBY0J1dqdIAEUfwwOets$yPuJ7BdT0~l{^m;i#f(H5?=53`u3Byn7vPyxH5;ck$(QRr0#(3y`58UpBCn{8in2doON1 zawP5TaE5q964KbGN&@G%N_T>+seQefa*Cd6-*%>u8tlZ5UhX0S^ln6 zY>c8`F>5+c>*d|(eTt>A1S zP98=ae)uTTp+9O&r;F}^unX160I z;5@D*>-b~**5#tlxkt$hAk5aPqv1@+oT$rln{mBl@7ObCE|Y)zKvI1ZH?>|z4zcfF zj(T|GkUhmpY6f`HAT0SioXVN}i)8TFAdB|@c&!{h=IIVS@u6eEX$!~@gyXzt=Dl}F zmtud*j)O}Cup8t_Y5Q<7H}S=MPi(XJ=y;c}hFEa6%SGgT9di1;6Y#AHPP_lUT`8Ev z2f5V3Qpk0$&NLWppdm7;PjMLm-H|-L`Oxkp_ujuhwDYQvCTHUiM)A-6pLU2)pUM@t zBqJR-*>B_Q1{-MR6i+T^;Ff^0D|Bmygl6?qZop|=^Gp!(iIY6U&wg1v9Tpp%)|EZx z-t)y_wIqTw3fHo14$mASduGyG6)>^tJY?yiO^;t_m48FJVRjs%5q^CSU?~~xM*0sQ zhdfylKe6hiU=yHn?-SU^}q64siN`z zU(Jug0JdXb1J31IejlKb3_F-`km{Wui$y;CCVnGi^PqvO8M|WY2w{5YIk^hFxKf$N zU*$MZwnfvMF)M#aZx_m53>Nvj+zPZIIXF8GZkzQ2{{3<(F&N&GZW_Kp-2xdY*$>~d z+m(e4cHqcJAsp0~8Ie@GFa1@HEAZ*U=}vT)mIFk2NiWIc%_e@SW5yX$TH&c_YM literal 0 HcmV?d00001 diff --git a/pages/home/home.js b/pages/home/home.js index eda79de..c32a256 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -165,10 +165,11 @@ Page({ const params = Object.assign({}, this.data.searchParams, {noticeStatus: 1}) UserApi.noticeList(params).then(res => { if (res.success) { + console.log(this.data.searchParams.pageNo) // 搜索时,把原数据清空,重新筛选 if (this.data.searchParams.pageNo === 1) { this.setData({ - list: [] + noticeList: [] }) } if (res.result.records && res.result.records.length) { @@ -179,7 +180,7 @@ Page({ } }).catch(err => { wx.showToast({ - title: '登录后查看消息通知!', + title: '登录后查看公告!', icon: 'none', duration: 2000 }) @@ -323,6 +324,15 @@ Page({ }) this.loadData() }, + // 公告日期选中 + bindNoticeDateChange: function (e) { + this.data.searchParams.pageNo = 1 + this.setData({ + "searchParams.startTime": e.detail.value, + "searchParams.endTime": e.detail.value + }) + this.loadNoticeData() + }, // tab选中 changeTab: function (e) { const that = this diff --git a/pages/home/home.wxml b/pages/home/home.wxml index 596739a..6bfa5fa 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -20,12 +20,15 @@ + + {{item.tab}} + class="{{(tabActiveKey === item.key ?'selected-menu':'unselect-menu')}}" data-key="{{item.key}}">{{item.tab}}
+ @@ -74,13 +77,30 @@ + + + + + + + + 时间 + {{searchParams.startTime}} + + + + + - {{item.noticeName}} + + 公告提醒 + {{item.createTime}} @@ -88,12 +108,10 @@ -
- - + 暂无消息通知! - + 暂无公告! @@ -131,7 +149,7 @@ - 公告 + 公告提醒 diff --git a/pages/home/home.wxss b/pages/home/home.wxss index 16c71b7..73c9ee3 100644 --- a/pages/home/home.wxss +++ b/pages/home/home.wxss @@ -225,30 +225,43 @@ page{ /* tab栏 */ .swiper-tab { width: 100%; - height: 80rpx; + height: 98rpx; text-align: center; display: flex; justify-content: space-between; - background: white; + background: #EBEDED; + margin-top: -15pt; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + position: relative; /*border-bottom: 2rpx solid rgba(193, 193, 193, 0.3);*/ } +.bg-image-left { + position: absolute; + width: 54%; + z-index: 99; +} +.bg-image-right { + position: absolute; + right: 0; + width: 54%; + z-index: 99; +} .selected-menu { display: flex; flex-direction: column; align-items: center; color: #069F99; - background: #fff; font-size: 32rpx; - font-weight: bold; - font-family: PingFang SC; - font-weight: 400; + /*background: transparent;*/ width: 50%; - height: 60rpx; - line-height: 60rpx; + height: 98rpx; + line-height: 98rpx; opacity: 1; /*border-bottom: 2rpx solid #069F99;*/ position: relative; + z-index: 100; } .unselect-menu { @@ -256,15 +269,15 @@ page{ flex-direction: column; align-items: center; font-size: 16px; - font-family: PingFang SC; font-weight: 400; color: #4f4f50; width: 50%; - height: 60rpx; - line-height: 60rpx; - background: #fff; + height: 98rpx; + line-height: 98rpx; + background: transparent; opacity: 1; position: relative; + z-index: 100; /* border-radius: 34rpx; */ } @@ -274,6 +287,5 @@ page{ width: 90rpx; position: absolute; /* margin-top: 10rpx; */ - bottom: -18rpx; - width: 60rpx; + bottom: 0rpx; }