From 391f4d3c14510379c78953cbc6c198c145d87f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Thu, 27 Feb 2025 22:15:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request.js | 17 ++++- api/user.js | 7 +- app.wxss | 25 ++++--- assets/icon/avatar.png | Bin 0 -> 15935 bytes assets/icon/back-black.png | Bin 0 -> 479 bytes assets/icon/close-btn.png | Bin 0 -> 880 bytes assets/icon/img-default.png | Bin 0 -> 2850 bytes assets/img/login-bg.png | Bin 26910 -> 9294 bytes components/modalView/index.js | 28 ++++---- components/modalView/index.wxml | 9 ++- components/modalView/index.wxss | 17 ++++- components/navBar/index.js | 4 ++ components/navBar/index.wxml | 2 +- components/swipeButton/index.js | 10 +-- pages/index/index.js | 101 ++++++++++++++++++++++++---- pages/index/index.wxml | 39 +++++------ pages/index/index.wxss | 78 ++++++++++++++++------ pages/order-detail/index.js | 46 ++++++++++++- pages/order-detail/index.wxml | 63 +++++++++++++++++- pages/order-detail/index.wxss | 105 +++++++++++++++++++++++++----- pages/user/bank/editor/index.wxml | 2 - pages/user/bank/index/index.wxml | 4 -- pages/user/income/index.js | 9 ++- pages/user/income/index.wxml | 28 ++++---- pages/user/income/index.wxss | 29 ++++++--- pages/user/info/index.wxml | 4 +- pages/user/rnAuth/index.js | 29 +++++---- pages/user/rnAuth/index.wxml | 6 +- pages/withdraw/list/index.wxml | 4 ++ utils/util.js | 18 ++++- 30 files changed, 530 insertions(+), 154 deletions(-) create mode 100644 assets/icon/avatar.png create mode 100644 assets/icon/back-black.png create mode 100644 assets/icon/close-btn.png create mode 100644 assets/icon/img-default.png diff --git a/api/request.js b/api/request.js index 5d31577..2e773b4 100644 --- a/api/request.js +++ b/api/request.js @@ -1,4 +1,11 @@ -const baseUrl = 'https://api-dev.beefast.co'; +const { miniProgram } = wx.getAccountInfoSync(); +const envVersion = miniProgram.envVersion; +let baseUrl = ''; +if(envVersion=='develop'){ + baseUrl = 'https://api-dev.beefast.co'; +}else{ + baseUrl = 'https://api.beefast.co' +} let app = getApp(); const sendRequest = (options)=>{ @@ -12,7 +19,9 @@ const sendRequest = (options)=>{ wx.request({ url: `${baseUrl}${options.url}`, success:(result)=>{ - wx.hideLoading(); + if(options.method!='get'){ + wx.hideLoading(); + } if(result.statusCode==200){ if(result.data.code==200){ rs(result.data.data); @@ -48,7 +57,9 @@ const sendRequest = (options)=>{ "content-type":options.data&&options.data.file?'application/x-www-form-urlencoded':'application/json' }, fail:(res)=>{ - wx.hideLoading(); + if(options.method!='get'){ + wx.hideLoading(); + } wx.showToast({ title: 'Request Error', }) diff --git a/api/user.js b/api/user.js index 351eef8..5b28b06 100644 --- a/api/user.js +++ b/api/user.js @@ -26,7 +26,7 @@ export default { add:(bank_card_id,amount)=>request.post('/api/withdraw',{bank_card_id,amount}), list:(data)=>request.get('/api/withdraw/user',data), statusKV:{ - PENDING:"提现审核中",APPROVED:"平台受理成功",REJECTED:"被拒绝" + PENDING:"提现审核中",APPROVED:"平台受理成功",REJECTED:"审核未通过" } }, @@ -48,7 +48,10 @@ export default { rj(res); } }); - task.onProgressUpdate(progress); + if(progress){ + progress.task = task; + task.onProgressUpdate(progress); + } }); } } \ No newline at end of file diff --git a/app.wxss b/app.wxss index 8f8d3cd..69e1b3c 100644 --- a/app.wxss +++ b/app.wxss @@ -90,8 +90,8 @@ radio-group label+label{ } radio{ - width: 34rpx; - height: 34rpx; + width: 17px; + height: 17px; position: relative; } radio .wx-radio-input{ @@ -100,7 +100,6 @@ radio .wx-radio-input{ box-sizing: border-box; width: 100%; height: 100%; - line-height: 20px; position: absolute; top: 0;left:0; } @@ -111,9 +110,9 @@ radio .wx-radio-input.wx-radio-input-checked{ radio .wx-radio-input.wx-radio-input-checked::before{ content: ''; position: absolute; - width: 22rpx; - height:22rpx; - left:4rpx;top:4rpx; + width: 11px; + height:11px; + left:2px;top:2px; border-radius: 50%; background: var(--main-color); transform: none; @@ -121,9 +120,18 @@ radio .wx-radio-input.wx-radio-input-checked::before{ } checkbox .wx-checkbox-input{ width: 40rpx; - height: 40rpx; + height: 40rpx; + border: 2px solid #999999; border-radius: 50%; } +checkbox .wx-checkbox-input.wx-checkbox-input-checked{ + border-color: var(--main-font-color); + border: 2px solid #000000; +} +checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{ + color: var(--main-font-color); + /* font-size: 30px; */ +} page-container .content{ border-radius: 24rpx 24rpx 0 0; @@ -274,6 +282,7 @@ page-container .content{ } .cells .cell-bd input{ height:100rpx; + width: 100%; } .cells .cell-ft{ position: relative; @@ -345,7 +354,7 @@ navigator button{ } .list-empty .icon{ width:160rpx;height:160rpx; - margin-top:360rpx; + padding-top:360rpx; } .list-empty .title{ font-size: 30rpx; diff --git a/assets/icon/avatar.png b/assets/icon/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..2577c70388a3cd390a0fc3015e6a4b1efb04f7d9 GIT binary patch literal 15935 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%0AnKHDcr0{6=U8B{Mxw+qOGpp-Hyk^d#o2^3%K8 z-ku0hT;P36M$*~*)5A9?Xqf2^;cjh_5yF$P-JfPXing{+Z#MMsaBQ$K$iegIK7+|^ ziHl?`BBBt=E=4UbvZNFi)WKU!C(Ps5kvu7@$s2wClhQ4D-hr2C>A;Ij#oekx@Zo-G zt--i=`p=|Y%SIi92b~8J@q1aX{pLlwrReQus3^#-P5##h27&mAL|ZI^dTXg4lE}3r z45=yxpv_f2wt2DtKf1V|hK6RQiStr58_YbFiu`dh*{h&mF-*hynQm`yFIwmLp(1T9 zO$#7C^-uTmiHq&<5iShJ=TWOBuK<0*N`!GklZPnBiVtudC8Y{c$-d>6lwCJ&e%Cph z^(u5@)o&?bqiG}Bx?8%x?>kXYG@YEC>=F*#)Dl> z%<;Cu@CTePCr!1#5nNI#Ar(RXthYbaU{z{i6ud>rU72&CORH zgK1UQ+{ecCjb=o|rLY)j8SL)jo?Y%CijsqyTo@UqN(6it#26+W!R6)U;Nkq!qy^QW z^iqu<-ifg9w&WuFgtxie~X=jCt1U;!K%&>~B(f zRz|`6j6xF#fUfL$(R2b4kwn7y2NLG~V0>bX{ji%i)?F@LIJ(T>IUYp+Wiu|1hW4Oy z#v>B>OxCd#%ZKPdhH4VVFN8HFO-Sw5MmYiar*mzT)8h z+`(JWt8YQkXR}t9j3?{AUe-CUTDFO0BeM|WA-D7Uhc|K37;QpIDL{Qm3V64z2CosKoV zs@=n}rP#rmU)qm3t+rH)9~k758_7_=6Cp5A#UG8ML!IS!m+BB?sHkaaw_T48uN72G zv;qe)AJy|AZRM4_noD8w5Z>stygUgcXqE2|Pun3=gsDOtoU5i6G)1{ z;*P#9AGB-3-x1+#@X7D=fJ(m9zYB987`dlI6MchrXG@aK-r~G~d<%}&Vlrqxy1co@ zdU{q?MS0)%bE{Sf4N~lkRZ|M!LFmxG28`pmg0*&wm+8)#X$3`yJ+f<^rxG&m{k_kR zR-(M1I(sLlfR>|aoRU}n>b{u7@*2I5612E6#Kib`8(p2BxDVJ5Xn~8*- z1QMZ|`-g|EQX3hV9~RlJHNR;qH|sdJZ59)kfnoH1$4X}&{DPg@+Wk>CF?-F(4+~)% zagn*Xxi1&1^>0qj5*G8^*zAagk!4M`N=R8T?)$%N*XjhGKL`3FG^Ww7Ic$tv_eWz8 zggS4SA8>I^5_51!e5g4!1Y293`vLGEZA2N>#xhC~ndt68E(rrn?Gp*@0G m>8Wu0$YA#W|B6QS1u^$y_YC&CWW@inv*o2#q#7j5!u}5eyDX3Z literal 0 HcmV?d00001 diff --git a/assets/icon/back-black.png b/assets/icon/back-black.png new file mode 100644 index 0000000000000000000000000000000000000000..573c92b787552b288f9b70278657023f970d2b83 GIT binary patch literal 479 zcmV<50U-W~P)Px#1am@3R0s$N2z&@+hyVZqiAh93RA_%w<&Fj8BqSu( z!4Bw<*Z`s;X_9OseNqI3*aHQI6}X`Xi^4X=U?oyKGty|r&+~GB>1vACoHM^&_&yT^ zSy7}8P{9*C$8Y>eoTXO^yvJWG|3BYhCuOLtyLVrogfKvfnUH6|hSRoMNH6>;%tJ1?-Zh@9Yvku%9Sjr>xA@m7U0_Y?u{h zhfSCjW`|Fh6=sJ|n3b{Frr)z+c8G*oVKxumXf~V0T4u#}1KvTk+34@poPEKxWtNT5 z=5FaJURIpFP`;3_O5<5D#%I+Z>$!5*{4iC(J{aLrb?F7pWmx)Jed!Y!mJZXxbePVD zFui8NbS{MHH4~p}}t$&AXMU&~d^7bOT(sici!gLPx#1am@3R0s$N2z&@+hyVZs8c9S!R9J=0nbA?>Fc60SRT@YKm<~t6T&$;2}H_~q5E)`SSH*Xt`| z%pAZq5lsP1jWLd^>h78hV3LDw|9u_ZBeg8Gb4a;F+0UhC&B} z)&Rc`WAjW*wAt_Xt31zj(D;x+MN#|)@G}O?qY}WQlyccOuoF}%l?fr909+*k^J&M- zcU|s!K`rDfhChd6rHSZnu~_U}7oDIsnqL7-&x+Po$;>mCv*PpzrBr5&dBWF20>D%V z@v4-{PA{}T?K9aL_=T$CqM-(8Q4~vf0*8n;09H6eYOFMX2m5j9%I-9u^H*PN@Vvvl zDL8h7crg{$7>-8Vs-ptIG)wrXhlgZ@X1KCiX=bD*saBw9G5&(=bAHKns z34nD}DK)n)1y3--S>NCAts;O=R|NnFA-?rYlAT85Kxe!D(au$@T&X%qb$$ z!Wc6a)Vl>mrd#J+0>E2JNE`wuwl-+U81o^BXqyzGSKw5ghD$IR5_ zYQ4gWOpD%h>rh!|YII6^nqk$^_I4y>0|LM!5nXh22UqpxS*xW}6vaEv-xTZ9PD(ke z|IjK*nE4Lzxj9DKGBo6Dl7$>&&!m!wZd@HbXPIYrffQBG5NT$f`Pz=&dUUZ^?Cd`0 zyfLwMU8e*fyfwZA@B`<06pnqZE(KNiQpzPW&w7%=AQ91qnJ+^ifpM>I=C%biWoy`q|#u}x-9hEX0FV>44VRnsvJOR3-dQ3+WG<|ME?K>vs6Zuz)Hga0000yX? literal 0 HcmV?d00001 diff --git a/assets/icon/img-default.png b/assets/icon/img-default.png new file mode 100644 index 0000000000000000000000000000000000000000..dee91de4a77aa9710e7afa269cb85009c7397c57 GIT binary patch literal 2850 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 V^!yBuB9MOXvBKJ#mt)-H{|A~yQp*4U literal 0 HcmV?d00001 diff --git a/assets/img/login-bg.png b/assets/img/login-bg.png index 652ad3a00a542712bf4dc70f1b7de658d25a481e..d7198842dffc4d5cfa50f486627a15caee4e1a59 100644 GIT binary patch literal 9294 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

!9t+4M zd`#t=yeO!}3tX^6Z|VK1ee~F9rMomDQu1KoO?6iSUuiq{7O1y+74et|`c4frzKUYv z^e~A@%h4vrvGPL~ZuWdWBl9KkV?KG*x#&A*4Af)$a>jdLFo>7or}ojqn1RjhXfNrK z{*t)Sy4zDY?Mt__nwd832gK|S<0?9Yh#XL5?ZgYT(l54hH+2aod<+b@r8<=`N@tD) z5q5Bh7gBsDdxK&$FDXlOCXPieQ3;QAMvSf+R>#v1KJIqwO*FMcTRZIF=mTJ%CrS=F zz0+uUpM$tbVEKtAl zP!q4F`uqR3U2N4YUNI4}xg<9-&^GRGcg{&Lq`R>D9}-)Zt}kJw^e|oLX^RGcmG;qv zo{Rs1maa!ffxO?EVykPi}G*(eb)709e;#@*mdA#LpMJ{LSVY9hHx9TetmJweUG{2o2M;n&Qau zk%#-OF>+;mU&R>%Q?;>Q2ue-@t;ISe))EwA;OAUl@<=MWkw;!Q+jz?4%A0Qo==j>T z`KG2FUc}j@pmHAKW>P)*1eo1db}*shxK>YVbaGul{^anDxwkI}#!J77YKZE-I827T zU`s{2ZMXt;`nwEq_HB{;s~(f;;zX0ikeMv5$<_7(f^o2OzU*tA32%PD)FIwAvKK_j zU#_9(F#2-m3%EbhHKjHGmAdaYpTJ*9A9<@eG**W@&(w&L7j0;ZXSQr&i1>iX#D2T2 ziNE(aE3S1eiNr6I{q6P46@0CHG>^QsLTKwL%%l~xYPS>Xb}~?M9D8-!Z2sN0IZE-m zPerdJ(TWJh4m;YP7vZ#`v3MThtl#KDGZPxf%k7(Zc^&ko-UcrL2rb+So|J9|j8OSCJH8EV3|Jt`tN zEhCyTIqRnBw`NzzA=lzhQ@bvewW}nt3nmW%(5#b685vL>#x;c6?`Z$aNLQiqDB$n^ zunv%5RG|@0)=EvWk#l0{;jQ(Dt@-2r#`C+y9Gb7GZ~LYa!oykh$QVI!j>NpKsS}dq z`(rB8Eixu<@uv3Qzly1_OHd+>_FW=9LVZG5#ph6lR0VQosi#IWiPc(XM9J)S*y*V| zSfTs&aKGk{53Tt_V^d-ZqD}`8FLv8O>LCUAnrYkPi__w4^Uzfr;K?|ZV8Ufw zdA##4R)P(n{_VkhDFEzA_LwjG>5WPxLM1`OcXGKN3%5Q#LP_W!bA@NcJ2$aeM)7q4 ze~Td{+i?;#_cdYz1o}q#sqvnqVE(AVNS_a4DiQFp_o+x-u|v#G-2p{6GmjiQL=Uk+ zN6i6WPmx(X87a_uD(1AV1x}(Q#3zn$_}D6KSE`qq)`Xqo&}|Opx+QJ#0FcsxF?lpy zHBV`Fog=DHj=>Toj0~I_F1!e6CVVWc-^`qg2?Jk+fzf1-+W%yTI^cmOOLdR8Omf6a zI+e4GtmW$eudatc&1)+6k~LO~Vrrc+Ps7e9K}UiSr~|HNLLT7ACb3Z)duE$gnZ2b_ zL9yI3O@O}LqnLtdTRv$XIvS9}Wna80!>fIdE=8~uErC9vsaX%KZf2_gtN|(9fTyIo zXXZ6rXbL-sP2;3c(z{wXugf+gw2i>_{EjXc~pKC1CW?1c*5+ z`jt;VCp95FYtFwz>2i@rgzx@x1RM zJBMl#MW_^ArZ^oC_zNqf!{jva_xW6^xUD&&CtnIz5!RqUW>&IP7cnlAf`3KzMEWd? zsQ^XrcIsn0B$XT0SrhgR<*qz2yUgYY`=)|- zP5D&L$gE0U;;akuk!vTe=ZD+x2L_uy)sEIgdf!=#Atb&obaZ~wR>;Q5;u_j7kfO#Mw$)Y5tiSK^K$C+{ zXJ6~PnrRLRhRaxt8=mfPbre{tGCKFxYn`i^Ik49CM(Q{O!3BP`s#`akIpkiQX$8`QUz4!dq z-^kecM@_%8vq?UIHP!`_rt(FBt#5x1=CCuW1Zl*S=Yr&cr&5$LE9Fy&;j?g%m7M>K zwOE8iF>h)%v59A$Q8e7IccZ(DY8OZfp6=vhRB6$OmpoJw54E^_{oyBktdnY|tU2+$ zQMLGW*+)rSMS0hBRIHI=>)4bR1bq9&(WN9x*rCaGd9G}WfVX)^j-Vwdy!WXZKOoSo z0RBFr*v>KGH6;rX;8n?D6zyWn|!M`@}x<*5ja!2r^F&=?h$E3!dj+g2= zcZh&r;lV>ZbU_hvhGURfr!1N?bbYAN$okKi)^+X$*IR*ILq0&f_E$+#pjX@QRo1PT z4p3Z~Q4g_!o$UrF3|nn?Opi*JC*jKMXCO(CJ6^CNw$>vP-4=WdJ!61&ET>h-1xs&0#9B_Y=GIcQ(Y z*L(p4`*BgI@;Wk(8;s+x(&FMcH3`MXcf5OXT~{n3u38S)Wb?Oj&;2!$A4MRymCs?x zXRKZr;LbD^Nu?;CdL=b#njxo3ng=ExIspeWBK2Z`e7a^a$tPb(FvtPY`7N3y&c;kijR#QaQa_hR)T+xQ&40p!E3WQrf@V~yn$p_1kv|dN$ z0Q<~?b9|I+{)Szt^E`CUs7U2ex^}LrxYH%v@y;WM&3}?40M> z^XG7AQmi+4`UU{#Z9rU*GPoa)Z;|N-73%Et+BrUkMsbonG9CwZxmevv8hDtRKx*bv zuMgR)LZ(Hfs@3p{+5O-H!g@cE#OJy*@+$T3UIO1YKa~l5cjfFE@#=?NDIX@m|57ey z0~n5LlHNz9zoeDk-^&Qph8|@>($dwznD_gFKI)9~(Eq0bWG3C38i%dWaK6uXB|*qg zrXTLO=>F$wkSE9gLGGrhRHFsru?^*Y^#_1>4Dx=!^deLxEfx0#AJ1|6(3K!*gp&$8 ze;wOeFvR^vJo)0hxSF|qC(vbG-aF1O5JSZnC=JCJ=KX@BL@y9Oq+?k_>EoQyra5Sv z^P6k+lY8S5#0?XlF z%65@}T%-}uxM^q%)QwOyQy8IY<;duj@yUzY#Pjwp5n~IB;&e5fF^-d+;Hxs>kFQmb zA+F2bbV8V0b?XV*akA92qOSzvl}-s@d+O&bw2h(@mBsNUX#dam{J)g0JsQXwbu1wu zs*?520+DM==s;h4emXu@v7V6L!GUUC{Ql)1LYEs6)id7R|0f8-M4-If@o1hzIewEX zqwJM(t{NndM)!7v)n;!8bOnuxfNQ-4=|1}OQHx>TRfL*$3T%f&-ia{DKrDVw`#;K@ z_!KB}{d2euwrRy}PUlLk!`|D{(}8fx_2FmL#awUkb`&6Hw#fiL>eb@W+mkPlt^oAt z8^w|48Z`PCz{Q+~{9&HN+H`1}6OrcTFRGW2$kB>Ta?;d+BW&j66hM^ zL}?B|X|hapU1Wr+IF}9DzcBAZsVYaMUPFPxb2Van^VEsgOw!=tVMZWCut!@|+89>w z68|d^A~5Ym=}Q>rW8Q~*OpKLJktP#E$%Fgo+ZAF7)X_VA*ewd2MwCeLt&H#rWHUf^ z!Ep9n8hwxyX%g2-^_dO-eZ`l@t*8Nb>tPIP906`2US)Lah%U& zV3vN7zn=>r4HZ!`^&5&VyZe(zDnfmyXPaVj7D8%2LperuYZdD!8MS$+N)~I!n3)Gu z0+i)v1UkU<&Bjw>z>oR>%zO}N{Klx?gVB(pn3*0nDE;jZyuaWJu^E#(3w%jG_(7Hr zX7Jl`^(!Z&ACyR2%!9Vl-Fo-{;QZ&VRNvB084~fQ8YR>sBkrRca6CK0ORW3<$5(^> z%@T;YVTc%n`pxJ72{wL>xx46qyzQGzq0iZG*l7dWV#xFH{qzHo=k@$QUn5kT>M|gO+n=}wXlV1Rl{Q5} zd`gLu{l8%Mxv3E%>?mX-$xOg5DvPGW%X_6t2 zXiKff_x$!OXE6JzVS_g2m-+aj?l&L}!5IKc*5N6MhanmQ}2 zEPm4rZNpKK)Tpq{NeBw8fgfY!qH9~7h(Ot4Tm=twq9NXCXQuOh@jUi-rTE`l55DGI zscF)=n!r(w|7;3+`l@C5qA&^-fNXW<{E0>w9JS6*w%jjsgFA0%qZ^;?Zp>0_8X1zI<%KTWRN;rb|iX!t!1MqnTO<)nJ$sp)~NwiA!L zr#IKQjlTfZ4rZwxL$0@sv3b?z#R27NniyF`C8>;$IO{XIMjiU}T8a{%3$dyGF`;BP zc;DfJ#NkLtzz-uiuW5LVLpR4EthXol+H#_1P4UxDe}2lMHM#cHxf=>uYeV}FuKHD+fvUb>sjKFR2m1w%Z=PE9omI=80-vBiSZx6cnlFhj?noI}!nN#5F7+l5E-O}?21 zrzufP*$XJQD>4($5dHdJ(W&c$&vt>hs^+BsE6=(&VPC_%`0hQvd8G}A1zN7+FO)Ot z0~YjevDo-?cgTSdSy7%99@>Z`6UmSTL83hU_$U*+prnIdEXKIc8rOz?#{Utq;I zd9!?F1>#{XpC2V=`63LTXzmhWM`IEcf!rigM7s8&?}-Vz|$ z-(6Q&S4I%~DVtUbfx8FTKb8nl@^8O0rVau?J$#Wf+|YJ@g*0BRiDVnLQieP!e2QOe zi2oGk#vB~*aJ$zNx%4_|X=OskgRA~3zV^`#n->D^+nmY2K-8jw^&fQz&T%!&RD}kD zszLwEzb5V$7tPum{GhXZe@FwMJwWxr7*I#pvUe|rXkG_$vKA}!YXo*vmTK8%(Mga$ z>J-T%f7$mGrYq5Y^7vBb$0V$=)4j)&7h8?B40R+Zxk=7JvB8YR51MNJvm(MoP2-$# z-)4>ta4m&n95!!OufDcGCtGB#0DavFMa>-0-pFlAJal~A>cfS*CdOqhSyBf$z$#!}NjP|7Uzs8d5f4Fm#YOQAeNlaa*9CKBrm-n^x zccL54Wy<(G3qQVf6zBauO7fM2J&ZufD1w~A^aqK8Kr|$g-@Y63DJnQM&)^w_KQWhb z=A_16&jfjEm@fCuaHl$|>Rg6?_m!%qMZzT10VP&mh5qUdmaJ^47Q; z!-=pjDrS}tV=n97sHo1*t8H3L0UfmWZ&{>}TJZUNVbp`{^LZKQ@TEQBzPNLNih``Z z|9loayV}38pCfscT^k5G%0o|h>ayt_EQm)KbPH54S;}wWmpnSw#28+<{c^mR#c<7yvFQXjYGxb z(9cduJ$YHc?t5tiC+>}5WtuJePOe(13Dzv^CTd!1P$CTq-jAr*~InJ*mob> ziMu=sJ&HoC%!{R!&RCsP6XX3cG3-%Hw9+vy!G5bOUWyRbQ(Aa6OuhP&qT4{njV709 z14J1xrZ(@@?3IaZdQ@8akf{X1it0~3HCNhC)MRaZ_hHod#A-3=HFEx_#0QjH=imA7 zIKR5>+k4nMP}1-^|Bhm^p_&ysntDJ;XxEXVE1N%{f#$>u#sSN(5Dj5SMSj~i7AIum z0*`pLY$JxUG-9=Z_(erS+{@sq`;YOTqq4e?4NlA8=G7NQ3Nr&CW3NQgk5UUCfKK{I z=W=z^B49sG?--z_4^k1^nPIHJZ&|f-Oa>uH|q?VEh zb_hwW?W=2sJ1F>2R%3`6m`S=#8x*cA)d0r);aC(3SHan?Ouq5DVCQuu%piE*7;x2V zLKClCL8F76dynE#I#zk)pqO3rnDUnAe!wsXT(|e`sf_m=w$|APp8KD%6#F?GWq-G8 z@BZ3S)>LvhFzf%FiToLX9#naluehHs2$~6~yXApkjmTaRdIF*wpH!9*YA%vrF50fI=E<*&j_q`!(q&_SNKUh)kH&yss(1n}m77e)`( zmX1_q&Drlbzin%0>yB1pg~sy^&9-|w3UoACD-K;C|1u-Ia#ViloZ|IbEJ*NgdDAYG z2f_fQHJA1{7YIb^Pp)f?W&`)#TQ*8Sx(?zDO}1tR5+&Jc$5?BXGK7zrm~ZSOl8j(V zoi2u-V8R0m)o?$sj{^Qtfk#2_CRIsj&^THzJMgB_cx3zUnFq4m6!ErV~ zt=4Sd3Esz4kd^D^!!?Y@Y`n!g|A}I%>R~jrJ|{*I_C^vzfw58rI}v8?9?VC`jS@*_ zQR_^m`s&k9Y)-xOZ38Xkp(@F|#LYvM{r9k|4t#WkFMlDgY;YzF#DHx<$yAxY&yQp1 zES5Wv2uBK6;9a=a6EDCB1Pa``DHW>%Jr_9b)+0%M_aV%zS6|g&tK-Hu+kEqDK)`(- z`A80Z5FhCH#4t^~+}_$l!vzTcqmVKUa@>p`k#JHI-zT{$XfDzFoCAjQIIx~qeo(+} zpqhHCOdgrX(XS4_CPXt2QaL9^l8jH}6+v)g^&b805}kjfI&8Q6w&qmCD&sw$6E!~@ z9mi&lfglgGFrLymlsnpK28kcP=lgv=UhAKQpGyqw%&YVM{NgKeD8a+KP|^|cagmw8 ztf71=M2?pzFKMZNg0iOn?kzs~r>lK6doAIwR0xm3F#pNd=j#O;Z-R(?X?ndbarq5& zx=&*Wa^-#ZLOZ43H3Aa4YWgqt4gL?`ql>RUS(Qwb?G@dpMY`Fzoz0(OK3nB+B#W1s z%|rj`Q~YTMTM8EU`daf<^_4UegGZMVMZRzXP2LEan83qi=eyYENRx$}TgHa4mYrl# zKG4hL1MDf`QFwm_(*>6EutvcET)8JfPWG(F`EMRjbPagBN4;G|aDGiMl|Kz>T#N>f zL;sS5F!JOUSbUIu&ui)5(?n===lz+_B^zI1OM189yjypMl{~_%Jw$p#v(Ubst{bm2 z%<1MjN5DdaP$)LI?)DZd&E-Gyacs&lSdss#!))PiICW7m{6I`qD}6KX5a|KM_YZ`W zlZt0?5^c{~P)^$^(ufgH z;sFxod};;(b}arpPHW|MtbT2N(nVJBAQwy`Xjtb9 zE2GMin+tFZNX6e4g2)nBe7SaRFVkN}$5Ri84SgnDI+)CXDA?nl!g*~w@Ad<8XU#eX z%qs44Uem{__doC&i~0Yw08e{nch)t_qLY^mx{07psWJxi>o;JgGJ~LaL?H7l@M`g8 z2}*e%VewjjA=B#Uf~O9QH3iyk(A{K<8Kexx3^*o}3~Rcl@14$&6};hyI+W4+4VZsW ztq1TdlyGJ^zUm7;GIb1&Iwnt$IU;HgWVAkls^Tzt2#yIhsAo8ubzg_~iq8f(qVOI^ z)Chgrj4FE?kq^%dtFViQ^ABATS&k*!6Ol85l#NUf@;D)MeI(-o0@nlMvq{Z^6a?g7 zq?TKd9hD_jl2tT3Nu7l+@7Q0!Og}Ip5Q7y9%`1f_FaBy|dn!^|Fpjam1&=m(gHg0R z5m7jSj#bjv?3?LY9aD>&gazjV1k*oo+SVQWPJtUTauM;!gQroP<)*fZ zuBJmt$se2U-s;!)QZISx;qyxrJNerEYNVJQ9K#Kdw%#x^7spjtDjntWfAcuh#IU+& zdLTZ+Kwrx!frP8fZe#XS0~>h^W#X3H)V+gukc1Iv_YEqq6Tt3s#0{S%?e#(I5(y~n zNbC8VTcMaLqD>zOPWZxCv6tFEq1?>&Hfk`hTVccSTEIB4dB@Y5h->u%8BegwsrBR^ zz+KkJfEIKln0paNh#0F@ny*!Hs4A#q=65_B=JjI?L|I~Lv*P_gxz~_xz#pS;gzKnT z5q~4+rdqkAR-!ma=CCGyHtP=h&DJQU3LF&`n|FiB>D2VtKt-N#3CAb)@Ar+xdvw+X zrP*(U-b7ZF!uYGj3Cy(1D$T?FZ>kmy$8Q(!vFG2ZuZ=$<+&FC30ol(BdvifLf zk$@UM{Dj}=&4!{vQH7Ts_e^yM!4&2>GI;epj|oAOJV|d^`#{JgypE$YDY%sYoFzlw z!y0dX5VBQ4`vcv$WiJnUkqi+|Wq^7e&dY?>tOzkVn;tP@-c6nG{rqtad=zD-SwBRYG)3vuJ9!8g-8cAeThA3+KH0D!X)tVIQ1ws^osLm}7{N9@1GpOB} zBKRI4nlp|@>hds^AvVv#KfU55&IsgnB5vv}G{4P!pc|ojh#Q(g{xe!Jbk>L{1$Df> zU?vx%5-DmX=WZj`g9tJh0|ogC=OTR@*#CrbLa+Rn&ls`c1#-Th9~vX?VRVy&f)7m1 zLC>OpFxEk~M6TbPn+A&sx^EDilzC}II&i~36ku*U*@>X<)SkSA&Y{~V3v=<3RvV@E z`J9ye2V5N!v-!$)gvGZl`IeR0RB}_^OOhoZ=bo=G&PJCb6|6 z{V?zXHVAq6XMn$^>+bDX>g^6 z_IjeX;krKh^^gE;@AwMZJsuDk;P438-{)gOIbfx4Iio|i+^fr^yzxCiF7U_?EL-~} zrljcuhb4633?Ef8LlWJ|s*^85ECFWL`Z^d>CpJq%0}e|3ZC6Q7=udGkYbPT+a0F=Rzut0n#-Kbg=<+s>-cc^ry;k8sU_ z%-UDct*=1tIQE)pd-SA%gO(t-}%%{PUW4qv((mhZd3$Fm*#KU9h^vupI;+GYArmdLz^+dE#b-aty=SWjbt>D`C zWLSEK6rDQrt&a_=|N5hl4Ai4d;m!aD)2WME0q5`3I6`y-fLyz^phl@Dwp8&TLNBn6 zdpzJ|RhM3LCNjg2e_uTkD3KFB`cA}Il|VsT^XXy%UY+w>QB8aOIS9%>?pRdX+EXWR zlYR6O-v_Y&Dg+hw(3#jCm1L6?!BpA>59`QFi8k`0-{iK2)!I6@gS90bqF-s8Yb(IM zGAAqoac+rhXU7@UiLJCjImV7J*_l7X1BD{+=U1W6!OVshG_?@pf-CIn*FdO9k z>yA2g_d73BnV>A!cU_r=( zpr^?#h<_KWH5NVq3+{Z0G-Onge!f70_l+Fyx^!e$4LF*z1weS{>QPkVSn>Z_I`4QY z|M!oJqCqmsri{?A$FY^Yj?4<#Gb88NMU*nKzE&g-byKi|J$O`O9rG;?uu2Z_1s23Mb} zX!v2%p)zA^1n3xOy9bl$ArUjPC+O(67!n?b_F2=E1SfAB#`pAUNj3h3)YIACzCOcL zWNGN^)EFU^HjuK;v1CR@p30mMAx)B7G**5NRSHHAL-E&NZ&G;4_^`uLuv9pu57Z zfcl4icW9qCglGPXFO67g${SSH^%h@kdv-f>vzDr_ldg|o8LG%N6y2W%H?&T%h#-xr zF}uT1Z{(8qVE$!~OTSvxpZ|bj+V%Xl1=t$3t$O4y2!E?f?fdM=%9B+cCtggjW%m%` za2QGn%q@)n$5?GqW2&*XH&flU{p3ol3+yOj$rhZoOYKY?-Oh5-0@m8a-Cx}{uUd;S z*JD5@Lk)$H-y2*H)EyOqPRCoUjEW}xd)k;Zv-!@}N(2<{IQaUDU5KBkT6;j}G!Eap z0+Cds2>XDCMuxrktv47boU$EM>&%h=evJ9$AhNgSTvWi&`J@zdIz$CZL_LIl+nRF9 z`{`(g_CkW?{3o$UyZ)eYmNdfgh%E!F)=7>S%7=OqzXp`@T*vaXwJpEAYVA;eNw|8X z^s*MYzE*Z0upe%zvGR(y<>DAjT&+rXOh5gM3_a!Jn+g`N;PMd{(fr}Xn!Ho9`VVExKWz2xt`{vSt9u#BRoAt*-JkaFPk}V-Gge$~BbuYXZ zlI>m(`t+ry*#TGomL4OWr88!!9jxFExA0IML#ATJ8cSX<_y^WF78-Op_IOuV%u+Se zkqe{*WO!v#M2HWv^@Iapv_*2H_k8D29wICqkv#p`GbypDg3T@5Wbtx-r%C)X$%$(s z!~3n^FPG2aYK&T7>7m7EoIwI~9#Z(p&-_;BmkRXD5EM4zEtnm{mG6H(L8}DJ_Wk?c^o}CG z-x%=W%>IC{^s{zvoDOa~ZqpyUQ2FAI@_*v=n$OFvYu?UVkgdv1XD;S^LnmlxY%gkR z(Bkdw)19LU!`AT=my(AcTxRp1vUU;W)oa^$wmEmh;xtfY7F&xlLjDfj*??pi8%-s- zBm1Wp&72Wak#6$*O9)B&d~rTct8nL*a;tEUrs$^>6jQ%1JUjSqdCs1*#04EBezh7F z-&QN>?wrc(_PJs>L|Vx@9Cpfw)9@;R*_Ml*kta%Ad z8)&v>Q(bmEnhnC1u2)ICK_ULcTGOY6gmlT(27&l}u#{DEg!{80N-~T0>EJmJ(Teg- zHb^?k3T?KTh_IjTbYc0WT-lpf*Otg}2c1>jw!scUg_AYHAV!XC{~!3(MfZ8rd;(lD z6}IeA%;QU$xlC!pkN9Ns4_=9gwz6jGEU-hg>`n5}n4omy#5Mh1r$=`#J&v#$_;jn! zK<`ep=;1VuAryA5YpII~^XE7bl`q_{&l!#lGMwTBN8fmNp{}s(rkrBPyIM(lq!pwo zJMvZr`%8mySd@VBq~r>`&h#R4Cv&7e>kqF6Ie64i*Vhkk0~6X~AN#m)PcR-Y=quzR z8X0odirb9@)x)+%5*~y4GM5|-DWC?#QHZ1hU!#iZYy3?C4N#JslTW-8h%X`pdM`JG ze2K_Tcoye@N2T<<3UDaE^VcJeJaG=+EdlY8Ty5)Yg8&g1QXzpK8uk`!&@`V70|7jwhXq^|P(egU)JQAeGxz^$_$Yc=B1oB#C_YdG< z1lM}qWb!@E-IorI`9PCkB*@jJ8gc@D<0D%E$&$P$hQ_R#m$;gH2xSra@7)msrAF&! zbLf5Tv`ht#v{@RP&0n;n_)(LS@e}$`Cx0*?u}F^>> zWdlSUDq!7^Ad)P*iVwMbw<5(GbFya-m~{VED;VX>jLnd~qMdo2E#|)mZli>8~u2`aL))eq>5*isQxOEGNU?ie%CUKB&zO&m#rN|bBxd$)%EA{ZE2HYGbWQS2Bnr;&Y0>Xg3JF&pusI1_L>=6 zx*Zi+8l$L4EJ%eUUPzG=>12RKGMqUgg7E*XoIj@uqgUrH46i_PO#6Jr5_}utFfhR6 zbGOd$VA&CkwdzGq*%Yyj<~?webzHna~}kw-R!$N$T={QeQf3N;ugFuEG* zNDE(dl@q8y6|Ub6<4Mcwq*9n7XnO#txP?3RdcW+&mV|D&cDZ`XD|DawM$c+)%wK-|UO8A9M@`M%IF5vU z-M0LAF>TE_gRy$?%?r-bW)#F*{SC{;PqrowT=USWb2+Tv6i9D16?rj!!ovyKinmo9 zI+(Nfo4wU)Ik#+-{UM@RC%Btg+-2>8tcMM}!2~>K?N3#(2}j1k9ni8NocUY>$s<=j z;;`*FxQestx;Tp^|7dSM%E||7t;FZMi1!3UE0A<9CD3#(p3m>~i%dk^KA8;MK)MK| zZ|AxWruEd!P|!v4NTMF69$ea9gp%rFjzxry4C0K7BpIZj2jFstp68S0fF+r&%lZAK zc;S^TX%O!W!&5MJULjrnL} z5Docfj@a7^za(~;W4n_3jk~KYRiMBn_`S}FSP;HEEoXgn@gu~83Rl> zg^Z^QeB?be_uKHrtm|4?kWpaR^1d*Zkb-4$X}tSyW>&Nh6CklLZ(ht(v0A{XmGlqS zKz*vy#}EH`Zgv&*G?=jxm#5#7UiZL_D*?Oyue39qKtnRqV{Lx$iyz}lC zUQob0Uuvqc(o{M}k5P1J6Tdo^&rg)NApVaknA$?s>OY z^4pK5Q>Vw>eYfqZ>_LH6=wx!thB#%uK{apuy-m*PN!Jgh zf!+N~F?2vKVTY;F?1=oc4!>m~*1MvnlHa_zd&1nk~qv#0Cdcw=Zw}Iq|_!>PD082;^PuT)M}Qt_h5oPi~OA zTQdO8cXvVFc;J*iXn_ofOXb0@4K!;7t09N=MDyP5QY~_$7ZPG*~ykj_jB>S%#&=?cskklWNAFiYDkOOlPCI-fLFYx;96Rw{D)5b1l=Tm(aB zZw1GERhK*)-9+;E8ScMTal3Em+c4vScgF2idOMWa=5Z6}L2oa|Je}_9@j|DR2ZA90 z=eYrD3CHYM-RZS1r$H0T`yT*~*m-Y^XKL%mfj|b?)5ih)#}2k>w98T*5jlsz-+l(9 zFvdWA^aYSE?Ly1azn{B35Ks|$r zr3KO2f7jl2`dP`Oh>Aozgn~TBKrggshe7h>u&>0E1dz(Rmu7##RLyD^8yWt%p5{mL zJlqq~r(*BSp}SO`=-F0Leeq}8hC`otESs#D-L+xZb!NUgXOj04=_``2Gd zx6u znRS3tHV9KcsaHhHmA#htd-&#iaxe(hr4(0typdLQyN$;DVP1UpAR7>GeCVv&wAd)N z?AgCtjAs2Ia=j<-w-go}V+8@gont+4#Vzq06M4MzKi(IarERhuR8F>a6j6$tE7t%elX&9!2aIQFK$x&4%pPU!bi8e@k3`D(ApeZ;G7z}A%BH$MFO-ueU>dP6NKtCO zoV62*$K%c*-fR>62n)_*h7S;nL$8D7eGDB|Pf-I;2)RfsACF@lm3bI7mkerUP{&$Q zBS^kdb-(T+$zjjck0p?aoETUoD+MuiM7L*Qk4lOY)#6r;Nc3lq2kSt&jW2B=G zhYh_hIHt!0e@b0e+H|BEhc+#Pb^eA=OH_I*QcmHM_;(&^KOZJ~QUUi!e(PHxnk^rY zg~^5HwWcK#+&aCVQ-cY@P?&>{-Zoc4R8QhSz^sy?%&QYgMyn1;8$f(7t@Rg?iH;xL z3z=52Js$q+F%aqt1@j0cvkCxW1<3~Ik8ZJD6E%(gQi}SmZvN{hs{6>9s78M);|E!Q z)U%P@T( zTgN?uZ#1y-0r0r(?|^V#2eE~~N{$-FSj#vGYHKQX(P|fxU;f;#IOM zVn^;`PO^;vz&m2bluK!`X{GuZ;V^L3i6pZm39rR-yTXo2dK?U1PgSp zAUYvu648y#MnupcJmH3SZdQp0w&esvD~cIP!(PlLO$@MFK9Uxv>{!yjjL+0(C7lES z>h)*s8$MRzClG9TcvKc7FS38Hw{}25atk59)g4-s92j>nmBVD98N`g{E7^8(KkxCD zKp-=bb>6YlZxA?uelQEPX&r?4@vIppekn$Vl^_^1*U%Ds&h_UZ>M1kbEuh4J#&+zA z#FH!S=+Sx3vwZgEFknYiTf=3m;~tLVmoA~{ZpAvZ<^W`rx`627qLgq~;$Z&T_95L~ zruF8tMIWfu<2&WVd<5%OK8t)qtAM79hlon-zp%E+&qN250&6Wd>-?h%Xbcb2R#jt36K7(0Vhn4CE7Y4% z7*Pv^-;>|7vt^T>t)I%Fpg5X~oDpy;*e->s18AkfRxw1EMwp8WFsJS0r>o>uXk!5v zj*lU*9@EK245hOp*M6*I2y(Cj`29RXI4P)SfaQCcm%8FhC$-V+0+cLmEU^HO*5DhAJUO`xxyiC#UfT}V(LCRy^_>dgV_9~>{V(28(Sb`XnR_Ht#qylei9WQu=qczpN`YDP(XtW zb7{~bL4eBzEDC521gMN`gjjo!ghSz}HUD5HLz({pn6ikx%9ao@=56H;xYfe|1W`)$ zg@i-eh4_2{M_#ta;g{#%O2amg zf_4FyFMvA7_870y_Ot&Cr{1rW#-p4fnsQmr@Xo-xhG@j05&&*zeJ$G$<;Q4k{<+l# zD35W(uxtwfr4X>HWuUSUwzpiJ+CL?!y|}7foX^r@TDo)9>bG3LH2>c#8q8(7KPbZz z+G<-3lSu6eWUIe1_sSOq?bmo-hTkuP^B}bE&O`_R*t@-??N7I)PUyfg&E~ZFLwTA6 zMefXOis0~w zDbz|#krYcAC(+=%17vz4*%#Bo!f2Fp3()7SWP(Z>F#}A#=$co}PALPj$ngLaV%!Im z^XvaYoCgOkp(a&A4Yue$%D|79{|qYEmAU+p2L8eX>0zZ2whE}C*Em3j zhXQ#Xy>`qD{s2|8$-F;P4%m+NB8y%j!5sJ~s%nA5snKfdiK8<<6B*w*U=OK=0{Ua^ zrTjOk*%|O8tJ(ngozw;-FlXeP3HeRFqeo86 zSOT&>*OSg1Sx6=%f=N*zGB4S^goC28p(r$%gh)a}4d7&7xLcdzZ)wWaddB~Uv`1!u zy9gwH6+vj>hEFHd$OdZENvqj3#LR|$kb|2JWdUFRATS27{kV&SKD5rh zG(Iz|2_Byn(}{=ROXRpv0c6Beyw{L8u4+GM!t!!?)z^G*iISQ^2M!Eq0QqcP^?mr# zXv$4i`SP%cQGA8T3}=c=1aAQd1g4yy{4naCk*6|n>%GVSP-w$2x6Lwn=naOApQ&fv`SR%+mcP8Sn|K@95owwlyb&vASvMb9B9B%3w< zF7|GZq9D3_oC|(DI9Z_>aBX+M`Qd5-h-^5xU=2fv$KLsSfK&5n6%wSl10?_Td`Obd zhBxAmUjBOKb}7qdZRo$+6l@wCA<_gb5!|*k^~(p?Q#P?!tnL`3NmI-qM_<(20}sdP zLy^Kn|Noz$Kp6&5V~X*b)a}g1C~tPz<92G9MF3ssL_{nUd(b88FI<%|%MndqrhZ*V zJS__%gk_3#5xC0|J{=+nRtc}`ZXP{H`c#)$;5XhtA*T7?X&H|smY1}^m@R?TFsu|h zafBTd;O&noM52E(!P~ArM9$(UYcCY!!1xapxpghQJWL^}3O5UG?0qiU+yTQs3F0Ox z160V>1c+Ac?T^=of0nTqI-X<5Tq$(8@>|*e{Py?N>Q-*&wB$#GofF89cqvliBs79g zl$!HtnrZR){`JMhA>qY8mpg9Kz3oI5ye^INmH0DBcX!6(osf5O=9Y=N;w~=SZq-EB z>m${5Vm^&mlCgXT%FJ+kM^=QMkHX4;^~gftk`jg5UQze4npCml6PNO~x#vuk`a6ph zqbR(Y?3mNta|wcDCi91Tcw;Gvv^RFt70L;jVYQEpY~NsGEb{t7HvTDIdn|T*P-2HW zEdQju#sl_8MmbL^%U)MD(l1_{KWqv&N*grN6T? zYkgFgp;Al)ocVli_c2!u)*}`f@0{|b)1jaVdOK#<{F0E+ZCv<%hLr`S1*7JJeBF=F z?)J4r{s4nZRk8@)Dx_OZMYGLEJ$PB^1OrBn;k5dL1!$t@nOkb=!EsTYB>V)?0)return; @@ -87,17 +87,23 @@ Component({ lifetimes:{ attached(){ - console.log(this.properties.row); - const windowInfo = wx.getWindowInfo(); - let viewHeight = 50+96+32+48; - const textareaHeight = this.properties.row*25+24; - if(this.properties.editable){ - viewHeight+=textareaHeight; + + } + }, + observers:{ + "show"(show){ + if(show){ + const windowInfo = wx.getWindowInfo(); + // this.setData({ + // textareaHeight:this.properties.row*25+24, + // }) + this.createSelectorQuery().select('#modalViewMain').boundingClientRect((res)=>{ + const viewHeight = res.height; + this.setData({ + dynamicsStyle:`top:${(windowInfo.windowHeight-viewHeight)/2}px;height:${viewHeight}px;` + }) + }).exec(); } - this.setData({ - textareaHeight:textareaHeight, - dynamicsStyle:`top:${(windowInfo.windowHeight-viewHeight)/2}px;height:${viewHeight}px;` - }) } } }) \ No newline at end of file diff --git a/components/modalView/index.wxml b/components/modalView/index.wxml index 8f161d7..a28b980 100644 --- a/components/modalView/index.wxml +++ b/components/modalView/index.wxml @@ -1,17 +1,16 @@ - + {{titleText}} + placeholder="{{contentPlaceholder}}" focus="{{contentFocus}}" animation="{{contentAnimation}}" cursor-spacing="200rpx"> {{content}} - - + + \ No newline at end of file diff --git a/components/modalView/index.wxss b/components/modalView/index.wxss index bd3115a..6bc922e 100644 --- a/components/modalView/index.wxss +++ b/components/modalView/index.wxss @@ -24,7 +24,7 @@ width:100%; box-sizing: border-box; line-height:50rpx; - height: 248rpx; + height: 214rpx; } .custom-modal-view .textarea.error{ border-color:red; @@ -37,8 +37,19 @@ } .modal-view-main .btns .button{ flex:1; - font-size: 32rpx; - padding:32rpx; + font-size: 16px; + padding:16px; line-height: 1; font-weight: 500; + border-width: 2rpx;/* 边框显示不完整 bug */ +} + +.modal-view-main .btns .button.cancel{ + border-color:rgba(153, 153, 153, 0.5); + background-color: rgba(153, 153, 153, 0.1); + color:var(--main-font-color); +} + +.modal-view-main .btns .button.confirm{ + font-weight: bold; } \ No newline at end of file diff --git a/components/navBar/index.js b/components/navBar/index.js index 28d0974..ad78189 100644 --- a/components/navBar/index.js +++ b/components/navBar/index.js @@ -20,6 +20,10 @@ Component({ background:{ type:String, value:'' + }, + black:{ + type:Boolean, + value:false } }, diff --git a/components/navBar/index.wxml b/components/navBar/index.wxml index a0eabbd..4216db8 100644 --- a/components/navBar/index.wxml +++ b/components/navBar/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/components/swipeButton/index.js b/components/swipeButton/index.js index 6caa00d..5b6be68 100644 --- a/components/swipeButton/index.js +++ b/components/swipeButton/index.js @@ -28,7 +28,7 @@ Component({ textOpacity:1, - textRight:120, + textRight:80, moveViewX:0 }, @@ -45,7 +45,7 @@ Component({ } let x = this.data.moveEvent.detail.x; let opacity = 1 - x/(this.data.moveAreaWidth - this.data.moveViewWidth); - let right = opacity*120; + let right = opacity*80; this.setData({ textOpacity:opacity, textRight:right @@ -59,13 +59,14 @@ Component({ if((this.data.moveAreaWidth - this.data.moveViewWidth)/3*2 < x){ viewX = this.data.moveAreaWidth - this.data.moveViewWidth; loading = true; - this.triggerEvent('done'); } - console.log(viewX,this.data.moveAreaWidth,this.data.moveViewWidth,x); this.setData({ moveViewX:viewX, loading:loading }); + if(loading){ + this.triggerEvent('done'); + } } }, @@ -78,6 +79,7 @@ Component({ }, observers:{ "loading"(l){ + console.log('loading',l); if(!l){ this.setData({ moveViewX:0, diff --git a/pages/index/index.js b/pages/index/index.js index e7f760a..54279b5 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,5 +1,6 @@ import orderApi from '../../api/order'; import userApi from '../../api/user'; +import {hidePhoneNumber,getStatusNavBarHeight} from '../../utils/util'; const app = getApp(); @@ -7,6 +8,7 @@ Page({ currentOrder:null, data: { statusBarHeight:0, + snBarHeight:0, list:[], leftPanelEvent:null, @@ -53,11 +55,10 @@ Page({ isShowRefundConfirm:false }, onLoad(){ - const windowInfo = wx.getWindowInfo(); - + const snHeight = getStatusNavBarHeight(); this.setData({ - statusBarHeight:windowInfo.statusBarHeight, - scrollViewHeight:windowInfo.windowHeight-windowInfo.statusBarHeight-44 - 91 + statusBarHeight:snHeight.statusBar, + snBarHeight:snHeight.navBar+snHeight.statusBar }); this.getUserInfo().then(()=>{ @@ -99,6 +100,7 @@ Page({ this.loadBuilding().then((data)=>{ this.data.pager.pageIndex = 0; this.data.pager.loadAll = false; + this.data.buildingIndex = 0; this.loadList(); }) }, @@ -181,6 +183,7 @@ Page({ params.status = this.data.statusDetail[this.data.statusDetailKey].key; } orderApi.list(params).then((data)=>{ + const date = new Date(); if(this.data.pager.pageIndex==0){ this.data.list = data.items; }else{ @@ -192,10 +195,12 @@ Page({ if(data.items.length{ + if(item.status==this.data.orderStatus.created||item.status==this.data.orderStatus.completed||item.status==this.data.orderStatus.unpaid){ + item.address.phone = hidePhoneNumber(item.address.phone); + } item.packages.map((pItem)=>{ - pItem.pickup_codes = pItem.pickup_codes.split(','); + pItem.receivedAll = this.getPackageReceiveStatus(item.orderid,pItem); }) }) this.setData({ @@ -204,7 +209,6 @@ Page({ statusDetailKey:this.data.statusDetailKey, buildingIndex:this.data.buildingIndex }); - console.log(this.data.list); }) }, @@ -217,7 +221,7 @@ Page({ wx.nextTick(()=>{ this.setData({ isShowLeftPanelMask:true, - leftPanelMoveViewX:560 + leftPanelMoveViewX:510 }) }) }, @@ -263,10 +267,13 @@ Page({ mediaType:['image'], sourceType:['camera'], success:(res)=>{ - console.log(res); this.setData({ tempImgs:this.data.tempImgs.concat(res.tempFiles) }); + wx.nextTick(()=>{ + console.log('nextTick'); + this.uploadImages(); + }) } }); }, @@ -295,13 +302,28 @@ Page({ }, //取货完毕 receivedOrder(event){ + const index = event.currentTarget.dataset.index; const item = event.currentTarget.dataset.item; + const hasUnReceive = !!item.packages.find((p)=>!p.receivedAll); + if(hasUnReceive){ + this.setData({ + [`list[${index}].receiving`]:false + }) + wx.showToast({ + icon:'none', + title: '请先取件', + }) + return; + } orderApi.pickup(item.orderid).then((data)=>{ wx.showToast({ icon:'success', title: '取货成功', }) this.refreshList(); + wx.removeStorage({ + key: item.orderid, + }) }) }, //完成配送 选择图片 @@ -328,6 +350,10 @@ Page({ this.data.tempImgs.map((item)=>{ urls.push(item.serverUrl); }) + //需求改成选择了就上图图片,所以传完就设置了 false,这里要发请求,再次改成true + this.setData({ + completing:true + }) orderApi.complete(this.currentOrder.orderid,urls).then((data)=>{ this.setData({ isShowConfirm:false, @@ -353,15 +379,31 @@ Page({ return !item.uploaded; }); if(!file){ + this.setData({ + completing:false + }) return; } - const uploadResult = await userApi.uploadImg(file,(res)=>{ + console.log(this.data.tempImgs); + this.setData({ + completing:true + }) + let onProgress = (res)=>{ //进度 this.setData({ [`tempImgs[${imgIndex}].progress`]:res.progress }) - }); - console.log(uploadResult); + } + //无奈之举,不大范围改动代码的同时,我需要获取到上传任务task,来中断上传操作,不然要出问题task在上传时被附加到了onProgress + this.data.tempImgs[imgIndex].onProgress = onProgress; + let uploadResult = {}; + try { + uploadResult = await userApi.uploadImg(file,onProgress); + } catch (error) { + await this.uploadImages(); + console.log(new Date().getTime()); + return; + } if(uploadResult.url){ this.setData({ [`tempImgs[${imgIndex}].uploaded`]:true, @@ -373,6 +415,17 @@ Page({ return new Error('失败') } }, + removeImage(event){ + const index = event.currentTarget.dataset.index; + if(this.data.tempImgs[index].onProgress&&this.data.tempImgs[index].onProgress.task){ + this.data.tempImgs[index].onProgress.task.abort(); + } + console.log('remove',new Date().getTime()); + this.data.tempImgs.splice(index,1); + this.setData({ + tempImgs:this.data.tempImgs + }); + }, leftPanelMove(event){ this.setData({ leftPanelEvent:event @@ -384,7 +437,7 @@ Page({ this.closeLeftPanel(); }else{ this.setData({ - leftPanelMoveViewX:560 + leftPanelMoveViewX:510 }) } }, @@ -404,5 +457,25 @@ Page({ phoneNumber: item.address.phone, }) }, - emptyFun(){} + emptyFun(){}, + onShow(){ + if(this.data.statusDetailKey==this.data.statusDetail.received.key.toLowerCase()){ + let needRefreshData = {} + this.data.list.map((item,index)=>{ + item.packages.map((pItem,pIndex)=>{ + let reveivedAll = this.getPackageReceiveStatus(item.orderid,pItem); + needRefreshData[`list[${index}].packages[${pIndex}].receivedAll`] = reveivedAll; + }) + }) + this.setData(needRefreshData); + } + }, + getPackageReceiveStatus(orderId,pkg){ + let receivedInfo = wx.getStorageSync(orderId); + let codes = receivedInfo[pkg.id]; + if(codes&&pkg.pickup_codes.length==codes.length){ + return true; + } + return false; + } }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5cead9b..56d8ec4 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -27,21 +27,22 @@ bind:loadMore="loadList" refresher-triggered="{{pager.refreshTrigger}}" show-load-more="{{!(list.length==0&&pager.loadAll)}}" loading="{{pager.loading}}" load-all="{{pager.loadAll}}"> - - {{pItem.station_name}} - - {{pItem.pickup_codes.length}}件包裹: - - - + {{pItem.station_name}} {{pItem.pickup_codes.length}} 件 + + {{ + item.status==orderStatus.received?(pItem.receivedAll?'已取件':'待取件'): + item.status==orderStatus.delivering?'已取件':'' + }} + + 图片取件 {{item.pickup_images_count}} 件 + @@ -93,12 +94,11 @@ - + + + + - @@ -113,15 +113,16 @@ style="opacity:{{isShowLeftPanelMask?1:0}};" bind:tap="closeLeftPanel"> - + - \ No newline at end of file diff --git a/pages/user/bank/index/index.wxml b/pages/user/bank/index/index.wxml index ca15984..7eb33c9 100644 --- a/pages/user/bank/index/index.wxml +++ b/pages/user/bank/index/index.wxml @@ -19,10 +19,6 @@ {{item.card_number}} - - - 暂无银行卡 - diff --git a/pages/user/income/index.js b/pages/user/income/index.js index 742859f..4091319 100644 --- a/pages/user/income/index.js +++ b/pages/user/income/index.js @@ -1,4 +1,5 @@ import userApi from '../../../api/user'; +const app = getApp(); Page({ @@ -9,7 +10,8 @@ Page({ data: { scrollViewHeight:0, pager:{limit:10,loading:false,loadAll:false,pageIndex:0,refreshTrigger:false}, - list:[] + list:[], + summary:{} }, /** @@ -17,6 +19,11 @@ Page({ */ onLoad(options) { this.loadList(); + app.getSummary().then((data)=>{ + this.setData({ + summary:data + }) + }) }, refreshList(){ this.data.pager.pageIndex = 0; diff --git a/pages/user/income/index.wxml b/pages/user/income/index.wxml index 5214fe6..e64201d 100644 --- a/pages/user/income/index.wxml +++ b/pages/user/income/index.wxml @@ -1,12 +1,18 @@ - - - - {{item.description}} - {{item.create_time}} - - {{item.amount}} + + + 今日收益(元) + {{summary.total_income}} - \ No newline at end of file + + + + {{item.description}} + {{item.create_time}} + + {{item.amount}} + + + \ No newline at end of file diff --git a/pages/user/income/index.wxss b/pages/user/income/index.wxss index 0782301..8201259 100644 --- a/pages/user/income/index.wxss +++ b/pages/user/income/index.wxss @@ -1,14 +1,31 @@ +.custom-scroll-view .total{ + box-shadow: 0px 6px 6px 0px rgba(0, 0, 0, 0.06); + background: #FFC300; + border-radius: 18rpx; + padding:30rpx; + margin:20rpx; +} +.custom-scroll-view .total .title{ + font-size: 32rpx; +} +.custom-scroll-view .total .num{ + font-size: 68rpx; + font-weight: 600; + margin-top:40rpx; +} .income-list{ height:100vh; -} -.income-list .scroll-view-content{ - padding-top:20rpx; + margin: 0 20rpx; } .income-list .item{ background-color: #ffffff; display: flex; padding:40rpx 30rpx; - border-bottom: 1rpx solid rgba(153, 153, 153, 0.2); + margin:20rpx 0; + border-radius: 18rpx; +} +.income-list .item:first-child{ + margin-top:0; } .income-list .item .content{ flex:1; @@ -21,7 +38,3 @@ margin-top:32rpx; color: #888888; } - -.income-list .item .money{ - color:var(--main-color); -} \ No newline at end of file diff --git a/pages/user/info/index.wxml b/pages/user/info/index.wxml index 47b62b8..994d8c6 100644 --- a/pages/user/info/index.wxml +++ b/pages/user/info/index.wxml @@ -1,5 +1,5 @@ - + @@ -31,7 +31,7 @@ 实名认证 - + diff --git a/pages/user/rnAuth/index.js b/pages/user/rnAuth/index.js index cbe6beb..34e37dd 100644 --- a/pages/user/rnAuth/index.js +++ b/pages/user/rnAuth/index.js @@ -11,6 +11,10 @@ Page({ idCard:'', already:false }, + validator:{ + name:{minLength:2,message:'请输入真实的姓名',autoFocus:true,shake:true}, + idCard:{length:18,message:'请输入正确的身份证号码',autoFocus:true,shake:true} + }, /** * 生命周期函数--监听页面加载 @@ -29,18 +33,21 @@ Page({ save(){ app.resetUserInfoUpdateTag(); - userApi.setRNAuth({ - name:this.data.name, - id_number:this.data.idCard - }).then((data)=>{ - wx.navigateBack({ - success(){ - wx.showToast({ - title: '保存成功', - }) - } + const valid = app.validateForm(this.validator,this); + if(valid.length==0){ + userApi.setRNAuth({ + name:this.data.name, + id_number:this.data.idCard + }).then((data)=>{ + wx.navigateBack({ + success(){ + wx.showToast({ + title: '保存成功', + }) + } + }) }) - }) + } }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/user/rnAuth/index.wxml b/pages/user/rnAuth/index.wxml index 7dc32ec..feadfe7 100644 --- a/pages/user/rnAuth/index.wxml +++ b/pages/user/rnAuth/index.wxml @@ -4,14 +4,16 @@ 真实姓名 - + + {{nameMessage}} 身份证号 - + + {{idCardMessage}}