From 59767188e3bedf9da20100adc03c36c13f78605b Mon Sep 17 00:00:00 2001 From: linju-json Date: Tue, 11 May 2021 15:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=80=E9=94=AE=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0loading=E5=8A=A8=E7=94=BB=EF=BC=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- common/appInit.js | 4 +- .../uni-quick-login/uni-quick-login.vue | 15 ++- pages/ucenter/ucenter.vue | 8 +- static/uni-center/defaultAvatarUrl.png | Bin 5417 -> 5947 bytes uni-starter.config.js | 3 +- .../uni-config-center/uni-id/config.json | 104 +++++++++--------- 7 files changed, 66 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index ecb2024b..f0751c72 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ 地址:[https://codechina.csdn.net/dcloud/uni-starter.git](https://codechina.csdn.net/dcloud/uni-starter.git) #### 项目背景 -我们一直想出一个结合uni-app、uniCloud和openDB以及uni-id和uniCloud admin等,uni全家桶的项目模板; +在过去我们会收集到开发者,咨询的各种问题,其中我们总结了高频。我们一直想出一个结合uni-app、uniCloud和openDB以及uni-id和uniCloud admin等,uni全家桶的项目模板; 为了照顾各类应用的开发者,我们取交集最终罗列了如下功能,发现这些就是除业务逻辑外的项目基本功能并把它命名为`uni-starter`。 uni-starter将节省开发者大量的时间,让开发者集中精力在自己的特色业务上。 有了uni-starter,再加上schema2code生成前端页面,一个简单应用就可以快速完成。 diff --git a/common/appInit.js b/common/appInit.js index 9dc4b6ea..3153514f 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -34,9 +34,9 @@ export default function() { const url = e.url.split('?')[0] //拦截强制登陆页面 if (needLogin.includes(url) && token == '') { - console.log('该页面需要登陆,即将跳转到login页面'); + console.log('该页面需要登陆才能访问,请先登陆'); uni.showToast({ - title: '该页面需要登陆,即将跳转到login页面', + title: '该页面需要登陆才能访问,请先登陆', icon: 'none' }) uni.navigateTo({ diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue index 4278203f..1d6fd765 100644 --- a/components/uni-quick-login/uni-quick-login.vue +++ b/components/uni-quick-login/uni-quick-login.vue @@ -170,17 +170,17 @@ }) } }, - login_before(type, navigateBack = true) { + login_before(type, navigateBack = true) { if(!this.agree){ return uni.showToast({ title: '你未同意隐私政策协议', icon: 'none' }); } - - console.log(arguments); + uni.showLoading() + // console.log(arguments); let oauthService = this.oauthServices.find((service) => service.id == type) - console.log(type); + // console.log(type); // #ifdef APP-PLUS //请勿直接使用前端获取的unionid或openid直接用于登陆,前端的数据都是不可靠的 @@ -211,11 +211,12 @@ if (type == 'apple') { let res = await this.getUserInfo({ provider: "apple" - }) + }) + uni.hideLoading() Object.assign(e.authResult, res.userInfo) } // #ifdef MP-WEIXIN - if (type == 'weixin') { + if (type == 'weixin') { return this.login({ code: e.code }, type) @@ -275,8 +276,6 @@ delete result.userInfo.token this.setUserInfo(result.userInfo) } - }, { - showLoading: true }) }, async getUserInfo(e) { diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue index 06de2819..a0ed33e9 100644 --- a/pages/ucenter/ucenter.vue +++ b/pages/ucenter/ucenter.vue @@ -6,9 +6,9 @@ {{userInfo.nickname||userInfo.username||userInfo.mobile||'未登录'}} - + - + {{item.text}} @@ -57,10 +57,6 @@ { "text": "文字4", "icon": "download" - }, - { - "text": "文字5", - "icon": "paperplane" } ], ucenterList: [ diff --git a/static/uni-center/defaultAvatarUrl.png b/static/uni-center/defaultAvatarUrl.png index ed018bff3aacf48696d06378acc0c8acfc37b860..c3d33188b94e4843e0311836ffb0fd843195ae4e 100644 GIT binary patch delta 4560 zcma(#c{J2-_k$T`hGAwbq3vTDTa0DKU}XC+_FW=dna!5aP@yzTXr{#2O(BU)(jp?? zHiXP1MbtNG`DUpkLM0Vm@9+H1dEY#c# zD>AW2B(3%TEX9gsQS?lD+kdfzGO2iTx+%$oWI`k`StL5aERxA2P?&T&!IEKVN;V-= zOvp55QKigwJd;8vlNdAxA(BouCzxB9F$i=bokd_#=oa)yvWdAlgHrTa29GD2STG}* z3=4uejcB=Uk!C_zzo!uxku(Z}#W1lnVVW0_pn?CJpq=c7|Bfd@7A#VNX?Qad;t#Rd z$t)%gNJ@4(lx&qqW7GDtl3DB|8(btiVLw1iOpJ?R(2`>k;*Af*GmU7>1UkzoF*+eR zAt^c`5lBt|V)oObSjLI*QAO`yJMc6zok3xl(g@}(6LW%@CE1ifBa>JJQyPV3K{Pcd zS~8eL|9Osu71^>VLN=&q5@!CtW${0{|5u9$+3Ory>E2%uh*G^96%0rj{ZffYEE!RK zxOF&OrN?TR8yLLl(z_5TmzbNXU{)X%S<(ZQ#?J^)p3;l}YPBH>1f+Aknt*+NOh5Z8 z=mH#kXDc?q_ob?q%GYmU_s{+y-^0(nnmc@dt#VnY;oSGA{X^O9w;TD^UYK`CJ6f#i z63669`K+fEDM#4Z&rl;7lrNQk@3#`CEk_wltSxGiDm5M}L}G<5<$FzU3LAKB9ss-* zBMvT0&2?iS%MS}}`eSm!E@r)a+!%S0c*%3)l+H!uv>Z3Z%WKL{=WMWE(c&FBT=}G7 z^C{sIrYT_}%4M?y+NIqeIbSogS`p~W$w{FQI5`{2OFhZM#?Yp&@1BL5bT=Wcqe~9( zga!}IZu-ulYjIRA{!!+<#_2jyv|)4cCvn(`qZt7ARJme5SK#hfV0ex6#lg-|ZD{Kq zDH2ydN1+54InEaTLQ^>*eb1%&2~~5f%L{1eV16F^9~6I9fnHf}14Y>S5IJWBPp{5v zEkdD)i|XfqOdH09)|%)aGB>F~lA!0Y7S4kca_y&6We^Pt^vv&S@S0w$UO2wCu!4~T zJGNQ7W9y!{rBxNa$U3zAgck4ca6}|-UfLyd>?Z;Yt0gpV6|3$3A$h<+cV{;_+hRR8 z_JZgS(T2a9Tn$&Ad(UP7oF5-gQ-_Xmg0N82d`piNELP9VGXt3489F-;zRx;!(0$9W z|BMXZfPK&YMpo$xI|vHZk2~vM|&AEr}1~!Nx60IFG+*~JYhP%2( zAb9b@Lgs?OoNfBJhA26rP@jf@vLTmqN5Tcx0mSQKy>M7(oGK^rq~U9*MwUA)GfcM= zNr9W>!@>m@Mbvi-hn90d)rpWPz3rG={ovFzfaIPK_&vRURI_IZvZ+hl3j+c_V3f&IX%Sn-0 zrK>`P`4R}{B=JE47*dVRc>ibA7&KzubAUm5mJR7+!=KuLTZvN8?67OFODC$2XB@a& z#%-i_fE~NvmjI73acJM!?+yYE?kP|mcPLbF6;6a(etE4jkpxwTR@lTNhU7b8XP)+; zKtj(U^Cp#>t3Gv(9D}4gigreuL8q3bN zoEhX01Z;Up=gs=z+Mt)ltPFwC0|LV`Z0V;F6m=>8bgW;F)`0mXhKt}R^r`dZ!MD+5 zs}1NccJ6tlT}%991u=hquWfz-%m%8nb_qNZi=XFg8bdV<$b6-2?7O+(g%~`iv$!;E z_|Tlfy9-k!ZP<;$V>+Al+RpG(_S9*b62!?4R9p#m`BgG{B zn@VcP!V5RIp{K8JbRe6#V_DU~f(si4pOAQp=`Qz*F$OL!80IsXCo&+2wh=e z@hT0EA#Zk(6p!qfv=XC-^AX+qcHMlB!J|5fnY&MY1i#Hk)dr+88=CC-f!!+U?=eh* zG^^(ONAGX9#kFBCZ~4qFIT+9rKD!C+MB)m^YR`^vAuH5PJd|>0tSvj{Z3;zI|Mwf3 z257a-RY!Jeg?G%n;^SBT2my*BP;db!BGAp^_O-*{N{K7;WW%mgn@|IR9 zpw20$p$A#kKUbz}N4XPMi}&F~BvQ*M?LIuTxBKS>W4}s_wLNET&wlVC2Lc+J=#&Cm z0TUhQrw1#)2WyWCcj9mFcJxcoNvUrHg5D(-r-GU=C&3nUH-4{+`&)}*u9>56|KX-- z_J+@Q-gEoyH$2*Y*hPLwS;|zu&%P#>vRb*qYqP$O63eZZz)`xw$!yfkq)INGKWh&*^%9y|l6o3B^ohawpkQ>t5^()9ZE z_BMHNHN*aIOOq1U;VIVliN6nJDtCN(z2+QEZhl5T z$^tfW)^)W%ISt4% z!HH#8_zk(tL=Zb0AAZ)k<>=WXbl%mlg*eJo$15QIx)*;;{I&}luzZPya zvkhN*4x0pBJ*WV-NwinBp%kwDt-lMI>YTE+k%?!t*!cT19@cyTM4eB?~`HoZaQZ%uOtY^c>Gg5^P z#x5n~Rj{UMaX#%8p(Q&WVh)x&4RfRhuTPFi?zovT5q?Aa{{5A`)_dbTr@Q8jDh|&u0O@F>r|FTu+x39MZIG zw(wv*br4Co+rvGE5PGxX?NlkfbCV8&Y_=wykWigTNL}EmjX++o!L28n1aT_v6Z4s;QX z9D)F6d*VYcBr{YAncOj@=Ro~Z~vAZNM zbory+W&=%st{<_iD6C+{7QdOjr`tks395NMCTC2MGnJH9z29Hp?MF)cN0NV~K=eWB zjpFA?q|)hZxN1p!^8`n@^c8W#EJVORUvy!EU;1hYTMZi!xJ6PF_4WZdajP=H)m@~v z=6^co@fEp(Kl8;29=zCEiHBZSv#1mp%z?abcPHI^#X0t7y*%mULCpa?vt!m^9+CvaODnIl(B^A+=Cf?&sOHprO7=oIy z#;!QOPB~Zh4%XuV(d+xarabQM=2DN{nxekgYW2WU#;--mExvx!4yORGKQ}aL_Z!?; zS*y_7*5|oDG@m0y4MOQ!?cw6vLT5Fve79t}J8_er1qy7bs6F=V9e!KHWzX)WA&1W6 z!0v%Jiy_FuuKUZqKzpU$mwIv1wqFQ#PJ1g3gmPZ&67-G>#=ML3vPY3Oe!19oqw%3Z z;B4nWxQqJqP2A+CHL7kFt(@C! zRo=s~ntrFGBT7q+m2CoD13stbMV(Q*;<8T{da3K^)t+pWaACfD&qBZ^6BpxUxX&3i zAN)+-wxw|_^=as3{k;)NHtc`&bz$upl-wm;hR!A)X>MGNYJ$#O?|&YlK&k;7+6mKa z*|KX4O?|pSN>)mDFks-U3blL*#^EZoRJGsG;#F^!MoGJS7()ja>2lROE)ypIasoBA z-T@I~Gj#y>6Wj_8Pc2;>%K_eJ7L3DfeJdRMdyc_z(fLTo$wkqXO>O$TcZ2|G-{PLu z#aB{bEKyseP_3>jyd1FZ6s9Vza-nit`xgPgbrPvm!;>~W+9wBV&*e~f5-HoA{b98= z0Qa{a*bz0GY*xQnjr!GWy`}87f4KM(2IAOhC{@`z%&P|NGlf8n(k;0XS!=r7PO>W( zKJA=q@zyu9!|NU^w!QSB5fWSQd(MyF;dN|0R`IqW56~!q7hBq176IHSUttF=C#~@I z76h)(rB3>U`eZQYO`0C>-N68(>tZvXq~{Fqy0i4m*PIW_)5igBohUA%u`QQ*!5R>{QWI!6_z$)fb4fP{mN6D!EDF zZHmPn*-%Ui|Ko!Bj_X~fQ?xp^zbOd4U;L`9z~mpgJZIk^!&>hOzFOam2+uG`c8USl$2up)dMI0`R4_;SJN7eRnh9{_aYt z-B>p@&paX`Q_`M+z=@7O&dX$KB{{xZAY^chhxp4_e!cZMr`#waR~RLwR{Je-IoQ>q zPRW83uKaP6{4Jo4_foLS)s=-#=pCzfijTp$>TfRp;_CbMXI5(1<%%IsbmlEuLiNmV zT+Cgtap(6zld=|-+TvJtNvk?yM)Qael*B7%0td9VCqT^Ytt5du+3mi+{~$5}R(;M} zCvIpY`I%_|MVScJZ2g6as`LRqjfbpM^>fBHO2QDAfVw{chg6?CW^L698LjFcIX_S! zkjHv$i&Sr>bo<9KZ%mvgPe7rUeANz67DA@pYRVsQ&NCnib3}*XbXZfTcUZGs$;(Tb zDz7HXYxZ?NJ`n}DM#lizLg1m1i)!gV*W+Lh-L&GJS3vYNj2!0-(G4?R)9lpWO6MJL zJW5Yj+#1jG20qnY!q7QAnY>`E|up`Zqb=P*k*n5FSpf~ xIxpR?6mvePMp_s3TKAYm#mldF7M=PdcS^7BTAM`NxW1i%xH)-KuR26<{{-g|@WDF_t{ zviDS$AhMUp@a4JZz4xB?+w&pGC6`?COD=awvsjU^Y`FGQRYrPFdH?{x_(biI?xl>q zq?jwTmzxZ;a5xwSML@vTaEK%ri?EWmg26Bd7(#-WMkUOP zm4;eNV$jlH87pgRFjNu-1ItKYCBRk?8EI*2D=7&$Oq#es#mg&+g+tL8m<`xUQUV5s zNn2Tgt)MbcungkTjJ1IyB(YXRNos@t&asS|{Xg;aQyUXwX?X72V5Bh!IO4KmE2!kZ z7#1ue1;>J+Q0!$b(gJ47R(l zXOt+8^n5!nHymQ)#eVUrZ~H{@BIPgFAKcEv59`N8bKDxa8~Xly`+`3{VipCS42s{7 zjvE9qqaU?cV6y_u*{`r;nF`D6mj!&jvMOIjPsBXgWc{S->fXwX!XvgqD?v8)}f70xF>Z>I&oytr!0k6F8sZ2ZPuFp8t3XjFV$x5`$lq&SgYbX%)YwXB}5B@~`fUkL}*w>^jHWw=+X z;NZIb7S`v#&RUqhy%lS52uX@HdxWm2Uwxvyrx&zbYHn`e6j1a%6owC&3KB9m*zLB( z1=#Euwf*)A&W z6^OUt`Z)}Q`gAsCpKkU`qgq||0sg*J?hMJKW(AjErMvZ~d(?lmA!CvSGq%)bE7>b? zHKv5W?kP5GLpS&4&p`Rlw(rNf7}GzaVMp&=d(rsQIYY$*PXbbpeOtM{F6iy;UO(UU z4q3U$*A5TjoJM!kjqIa&3;5$SCEj3v8dF;ocsX0#hR4uo1frECutus`zQ4pG4gj^X zzx=<0tP=@k-&iLl!gjOt@%T2dVejTvCEuvH2&T7;9Nf0!egRJ7(9W4m^T%U7>xk*0e zR&M-mz*5rA1puoU7tWfM`;8)io1~d*rJ6s*m8SmK61vbPRV;Cv&DwqtP&ZkGo>Pd+ z-N46aXuZeTyj;oHc8KF$iZGMbR;QKDkI#Z?CgFXCwZC|!t2g>l$ffeG*Yda^NzU#! z1xzji_}s2(by0*xk`TBUDu&Rzqd%>bG?y9qIBWLMgMqjlIxtc@p!4{Kiqtq?p7cHS zhv_7bIdPluVbV`kE>9^@z?dATM@-EUX7Fn}h_#-W( zbu7P+u6G_DTJ3a7 zl2D>YG0f$1S^^ao>ZJWGLqKrjl3+rVSO**BmLkEXXP5w+jWF=u|eF1YTK5A9kZ9tVzm|6f~ zS;d-8|JAij9EhJY4R7HgscA)Lo!lu)?-<5lf&Y>yy-XD`OGyjdY$!se9KYebJ-K7n;R2}X=o=~c5TwC3R7`Z$E<)1Z3?uY0m4Wy~UyT@4T$%VqLj>^Sum^SwSnA={>!^NqT!P(V?^d_@HnV z8$}f~f6$eX6`pT4&0m2G?Gr5KMve5wMIXGyxDFe%v~-^iMjiq$S~KzOoG-yKBw? z^j@dAT!pZP1!ZJYqjp`$ht(Nw<)Iy4mR(EK$kNV?YwKSg z?y0bbigAl`!4`TxEv+aLP*UpJsK}1TR`2&JaGbK=dBp8WLT;C`<9;^YxIQD^gCU0M=FM>PXM@ZQKWqrm&i3j$T0HLD z3dkCY-A^=vDR-21$F+2DC*Vc%rv4!hdZFt=s1|cN@&oZW_tRp|ld7J3L-{M6h8v|B zfqRp6Ot}JGNk~(Ng^=v^i{*Wc&Prz#nM5oBFQlSIhMAs45cbRjO}K^qXEGuF8POnA z)9t}FWzke=LSUk!Dqna_;w1F_G=j`#%(=xu`IB^`OkJE+SXc%7HMd{`YcP1Wu6Y%s=x)tuqM@d3p(xKZKl!w$(pxi6rL zh^FU2`kDb!$D4*%1|opX)Pjfp?(!w9{v7v%#=_I{8U4*E{?3Y>OAR7N9bOm_j$#sQ zZ6E~ywRI^as&&fDtbX#~&l+xcwu#@Tlyew7Tkc#wxXn+tXvDilPP~sR+IjA);IX(0 za+<}Lq6iW;qvo^%cbRDfH3e&-WW_a_Zvf9n5>&H1-6$g%^|V`D+AXk8ai^^rtFcaw z+J1F3RcLYR0b4)C;5FwPjhzqH%wK8!ohQuF;(+hla_UZ;mg}5TxCUvFd>Mv?n@L4a zD}%D(lPct-ttNa(@XDULn%#mR^`?Oz@wc-#p@`s@Xz0coF(Hs;>O)0leE4|ClP;p3 z@H%__M~L!r;>iQTW5Uw*j>ie%?5{7lfz5(g@%8wd&+dbh`OB2*nnQJ&g8LT2gw!O5 zzM`)`FG~RyfU0L+mXuoJ|(M!>D!?g&N4ma+0aAs||PUScurlB^XA76%Pw+=dF zy>qy%3W61lX^1MD*g7%CG zCyIWlp=y*zpNx24iOfd5FdWdBBUA|^oOB+$HciuuOX;Ddf;IhIjo;^SC#cq8a%Kx% z77-G?!uAST|yYT=#8elg<_$ zZb1VI`Rn>^0;ePGDYUt|npcuASMfK-JG))?u_KFj?89~szGD;kcoh+J1Y9nytI4UN z$rkpeQXKDX&$}HDP{xjYNt(Zd9pktP6)?ZPsxv%#gLRB*p_t|-wAgYNKJsFh2nXgH zPyxpHL9Pj`g=)ER6Cz8LC2I*KP^WUb_$S2%>wW6$t*3MYIPJ6^zGW^hvj{fY!9RcQ zFN-BavjON8YE<9TtXB*EB&2PF`<9QwU;9uf1P<(bJJC;$h_IK1Mb*Z`$Kx70T9{q= ze|EVT#D?#>SW@b!t{PjB`dvDBv#;qJWsykwmiJb;8d7BI7wBaq<_FLW{5P=Qg!jA+ zOsqn=myEumf%bRhh2PHFHuv6d(SCIJhPy|UKP6wT4Lh-IDUE3$Dj72E#E?Pm3