From 19f379a8267c8614d15d4cff7fa24747b7937226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Fri, 20 Aug 2021 17:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/news.js | 16 ++++++ src/assets/logo/logo2.png | Bin 2389 -> 5445 bytes src/views/home/info.vue | 15 +++-- src/views/home/mine.vue | 7 +++ src/views/home/news.vue | 58 ++++++++++++++++++-- src/views/home/ollection.vue | 13 ++++- src/views/result.vue | 103 ++++++++++++++++++++++++----------- 7 files changed, 168 insertions(+), 44 deletions(-) create mode 100644 src/api/home/news.js diff --git a/src/api/home/news.js b/src/api/home/news.js new file mode 100644 index 0000000..93a75e3 --- /dev/null +++ b/src/api/home/news.js @@ -0,0 +1,16 @@ +import request from '@/utils/request'; + +// 消息通知列表 +export function getUserMsgPush(params) { + return request({ + url: '/mobile/getUserMsgPush', + params + }); +} +// 一条消息已读 +export function readPush(params) { + return request({ + url: '/mobile/readPush', + params + }); +} diff --git a/src/assets/logo/logo2.png b/src/assets/logo/logo2.png index 5f08af2ed4deda5cd7db902ed5cda092a0626c2a..bd3b2f3eb49ebc1e98cae9cd90f5a59e141babf4 100644 GIT binary patch literal 5445 zcmV-L6}sw)P)Px}|4BqaRCr$PoC}y;Re6TL|4e2A19AzCR8SzTw16a%Otf05aw(|A3kXt0siL5j znM6b?wN)TqTGUp+nLug1Km}B8+S1~!3RMb4X2K;HiUKMIwT4QF36n`O=ks~jtbN#L zpEHxm6q2C%pXWTuoU`}ZYp?zN|N8#h4oy+!_4~#My`+44Sc?W1#5q$Ovh8W}2YjNX zf3E)M&`C>rR^~MJ$Gsd=Kp1La#Jp=YuF#S7+`r@E=^XM7y zkfeESep@DK{djY)TPNSXAO`upXR*I1>*zMe-Y03zcw>Zh*5HEp*U7Gr?P-$skQ5Q| zqvAZwf!_n9i@X-MMQlvYhimkNgt5J@$Zj_ai7y<#+&FE z+cimNN}4X|6A|%?>hW7O$a@z1U|HXu%0h&7=-`65@%jCpH5$4f;BD$Sli4k7zgf~} zDr5I%1q4jDNcyy-H%ZzxB371w$N%q$h(m0n99@#0DW!Y9M$#Gi*wqp7aOu4NkaW1D z|B*C1A~x85nWUFQ#Cz>zxGso@(`>Wb9wP~mA0g@Ml9<;QC0$yY_fC>_k#tx@+-Um_ zNzX0)eyG%DH_RGcni~MWT+(YKt(MZ-SLKF?co$!01HfD+Bk7*X2ijf$xFua15y!S0 z1dwwxQ;}y&+M#md|6-Y@Fxb6AeetK&^X3is>X6z_d}G%rKt6xK=UHl6n2nv=cwm#D zMA`E0CFzrSJzfZqZT~m}_Fk-N8RWJPl=LA2AbbEJRu8IoV^*etd@*(v6o>183x5An26qASzsn%z zFs$_}*|zdIZ;w3j<=CYp{!bDk2tdvUMvi@MLrHgD&zu9i!rg%3CJp__})N+Hmp*(t|I_ zHy!#ce|Jb<>Do?f)(-0-No>6h32Cq%S{&AXd8;e`yv(7Gi4o3^1S%n=LOu;jL})`0bIr8GYt_*e72qA+(#`kbUw^EKB+#ACJ(&JXV! z*-~DRj{(H9B(;D%g8_xRCR_H4v$fv0tPItAn*iik;Ll6?^L%gHN5t;=I)5+eZb=LC z&Vj$fcNj#J3fjr;@z#hKErFF|*qPWxShuu`l#~aBMgdPKoijTtI)?RS5wW~{54Nw) zW6nw-ZwJ_R5A;d-E_A_AZ}S$!b$SMj#dvqiHLW>A3u5WBKjG;+*92dGPU)BtSqBX* z7_&w_{eGuH=U2xF>FB|}_!qvPKj1H0VyiD}!ApmF<7<<-U)unb4*+L9S4m>-aAl~- z8rwYJjnS3gm$ZH6^#3mDy3Ea)#(fd7+V*hXDN&Afd48uznwxinx3sb3C>fj;OA4(z zSrRmfodiYtrKB>CJtHEn&OrMeNsmba#DygX8E)3-{H zAF$XvZf~KPJ6C{q<4|8Twy?SVo?nYZ12ES!!E$1Cla-E$pJkviH$D~fV(JoJJ8Gv2pQen~?SfsraG3%ku_5phZd?|Sn7H@nnox_YoT3Qm}=KXW1|6`wWlq*@o1t4@FHstxF%SjuD|R4E6>VtReII{l;wJ8sA0eGedn* zcFe|I8#|q!XcAzFh_f;!IWcofqAq2+!dkzbZCg@je)u@6DDY<^B7w*@4k*BRW(FQy z_Xm;|MZ`HJrx&V%#cs#R3pzDFgB4y(#0cN%rx`$SZ=AoRO!?a5adNmWh6P`O9q^^u zite4M$UTz2mnj#!47(ZY0cH7vydK;K6b#Cf#P+_DY7ud71>}sob3~N+J;!rj(9MYi z<+>|@e9p(bLv31G?9DE#J2ZUX!eF~;$RVHcb}LsV2WgX}HeLHgJyC}yap;Wtx@2iL zN!G2@W6KsrK?~ZRYnwG(l0$?%ctTq6Nx;a%;CE<38RV~*^w;?z0VXUzAXp0Lj)
a-uz0eSloh748*!gkQnA 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 literal 2389 zcma);`9Bkk1IIUd(vy2`EuoQPxpHJO$A&Fe?pD!(M~bu&2qry{CY4nDWw6Bwo)EEj zM4+Y5t!VmFMOB^*e*h463KjM@-In9MB%hb`MgU?J6T^(3bCh27pezG&%PcLPLiu^) z%j6?~2**2+qCw2q$a4EZ_GEU`4qzgkSsCE7GHtLv+CE&n@h`_3Dw&j1gmY`Sg9$A| zLDRwi2hwNUfs76TWD>%&L8eMZqG~daZqPtJ?*Bz?vl1%z+@`Ro z+8saMIF!(yCy_DiePYBFEX&&nW@eiisZEB@0k_nK<^+c}g1=vtjISX>W{9)Cfuiu&e8Np&|7m$r_PRO2ySRN+7DqVa!Lb$T;ex; za&~s4XLm~k(@*>K;XkT$j&El`Dn0s@s`_N2$qNOq&R(3%CaSlfE?P#bMv4&n;5OGI z&D+w(^4HXs_}Kk_vqaiMQBq2Q0eQ>&!d?uY?!O?GB$IRB*-`~IytRQ5phHHCCTLfm zt#P!I%SW?*)D%oEWdtTuFuGg068`$Te)CxR_9Hj^fyBipOOT&#$Ndwq z&m+)ep;Eaz#I>gTv!{G=(Zb~*|54mJi) z8_`1Z34_RctA8wh`$^^9I{w3ly+@k);eCqQH~wJbESd0dO+xXfZjQyg57j6_(ongC zbWiaWap%+Az;%)cYPi$^60Trg{D;D}?k7S5!wq;gLyFaLtBI`ECjRm!ksZI+Ey z69y3(toOJvc zlTeSn3M2>=jxC7z@vxj#U(UMua$STt!k!9d$Vp%+jQ z*voZO6E3%3c%)L2#OQ9flxz^oMF`aF6kF(!OPDdV=R(tgOBEyM?olyj)5>Wj-I!lb z*-ts1u@lvVPohRN-Yp$^R|c!y(zS(#ngFW+e(S$PUJg&JD^xM9-PNMuV`~M;Xl^Va z(DNSa(xcH3rf$)mjy<>inib7@v?4>C)WSks$l#Q*-SlM zOz5*M5kMZyKJ{G_DAEy1d$z1hQE^@XWi}Z9))z|LTROcA7f2py^Ye9FwCdN3xdbld z)OI|+7;?=*?8B{yE6mtZ(H5)y({pr;Y^7oiZV&h~x2}WLdp5-_XLa+LcYm^xokv!o zGIC-^eA|Vn4juHt%bRSn$^Xq;JY%okj+%gIcq^km}bsE(Dq@KafjHy5t> zyJBIa!|@!Uo9G^-hUcX^=ei^*E^)&p#o91me{ z>Za`|?BLY%+(#{}UQI)fKMgUM>H4-e_y?RspMbLUA9_1GNoP<4T>Q$mnpgFbD*{B$orfmE|grkWwQTS^#BDg~aD z;(}7&(#`|lUay3S|OuLc=yRq`&vtx9dujf)7kNy2+mXQu#QtLAvn z#@c6&{Xji)V``ppQEu!;6h3(M%g$G;bM+;%k%n;-X2Y=6>$<`YqWiNc(<6v+so6&v z=jY401DJPD=49SE^l$dOt>$|Po4u0?F)ps3G5wT7f1+(;5A>o!E_&s1$ld1LMEHxTypyt#v{a92SDm6_N6gxB`=^#qWKXx7KQ{0gbt6(!* zb68919xgdAgFA3>`JlD3T{w$p?pc|X)`h%pU1aKQ!eXHnnYhbQN!fk51iM)14kw4M z!rR0TFK0*+=Z^~)GUTG}Q)J9?0E{`_4lYHTTUAPb)p)O}Ljt z#Azg3)l^aQvwH}#%wgJ3Pv`n(`eVfQ^-G0?mv?tm1KD3$q}+eD^M-cc#qL3RB!Jh`L$VPLXUROZpCBL%FyFk z4o{u(_-~}Kvr|Q*nNdioe)poVi&66_w@W%YSJ)aUivACq{A5FDH0!Gq*Occa(yP+; z1k+{`CNB7DLb$b0=ngW`aRt(7$0S4$IL}BZJ~&Qv4s1uXCX+gm7^q9e?tQ!S=@v8j owOYe>RFfr$&8cz!8;yrRSQ}AZyr4?+=qCZt7IsLw`K`zQ0hW-Qga7~l diff --git a/src/views/home/info.vue b/src/views/home/info.vue index e3bce26..73170d7 100644 --- a/src/views/home/info.vue +++ b/src/views/home/info.vue @@ -5,7 +5,7 @@ ref="form" :model="form" :rules="rules" - label-width="80px" + label-width="100px" style="width:514px" > @@ -131,11 +131,11 @@ export default { }, optionList1: [ { - value: 1, + value: 2, label: '地级市' }, { - value: 2, + value: 3, label: '合肥区县' } ], @@ -161,7 +161,7 @@ export default { userInfo().then(({ data }) => { if (data) { data.addressType = data.addressType - 0; - if (data.addressType == 1) { + if (data.addressType == 2) { this.getType(true, data); } else { this.getCity(true, data); @@ -199,7 +199,7 @@ export default { handleCity(e) { this.form.cityId = ''; // 地级市 - if (e === 1) { + if (e === 2) { this.getType(false); } else { this.getCity(false); @@ -213,7 +213,7 @@ export default { if (edit) this.form = info; }); }, - // 获取地级市 + // 获取区县 getCity(edit, info) { getDictListByStatus({ type: 6 }).then(({ data }) => { this.optionList2 = data; @@ -266,5 +266,8 @@ export default { } } } + /deep/.el-form-item__label { + font-size: 16px; + } } diff --git a/src/views/home/mine.vue b/src/views/home/mine.vue index 0ccf323..3277655 100644 --- a/src/views/home/mine.vue +++ b/src/views/home/mine.vue @@ -38,6 +38,13 @@ export default { ] }; }, + watch: { + $route(newVal, oldVal) { + if (newVal.path === '/mine/info') { + this.index = 0; + } + } + }, methods: { async logout() { this.$confirm('确定退出账号吗?', '提示', { diff --git a/src/views/home/news.vue b/src/views/home/news.vue index cfb14be..58a068b 100644 --- a/src/views/home/news.vue +++ b/src/views/home/news.vue @@ -1,15 +1,17 @@ +