From 382871c86128b88426b5e59c8a2a6c2c37232b43 Mon Sep 17 00:00:00 2001 From: dai_siki <851733175@qq.com> Date: Fri, 20 Mar 2020 16:23:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=85=8D=E7=BD=AE=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91=E5=92=8C=E6=A0=B7=E5=BC=8F=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E5=AE=8C=E6=88=904?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/public/index.html | 4 +- .../wx-mini/index-set/page/avatar-mini.png | Bin 0 -> 8421 bytes .../modules/wx-mini/index-set/page/qi2.png | Bin 0 -> 1568 bytes .../modules/wx-mini/index-set/page/wx-top.png | Bin 0 -> 26932 bytes .../scss/modules/wx-mini/index-set.scss | 44 ++++++++++----- epmet-oper-web/src/utils/request.js | 1 + .../src/views/modules/wx-mini/index-set.vue | 53 +++++++++++++----- 7 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/avatar-mini.png create mode 100644 epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/qi2.png create mode 100644 epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/wx-top.png diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index 6be3c61..6ca5268 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -28,10 +28,8 @@ - - <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> diff --git a/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/avatar-mini.png b/epmet-oper-web/src/assets/img/modules/wx-mini/index-set/page/avatar-mini.png new file mode 100644 index 0000000000000000000000000000000000000000..74e2694974760b5e3c823a144bc8254acca5a5c7 GIT binary patch literal 8421 zcmVgpls?sR%cr<2g>BqSjtWS$9x1QKRMWe6DI;zi%PiawV&(+#`#;qQ3V6k<@4a3t>8f5;r_T59y}!Np zw|8;)JN@k5eKIb^}<26}^MJ!NU%4_}ZZQig*87 z;C~h1C!Tn=)-?1VZQs8B`mXLyeE#$QfcXpO!ggKgiUUcKp&A-=Q}scTXY>9?F)yZr z;ferREOX%dp7Z4DzH5I3a9?)E3hC)BikWCCtq}LkKS~V)_l_Q zxsH3+0*{l;ZyE&wmPd#E2190Kdj^FoF__C<-v)-*`M4MkE%8YXiEHhaiiHm6SqP zHE6nuTW`D*H{X0KbjyaKYj9o12j=k?N!VpTE~PDz7yB}l@4lQ5t$ z@AGVFc5`#A`_Cc%vw$Z~oS5Kwew}TaBWwuZc>z*Dq<}=BkcVv<2nJ->o*$2~a0HSR zfbH54B?--qgU~j7G@6=+qM~0v#G+9IWf`u+ZkOS7FQy=$#RGkS`{K8c<$V7yTAD0Q zpLhvA^AC>Srwiir*1FQvCxQM%z|GCga%ENjw|SnM%6TpvVp5(5#|sdJ0N{Ek6mrlt z6{c;%1`k;f5tajxuAK6A%%)Hl?lK*Z+Qto(2< zu`Y{sQ4m;~@{`u33e0zD-?e$T5G9el#<6U;u1|>UPW{9AX>(K6-5+P=j|Dt=%9LB- zVil1LvjWG%qZ1{847+3flqaI&cM^JQ(abOPnHX;z?1!{K+$M&n=&Y z915c2>=|s>x&iNOU5g9JUdU1eAt?mY)L=UXuDD_n?z#6%2#3P3T#LmrgF@FNFyzvL zUyCt27316Y1bQuxpcI6vsaUt+U1ossM(|9B(asG<`0s zcRk`K4*^Mn9FSnzI)dRCWKl*s-2+LKal^GY;xo730>ieUD;o4n7Q41@#pYexapcTN z=(+(_R}hkAeD!PJMcd`$peb3Fo9SSSnUNa6&fPXv8F(hBZ!1!(DVY-LYAeYhwgg_6Q@jus+!;}7j{9xn)lY=sh56^o^%R^ zp(7rT;|Krp6b26-0wte=MMTJM&`(Kpvt;2S{rHxqAm;$y;}8r5AxJ#7ZrO~3``S@e z-j7v!yeL4DMTlY$kw_R76=f(XErrLqupD>CkjBah9|1gV*4$YkIkd)eT*kWeA!2}- zkViNeWWB3pSgfCwLm^lW5ryYlT`8cVtQ2?MwH#MmK9)t$sgozM>ZO&~ykjd$OUm)V zsSj8v{OHkVFr=jgs#1XM5WDvE$3D{vl=_H`nc?XX4>=@576TAvfEPLJ-*pg&4;^M6 zLgbgv7g$-#^CBW8QFgxrYw9qxbr^!tC>`wVmiqYGzVKk+r_P@DW@$9GAS{QFQwlI0 z6Y-KV_JO&42Cl6mUXp;SnaC?y=I@jZq@aw(+B%d_0RkJNM~s2Q@mRlYJx+I=#r)~> zpr|H(_QEqLuc*KiPd<<8ni{A|o-r?7-~XYWn3$Iipx8h2B4kO1Vd*$}_z(k^NR&g% zt2lSz0=jxS(a~`Z1trbm*>yNXOG;2#RRxKcQQf~9S6+1`qGj>b4K>lLF9M!3XHK0I zDm}>u1VIo*xTXc$F;P}p#k}o&_c`RVX$%?Ef&tZaXg}5tO*I)oq;g5LwG6@Si|@eM zj`P^Cbscn7L1{FK`E#$vjSX&-G%SdbS;$;tWqV#=@f}B3sCNMTiBBiWM>`kSR$)u5pCve|q zmLnVuXzhYA_$nEE;&s^a`S>^el09O8*6;2QYu|NIV)96N)@6xH!PcfB{ycwtkUWM@m@~k#boDsIG&3{WfcQ%nK~;D6jg(%s}MW~S52OQhaUVg zR<8OP9)J2#0Z{-i@Q_4_al_u-d$Ib>)#&Oz30)~*=B%X{P&W|2ePbo^g#rxA zLO!2HG!{WPR*nEC!=?Jb(pYLD4x;QrIk~c|%8o>072K6qPMc>~)?1NC44mh{FjUB) zFk-P1#)6LH!c;ZbhJi>Zg8KSKEWhUgtY7;k{@0Jb3kM?Z`pmspasL+}xWK;l!}!&| zuf)Le1nyY=AcFmCVHzgfLLRwfH!P8d5Q;(&0)8#sr+N@!i2?$F0CUrG=g#BVpZ|i@ z-IlE&mFz}i(@H;5$prENpBq}hVz5$#ZfM%QE9S>$MkAhl&6A-}%0=|`tN+lz#fPio$ zOua3B`s7pCwrvvz45&jWT#8IC1y#vGl!J^oEnPwT!9T#|1XRS!!Ep}j-W-=hTkBYa zLP2cV`Zjb!L87c0kx&!^Y6pCsn>lac3%ZiONmKIRIgv4=CvYt1Qi!>(1wJ5R>cr`o zKVu%E(J-n83`C+|Ib7Zb^%s`zK+R-83?GVwke_-y?J87MR>E{`79RO*9E-7JYY2$nEVg1H+sHqviNT{F` zV3-nQ+6wAS)#3Bfg0|IQ##Liv&ux9;QbatM@;KsqY?z-zRbZ9fuXV0LgqYGR~43V-j zc%H?o7s|Pmh2>}r0YSjQJ^QeA+jay(GAk!@**tRD6w;|)WHLQawLC1{0>|P#0z=i{ z+Afw}dp+*H|8sct*RSKvw|nR-(BUVAuvupE!-*yzv^|Ui%itjU0pJUwjCWaw^nyc$6@U>Y+=`dmw;- z>*3JB<9Pm+7tzz(fyMz17&&4zS_Th>kjt@>GFD%Qa7h%VuER7PRwq-p5{}5MBig&~ z0Jd)5hJZ-wiO9O3R62>y&JIRQ%}p&BHgp&Y*)%q7-hh&L0t*)`!qtoBAd}7DD-S)4 zF_&L~`yafYRc>onufb2A`8VXXg2LUq{C;cghBe~Qh88^Y_)|#KSEIW}2UGV^!1O)?DurhMW74hL5F2ZaDGobSYAKYaqdJ)IaeY!t$w z2%@EN3~XpXzkXGWKse536AIn5VCW?Ix{MzH35Sm!#-Sqzq3bFP(}d+X=uP&*RPwlb z=6uXqFbDnmCvft>5xns1FEDw|d|WmAN(h30m!5kWzk2aGJpA9jfl(93LQQM1vl+a* z@jbl$_8ShjVe=oX7oPu_xO3Y^eDkZ{!u-Y8Ael6fKi2`z(GjhzMy#?7$TeguH<6-d4CJVIl)QC^7$zWgN!p%A)`oXTvrylr80FxltYlhVH7ecq`SIMQl5YmiGXyti(?Tcr}|7xK~6nzvY?=| zHwDem5Q|2b!kJ2?S-~I&Lo_8sKoU?EFN38U&?#kk7LK1ffm0_>p}wvjrfcEs=~I|F zaWdvzGY6t9L&>W6^~=A;uU>l@_uab!vu4kN6co_D{|J8Yy?@3{H{OQX*UUmPoyG1g zJ5b*^2-OX>So`MN3b$wf2WR4C<#j|#>(;Nq>ElOn-NGBt+&q}|tCmhxmI+>xAp`{& zN*c zZ@l^%*1z)>{_&x&p{cbAC(oS6hPPH@+{7su&@d32H*7e|?cQ^2hbYP8Bw1!Lc<%f; zoH%@xk~D@58-jQu&e&MdE$EsC&oKRZSNyOt;WzJ81XBmaIXqJ?c+W|DYne?-1 z?G`-s>{A%h*o6D;|04R=RUnzn;qf1SA5_16;ejt9QdWvX?T4{*<2uZ_`da3dyMDjx z_uSt7Ctu(N;U@A#nkq<=glsO01AF(f8>+6U!m!q%sHz+QEuDp4P{4;mehwy|WJWGZ zs?_9BQ%?-Wb8tNyRzA=A*Q}~Su`L8k6OiRF3fU}DsU&MWq7-8qm4Oa;K|ng$i|%9> z)352kx;oEb-t-w*yzF`eWeIzC9mda}eFklp4Z#gJ--1Y47{`yE#?wFgA*N29iTR7> z!FD~o_x4(xJ$VAlZoL(PC}H28{V#F*4xW01d(kWgc(6`YL|B@@JU6@FvWdF&~*!FVdMbOv_-LK#E2oSHQ{RN03T&BN&N5 zfPk_{0M{&Df_T3&be+6_U0XI`z@TOf8P&$ByuCYi;ryu+m@;<`s_GKh{r(=jzG@Y& zU3Lq`Pa2IA$Is!_S6-dZz5l@nrLraW!t+F5X!pk$OyTEv1Os81j*FAWk0K@oF}QUY zvz)1Ea41I_CQQd-6MO+QcPcV9&2;Gu2sG)<9*?fBF8uP>zr@SGeHm3%HTc|}4`BR+ z=`6jmk&R^_9xsKin>cppAd<;$zX3r2>GQ|2_=X!$*)$M^tO_%kVniy&B24>oR0XbM zBN#7%6qd1n>sEYlpdE9UUXSXU3hdf>z<%ZR)fG$tIB@vfX4ms3({zE#JZcl!MQj(g z%dv*Su?+NHIEUKWTEr6-aH$P5P3Wf1q*+JPnMy(m2}wjQr5RI&qAE}o6}yid!8@DZ zLuV?9P)LTZ=2<5*Y2s`wU2-RC`q#qHR0QMz%f(%tok*v<(Z7E!R7JzFgS&9Y9iKs6 z%OGU48a&fr)frWIzNSsI!NK7?2pkWsCkfl}P%*FuL5ahr^_#aWSUCMk26%t_nTI_d z-)93ZDkfZ)31XJV!E|i)oGwP~Sx5|^re6&LRA9I^blZTf8nE&zbh7}%(BNtYOJ_MX z4@FT~CAEIJw z>9eP>ZQFV*z4ltnU9bSjQ~{=8AP@=pi!d~xplgU+TH{@kK(y@IkxI3&;M*DuO;y#8pmw0qA7 z+ilk!Pps+M4!aO_Go(E6o{RSOgBUch4y}WlnS0ZXIpjL72glGE={TAN*cNQwf#ul9 z_V(b^`Sa*Vrf~Gk2RMA}u&-x{RJ2fQcyU(;949hsl9on|gQBUd&utnw7|lb6B9}>F zeA_6@xM~Js(FDYB2q7A^(1gTs7|-~NGnCJZdm;g0M?+oWqoWo=zhl?&8LsEP%MsJs zE(}^SvuwmdA)GvR2+zN?3SYSAevED%&ZZF>sr{f2BPAmTqoBgoEm)QTld3G+LOPYi zsqSv1@_A(PS!~<2lesZfbj%WzwAq>xxuodNfk9IQi;X}H-DP8xP$+=Q+Qy=?v=puN z^_V_&9x7_U~CQU)rN-hPac<&mA7u)Q)_yByJgvIARd)u95}iUKY995+NAtk_wh8UMBG}j}*RJHMJvCXnnl*Z$1UxemT-5uvJZNgQ!^Y*)#TZ1&R zfXoC)a%z$1vx0!uKi$^**p-KM>vrF2+Qur{(ICm?-=6*<)~@>1=q|NiBFLSuas z^0_Qh-91S6_8^&#Tm-?py{W$6s=h4L_xlr~esK?U9H(}D4 zagbb>75d3s64`VHnOp%`U170LwYI8hP%Ry$kr*akHVWk>C3yO^=dp3uCN^P|q##p7 zeareaxi8MUusj0nvYhHU99-9gZTgj9zpDNyudGBe-HU6d&ccn0Z$=6TjPG*+)(EpuGi+rL=#!Q)T%Rm%2ld4u=~yJ0vCV~IO+X!) zzp>*W5{*HULs&R<7H+xz7RV)~Y!@XU2RC?J;nS}z5$L&dmnP149a$F(g+~|`2Zg4J zl#cW~G=uiDEVgzS3DSy^1fI8vUm1_HIoPHFwh55VObeovs){Q{eIVH06{-SaT!&Yn-3yZdwxvqz3> z{_9r{`#`t0wkBLbdX4j}s~p#4D@SZ`+vV87Q>;;;!gixw9y~`<53M>;i^#zv9$`Dt zex9U^;e+!d*54-avlBh*`&xiwad0hvyT0#K$g50KMIv5~(XDM*wrCkfj=5r!rRdkS zPHO!`%l@aN^{4DctB8UuJnp#GUF4>&OG+}?%_kOWIQ+#7N`-!V*|$yS6_>s*UXxh# z;zC-VJmkx~gqnJC0_j*HEREI_E&3h+Q$MJ@ZD<&Xwjm=>76@YEgvmc0Q8Q-6;01rf z_2CbLuWzou6&(L#$K^}ee%bPpo|MBdO<4jrHN@pO}{Z+?xip z45)=IJ;r(NVt*x(+}r=ILf^iIf8k5Jl$YX^&{8i_Tn%TnwEIT~LI+2aLCaPVmP=4x z-VgNyn^9F!j_wObNtk%GU%c*%KUw*czyDVNK70_hO#^4b^}YiS<9U~sQTi6S``om+ zLfE&-PERSOSseQdWPYjduOIrGhHOpTpE~3+Yy!A!@g0~jekx+6v7P(&ZvX0v6?gvM z{gTI@TEC`o;B4OE{sA85dLB{K$N%^x*7W6d0001>NklC1_e)>qAeZ+0c0VjA z&r^F!i!{N2?0oH?zW4Tw84Lckt?mEu*LXexyr!m35CS*4@D{=ICeYT#$3kZW?f1h3 zvTrcXHi@b5_h{9G+peqHYx&OfOB%HQzrLvTaiAI+8sdO3!Q(Ji6olbC&oy!!SHp39 z8Q=xkmv?whcX=-Dd2R=Qla_5C@PPMW7~4;sI`wz?D&BtpiQs<{- z58Ve7;(a-@oUJm~9I?-d&rM;J0KB2FBi!J->AM+G+!*(^*6Pg!L>Ma~9uOd%okXww z&xn9T!JF)KDrHKG6yL+jA70=i6g?v^S;3I17+l<+qW0ekN&5Wgkba2%3hiZ5 zIpbDIE#=UiJIn}{Gm4Be54fDn9|iBoFQGx=TijqPV4-O%r(v!uqLXQ1A31XVt_VfN zp}Y?oEG zux-(yYz6U7#p_&nv{hG2=6rfNT1us!~mEGL0bbCwu(g{_StorCaJL>zY zflWqf53l{i7NL~uhpse_;=0yZmOp%;P6E2meIShg+;PHxX(bP8W!KEV+TZ(gL1vVm z6UqdZ_WH@qC5e2Eb?0?RU)&pJPOSpMd>I2$fW=H=iK1jq)FXpk5>x20&Z%wJwyOy+ zdkFB7i|)(>HU4XRw`jM=zs4JbCH=ENNOoo*ArTt4$5sqU}o}7WCEqg`iZpo5estU`8zupFy%5Z!kV7lDLo))-X)QVoP-B5%)aHH%siZ9&Z5aG9Wv?)yh_CmIT1 zh`Bb%Mb`3*gplxBuU<|n(EaeJveMF>p)|Jis}`Ldxb$8{RXs_DCF25(?!sg7;k#AZ zA%FORUFPS?nKfty$mr*Fo;r1PDuWi=s^k^j#mASe>o9OyvbrGLL^yN5>^~gYLi#+o zAD>ulAj>$s!nNprI>z%?`^ibGM^V;gxT9WrwdRm9b3FS=0`dlQKR+2OqDwhQuC%#m zA^Oc+W%dY(Fc1HHs3?|w8DJz-MsejRE1n-3=Ud07YtYRIU>XC}>8b&>HUzf1a!V=L z?ohKExtCsRBElsgdR087t@SA(%s>KK6@bS&bL*VZeb*e)$?nAUcQC$jEkE6wP)oM>o*Fr$p&48FgwI{)b)0QGutu$3ysU_UU37vskd#CWk@4GEW zd(dhvoL}CUcFZB0O{)poshaaO`87d#+!Me@xIf>-7q9P(fnec4*iZ zKX(4o92qk>-`<#Z(9HlStDHP2@LTLk-_XG$>^euMx<9U*!Ixow?9AHzrJ>d2(Dw0Z zhZOseaA;JT{zRhJ;pX3O;7hyz-cA5_46UJnVjof}*T=z4boe$Lx^)_#zH;ME0ywZh zL==35yeL4?SREq03wv}DU-;$PDgrq0KqR1@ ST`x}n0000ppryD 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 z zgFQuznCDUFw>JHHarQEjc4>0D_RuhN0~kYY)!}_hu1P8`T{_R-oci$h;wZ1c$#T?7 z_ckhQV7jMo9si|xi_V!B;}(@G>f6OXq0#2CbKy4UpcbVqb<7U2Cge&;<#nf0~h1noYidl-EL64 z?Z-=`*eZkX2qqMdB+T`dv9SWAQp|_!R*?2dd!ba#&o3;l;L?G{hJ!MKu<82Wi=_^X zG@w5MX{~4~Rs1bH7H5Crm6+YT@20cj-3`9?6DxVGUC9QcQ$C*COuU1gljCFM?uSg( z(DRm~J2oJdi^KHMmbOqTp7b8JlwWT(C*_m`fVdz2M@1^b*cg@g=x+fk3j2@m-w6R4 zs-<@M7qjGU8!4A&?2!Kc{&@7N9v%}N$R=I`l{K#7`#C)R;M&YNb*G1HdaCNBOPA8= zj?rr~yW90{jhoPn4|-dl^YG zN-n!%oSlDFRXyp&(**t*M_rXwDvNJeKG-d4YvlOH6eG&(o?+>@uk00Ig+h+<`f7O1kc0R%@~X?KSKQ`YI1Qy=S<$%jo#g3^&w1zC|^fPCA~ zACt`5T;4wE6YYZo1E)M*Sw0+ichou)z{F{~W51)c2T_XQ#EB!=@PuS^=rw7}Nv+V*fK`3kQ80N5-N9xznv=WtxtWP!(B6~~DjD8`!m`cGhCO#u#x@zlr zJMVn%y&ij9Ig1|URA45jxu5^#WHBK+CN?}0{=KXE`4e8mbJCFk29gg^ENEF zZoVP*2|gae+0xO+U0v`S=kI;JV{>VLzISNMR6q2{eP8$ZFyt@Ww>Lhs4qMSz#IuOp z?6-U3kq%=zmGb8ff8S&F?bE@Ts9N24-y+w9uyY=Me*gVo3%1Po8ClK0mUA|$_|YW( zTvmMGMHtUj3SpZ1e?H@a_)p}Gc>V8Z{?8A?_}@4Fl9-&A%9w0wswY0z$i{M=#SJq~ G^nU<}(TKAE literal 0 HcmV?d00001 diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss index 752e54f..206106d 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss @@ -128,6 +128,11 @@ background-color: #f7f6f9; box-shadow: 0 5px 15px 1px rgba(0, 0, 0, 0.2); + .mw-phone-topbar{ + display: block; + width: 100%; + } + .mw-phone-hint { position: absolute; top: 0; @@ -177,11 +182,11 @@ cursor: pointer; &.z-focused { - box-shadow: 0 0 12px 3px rgba(#177, 0.5); + box-shadow: 0 0 12px 3px rgba(#67C23A, 0.5); } .d-cpt-operate { - @include bs1; + @include bs3; position: absolute; top: -1000px; bottom: -1000px; @@ -209,8 +214,8 @@ } img { - height: 12px; - line-height: 12px; + height: 10px; + line-height: 10px; } p { line-height: 10px; @@ -223,15 +228,23 @@ position: relative; .d-cpt-wrap { - line-height: 50px; + height: 40px; + line-height: 40px; padding-left: 10px; background-color: #fff; - img { + .d-cpt-ico { position: relative; top: -4px; margin-right: 4px; height: 20px; } + .d-cpt-avatar { + position: relative; + float: right; + margin-right: 10px; + top: 5px; + width: 30px; + } span { font-size: 17px; font-family: PingFang SC; @@ -245,7 +258,7 @@ position: relative; .d-cpt-wrap { - padding: 1px 10px 15px 10px; + padding: 10px 10px 15px 10px; background-color: #fff; .d-cpt-subwrap { position: relative; @@ -347,11 +360,12 @@ } .d-news-title { height: 40px; - font-size: 17px; + font-size: 16px; font-family: PingFang SC; font-weight: 500; color: rgba(51, 51, 51, 1); line-height: 20px; + overflow: hidden; } .d-news-info { margin-top: 17px; @@ -451,7 +465,7 @@ span { position: relative; z-index: 20; - font-size: 15px; + font-size: 14px; font-family: PingFang SC; font-weight: bold; font-style: italic; @@ -511,7 +525,7 @@ background: rgba(255, 76, 82, 1); border-radius: 25px; text-align: center; - font-size: 16px; + font-size: 14px; font-family: PingFang SC; font-weight: 500; color: rgba(255, 255, 255, 1); @@ -535,7 +549,7 @@ } .mw-phone-top { position: relative; - height: 50px; + height: 40px; } .mw-phone-ban { position: relative; @@ -581,7 +595,7 @@ } textarea { - background-color: rgba(247,247,247,1); + background-color: rgba(247, 247, 247, 1); min-height: 100px !important; font-size: 13px; &:focus { @@ -590,15 +604,15 @@ } .d-config-hint { - margin-top: -10px; + margin-top: -10px; font-size: 10px; font-family: PingFang SC; font-weight: 500; color: rgba(51, 51, 51, 1); line-height: 18px; img { - height: 14px; - margin-right: 4px; + height: 14px; + margin-right: 4px; } } diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 19eab38..dbf3465 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -17,6 +17,7 @@ const http = axios.create({ http.interceptors.request.use(config => { config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' config.headers['token'] = Cookies.get('token') || '' + config.headers['Authorization'] = Cookies.get('token') || '' // 默认参数 var defaults = {} // 防止缓存,GET请求默认带_t参数 diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue index 2c9b738..19a38ed 100644 --- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue +++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue @@ -37,11 +37,11 @@
- - - - + + + + {{ item.functionName }} @@ -68,6 +68,8 @@ @click="isInPreview = false" icon="el-icon-close" circle>
+ +
({{ getCptRegionName('top') }})
- - + + {{ item.demoData.title }} + + +
- + + {{ subitem.no }}
@@ -289,7 +295,7 @@ import getRandomString from 'dai-js/tools/getRandomString' import cloneDeep from 'lodash/cloneDeep' const getMockFilterUrl = (url) => { - const usedMockTest = true + const usedMockTest = false const mockBaseUrl = 'https://nei.netease.com/api/apimock/30f0251f1b7dc90a8c38e3c634ef2a8b/api' if (usedMockTest) { return mockBaseUrl + url @@ -348,6 +354,7 @@ export default { }, demoData: { ico: '', + avatar: '', title: '青岛市市北区大港路第二网格' }, configurationDescription: '请配置具体内容' @@ -436,7 +443,7 @@ export default { }, { ico: '', - no: '1', + no: '2', avatar: '', title: '群名称', info1: '山东路45号-张三', @@ -445,7 +452,7 @@ export default { }, { ico: '', - no: '1', + no: '3', avatar: '', title: '群名称', info1: '山东路45号-张三', @@ -467,7 +474,7 @@ export default { list: [ { pic: '', - title: '我是新闻标题', + title: '我是新闻标题,我是新闻标题,我是新闻标题,我是新闻标题,我是新闻标题', author: '大港路党支部', date: '2020-01-02' }, @@ -507,6 +514,7 @@ export default { // region: 1 // 区域 1top 2ban 3fixed 4cnt // } ], + lastSavedCptList: [], focusedCpt: { tempOnlyId: '' } @@ -621,6 +629,7 @@ export default { ...res.data.floatingList ] // this.cptList = list.map(this.processBackendCptData) + this.lastSavedCptList = cloneDeep(this.cptList) console.log('用户储存组件列表', list) } }).catch(() => { @@ -650,6 +659,7 @@ export default { return this.$message.error(res.msg) } else { console.log(res) + this.lastSavedCptList = cloneDeep(this.cptList) return this.$message.success('保存成功') } }).catch(() => { @@ -686,6 +696,7 @@ export default { return this.$message.error(res.msg) } else { console.log(res) + this.lastSavedCptList = cloneDeep(this.cptList) return this.$message.success('发布成功') } }).catch(() => { @@ -784,6 +795,9 @@ export default { // 删除组件 delCpt (item) { this.cptList = this.cptList.filter(cptItem => item.tempOnlyId !== cptItem.tempOnlyId) + if (this.focusedCpt.tempOnlyId === item.tempOnlyId) { + this.focusedCpt = { tempOnlyId: '' } + } }, // 检测实例中是否存在某种类型组件 checkExistCpt (item) { @@ -816,15 +830,26 @@ export default { } }) }, - // 重置聚焦组件数据 + // 重置聚焦组件数据,重置为上次整体保存时的数据 resetFocusedCptData () { const { focusedCpt } = this - this.cptList.forEach(item => { + const fun = item => { if (item.tempOnlyId === focusedCpt.tempOnlyId) { focusedCpt.demoData = JSON.stringify(item.demoData) focusedCpt.configuration = JSON.stringify(item.configuration) + return true + } else { + return false } - }) + } + if (!this.lastSavedCptList.some(fun)) { + this.cptTypeListTiled.forEach(item => { + if (item.componentFrontId === focusedCpt.componentFrontId) { + focusedCpt.demoData = JSON.stringify(item.demoData) + focusedCpt.configuration = JSON.stringify(item.configuration) + } + }) + } }, // 改变可用列表组件展开与收起