From cb4b3952a501ff0d40fb0a8157b3fac1df32ad5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 7 Jul 2025 15:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=95=B4=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 14 +- src/app.scss | 2 +- src/app.ts | 4 +- src/assets/tabbar/home-active.png | Bin 1628 -> 2430 bytes src/assets/tabbar/home.png | Bin 1632 -> 2419 bytes src/assets/tabbar/order-active.png | Bin 1858 -> 2285 bytes src/assets/tabbar/order.png | Bin 1855 -> 2317 bytes src/assets/tabbar/shop-active.png | Bin 1667 -> 0 bytes src/assets/tabbar/shop.png | Bin 1746 -> 0 bytes src/assets/tabbar/store-active.png | Bin 1889 -> 0 bytes src/assets/tabbar/store.png | Bin 1909 -> 0 bytes src/assets/tabbar/user-active.png | Bin 1557 -> 3179 bytes src/assets/tabbar/user.png | Bin 1541 -> 3255 bytes src/components/TabBar.tsx | 55 +++--- src/honor/detail.config.ts | 4 + src/honor/detail.scss | 128 ++++++++++++++ src/honor/detail.tsx | 52 ++++++ src/honor/index.config.ts | 3 + src/honor/index.tsx | 86 ++++++++++ src/pages/index/index.scss | 2 +- src/pages/page/index.scss | 128 ++++++++++++++ src/pages/page/index.tsx | 47 ++++++ src/pages/user/components/UserCard.tsx | 159 +++++++---------- src/pages/user/components/UserCell.tsx | 206 ++--------------------- src/pages/user/components/UserFooter.tsx | 4 +- src/pages/user/user.tsx | 2 +- 26 files changed, 577 insertions(+), 319 deletions(-) delete mode 100644 src/assets/tabbar/shop-active.png delete mode 100644 src/assets/tabbar/shop.png delete mode 100644 src/assets/tabbar/store-active.png delete mode 100644 src/assets/tabbar/store.png create mode 100644 src/honor/detail.config.ts create mode 100644 src/honor/detail.scss create mode 100644 src/honor/detail.tsx create mode 100644 src/honor/index.config.ts create mode 100644 src/honor/index.tsx create mode 100644 src/pages/page/index.scss create mode 100644 src/pages/page/index.tsx diff --git a/src/app.config.ts b/src/app.config.ts index 51c4030..1fb8a38 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -3,7 +3,8 @@ export default defineAppConfig({ 'pages/index/index', 'pages/kefu/kefu', 'pages/user/user', - 'pages/study/study' + 'pages/study/study', + 'pages/page/index' ], "subpackages": [ { @@ -40,7 +41,14 @@ export default defineAppConfig({ "index", "detail" ] - } + }, + { + "root": "honor", + "pages": [ + "index", + "detail" + ] + }, ], window: { backgroundTextStyle: 'dark', @@ -51,7 +59,7 @@ export default defineAppConfig({ tabBar: { custom: false, color: "#8a8a8a", - selectedColor: "#9a23d4", + selectedColor: "#d81e06", backgroundColor: "#ffffff", list: [ { diff --git a/src/app.scss b/src/app.scss index c5ded95..d2cf1a5 100644 --- a/src/app.scss +++ b/src/app.scss @@ -7,7 +7,7 @@ @tailwind utilities; page{ - background-color: #f5f5f5; + background-color: #ffefef; background-repeat: no-repeat; background-size: 100%; background-position: bottom; diff --git a/src/app.ts b/src/app.ts index da26cd0..f0cd313 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,5 +1,5 @@ import {useEffect} from 'react' -import Taro from '@tarojs/taro' +// import Taro from '@tarojs/taro' import {useDidShow, useDidHide} from '@tarojs/taro' // 全局样式 @@ -12,7 +12,7 @@ function App(props) { // 对应 onShow useDidShow(() => { - Taro.hideTabBar() + // Taro.hideTabBar() }) // 对应 onHide diff --git a/src/assets/tabbar/home-active.png b/src/assets/tabbar/home-active.png index 9b4aec7240868a7b4de1628121233ce783b592b8..68b8131ed69a647ee447897de758f21673d640f7 100644 GIT binary patch delta 2420 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 D!wcav diff --git a/src/assets/tabbar/home.png b/src/assets/tabbar/home.png index 12a12e872ed0d3863902f5ef25828b6b0062b099..bd0532555e744df35a2fec6d3a7d982b0a8cda80 100644 GIT binary patch delta 2409 zcma);`9IY81IOPVhMCDVxm(I8lv`z$Z;KJuj$yK`D~fUDoWe>X^BG4`wyj*7$kn!# zV;Z+6M;c3OHB2;i#4ySTQ#5i8v$cQ0_s7@k@%rKUc)VUeye8#E%D48x=mU61dyhnD z;oeZv*a4NRMQ=t8H1bz0ik>%X0+08_lwzquONp>gW?BawJO zvO2gc2JG?OKF`~uPUUsNo$i!v@w)k#^Seo12)F!vYVnf$rKF^!Fv9r00|+ ztTvAC2B<5fCa3QG9Z{R(TwWc(VKXB0Jubg;HkSCUjl&86m5#H<4|AAE{Yr(DL2sf~ ze=`FBdyK*Up?Y|0X}Y&F&-p4T5yUs?oZ+_1Nb@_}+f!t;uw`ZomC>OR#YDsAg6J8# zyaM1ytxTL5mrE}Q4=|z$_?f}Ou_pgzi1LQbUgWDXRHop%`R)6BWNf^6eslFB`!oDL zJ^|HR(9Fb{5PEAlN=RzXR`(&(YbV_5RJU?kX%AOM*#;veKB}CsNA3EIa^Rj5khf6d zxKA%_#^9b+qZ_%h)xhG~!KNEBj6i^;yTlc&)k|=FY{ysXI@ZEa3BJaf+}yZZ3e+{@ zqlpzEl4m0+#G*TZAh3zi3MeB;7b^+I(% za_GHZtRBsRO0kX`lIN4{0d5D=tdU(I4CV?3J_ImNVM#Cnu zB9IQmSwnwy^gp2xU8AB+9R^jw_{5z6PQbosq90t1v6Kc&7v>2598OKZ<|h7Kj7rC^jmanW_BG^n!* zHtc9LS!!B8CDiZn9e=LP2@fF)N1DlwJ@)2Ztk`48A3dZ?1)&839ayh9$$Fb3!e&c6XQqdTeXm{va^h_I*Jc z`|UVYoio9Xybj77O4lRMFPn@~f$3mIM;yTl#5-nM?|wn?CNQjn&FMn4y*hX@yZB&S z*-4JOoQB=?r93B>Pi(W`vorJXj*F|+$-gu?y@%|Tzf6I!HW2X7Io&>W+f>|o^on@W z04P&7hSG}*X{3SnCdQSRZ#UnXJbG%CO4E(ba@ zGKL^26c&ZBNtLxf&xV2YidFd+&}<<&J;fTxI^od|3vNie8|S8P!~$8hI$DUB zGwk&Uk?9K;-^e1@mQDyWrQxoMHG9i``V~#VSUJ#~N>0eoWa(<|pnl70XCZ~9lCz`( zVEbyj7|-j`dCD2Bm`rXHyt-X(CYvcWDGq2XX4`Cb_1|iE6v;46@s>OEYRDag{5mk8 za%d9h>Agt9S8Hlhy$W|TY0?&1?zP?Vz&A7j)2Y~nJ>InA6%-EV|6?!yA4o@y7`YFKjU$@8x_~O5gG@4I*blU4^i0!m0`N zo(5x=j|{b=lnAG?KVW*ZYAjvu>D#)DvCpXiame*jnIERDWR`|VZXc_`(S)bhyY4IT zR6|I$Yw>O005cqRXPEy+C@yRw+Ya*MiXy?RrtghfG)fu#)Lm~%9PpHcfX> Jy5pp@e*r%&dzAnH delta 1616 zcmV-W2Cw<^65tGwBYyw^b5ch_0Itp)=>Px*8c9S!RCr$PozYU`FbqYT{21_2g-75K z`cd#@&Eihe$!3yRwk6q;FE6{Z>!gkJHCM~~o70HAXS0002!JOiDF z4+j7MooAr)@ZkUepz{oL9zGnv2>_SNnnL-lLs2hmz(LP2oC_<$bLHI2p_^n6KEWQT;b=ir)m0pdwct!rU4~@nknINrNRRM zVS%J>&n0|L{eQoe45`3y-{TD2Pww8QX}X=@as8z100012))Vd{C487dYW)WQ3Br{Q zl@va={sVwgRSDN?2tQ9FKXfL4SrX#fF01^}%IUsC@8Kmq`*3V#m(5=6`y+Pd&14ImugfCvl1 zmo|U^U;_Y4!k0FH0AK-tMd3^9KL9wLPL_oS06AUV{TdI#mo|W1I)E49IU2yO0PrR} zM+4Xe0A7XXsQ>N(;C{npLCYa_Y3h3b*AsF1rqCXQ=V$=kIY2MMb2Wf&0O(D4t_ILN z0KE#&)qen*1)z7~y9L0S@Zm{a?k9gZ>%SQXu(+2GPw9-~_yhn7cEA>epSNd{;@?(o z!sh@TNzmjufK}mx<^O5(`S+L}`$L~=5lat%9y^JG133mm6 zW#MaxpYs&(-fFE{0;~%^TYmUVKCP9{bp%|s1bDzf)mKA&Qvf&<{ zwSTpExpx4`0DOOcPkU#|mj8Y0Bi4iX(=`3G6c^X8fR{0me;3eVLO8_PT2-ya%H04a zJ3uS7kVE*rEmf=HOEiEv05oTdIWTN(@xpyt7GI+NCj&4i+uEBmmyqlwvSsn5b^zG` zgbOV~U{!pH6To>Nfua;xII06@|Wj<$F+oR-Cpxf*2w9*rqJ2S}X&ryEd`V_AIZ22i{QkUTuy&Jb@b?$%_71@AkI>q=Fw!&cOinZD7e{_pbFQeu!1N{x??w za^UbPJ^&!n;O&j7bJ*0TmzbvAVSlDefalc@00?M%20)_$G~WYw20)_$1ONn=sWk)u z5Hj!80krBr9Do2>jUfPln02oXpw$4v0f?Y!57Vmu06<$=;_CqbVxl~j0L}Uj2Oxr` zISc?KWZR5>^ zB@Ga2)cStZq30w07npT)%@5hDs=JnlD0E8rY9s&S7t4oLt01%SodB{IwVdA}R*oOiD O0000OpJhrQtc4bLc)^-)`V<)TV zvRH^Y`bUAO8A!miO<*pNK2_@&4UC zav(UotA`*!2z>wi{Iwg$&u8%vxQ#38yY3Ew5Jw_H^8_H6=YPPvSa10|6TxMSE%j@z z(=-7{^#n6DKoAE4rM9o3U9$ur_&(L&7zGH#6mp}Q-8OHM0DjcEd0h&1p9vbB4w@qX z!DrM;1wZKN$MG(FZfV~f0n~!yGD=HRLBOdg0uUgL(I3ESF$*+BfbRMEa|o8o-emz5 zy#90q+GIz9JV=bK?(V8_=H`1I?y5#TyR<<5?M|Db9;M}|>#;H~ne zGJy8z9LMqdTL|keX^H@ZV(dD#Eb!^^=^h&`Npl3y3V)I&u}TuEIRXIYI1FFdO9{c( zB9>GiQ}r}S0KN+lv{X=DwR2zmS`9vaHc0>+BWO31zy<%~fB%bS6Z%#{F4=6B066SP zz;xgO$#IN8p4Nj89!(Pf2bm7oM@wTXewX}jo&c8|xAGGLMt~Czhusb^;2iw*zF3VH1agu+Dn2DNU7~>Xa}Jocjq!(bbpnm0dWGP%>PFS{xsmD_KPg0##TOy6Ch>&Z++y? zV?ZWI$^vsm0>|EH{K9{d7K+J5mxn(ROQyLECR%m_+5+TnE+I# z;`!b^xAMgGe1!6{u9)>01g5bheyq)~N9MPodji0cbKsXOIWqW$%6F$MnYOZc1b?o^ z(y4<8ki>oLJOL=+U`@2HNUhnm^V<<%FmI{tN#ZIFTN}8#9jPQR#~<5fR|pWxt%I44 zQ-6qFT~b(%q%$UI2;9<&*bj{A7$r1{sc&`jArKuK_ubBa2guh&v$Qt^i~xI!Nap?+ z0Wt%=H*-dSy+tH*e~bW`0pFXss(%SkdQGCVeF-vEM*tQtxHiGkG^<(c5y~Y1S<``? zlJ-OYr1sSifYAo+n@U^aa;`n80}jYtsnwqkpO3^gOOj-{5Ep_hge&?AZ>rE-IRJ&5FiG84}zN_B(p$i``#y|&F%@n=zmM`U1}7j z5=qK_itjOPc29s9XH@E@Uj1}gNTol*N_S6y=qp?Sph^M|x?5_$djcdqLIs*qPaN&+ ze-FboN!dLCQk@;g@q21piFQ2kETKnR$Lpe>1p)9LP}fMndH)I)8VJi4`@HnwR$2Izd|jbfblWl9_Lzq0SL&D6dY`IOx8YO5lE@3Gqu2!vn& zI-g0??o^gPZ}0Kx9@~gN{`LD?7URN3sw99g234rj>ZB1s3)xEa8h-&Q36xehjR0E6 zR-)GkP)VS)x;gMOCPsPbHTIakTHSR7hV?2|qZR~W2Pf+%L+m;?zjcYL_G$xp8_^z0Y?%V#B|8&=0|`S5!|bmC$aPdfH^Fy zUTR1=OP*Ji+R5D@aDR;i^H_QUgr3vT6JZ#>aB&6UnDS7^_H`gY%!nN^48k$xQx9Gd zAed~NA^n|ED~U;qLsCYfDxe0xNi2!2(THdHY08nhr{N-*tDF&R;A~SnI#2>*a(z0bUeG?c6i~C{b-HtxUE{3cmAK<2#l(0XAJ%aL&yC z0EKt(0MPtgE60%Bzv?E%p@hu3#f&%sZepp+1OOCX_5@(H3#9h){@n=4w*+OWj>azl z?1&QprLlJz`F}RE4Pdn({>4&`*faN{59e$6(F!g!P$9q=`7q~&z8$i7$!V_OEtN}@ zsSvH>Vph5r?TNVI?+eLHq(>pZ+kOj0mj{{AM%c7d2AMDf!fO0x- zBmjvt$&p1>34q&>K;l;cx{f3a9I~jk&*}ug0q!TnA%8xbtRuiJTz=rJSG~DL76Q;q z95NDs#C7q(&-ku^Yy`k;woNPKj_hGPs~K;zQtbeAx@Q&-cX$5IO=85T6xz9--?VAOr$PEeO7N!9ORAcBEwB z1OCMc5L-IJ9zY;N5I|}{f;-KihlqA0RR65@(G~;000I_L_t&o0Gf`EOiV@98vpY}fasU7T delta 1844 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 delta 1841 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 T;d*rO&;Z^${I=I@*}%LhHAB13aK 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 fGe@>iw{N1+&}a?Cw;$At>=bT&Acq diff --git a/src/assets/tabbar/user.png b/src/assets/tabbar/user.png index 0cee24d1000b83cc766787c727875609f0ce0060..b1213a05a00f7f75be59dd8f1c7dcef627892ee3 100644 GIT binary patch delta 3252 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 m|A=}k=Kufz21!IgR09BY?UssR&p(j>00000 literal 1541 zcmb`H=U0;l6vprSW+H?H5Qz{mD1yk8MnzV_GALz=GKEw{WwanTScU`v16UbVK&Xr! z5DryThBAbN(Nirds|>XPL`7pHARD!z^bhE_ez^DdoO7Q~&pFRc_i$sA)@iN-0MdSE zN3S*V{v9HIZFky!*S!WL#*1waHP2`g0Gx2Yqn&qb(A14S|JQU%YEj!r4f#;3w`l{p zqRqE9v!pS?wNUwqh-NX`$bCsEn2Vv7>J0Fi4s4EQ^FqW|J}4<82pul6IWv<32vIby zLVdV$22itDEI!h96AzTM`RzsSg#WV0&6J~TOOgn;-^IzlUa;0qa++FGf>m4Xtm(=D z$%XYM&3JkS*Mg>s!>FK+P#yB6zf8wS`-WSkmE^23lZ@lBrNZ@O z5=sT@fYo(avjGPxP~wwvDIH2U3eeNDb{o=R-$v>I6F@{#sq|?1PoejgmX>6%rESTA z#Vm#r1supMD*i7FFKji(aJrKh4%w6Ps_ss#D2hmQN*LQ5MS^HlkV{mBV}u#`5d>wy z<*gnbiDU;@3%8M5ELx!Sb~3V+J;uQXM4_Az=$Ms`NtR*~iS_eEouP4iLsWPubX4@~ zb4~JtDuycuTkEH3>=6zBAfI%PnI7PFN<4j zzb{;RGo4Vk!y!vA-#J;BpNK1+VC-b*(J*S<;DkQ|=H#wu9m=RaS0)iq$(&tZL!HRD26%_jciOzFn~wGkAvT-tjgx==Za0u8Qf-iELs& zqbFiwNy^@kaV0JNB-}(42<$wXc`8FzIhBST@5W`&v;E&T^dyYUH2I%@%BtV)V(At> zq%yeJ62;4X&c|Z~3c-8!iu@hQ>n^GivyE44#dr6L@_2dl`F?4O7HYIf=NUELa&s&Z zj&6P3EIeMQu_x7j<9l|yjC58^LJ~+<4nCT(iXi^>W2s7)%u?Z@Q!ID#BsT2~B+rRb zQwjsan^@Jd@K+|dLg_NIF6}VIo4|^G!FG#IO?1tCNAid9MX~Vqs~jVr@WF;1P%ppm zJdBJRTyuY!&^Np`IBF9}g2yYi4=z>rxDV0RRfA~Ml+ZBb;emri?p}D6p;>vQ03#YL z(U%YFU0Zp%?+L=0?je+>DHfoj(O^9;Ny7}sYZcN!x{<#TKK}i7V%S%M4)K=PuN{}5 zC!kk;HtuerY9X+`468G*o@hAe4D$`<27O^vGlaKzrw5SUEQ7%G4RO3?%#0TET%g|@ z!|Ya^%T(P^*eQw zUqwxJEY8mAqI1?szSit28F-TnQ7pKaF1%2Mh3up1&Tx0$>y9zvK{hzd{~r%Y@aRNw UjgzFackQpkekV7_8hcLiKQTO%TmS$7 diff --git a/src/components/TabBar.tsx b/src/components/TabBar.tsx index 5f346ac..a3b3dfe 100644 --- a/src/components/TabBar.tsx +++ b/src/components/TabBar.tsx @@ -1,28 +1,35 @@ -import { Tabbar } from '@nutui/nutui-react-taro' -import { Home, User, Date } from '@nutui/icons-react-taro' +import {Tabbar} from '@nutui/nutui-react-taro' +import {Home, User, Date} from '@nutui/icons-react-taro' import Taro from '@tarojs/taro' -function TabBar(){ - return ( - { - console.log(index) - if(index == 0){ - Taro.switchTab({ url: '/pages/index/index' }) - } - if(index == 1){ - Taro.navigateTo({ url: '/pages/study/study' }) - } - if(index == 2){ - Taro.switchTab({ url: '/pages/user/user' }) - } - }} - > - } /> - } /> - } /> - - ) +function TabBar() { + return ( + { + console.log(index) + if (index == 0) { + Taro.switchTab({url: '/pages/index/index'}) + } + if (index == 1) { + Taro.switchTab({url: '/pages/study/study'}) + } + if (index == 2) { + Taro.switchTab({url: '/pages/user/user'}) + } + }} + style={{ + display: 'none', + zIndex: 100, + backgroundColor: '#fff', + boxShadow: '0 0 10px rgba(0, 0, 0, 0.1)', + }} + > + }/> + }/> + }/> + + ) } + export default TabBar; diff --git a/src/honor/detail.config.ts b/src/honor/detail.config.ts new file mode 100644 index 0000000..349c0e2 --- /dev/null +++ b/src/honor/detail.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '详情', + navigationBarBackgroundColor: '#ffe0e0' +}) diff --git a/src/honor/detail.scss b/src/honor/detail.scss new file mode 100644 index 0000000..94aed36 --- /dev/null +++ b/src/honor/detail.scss @@ -0,0 +1,128 @@ +.content { + padding: 32px; + line-height: 2.4rem; + + // 富文本内容样式 + :global { + // 段落样式 + p { + margin: 16px 0; + line-height: 1.8; + text-align: justify; + } + + // 标题样式 + h1, h2, h3, h4, h5, h6 { + margin: 24px 0 16px 0; + font-weight: bold; + line-height: 1.4; + } + + h1 { font-size: 24px; } + h2 { font-size: 22px; } + h3 { font-size: 20px; } + h4 { font-size: 18px; } + h5 { font-size: 16px; } + h6 { font-size: 14px; } + + // 图片样式 + img { + max-width: 100%; + height: auto; + border-radius: 8px; + margin: 16px 0; + display: block; + } + + // 列表样式 + ul, ol { + margin: 16px 0; + padding-left: 24px; + + li { + margin: 8px 0; + line-height: 1.6; + } + } + + // 引用样式 + blockquote { + margin: 16px 0; + padding: 16px; + background-color: #f5f5f5; + border-left: 4px solid #ddd; + border-radius: 4px; + + p { + margin: 0; + font-style: italic; + } + } + + // 代码样式 + code { + background-color: #f5f5f5; + padding: 2px 6px; + border-radius: 4px; + font-family: 'Courier New', monospace; + font-size: 14px; + } + + pre { + background-color: #f5f5f5; + padding: 16px; + border-radius: 8px; + overflow-x: auto; + margin: 16px 0; + + code { + background: none; + padding: 0; + } + } + + // 表格样式 + table { + width: 100%; + border-collapse: collapse; + margin: 16px 0; + + th, td { + border: 1px solid #ddd; + padding: 12px; + text-align: left; + } + + th { + background-color: #f5f5f5; + font-weight: bold; + } + } + + // 链接样式 + a { + color: #1890ff; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + + // 分割线样式 + hr { + margin: 24px 0; + border: none; + border-top: 1px solid #eee; + } + + // 强调样式 + strong, b { + font-weight: bold; + } + + em, i { + font-style: italic; + } + } +} diff --git a/src/honor/detail.tsx b/src/honor/detail.tsx new file mode 100644 index 0000000..1fa7125 --- /dev/null +++ b/src/honor/detail.tsx @@ -0,0 +1,52 @@ +import {useEffect, useState} from 'react' +import {Tag} from '@nutui/nutui-react-taro' +import {useRouter} from '@tarojs/taro' +import {Divider} from '@nutui/nutui-react-taro' +import {CmsArticle} from "@/api/cms/cmsArticle/model" +import {Eye} from '@nutui/icons-react-taro' +// 显示html富文本 +import {View, RichText} from '@tarojs/components' +import './detail.scss' +import Line from "@/components/Gap"; +import {getCmsArticle} from "@/api/cms/cmsArticle"; + +function Detail() { + const {params} = useRouter(); + // 文章详情 + const [item, setItem] = useState() + // 浏览量 + const [views, setViews] = useState() + + const reload = () => { + getCmsArticle(Number(params.id)).then(data => { + if (data) { + setItem(data) + setViews(data.actualViews) + } + }) + } + + useEffect(() => { + reload(); + }, []); + + return ( +
+
{item?.title}
+
+ {item?.categoryName} +
{views}
+
+ + + + + +
+ ) +} + +export default Detail diff --git a/src/honor/index.config.ts b/src/honor/index.config.ts new file mode 100644 index 0000000..d3c99ed --- /dev/null +++ b/src/honor/index.config.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '图文列表' +}) diff --git a/src/honor/index.tsx b/src/honor/index.tsx new file mode 100644 index 0000000..bda112f --- /dev/null +++ b/src/honor/index.tsx @@ -0,0 +1,86 @@ +import {useEffect, useState} from "react"; +import {pageCmsArticle} from "@/api/cms/cmsArticle"; +import {CmsArticle} from "@/api/cms/cmsArticle/model"; +import Taro from '@tarojs/taro' +import {useRouter} from '@tarojs/taro' +import {Image} from '@nutui/nutui-react-taro' +import {getCmsNavigation} from "@/api/cms/cmsNavigation"; +import {CmsNavigation} from "@/api/cms/cmsNavigation/model"; + +/** + * 文章终极列表 + * @constructor + */ +const Index = () => { + const {params} = useRouter(); + const [navigation, setNavigation] = useState() + const [list, setList] = useState([]) + + const reload = async () => { + // 获取栏目ID + const categoryId = Number(params.id); + // 当前栏目信息 + const navs = await getCmsNavigation(categoryId); + // 终极新闻列表 + const articles = await pageCmsArticle({categoryId}); + + // 当前栏目信息 + if (navs) { + setNavigation(navs); + } + // 新闻列表 + if (articles) { + setList(articles?.list || []) + } + } + + useEffect(() => { + reload() + }, []) + + return ( + <> +
+ +
+
+ { + // 终极文章列表 + list.map((item, index) => { + return ( +
Taro.navigateTo({url: `./detail?id=${item.articleId}`})} + > + {/* 标题 */} +
+ A {item.title} +
+
+ ) + }) + } +
+ + ) +} +export default Index diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index 0a07e09..75a631d 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -3,7 +3,7 @@ page { .mobile-container { width: 100%; - min-height: 100vh; + min-height: 90vh; // PC端样式 //@media screen and (min-width: 768px) { diff --git a/src/pages/page/index.scss b/src/pages/page/index.scss new file mode 100644 index 0000000..94aed36 --- /dev/null +++ b/src/pages/page/index.scss @@ -0,0 +1,128 @@ +.content { + padding: 32px; + line-height: 2.4rem; + + // 富文本内容样式 + :global { + // 段落样式 + p { + margin: 16px 0; + line-height: 1.8; + text-align: justify; + } + + // 标题样式 + h1, h2, h3, h4, h5, h6 { + margin: 24px 0 16px 0; + font-weight: bold; + line-height: 1.4; + } + + h1 { font-size: 24px; } + h2 { font-size: 22px; } + h3 { font-size: 20px; } + h4 { font-size: 18px; } + h5 { font-size: 16px; } + h6 { font-size: 14px; } + + // 图片样式 + img { + max-width: 100%; + height: auto; + border-radius: 8px; + margin: 16px 0; + display: block; + } + + // 列表样式 + ul, ol { + margin: 16px 0; + padding-left: 24px; + + li { + margin: 8px 0; + line-height: 1.6; + } + } + + // 引用样式 + blockquote { + margin: 16px 0; + padding: 16px; + background-color: #f5f5f5; + border-left: 4px solid #ddd; + border-radius: 4px; + + p { + margin: 0; + font-style: italic; + } + } + + // 代码样式 + code { + background-color: #f5f5f5; + padding: 2px 6px; + border-radius: 4px; + font-family: 'Courier New', monospace; + font-size: 14px; + } + + pre { + background-color: #f5f5f5; + padding: 16px; + border-radius: 8px; + overflow-x: auto; + margin: 16px 0; + + code { + background: none; + padding: 0; + } + } + + // 表格样式 + table { + width: 100%; + border-collapse: collapse; + margin: 16px 0; + + th, td { + border: 1px solid #ddd; + padding: 12px; + text-align: left; + } + + th { + background-color: #f5f5f5; + font-weight: bold; + } + } + + // 链接样式 + a { + color: #1890ff; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + + // 分割线样式 + hr { + margin: 24px 0; + border: none; + border-top: 1px solid #eee; + } + + // 强调样式 + strong, b { + font-weight: bold; + } + + em, i { + font-style: italic; + } + } +} diff --git a/src/pages/page/index.tsx b/src/pages/page/index.tsx new file mode 100644 index 0000000..6f31700 --- /dev/null +++ b/src/pages/page/index.tsx @@ -0,0 +1,47 @@ +import {useEffect, useState} from 'react' +import {useRouter} from '@tarojs/taro' +import {Divider} from '@nutui/nutui-react-taro' +import {CmsArticle} from "@/api/cms/cmsArticle/model" +// 显示html富文本 +import {View, RichText} from '@tarojs/components' +import './index.scss' +import {getCmsNavigation} from "@/api/cms/cmsNavigation"; + +function Detail() { + const {params} = useRouter(); + // 文章详情 + const [item, setItem] = useState() + // 正文 + const [content, setContent] = useState('') + + const reload = async () => { + const nav = await getCmsNavigation(Number(params.id)); + if(nav){ + setItem(nav) + } + if(nav.design?.content){ + setContent(nav.design?.content) + } + } + + useEffect(() => { + reload().then(); + }, []); + + return ( +
+
+
{item?.title}
+ + + + +
+
+ ) +} + +export default Detail diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index f1f00a8..a88c097 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -1,112 +1,79 @@ -import {Button} from '@nutui/nutui-react-taro' import {Avatar, Tag, Space} from '@nutui/nutui-react-taro' -import Taro from '@tarojs/taro'; import {useEffect, useState} from "react"; import {User} from "@/api/system/user/model"; import navTo from "@/utils/common"; -import {TenantId} from "@/utils/config"; +import Taro from '@tarojs/taro' +import {getUserInfo} from "@/api/layout"; function UserCard() { - const [IsLogin, setIsLogin] = useState(false) - const [userInfo, setUserInfo] = useState() + const [IsLogin, setIsLogin] = useState(false) + const [userInfo, setUserInfo] = useState() - useEffect(() => { - reload() - }, []); + useEffect(() => { + reload().then() + }, []); - const reload = () => { - - }; - - /* 获取用户手机号 */ - const handleGetPhoneNumber = ({detail}) => { - const {code, encryptedData, iv} = detail - Taro.login({ - success: function () { - if (code) { - Taro.request({ - url: 'https://server.gxwebsoft.com/api/wx-login/loginByMpWxPhone', - method: 'POST', - data: { - code, - encryptedData, - iv, - notVerifyPhone: true, - refereeId: 0, - sceneType: 'save_referee', - tenantId: TenantId - }, - header: { - 'content-type': 'application/json', - TenantId - }, - success: function (res) { - Taro.setStorageSync('access_token', res.data.data.access_token) - Taro.setStorageSync('UserId', res.data.data.user.userId) - setUserInfo(res.data.data.user) - setIsLogin(true) - } - }) - } else { - console.log('登录失败！') + const reload = async () => { + setIsLogin(true) + if(Taro.getStorageSync('UserId')){ + setUserInfo(await getUserInfo()) } - } - }) - } + }; - return ( - <> -
-
-
-
- { - IsLogin ? ( - - ) : ( - - ) - } -
-
{IsLogin ? userInfo?.mobile : '请点击头像登录'}
- {IsLogin ? ( - - -
{'注册用户'}
- - {/*{*/} - {/* userInfo?.organizationName && (*/} - {/* */} - {/*
{userInfo?.organizationName}
*/} - {/* */} - {/* )*/} - {/*}*/} - - ) : ''} -
+ return ( + <> +
+
+
+
+ { + IsLogin && ( + + ) + } + { + !IsLogin && ( + + ) + } +
+ {IsLogin ? ( + + +
{'注册用户'}
+ + {/*{*/} + {/* userInfo?.organizationName && (*/} + {/* */} + {/*
{userInfo?.organizationName}
*/} + {/* */} + {/* )*/} + {/*}*/} + + ) : ''} +
+
+
navTo('/user/profile/profile', true)}> + {'个人资料'} +
+
+
-
navTo('/user/profile/profile', true)}> - {'个人资料'} -
-
-
-
- + - ) + ) } export default UserCard; diff --git a/src/pages/user/components/UserCell.tsx b/src/pages/user/components/UserCell.tsx index ab3bfdd..2ef5530 100644 --- a/src/pages/user/components/UserCell.tsx +++ b/src/pages/user/components/UserCell.tsx @@ -2,16 +2,19 @@ import {Cell, InfiniteLoading} from '@nutui/nutui-react-taro' import navTo from "@/utils/common"; import UserFooter from "./UserFooter"; import Taro from '@tarojs/taro' -import {ArrowRight, ShieldCheck, Truck, LogisticsError} from '@nutui/icons-react-taro' -import {CSSProperties, useEffect, useState} from "react"; +import {ArrowRight, Headphones} from '@nutui/icons-react-taro' +import {CSSProperties, useEffect} from "react"; const UserCell = () => { - const [roleName, setRoleName] = useState('') const InfiniteUlStyle: CSSProperties = { height: '88vh', padding: '16px', overflowY: 'auto', overflowX: 'hidden', + backgroundImage: 'url(https://oss.wsdns.cn/20250707/fc6234359d394788879ee64e27f76d2e.png?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90)', + backgroundSize: 'cover', + backgroundRepeat: 'no-repeat', + backgroundPosition: 'bottom' } const onLogout = () => { Taro.showModal({ @@ -33,7 +36,7 @@ const UserCell = () => { } useEffect(() => { - setRoleName(Taro.getStorageSync('RoleCode')) + }, []); return ( @@ -45,193 +48,18 @@ const UserCell = () => { className="nutui-cell-clickable" title={
- - 实名认证 + + 联系我们
} align="center" extra={} onClick={() => { - navTo('/user/userVerify/index', true) + Taro.navigateTo({url: '/pages/page/index?id=4355'}) }} /> - { - (roleName === 'kuaidi' || roleName == 'zhandian') && ( - <> - - - - 实名认证审核 -
- } - align="center" - extra={} - onClick={() => { - navTo('/user/userVerify/admin', true) - }} - /> - - - - - 违章记录 - - } - align="center" - extra={} - onClick={() => { - navTo('/hjm/violation/list', true) - }} - /> - - - ) - } - { - roleName === 'kuaidiyuan' && ( - <> - - - - 车辆信息 - - } - align="center" - extra={} - onClick={() => { - navTo('/user/car/index', true) - }} - /> - - - - - 报险记录 - - } - align="center" - extra={} - onClick={() => { - navTo('/hjm/bx/bx', true) - }} - /> - - - ) - } - { - roleName === 'jiaojing' && ( - - - - 违章记录 - - } - align="center" - extra={} - onClick={() => { - navTo('/hjm/violation/list', true) - }} - /> - - ) - } - {/**/} - {/* 管理*/} - {/* */} - {/*}>*/} - {/* */} - {/* */} - {/* 分析*/} - {/* */} - {/* }*/} - {/* align="center"*/} - {/* extra={}*/} - {/* onClick={() => {*/} - {/* navTo('/bszx/bm-cert/bm-cert', true)*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* 客户*/} - {/* */} - {/* }*/} - {/* align="center"*/} - {/* extra={}*/} - {/* onClick={() => {*/} - {/* navTo('/bszx/pay-log/pay-log', true)*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* 折扣*/} - {/* */} - {/* }*/} - {/* align="center"*/} - {/* extra={}*/} - {/* onClick={() => {*/} - {/* navTo('/user/profile/profile', true)*/} - {/* }}*/} - {/* />*/} - {/**/} - {/**/} - {/* 设置与帮助*/} - {/* */} - {/*}>*/} - {/* }*/} - {/* onClick={() => Taro.navigateTo({url: '/website/modify'})}*/} - {/* />*/} - {/* }*/} - {/* onClick={() => {*/} - {/* navTo('/user/profile/profile', true)*/} - {/* }}*/} - {/* />*/} - {/* }*/} - {/* onClick={() => {*/} - {/* navTo('/user/profile/profile', true)*/} - {/* }}*/} - {/* />*/} - {/**/} 账号管理 @@ -244,13 +72,13 @@ const UserCell = () => { extra={} onClick={() => navTo('/user/profile/profile', true)} /> - } - onClick={() => navTo('/passport/sms-login', true)} - /> + {/*}*/} + {/* onClick={() => navTo('/passport/sms-login', true)}*/} + {/*/>*/} { const [openLoginByPhone, setOpenLoginByPhone] = useState(false) const [clickNum, setClickNum] = useState(0) @@ -48,7 +48,7 @@ const UserFooter = () => { <>
当前版本：{Version}
-
Copyright © { new Date().getFullYear() } {Copyright}
+ {/*
Copyright © { new Date().getFullYear() } {Copyright}
*/}
{ }, []); return ( -
+