From 32383e0d43030c938fedf3239e90cc41cd7f30fe Mon Sep 17 00:00:00 2001 From: yirenyishi Date: Wed, 21 Nov 2018 23:31:48 +0800 Subject: [PATCH] bug --- data/beeblog.db | Bin 45056 -> 45056 bytes service/BlogService.go | 2 +- utils/PageUtil.go | 7 ++++++- views/T.header.tpl | 4 +--- views/iframe/blog.html | 3 ++- views/iframe/note.html | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/data/beeblog.db b/data/beeblog.db index 4cf108f5e5b7f769ed453cffe3667d7c3df6ad24..368b68453f4bdd2d598a98b94e8203afe71716e7 100644 GIT binary patch delta 609 zcmZp8z|`=7X@WFk`9v9K#`28`^Ys~JHyN-Pn6dCRG4L0PF|pAXNHctg@EMjs`N0z#cQbMBpV*ke#2E@C8962k2J|s;#7u1LWMaQK zv9Xtl-3dgpZ3dGnAd+<|m}CQyEaf1Q`30Da1d&XqCN_36G1-FHjO!*g>eR={@-uJ> z^D6rLb8v7lFmP}h8XDRZ*d-RH*ytD785tN_=o%X88W}1WnpznfSQ#1VnVFdz8e5oZ z8yHv_7!XttCxh4gdK3$cEUk>q^o)&6Of1YTuvvgbL5wuS0$*Rk9x$@7GBMG!G%_H$mzaZ-5QkLr92DDy&c{%&`F}p60|0Zcn4SOt literal 45056 zcmeI4Uu+yl9mjX?k9~K!yG?71YeiAER8?ZRz3$BH-y^g_oNuTB$*Rv>%!UwqBk z=lIS|B3^o_1x+7FctGh3@Q|V+Q3Rq0wG^dDNIdodRDlE)sH)ReJi|ku`0d`F|J^7X%5_int1FAVE;HevAd14{vMdO~)9^k3@79rp zK%#X5f5k1~oq|sbg=5d;@(&1^LG{gixi@+o=Z?3vQk4CFFBIdkTrW};HboYp8c)jUm z-7fEhrqv!hcv36#mFmTsSL-sSb@uG)axZ2J)p{>x^-W!ol!cBM*Q@vy4h`2a;C6^> zjnljNQ)X=KVj^^ytFxiQ1nnBUliM98h`I|7v&4geeAjVbK07ltdv>zbWWi{=d=YLm zyC#fM)OZD;_iDZ1aksn(SbI%imsjcwF2CHoB}HX=i@dytfp4*Dm-liHyfAm6cYzDl zMQ?6(We;*{-lbmL%Jpi_TzSc__O4~8{+Jm%nj9GU;;<-`mt5~s?Lq|}1Lyc^y&9g+ zg#!!;J_q2NSt|H;_KooUJ}y2Lc7sSx&AYJbEjeD>X?$DfXuEhUaPo&B<=B-kh=U{d z-!HC7VV;{xHbb#(Ic*VpXPvFbeipeduar3qdA+)Sh^uGo)#XZ+yK|d^SrFP7(=%ha zpk)sRA9x@EB!C2v01`j~NB{{S0VIF~kN^@u0{^cBg6IDM>2*Q+xAc+pcj+DJ4{(A9 z54iL zxS{AkEPhCgHs-}rB18u}xkfWVZE*d6U$iNTKmter2_OL^fCP{L5Oe+GsDsC@!$*a_=OO*MRMhwsAF5`x0Da2NZLAYsnp5|JB)};YV z#RN5k__jqAU9l}o0V%q=wOGX}QXp&;OvW^5ie_zt_5Y;wcCi2dJ?Ssf+tNSxg_ENQ zB!C2v01`j~NB{{S0VIF~kN^@u0!Uy-0_pgO7|sVJTOpE2!B+nuE}n^xip|N4SUNtM zZcZ=+>;I$ikA(c`{Cm=c-0yRG_Lb~?2d-v5&YVyGEj^vOm3n0G<-y^BpAJkU|D0S) zvcx|U*AmAe2_8rQ3H+}Rm>rdbG|U*6N~sk5oNFr8nvtYLCTdYtiW)7LFh6Rj(d_H4 z2DA6=mL-8nPF*325zRJsWZ7;|8fj)ZJ>69$3+6BjmPH8bnq%kn+0TEXMo2)+0;Q^{ zQ?)rGx?N)zgVOMB8lhH9Q}ym3gB-VCpZ(k?Ycz|hULXcjsMWP;Sf|0l5M+5IceK^o zBCom4*YV{?qrfA}kGARx)BcK41Z4~+!-=I*tqsPG2C;>EB_Xxfl86NkS5Q?;VT5hR z-Ylt$L2Tik|E8oS8^$cE>Rn6fG>A2_2M-FVhPb7-OrAP99{iX)cg~NW=YH)xA746G zUb-aTzW%fIH-EGK!nfC7e}4V9*KXhV@%mdg;Pmznudl!H+WNI$Y%n%t%8JA&Y8v!2 zlfl0>Jv$jRQc@)6)TDlIdd5 z$maSZhe9hAsa4Ra&P=u4ML|wigGM&nFFC4Sq&mnk7}eW`zJLxa>~tD5vIqJo2gXf} znWoOHPR|MDv>PZ2T{ z6?9@~s@Bz&RaR^_Xk-WbD2M0;_@<$%dUxM}QK!wIksau#95wJA2J6aQT^Z!G88kA< zNY2I=mAf+{gQr4iNbJ=ESV>)Q-nhhneW)sZ|kBbAsP}6>QPKbS6^hXb}Ru7CfLy#)kF}XDX z6k`@OtDq>1Q7zhn0Il=g^kGO)<1V~-ts@213W}x%TmHayCOrhU@HF2tGl!tSp`&3O z)Gy4!-CDtDi!Li_q@b&crYOWf9K8hYp=ck`iq@8zy?qF zg$0XH*b5YC51#)M((eT6U(yHCA0dDT5t-t)r?Hj*-|IM4(7(^b1$R{U0{Q0laBAktc z^C->r|5pX+9qHA5S2+}f1dsp{Kmter2_OL^fCP{L5 0 { tp += 1 } - fmt.Println("tp:",tp,"num",pageNo) + fmt.Println("tp:", tp, "num", pageNo) if tp < pageNo { pageNo = tp } + if pageNo == 0 { + pageNo = 1 + tp = 1 + } + fmt.Println("tp:", tp, "num", pageNo) return &Page{PageNo: pageNo, PageSize: pageSize, TotalPage: tp, TotalCount: count, FirstPage: pageNo == 1, LastPage: pageNo == tp} } diff --git a/views/T.header.tpl b/views/T.header.tpl index 9d66bda..ce1cbdb 100644 --- a/views/T.header.tpl +++ b/views/T.header.tpl @@ -6,11 +6,9 @@ - {{/**/}} + {{/**/}} - - {{/**/}} diff --git a/views/iframe/blog.html b/views/iframe/blog.html index d15beaa..e839b1c 100644 --- a/views/iframe/blog.html +++ b/views/iframe/blog.html @@ -8,7 +8,8 @@ content="个人随笔,博客,个人博客,个人笔记,技术博客,免费云笔记,云笔记,随笔,IT博客,谷歌地图,码农笔录,www.aiprose.com,aiprose.com,aiprose"> - +{{/**/}} + 首页 - 个人随笔