From 2e1eeade29ee6977bcd007d7495cd7137c82121d Mon Sep 17 00:00:00 2001 From: blak-kong <546598185@qq.com> Date: Tue, 23 Jan 2024 18:13:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.tsx | 3 +- src/components/calendar/body/index.tsx | 4 +- src/components/calendar/body/isFolding.less | 8 ++ src/components/calendar/img/arrow-down.png | Bin 0 -> 270 bytes src/components/calendar/img/arrow-top.png | Bin 0 -> 1424 bytes src/components/calendar/img/right.png | Bin 0 -> 274 bytes src/img/index/add-black.png | Bin 0 -> 1095 bytes src/img/index/add.png | Bin 0 -> 1134 bytes src/img/index/arrow-top.png | Bin 0 -> 1424 bytes src/img/index/close.png | Bin 0 -> 1188 bytes src/img/index/fail.png | Bin 0 -> 4313 bytes src/img/index/incomplete.png | Bin 0 -> 1941 bytes src/img/index/success.png | Bin 0 -> 2010 bytes src/pages/about/about.less | 44 ++++-- src/pages/about/about.tsx | 47 +++++-- src/pages/activity/activity.less | 8 ++ src/pages/activity/activity.tsx | 10 +- src/pages/detect/detect.less | 8 ++ src/pages/detect/detect.tsx | 8 +- src/pages/entry/entry.tsx | 55 +++++--- src/pages/index/index.less | 5 +- src/pages/index/index.tsx | 24 +++- src/pages/initiate/initiate.tsx | 63 ++++++--- src/pages/integral_list/integral_list.less | 9 +- src/pages/integral_list/integral_list.tsx | 2 +- src/pages/shop/shop.tsx | 5 + src/pages/user/user.tsx | 19 ++- src/pages/userInfo/userInfo.css | 139 ------------------- src/pages/userInfo/userInfo.less | 4 +- src/pages/userInfo/userInfo.tsx | 7 +- src/pages/userInfoDetail/userInfoDetail.less | 3 +- src/pages/userPolicy/userPolicy.tsx | 9 +- src/pages/webViewPage/webViewPage.tsx | 7 +- src/utils/request.js | 4 +- src/utils/traoAPI.js | 31 ++++- 35 files changed, 282 insertions(+), 244 deletions(-) create mode 100644 src/components/calendar/img/arrow-down.png create mode 100644 src/components/calendar/img/arrow-top.png create mode 100644 src/components/calendar/img/right.png create mode 100644 src/img/index/add-black.png create mode 100644 src/img/index/add.png create mode 100644 src/img/index/arrow-top.png create mode 100644 src/img/index/close.png create mode 100644 src/img/index/fail.png create mode 100644 src/img/index/incomplete.png create mode 100644 src/img/index/success.png delete mode 100644 src/pages/userInfo/userInfo.css diff --git a/src/app.tsx b/src/app.tsx index b90ed73..20a64a0 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -26,8 +26,9 @@ class App extends Component { // Taro.switchTab({ // url: "pages/index/index", // }); + // go("/pages/initiate/initiate"); // 介绍页 // go("/pages/entry/entry"); // 介绍页 - // go("/pages/userInfo/userInfo"); + // go("/pages/userInfo/userInfo"); // 个人信息完善 // go("/pages/register/register"); // go("/pages/instrument/instrument"); } diff --git a/src/components/calendar/body/index.tsx b/src/components/calendar/body/index.tsx index a533b1b..5a749d5 100644 --- a/src/components/calendar/body/index.tsx +++ b/src/components/calendar/body/index.tsx @@ -434,7 +434,7 @@ export default class AtCalendarBody extends React.Component { className={classnames("arrow", { "arrow-rotate": isFolding, })} - src={require("../../../img/index/arrow-down.png")} + src={require("../img/arrow-down.png")} mode="aspectFill" /> @@ -531,7 +531,7 @@ export default class AtCalendarBody extends React.Component { className={classnames("arrow", { "arrow-rotate": isFolding, })} - src={require("../../../img/index/arrow-down.png")} + src={require("../img/arrow-down.png")} mode="aspectFill" /> diff --git a/src/components/calendar/body/isFolding.less b/src/components/calendar/body/isFolding.less index 77ffa8a..49c38ab 100644 --- a/src/components/calendar/body/isFolding.less +++ b/src/components/calendar/body/isFolding.less @@ -35,6 +35,14 @@ } } +// .at-calendar__list.flex .flex__item--selected { +// .flex__item-container { +// position: relative; +// background: linear-gradient(0deg, #fff0da, #ffe4c0); +// border-radius: 50%; +// } +// } + .at-calendar__list.flex .flex__item--complete { color: #333 !important; font-weight: 400 !important; diff --git a/src/components/calendar/img/arrow-down.png b/src/components/calendar/img/arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..6cd1e0e5ddc867c5ad447df8d59f067a60714aa6 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Zj01c^T!HjV5<$wUZ*4$r0wqCy z!3?vOZtBdch&m_qaj%cV6SH%twPyq6sytmBLo80ey|A0FL4l|BA#;=Xgwwz6*Q&~P z2>Hj{`7xdEZ`-mNwWmXlH=gI)8g}@M7DJo1`fJe*Mmpw`DuZ`@atJ?Ska|^MY1(dC zi&d^?gLUupXswcrzkT)M8BT-JH(4D?Zl8QtdNKr0lnxE@Sde>GgdwIi#^CpQZt3^z Vztj&XR0CbX;OXk;vd$@?2>?pnaOwa6 literal 0 HcmV?d00001 diff --git a/src/components/calendar/img/arrow-top.png b/src/components/calendar/img/arrow-top.png new file mode 100644 index 0000000000000000000000000000000000000000..fd75699cf90e14ec2a13684683661998afdee13e GIT binary patch literal 1424 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iIIZ2rJkXg zfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQDjPb?enI-d;{2mZ^>j z&ixBjmS`4eWpp<+HL+z*SaI;wKK6a)eADIjtuwpBEdQZ==f6L9K3hM(Gyj;2QsNK) z#Roo|Z_``C{n9ClfAanJ=S_|aL@?_wV2@e$DRuqz*;gfBv0E?Tv2c{Q@?>?&T?LM= zCD~>LOm}vQWwGv_bVjt}Q?aFmZ@8B1LbU>pF3I~1W)~Qf_B>1YIVXzSw1L_48RM4b z>HG2M# zee{%PrPJ04Q%k3&rXASDrt9yZYRX|IqA8r}bcgZO3}!pt-v)}QEVFyu4_Yr#Yq_w^ zD@{)4*#gTuOsWY}KT1>xslJ|+7sbSF`6i+^Mk@Za3&+o$Tf-0JtgFu0vcV}!>P}F?Qfs!D< zV20Pc*DLyy0@aRgaWa!!I@iJFSujwp&eO#)MB{wxB}1kb1s<0`W=2NV;{TW5ncO~U z{&uyI@$vs*KN!UYMSo13|G>HKt>ssa-3K@Cd0Ttx^POtr%B1%X%3XLW-cPcBuzXKL z_|E3v?tffAGUz{Px@%z;y;Ssm8PC=P)$G;5Rt0*t7jG0TT6t^9!sx>r5{@lfu=42j a1@)ZOY}E|L6<2^RVeoYIb6Mw<&;$Tj$991L literal 0 HcmV?d00001 diff --git a/src/img/index/add-black.png b/src/img/index/add-black.png new file mode 100644 index 0000000000000000000000000000000000000000..08586e37903e21b166dbddccda419cce0d26b698 GIT binary patch literal 1095 zcmaJ=O=#0l98afoI^CS8_<@6GCc}YkKKix9)l!qTE0{5B(Vlc^^0vmAyqLV&te{R0 zV;&U22~#fvhX+Bylc0zo^WZ`7;6*R$O;nJ9;LZ86ty94oczGZEe!u_6`@PFUgSqy$ zU2POawdV)q0-5*vV_lH^KT1~DkZQNv2o-<~|9fuSeq<1vL*YzbD3fw}{a z)(4APeM}Q{I&~2Adm<4qAy$EBp0-@kOVUfaB3b*#3=Nhbcq~aTCsk60fP@?fV&Qm5 zp&KdLhg0ZYapm)f~gd2C{&!sFqO`Cux%DatWrrDr>nb zZ6Xb0Jk@5nFzc7p04mD=p{BWtc5wmz&i9|fZgJd(OaZ#6>S*NRM!Nk_wkSDJ#mFfl zbh^>Sp$fvttsomnlHavHu8R%RE^!n^%v&y2Ee+=7Bu!MphM|jm-yuO_lv>)XM!Nn{y1##yLm9b|%~vPGkL zF0rP1D_p&KF7c*Zh9txIm;1+MH;#yd{N<{3$!693&?1g^h_xrKKlb0-qr99hdhg1^ zv%3dc78G!P)BM%BQ$H6MQ*C#H1FbhVyl{J~om;l;p1(Xla`z3}Gno!%yP}_GkF;J9 zD{s=jgviJE5ctPs+~8wzIWYU&wZG< bC)KGyka9}7TQA{s&VSnZ%%J?>(D0>Sv*cO| literal 0 HcmV?d00001 diff --git a/src/img/index/add.png b/src/img/index/add.png new file mode 100644 index 0000000000000000000000000000000000000000..744bd977d0ecdc56690e848a250082f991b8e0a5 GIT binary patch literal 1134 zcmaJ>TWHfz7>*XaOb0&rp!0Uja9&uOr0Hde%hs-Gw}KtDRxKj9G&$SCOioPBY}Yrh z=!=R7ULL&QgL@J|2BHtnF+|aa4SjJBfyS3^-$ZL&kokk#wH%a)L@Soi)KS=Qos4(~zTxS-gOifSkiLDEoqU(*$ znW8)mdNzl1sa>Lq44>lq_=<)_&=l3&TC^0k4`PsqJ-R8;UmrcDfv!pP{$PqtSuxnF zca&_nr_`BMOMR-K(XB0@xhN6>17Zafjl-rR7A1O)S0sDa%+O%Y1@}qxZ&A5a8pMzd zLC_cSs$9Si!h(+rv4TI)2>dJ;X4o*p@m`h_*^tN!p#0Dznyqz<897moMNSgki?Jm# zOrcQl6?h-Adl*g-1cvo9e!rJ^c%1WloOsa)^&surgBn4QS#DR$IVEt76@8Ff0;ThPHkbY6%+| zU@mP@udXFrm9LD|s%vSgie-ox#%=B&&90cp1i9P!(ItoZ;fE%fc$tJV(ImG+4OvAW8~%X(RY!?$QFL@*v#q3!N`{Thdh%95?wd?wqAG_ zI=Q&C^V#_0Tbo<5!<*9A-Zqb3oZ6S}IMMcI#hFus+TfB^m+L1Bo=N|Xt3Q^ne->CX zZAI2iUtw22l@c#L{T*#Vz)9h|chS$AcnX5+HJ^i?NgZ5|8Y`&9E2(=!4{{Udsl59K NNX9$myKP;^e*t13e9`~_ literal 0 HcmV?d00001 diff --git a/src/img/index/arrow-top.png b/src/img/index/arrow-top.png new file mode 100644 index 0000000000000000000000000000000000000000..fd75699cf90e14ec2a13684683661998afdee13e GIT binary patch literal 1424 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iIIZ2rJkXg zfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQDjPb?enI-d;{2mZ^>j z&ixBjmS`4eWpp<+HL+z*SaI;wKK6a)eADIjtuwpBEdQZ==f6L9K3hM(Gyj;2QsNK) z#Roo|Z_``C{n9ClfAanJ=S_|aL@?_wV2@e$DRuqz*;gfBv0E?Tv2c{Q@?>?&T?LM= zCD~>LOm}vQWwGv_bVjt}Q?aFmZ@8B1LbU>pF3I~1W)~Qf_B>1YIVXzSw1L_48RM4b z>HG2M# zee{%PrPJ04Q%k3&rXASDrt9yZYRX|IqA8r}bcgZO3}!pt-v)}QEVFyu4_Yr#Yq_w^ zD@{)4*#gTuOsWY}KT1>xslJ|+7sbSF`6i+^Mk@Za3&+o$Tf-0JtgFu0vcV}!>P}|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7iIIZ2rJkXg zfu)g&j)IYap}D?+xxS&Xu7RPIfti)Dr2-Tv0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQVWKRCKFR?Cm`NWkO!X6BFGmYr+JO3qpL?dUbd2`g&Z zpB;|;XFbIsJvPb*_Ananako6$&7~sL^jO6 z5-759>(ziM1?M^zdpx)x?ChCvBw*5vlqqa#QcF8I-4qS(t#EFuTE@RM^FF^~_iDW> z@9SR7+juE^vEQ+~Cu1z0Kl{tGK{PK#C+(wX0)u;J&dU6+qHdsa!_(EzWt~$(697TJ Bm(TzJ literal 0 HcmV?d00001 diff --git a/src/img/index/fail.png b/src/img/index/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..22e5ff36349332347fda6f4a77a91fbdbde4f0ac GIT binary patch literal 4313 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 literal 0 HcmV?d00001 diff --git a/src/img/index/incomplete.png b/src/img/index/incomplete.png new file mode 100644 index 0000000000000000000000000000000000000000..a44a6700ef20b828726ee6688c61b3c618205ab1 GIT binary patch literal 1941 zcmaJ?c~BE~6yAV{MGh-UQ4!bRL6Br~5lkRpNI-%F5vjlk$|l)_pvlI~3L$o?iQ<{Wail1YID>8PxUs~S_s2bqIHus?iTF}ffoH-P0tn=&6amF*Sc$|Tusmx` zGeRKj=cwWn@kB{9Pll>#uq}qBS8EA0K^Cgl!m?Ee4oVTFO2a1)TxcYNDmkB=5FnvT zv_d3J6=}ebrG}VznPHWTD<_ABfWdkmL7+x(7}Tp*Yjiw4pFGUVBW&9>LB z-$f-#VnHE_Az%QFLzOYuOfZm3V{qtPCfgrm(iwpeJrH8BsB{L8&f&4R;D?7yWW(eN zUYsc6LoUMOlhbfq%Y&fI%uHG)i-uxKh{5G@AvzOcGO0uaRhOl~VLer&^BG|fAvzhR z(&8#q1KJp2DY_QtlZi_IZb7a6NUPC(7!xrtNDpfv290iOX(Ui0`TtP0`eU>Xk3;^c z_dkhs@mX2~ibHhhT1-YPPT^xqrR51R1jbP;9z|D=OffbM#Zg@vss)8Y+tlWRz6mOg z9L>~GhA|QePpr}5uttW6MSL>BLQ|>aJT^llU~?nrEVfX@V1$PYgo3d7EEYYCPFMm) zzz9}^%GRn84L*XE|AS?WinYl>ttB#x5KNVU$RjXR4Gy=>Q;k|nc=)J%AF%RKYYC4S z6$=r?K(^)nYuO`Lgo145N9hvINAV*XLh%?OZHvR7sQ@s>K`au)>woMi>R1%NWYX34 zXzA8&-|px(hs$+gWIxJ8YJh#&iaYGK&;>`guK1$P+h<%}o?)NqkfBeC-*%=roASEi z$UCl%@Ab{IT7U1YVnvr_C|Z%$D{diPTWZ^rLR*U)ZgeTt4_?2XpLAF{I5T7R1yf3E zS1S#6?Af0+=)cbNXFk8h8+NN*pOhP4()>KbytuaLp5whD_D;90H=izO8Cq{0u)0}? ztPie7wJC2+4!QnRI^zbwTuyrT$y=v&O=&B=4(3^mPv4#?K7QBr;fel` z!Fd@jk75F_){y3zbDK`|L;bEbi>K!akLNeN>GvK?d2D>Lth&ck%qen7{^rZ;Aq!jG zF~e2YLIa z9lF!tO&>du?q-)TzQgY!?ZwISw~Te>X?*8S-yPzI8O-(Pz7@B)U!A4Rxy_Np9g1-$_v~OXhSg zKer*pRo#PpfYl03GP^p?mm{5Hx>Ge`ndBT%VKoLi1|VWMxrdq1YPn zYJ7L-ueS=CFGSUp+m($?zqZjVw48PF>>C81UAeRVmT{$dhGCqC|Bd&K&IbaS8?oJr z?CjGU8f%02KqtljtELHlorVSiepllapLDd#K7N zRxEMp-$gU3cNdEx^Y7NIO?wTCD*9X~+1*P{*t1fO9PlZ>`2M^-jGA}-l*`|gfq3IYsraf}Y^R3hC04A+^&Cc|)0~Ja6LH0j0&z+)sNW1g9vIYM24Rgx}r!0=% z*>UvDzPP%dOIrY_tD4z(cUf@N+a1k`>5rFPY_xL*CJrU%Vylh`Y(GkIc#P;|SgPqS DJU|Q1 literal 0 HcmV?d00001 diff --git a/src/img/index/success.png b/src/img/index/success.png new file mode 100644 index 0000000000000000000000000000000000000000..b27ac49e791456219d2077199a635f10b5c0e797 GIT binary patch literal 2010 zcmaJ?Yfw|y7EW7@1w}_ho>~tHauM=Qcm;xJ9ui4-gb0CJZAeZaf#ihbKmsV(HmLY2 z4=cn_g$tyjR;Ix!2B`zL7u1R^irj%}DMAq|0&0pD3iiZ`y+1DZ%$&2=-m|`MeQWJ+ z<`l=pY;kh*bVQ+0PTVM#09nKB@4IN^OaG%!gDf5}TLdRSGFT_pfT&GUC=~>_N^u$} z0L9YWtZN{Gc*j>R6u}}sk1m0f1hGAbpjWC9G(xsfuNF%(Kp02`)8r}!W}@W^29Qe` zn4~~HiLYjY>GG&N4VaJ@Bb4N2NJ6EUjS)b&o{kVGL0Amvm6<9nUC+S0;-w?8{g{XW zUZubp49s7mMEp2_328tekPw8IkZBYkIFvvRB85_DIDkST2NOxbL^2gmBGXAhbZRK@ z`oSR8G*TH|z~a2Fh3puZbQo6CiA0@FN6=9TkS2{t4h;<@k|;z91&?IlwYe%-tjDXg z*m(vPsFi5sYFG}b06U{N70QMg7)0q`EhyD*XjR(RV?qW-)Qiqz0Hw z`_w`Jza+Uz3hA^PUSarrI#;EI#VQHNWic=a3qdZI(gVpMo2YCSnMz}_$YeG<1ergF z!=#a@A#5@ykT#EHL6U4GsDkIQ(!a5k1+jKJDAh=17O0WufKrYIQUb5qrpp)9!sIN- z_Zll*SPN-EED;eyv|sLjUH1GD;vjqY#=6Mnjrli&E_VMvMsnQ+Ob72EGld&a?+M<1O<&Ve;W7EK=_l(pBH;nt45HVrDbLTMm z63?^zx)1dU?@;EDY`T&#;`Hp0989T%YW)1K|2!qARNmmo7O#4kHsk)*4E}j;;r>gV z+odjvMv{flA!)AX6WyAo?W z+O@{pyj2O2gV7)D8j&}694bERfLV5IQm?sCDu|ml8$fR zXT(@`9;lnDHe^``*i%l50nbw;!engetX6QYd)9H?XDbiiduJbZ&hQ_S*VWKIk~M5C ze%GF=iqkJ0YMgp2c4Nw92%*wkVBSzuc9udQ0PE4yC}_xwY6C34H^SyxJPe z47}644Yik>|D9s$t8+ZlbnqBYYB<>YkCC`(+wZgum@-YOn_TI5BRM( zO;QH7&5wbtZGQo$xHj!M@%&0HC*p$5Wi>ikivDKM{mcBc4s)Jk*UyAn8u`21J5xli z#dosL{F420$;3dkxjwyYc`c5D5?}0X^~(EkwCnrW-K4G z|DxpKC59H;`D%8*Px3I;5N5mJeCT|!C2EP`q-VEtU50g?{=oCkc2rb8E@tXke9H%TXwzu ztHoCW&mNPLE#S8P=MR(?T(RV2-e6YSXm4j(P<-#BQ;sLaXy*ER7gJmvA9gf8evij%4Veoh?k=hFYBV*HdL!@URF5gMX12IDXsRa*1`0V# zgDDkje3n*Z3^`!)ZHKCHM8fjVSKT&I>)5vnoA1)^e!_r*FWd^f&~*OH z=gFOGnySaL%!Y?f(xDGW>I+LPLR~=7XmL64>;pv~{_E22cE#k;Yl7@%P;fJKGh5-{ zpE41?%LnwBJ5E{=GG1cQ!!13LgU*Sc6j&o;+>;!h={wRy{T*q;j~Kb0UuzziNwG%) zY(@IXt&hG1eD98zTc$jcczYSAK$~E_OCtV7#DRU=(9KUG$~y{N8cj#N-X4u+PW%0| b?kzORr=-ZHOHA#x|82SK7}mMXAAbBN9D_Iy literal 0 HcmV?d00001 diff --git a/src/pages/about/about.less b/src/pages/about/about.less index c685942..a36bc1b 100644 --- a/src/pages/about/about.less +++ b/src/pages/about/about.less @@ -2,15 +2,37 @@ page { background: #f3f3f3; } -.cell { - border-bottom: 1px solid #f3f3f3; - background: #fff; - padding: 30rpx; - font-size: 28rpx; -} -.cell .label { - color: #323232; -} -.cell .value { - color: #a19fa2; +.about-box { + width: 690rpx; + height: 270rpx; + background: #ffffff; + border-radius: 30rpx; + margin: 33rpx auto; + // padding: 20rpx 0; + box-sizing: border-box; + overflow: hidden; + .cell { + border-bottom: 1px solid #f3f3f3; + background: #fff; + padding: 20rpx 30rpx; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #000000; + .label { + color: #000000; + } + .value { + color: #000000; + } + } + + .version { + // height: 26rpx; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #000000; + // line-height: 60rpx; + } } diff --git a/src/pages/about/about.tsx b/src/pages/about/about.tsx index 0cf886d..4ba4bcf 100644 --- a/src/pages/about/about.tsx +++ b/src/pages/about/about.tsx @@ -1,11 +1,13 @@ import { Component, PropsWithChildren, useEffect, useState } from "react"; import Taro from "@tarojs/taro"; -import { Block, View, Text } from "@tarojs/components"; +import { Block, View, Image, Text } from "@tarojs/components"; import Navbar from "../../components/navbar/navbar"; import { GetAboutUs } from "../../utils/Interface"; +import { go } from "../../utils/traoAPI"; + import "./about.less"; export default class About extends Component { @@ -34,20 +36,49 @@ export default class About extends Component { // this.setState({ version: res.data.data.value }); // } const accountInfo = Taro.getAccountInfoSync(); - this.setState({ - version: accountInfo?.miniProgram?.version || "开发版", - // accountInfo?.miniProgram?.envVersion, - }); + + let version = accountInfo?.miniProgram?.version + ? "当前版本V" + accountInfo?.miniProgram?.version + : "开发版"; + this.setState({ version: version }); } + goUser = () => { + go("/pages/userPolicy/userPolicy"); + }; + + goPrivacy = () => { + go("/pages/privacyPolicy/privacyPolicy"); + }; + render() { let { version } = this.state; return ( - - 版本管理 - {version} + + + 版本管理 + {version} + + + 用户协议 + + + + + + 隐私协议 + + + + ); diff --git a/src/pages/activity/activity.less b/src/pages/activity/activity.less index e69de29..fec9a80 100644 --- a/src/pages/activity/activity.less +++ b/src/pages/activity/activity.less @@ -0,0 +1,8 @@ +.main { + display: flex; + width: 100vw; + height: 100vh; + justify-content: center; + align-items: center; + font-size: 30rpx; +} diff --git a/src/pages/activity/activity.tsx b/src/pages/activity/activity.tsx index 5cee0bd..5647e55 100644 --- a/src/pages/activity/activity.tsx +++ b/src/pages/activity/activity.tsx @@ -9,13 +9,12 @@ import { Video, Swiper, SwiperItem, + Block, } from "@tarojs/components"; import "taro-ui/dist/style/components/button.scss"; // 按需引入 import "./activity.less"; -const app = Taro.getApp(); - import type CustomTabBar from "../../custom-tab-bar"; export default class Activity extends Component { pageCtx = Taro.getCurrentInstance().page; @@ -42,6 +41,11 @@ export default class Activity extends Component { render() { let { name } = this.state; - return {name}; + return ( + + {name} + 待开发 + + ); } } diff --git a/src/pages/detect/detect.less b/src/pages/detect/detect.less index e69de29..fec9a80 100644 --- a/src/pages/detect/detect.less +++ b/src/pages/detect/detect.less @@ -0,0 +1,8 @@ +.main { + display: flex; + width: 100vw; + height: 100vh; + justify-content: center; + align-items: center; + font-size: 30rpx; +} diff --git a/src/pages/detect/detect.tsx b/src/pages/detect/detect.tsx index e0a04e7..a063fcb 100644 --- a/src/pages/detect/detect.tsx +++ b/src/pages/detect/detect.tsx @@ -3,6 +3,7 @@ import { Component, PropsWithChildren, useEffect, useState } from "react"; import Taro from "@tarojs/taro"; // 引入 Swiper, SwiperItem 组件 import { + Block, View, Text, Image, @@ -40,6 +41,11 @@ export default class Detect extends Component { render() { let { name } = this.state; - return {name}; + return ( + + {name} + 待开发 + + ); } } diff --git a/src/pages/entry/entry.tsx b/src/pages/entry/entry.tsx index ebd51b3..9858af1 100644 --- a/src/pages/entry/entry.tsx +++ b/src/pages/entry/entry.tsx @@ -13,15 +13,20 @@ import { SwiperItem, } from "@tarojs/components"; +/*** redux ***/ +import { connect } from "react-redux"; +import { userRefresh } from "../../store/features/userInfo"; +/*** redux end ***/ + import Navbar from "../../components/navbar/navbar"; import "taro-ui/dist/style/components/button.scss"; // 按需引入 import "./entry.less"; import "./Animista.less"; import "./fade.css"; -import { go } from "../../utils/traoAPI"; +import { go, msg } from "../../utils/traoAPI"; -export default class Entry extends Component { +class Entry extends Component { constructor(props) { super(props); this.state = { @@ -40,7 +45,7 @@ export default class Entry extends Component { async onLoad() { this.setStatusBar(); - this.intData(); + this.initData(); } componentDidMount() {} @@ -73,12 +78,18 @@ export default class Entry extends Component { }); } - async intData() { + async initData() { let MpSplashDetail_type1 = Taro.getStorageSync("MpSplashDetail_type1") || undefined; if (MpSplashDetail_type1) { let detail = JSON.parse(MpSplashDetail_type1); let list = detail.filter((item: any) => item.fileSuffix === "images"); + if (list.length === 0) { + Taro.reLaunch({ + url: "/pages/index/index", + }); + return; + } let welcomeList = list.map((item) => { return { image: item.filePath, @@ -88,7 +99,9 @@ export default class Entry extends Component { }); this.setState({ welcomeList }); } else { - go("/pages/index/index"); + Taro.reLaunch({ + url: "/pages/index/index", + }); } } @@ -115,7 +128,10 @@ export default class Entry extends Component { } } toHomePage() { - Taro.switchTab({ + // Taro.switchTab({ + // url: "/pages/index/index", + // }); + Taro.reLaunch({ url: "/pages/index/index", }); } @@ -209,25 +225,18 @@ export default class Entry extends Component { ); })} - {/* - - 前往主页 - - - {welcomeList.map((item, index) => { - return ( - = index, - })} - > - ); - })} - - */} ); } } + +const mapStateToProps = (state) => ({ + mobile: state.userInfo.mobile, +}); +const mapDispatchToProps = (dispatch) => ({ + userRefresh(value) { + dispatch(userRefresh(value)); + }, +}); +export default connect(mapStateToProps, mapDispatchToProps)(Entry); diff --git a/src/pages/index/index.less b/src/pages/index/index.less index 2fabf46..a356f42 100644 --- a/src/pages/index/index.less +++ b/src/pages/index/index.less @@ -993,10 +993,11 @@ page { background-color: #fff; .date-title { position: absolute; - right: 0; - width: 140rpx; + right: 16rpx; + width: 132rpx; display: flex; align-items: center; + justify-content: space-between; height: 40rpx; .text { color: #666; diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 4761264..7270753 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -70,8 +70,17 @@ class Index extends Component { weekinfo: undefined, // 日历 currentDate: dayjs().format("YYYY-MM-DD"), - calendarComplete: [dayjs().subtract(1, "day").format("YYYY-MM-DD")], - calendarInComplete: [dayjs().add(1, "day").format("YYYY-MM-DD")], + calendarComplete: [ + dayjs().subtract(1, "day").format("YYYY-MM-DD"), + dayjs().subtract(3, "day").format("YYYY-MM-DD"), + ], + calendarInComplete: [ + dayjs().add(1, "day").format("YYYY-MM-DD"), + dayjs().add(3, "day").format("YYYY-MM-DD"), + ], + // currentDate: "2023-06-23", + // calendarComplete: ["2023-06-16", "2023-06-19", "2023-06-21"], + // calendarInComplete: ["2023-06-25", "2023-06-27"], // 横幅轮播 bannerList: [], bannerCurrent: 0, @@ -138,6 +147,11 @@ class Index extends Component { this.GetSitePopupList(); // 全局内存缓存，仅初次进入首页运行 this.props.setIndexFlag(true); + // 小程序切到后台，则清除弹窗缓存 + Taro.onAppHide((res) => { + console.log("小程序进入后台：", res); + this.props.setIndexFlag(false); + }); } } } @@ -366,7 +380,11 @@ class Index extends Component { 护理记录 - + + {/* */} { componentDidHide() {} async initData() { + Taro.showLoading({ + title: "请求中...", + mask: true, + }); const { data } = await MpSplashDetail({ pageNum: 1, pageSize: 5, type: 1, }); + Taro.hideLoading(); if (data.code === 200) { let url = ""; if (data.rows.length) { Taro.setStorageSync("MpSplashDetail_type1", JSON.stringify(data.rows)); + // 1.判断是否设置登录页视频，有则正常显示视频 let bgObj = data.rows.find((item: any) => item.fileSuffix === "video"); if (bgObj) { url = bgObj.filePath; - console.log("url", url); this.setState({ url }); + } else { + // 1-2.判断是否设置介绍页图片，有则跳转介绍登录页 + let imgList = data.rows.filter( + (item: any) => item.fileSuffix === "images" + ); + if (imgList.length > 0) { + go("/pages/entry/entry"); + return; + } else { + // 1-3.如果介绍页图片也没有，直接跳转首页 + Taro.reLaunch({ + url: "/pages/index/index", + }); + } } } else { Taro.reLaunch({ @@ -85,20 +106,15 @@ class Initiate extends Component { }); } } else { - // msg("获取首页视频失败！"); - } - } - - setBg() { - let bgData = Taro.getStorageSync("MpSplashDetail_type1"); - bgData = JSON.parse(bgData); - let bgObj = bgData.find((item: any) => item.fileSuffix === "video"); - if (bgObj) { - this.setState({ url: bgObj.filePath }); + msg("请求失败，请联系管理员"); } } async WCUserLogin() { + Taro.showLoading({ + title: "请求中...", + mask: true, + }); const { code } = await Taro.login(); const { data } = await WCUserLogin({ code }); if (data.code === 200) { @@ -106,10 +122,12 @@ class Initiate extends Component { Taro.setStorageSync("token", data.data.token); Taro.setStorageSync("mobile", data.data.mobile); this.props.userRefresh(data.data); + Taro.hideLoading(); this.initData(); } else { - msg("登录失败！"); + msg("请求失败,尝试重新请求"); + this.WCUserLogin(); } } @@ -125,18 +143,23 @@ class Initiate extends Component { } } onEnded = () => { - let timeOut: any = null; - clearTimeout(timeOut); - timeOut = setTimeout(() => { - go("/pages/entry/entry"); - }, 300); + let token = Taro.getStorageSync("token"); + if (token) { + let timeOut: any = null; + clearTimeout(timeOut); + timeOut = setTimeout(() => { + go("/pages/entry/entry"); + }, 300); + } else { + msg("请求中，请稍候"); + } }; render() { let { menu, url } = this.state; return ( - { src={require("../../img/welcome/top-logo.png")} mode="widthFix" /> - - + */} + { src={require("../../img/user/points.png")} mode="aspectFill" > - 暂无积分记录 + 暂无积分记录 )} {list.map((item: any, key: number) => { diff --git a/src/pages/shop/shop.tsx b/src/pages/shop/shop.tsx index 7ff14ad..dbeee3c 100644 --- a/src/pages/shop/shop.tsx +++ b/src/pages/shop/shop.tsx @@ -72,7 +72,12 @@ class Shop extends Component { // 获取小程序设置 GetOtherSetting = async () => { + Taro.showLoading({ + title: "请求中...", + mask: true, + }); let res = await GetOtherSetting(); + Taro.hideLoading(); if (res.data.code === 200) { this.props.otherSettingRefresh(res.data.data); diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index e109365..e1dd88c 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -12,7 +12,7 @@ import { connect } from "react-redux"; import { userRefresh } from "../../store/features/userInfo"; /*** redux end ***/ -import { RefreshWxUserInfo } from "../../utils/Interface"; +import { RefreshWxUserInfo, GetNoReadMessageNum } from "../../utils/Interface"; import "taro-ui/dist/style/components/button.scss"; // 按需引入 import "./user.less"; @@ -47,16 +47,19 @@ class User extends Component { }; } - async onLoad() {} - componentDidMount() { + async onLoad() { this.initData(); } + componentDidMount() {} componentWillUnmount() {} componentDidShow() { this.setState({ userInfo: this.props.userInfo }); + let messagecount = Taro.getStorageSync("messageCount"); + this.setState({ messagecount: messagecount }); + const tabbar = Taro.getTabBar(this.pageCtx); tabbar?.setSelected(4); } @@ -65,8 +68,18 @@ class User extends Component { async initData() { this.RefreshWxUserInfo(); + this.GetNoReadMessageNum(); } + // 获取消息数量 + GetNoReadMessageNum = async () => { + let res = await GetNoReadMessageNum(); + if (res.data.code === 200) { + Taro.setStorageSync("messageCount", res.data.data); + this.setState({ messagecount: res.data.data }); + } + }; + // 刷新用户信息 RefreshWxUserInfo = async () => { let res = await RefreshWxUserInfo(); diff --git a/src/pages/userInfo/userInfo.css b/src/pages/userInfo/userInfo.css deleted file mode 100644 index 8467b23..0000000 --- a/src/pages/userInfo/userInfo.css +++ /dev/null @@ -1,139 +0,0 @@ -/* pages/userInfo/userInfo.wxss */ -page { - background: #f3f3f3; -} -.nav { - position: fixed; - z-index: 99; - width: 100%; - top: 0; -} -.nav .logo { - width: 223rpx; -} -.nav .nav_box { - position: relative; - display: flex; - align-items: center; - justify-content: center; - padding: 0 32rpx; -} -.main { - text-align: center; - padding-bottom: 153rpx; -} -.main .title { - font-size: 48rpx; - font-weight: 500; - color: #000; - margin: 73rpx auto 48rpx; -} -.main .txt { - font-size: 26rpx; - font-weight: 500; - color: #666; - margin-bottom: 10rpx; -} -.main .avatar_box { - position: relative; - width: max-content; - margin: 78rpx auto 59rpx; -} -.main .avatar_box .avatar { - width: 147rpx; - height: 147rpx; - border-radius: 50%; - margin: 0 auto 13rpx; -} -.main .avatar_box .btn_avatar { - background: transparent; -} -/* 去掉背景色和内外边距 */ -button { - margin: 0; - padding: 0; - background-color: inherit; - position: static; -} -button:after { - content: none; -} -/* 去掉边框 */ -button::after { - border: none; -} -.main .avatar_box .btn_avatar::after { - border: none; - background: transparent; -} -.form { - width: 690rpx; - text-align: left; - margin: 0 30rpx 0; -} -.form .form_item { - position: relative; - margin-bottom: 35rpx; -} -.form_item .arrow { - position: absolute; - bottom: 30rpx; - right: 51rpx; - width: 30rpx; - height: 20rpx; -} -.form .form_item .label { - font-size: 28rpx; - font-weight: 500; - color: #030000; - margin-bottom: 28rpx; -} -.form .form_item .label::after { - content: "*"; - color: #eb5858; - margin-left: 10rpx; -} -.form .form_item .ipt { - width: 100%; - height: 80rpx; - line-height: 80rpx; - background: #ffffff; - border: 1px solid #dddddd; - border-radius: 3rpx; - padding-left: 28rpx; - box-sizing: border-box; -} -.footer { - position: fixed; - bottom: 0; - z-index: 99; - display: flex; - align-items: baseline; - width: 100%; - height: 153rpx; - background: #ffffff; - box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21); -} -.btn { - width: 540rpx; - height: 90rpx; - background: #000; - border-radius: 45rpx; - color: #fff; - line-height: 90rpx; - text-align: center; - margin: 21rpx 49rpx 42rpx 30rpx; -} -.text { - font-size: 32rpx; - font-weight: bold; - color: #000; -} -.btn-disable { - background-color: #ccc !important; - /* 设置按钮背景颜色为灰色 */ - color: #fff !important; - /* 设置按钮文字颜色为白色 */ - border-color: #ccc !important; - /* 设置按钮边框颜色为灰色 */ -} diff --git a/src/pages/userInfo/userInfo.less b/src/pages/userInfo/userInfo.less index a935669..dc764f3 100644 --- a/src/pages/userInfo/userInfo.less +++ b/src/pages/userInfo/userInfo.less @@ -43,7 +43,8 @@ page { .main .avatar_box { position: relative; - width: max-content; + // width: max-content; + width: 147rpx; margin: 78rpx auto 50rpx; } @@ -131,6 +132,7 @@ button::after { height: 153rpx; background: #ffffff; box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21); + padding-bottom: env(safe-area-inset-bottom); } .btn { diff --git a/src/pages/userInfo/userInfo.tsx b/src/pages/userInfo/userInfo.tsx index a0ede7b..b38cf91 100644 --- a/src/pages/userInfo/userInfo.tsx +++ b/src/pages/userInfo/userInfo.tsx @@ -157,7 +157,6 @@ class UserInfo extends Component { let res = await UpdateUserUploadFile(formData); console.log("Res", res); if (res.code === 200) { - msg("更新成功"); userInfo.province = res.data.province; userInfo.city = res.data.city; userInfo.area = res.data.area; @@ -169,10 +168,10 @@ class UserInfo extends Component { userInfo.integralText = res.data.integralText; this.props.userRefresh(userInfo); this.setState({ userInfo: userInfo }); - if (res.data.integralText) { this.setState({ isShowIntegralText: true }); } else { + msg("更新成功"); this.goUser(); } } @@ -191,7 +190,6 @@ class UserInfo extends Component { let data = formData.getData(); let res = await UpdateUser(data); if (res.data.code === 200) { - msg("更新成功"); userInfo.province = res.data.data.province; userInfo.city = res.data.data.city; userInfo.area = res.data.data.area; @@ -207,6 +205,7 @@ class UserInfo extends Component { if (res.data.data.integralText) { this.setState({ isShowIntegralText: true }); } else { + msg("更新成功"); this.goUser(); } } @@ -419,7 +418,7 @@ class UserInfo extends Component { close={this.closeIntegralText} confirm={this.closeIntegralText} /> - + 个人信息 请完善您的个人信息 diff --git a/src/pages/userInfoDetail/userInfoDetail.less b/src/pages/userInfoDetail/userInfoDetail.less index eabfad9..d40a284 100644 --- a/src/pages/userInfoDetail/userInfoDetail.less +++ b/src/pages/userInfoDetail/userInfoDetail.less @@ -29,7 +29,7 @@ button::after { border: none; } .infobox1 .avatar_box { - width: max-content; + width: 100rpx; } .infobox1 .avatar_box .headimg { width: 100rpx; @@ -164,6 +164,7 @@ button::after { background: #ffffff; box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21); padding-bottom: 21rpx; + padding-bottom: env(safe-area-inset-bottom); .btn { width: 690rpx; height: 90rpx; diff --git a/src/pages/userPolicy/userPolicy.tsx b/src/pages/userPolicy/userPolicy.tsx index e8249f2..3abd443 100644 --- a/src/pages/userPolicy/userPolicy.tsx +++ b/src/pages/userPolicy/userPolicy.tsx @@ -52,14 +52,7 @@ export default class UserPolicy extends Component { - " + - // nodes + - // "" - } - /> + ); diff --git a/src/pages/webViewPage/webViewPage.tsx b/src/pages/webViewPage/webViewPage.tsx index 8fec071..b1e88a9 100644 --- a/src/pages/webViewPage/webViewPage.tsx +++ b/src/pages/webViewPage/webViewPage.tsx @@ -26,8 +26,11 @@ export default class WebViewPage extends Component { componentDidHide() {} async initData() { - console.log("this.$instance.router", this.$instance.router); - this.setState({ url: this.$instance.router?.params?.url }); + let url = this.$instance.router?.params?.url; + if (!url?.includes("https://") && !url?.includes("http://")) { + url = "https://" + url; + } + this.setState({ url: url }); } render() { diff --git a/src/utils/request.js b/src/utils/request.js index 55ddd30..4c17c73 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -108,7 +108,7 @@ export const Ajax = (params) => { }); }, complete() { - Taro.hideLoading(); + // Taro.hideLoading(); // const requestUrlList = global_requestUrlList; // const newRequestUrlList = requestUrlList.splice( // requestUrlList.indexOf(params.url), @@ -262,7 +262,7 @@ export const AjaxFormData = (params) => { }); }, complete() { - Taro.hideLoading(); + // Taro.hideLoading(); const requestUrlList = global_requestUrlList; const newRequestUrlList = requestUrlList.splice( requestUrlList.indexOf(params.url), diff --git a/src/utils/traoAPI.js b/src/utils/traoAPI.js index ea96d7c..172165e 100644 --- a/src/utils/traoAPI.js +++ b/src/utils/traoAPI.js @@ -100,15 +100,31 @@ const jupmFun = (type, data) => { try { switch (type) { case 1: // 跳转内部链接 - if (data.linkParams) { - Taro.reLaunch({ - url: data.link + "?" + data.linkParams, - }); - } else { - Taro.reLaunch({ + let tabbar = [ + "/pages/index/index", + "/pages/activity/activity", + "/pages/detect/detect", + "/pages/shop/shop", + "/pages/user/user", + ]; + if (tabbar.includes(data.link)) { + // tabbar页不能带参数 + Taro.setStorageSync(data.link + "-jupm-params", data.linkParams); + Taro.switchTab({ url: data.link, }); + } else { + if (data.linkParams) { + Taro.navigateTo({ + url: data.link + "?" + data.linkParams, + }); + } else { + Taro.navigateTo({ + url: data.link, + }); + } } + break; case 3: // 跳转外部链接 if (data.linkParams) { @@ -140,9 +156,10 @@ const jupmFun = (type, data) => { }); break; case 5: // 跳转视频号 + // Taro.getChannelsLiveInfo(); Taro.openChannelsActivity({ finderUserName: data.videoNo, - feedId: data.feedId, + // feedId: data.feedId, success: (res) => { // 打开成功 console.log("跳转视频号success", res);