From 8765258f96a218d29271786af30f9b84fc04e801 Mon Sep 17 00:00:00 2001
From: liuminjian <xxb_lmj@jiajiayue.com>
Date: Tue, 20 Jul 2021 17:10:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/farmlandEditSwitch_bg.png       | Bin 0 -> 6957 bytes
 .../homestead/farmlandEditSwitch_close.png    | Bin 0 -> 339 bytes
 src/assets/images/homestead/nd.png            | Bin 0 -> 4158 bytes
 src/assets/images/homestead/nf.png            | Bin 0 -> 4394 bytes
 .../homestead/operation/positioning.png       | Bin 0 -> 1007 bytes
 .../operation/positioning_active.png          | Bin 0 -> 1447 bytes
 .../images/homestead/operation/scale.png      | Bin 0 -> 487 bytes
 .../homestead/operation/scale_active.png      | Bin 0 -> 1144 bytes
 .../images/homestead/operation/spacing.png    | Bin 0 -> 511 bytes
 .../homestead/operation/spacing_active.png    | Bin 0 -> 1203 bytes
 .../images/homestead/operation/tensile.png    | Bin 0 -> 691 bytes
 .../homestead/operation/tensile_active.png    | Bin 0 -> 1294 bytes
 .../images/homestead/positioning_icon.png     | Bin 0 -> 506 bytes
 .../images/homestead/searchBar_close.png      | Bin 0 -> 2546 bytes
 .../images/homestead/searchBar_close_gray.png | Bin 0 -> 2484 bytes
 .../images/homestead/searchBar_save.png       | Bin 0 -> 2210 bytes
 .../images/homestead/selectionNext_icon.png   | Bin 0 -> 1202 bytes
 .../images/homestead/selection_icon.png       | Bin 0 -> 412 bytes
 src/views/homestead/index.vue                 | 779 +++++++++++++++---
 19 files changed, 665 insertions(+), 114 deletions(-)
 create mode 100644 src/assets/images/homestead/farmlandEditSwitch_bg.png
 create mode 100644 src/assets/images/homestead/farmlandEditSwitch_close.png
 create mode 100644 src/assets/images/homestead/nd.png
 create mode 100644 src/assets/images/homestead/nf.png
 create mode 100644 src/assets/images/homestead/operation/positioning.png
 create mode 100644 src/assets/images/homestead/operation/positioning_active.png
 create mode 100644 src/assets/images/homestead/operation/scale.png
 create mode 100644 src/assets/images/homestead/operation/scale_active.png
 create mode 100644 src/assets/images/homestead/operation/spacing.png
 create mode 100644 src/assets/images/homestead/operation/spacing_active.png
 create mode 100644 src/assets/images/homestead/operation/tensile.png
 create mode 100644 src/assets/images/homestead/operation/tensile_active.png
 create mode 100644 src/assets/images/homestead/positioning_icon.png
 create mode 100644 src/assets/images/homestead/searchBar_close.png
 create mode 100644 src/assets/images/homestead/searchBar_close_gray.png
 create mode 100644 src/assets/images/homestead/searchBar_save.png
 create mode 100644 src/assets/images/homestead/selectionNext_icon.png
 create mode 100644 src/assets/images/homestead/selection_icon.png

diff --git a/src/assets/images/homestead/farmlandEditSwitch_bg.png b/src/assets/images/homestead/farmlandEditSwitch_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..710238328f7d0e68f30142070a0ec2bc43619553
GIT binary patch
literal 6957
zcmeAS@N?(olHy`uVBq!ia0y~yU@T`~VAkPa1B$E{d-NDcu@pObhHwBu4M$1`1B28P
zPZ!6KinzB|9C;ZGc$ha%wZFQzE8$YYoEWykRcGGad(0uA;Gm#taLo4Vasw6)fgeoA
z?ka<XG!pJKFYR(^U|@Xwjvc5-K*ZqP!5~*9hlYm2@614z99$CL6ILn-DmWb2@tcu}
zg@c8)r+P!kM4;M)JAWB~B27%kY$H~A0M#12s{<Ou<jD9~PA60as8*uf-l2h^aX~{N
z|1>QjpxU0@@(K<O4gm*tuzQPk0@WV7%RlOj(a;!88>2a8wA>giMMvwD(HeHNy)oMQ
z8f}Y?w#-L62&3Jl(az&&S9)|{VRV>fbkJ#Z2yS#ha&&lhbg+7K%zShPVPwvyRJ@+`
WUTf)|)O*1BF9uInKbLh*2~7Y+B0KK@

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/farmlandEditSwitch_close.png b/src/assets/images/homestead/farmlandEditSwitch_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..a615d60f480eaabcd14cb805fe83427ccfded53f
GIT binary patch
literal 339
zcmV-Z0j&OsP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00004b3#c}2nYxW
zd<bNS0003BNkl<ZC{vY^-AY116oozA^akdI2>Mp0kO~Q+rea0tl~knSKS>B-pa@>{
zRN|En5q^ti;y8Ge2EH?A4|~mCGqb(W?+C-r{GXemBy2rC5&gh5e8W$GQn@Mkg17>W
zEPO%<J_3Xp*5_~oODnt}xP=Kcq34Jnh+iQO3%RmFo2P_lsKeAOR+u}`f;XG!3biir
z3sm6}+QvoS@8X!yin}IJ)d!CCP>@j7hCZu0`@uLSydy)^o{UwU?H=AwSuGn;!&gxv
zomm@=+{@8(6wFy3na7T^8nJFxIck8v=SUOieTop&0BRC7KoZtE;}xjoa<I~FPBk0K
lmAYmI341yJY4RAt%^sUkFh^N9Ju3hJ002ovPDHLkV1o6Hi0l9W

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/nd.png b/src/assets/images/homestead/nd.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c1716b5d0cb775012d6eaa538c655c468f0f65c
GIT binary patch
literal 4158
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
KY?+bg<^KVH1z8FJ

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/nf.png b/src/assets/images/homestead/nf.png
new file mode 100644
index 0000000000000000000000000000000000000000..19177344edc0fae46e8cc8fa01fd2ae5f8c3944f
GIT binary patch
literal 4394
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/positioning.png b/src/assets/images/homestead/operation/positioning.png
new file mode 100644
index 0000000000000000000000000000000000000000..7525b8aed96bc940248227f5ff50b5164184a40e
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq000vJ000;W1^@s67?;Km00004b3#c}2nYxW
zd<bNS000A~Nkl<ZI8TL?T}YE*6vum~Hl-OQC?pyYYM{+eD(p+M%oGC?wZe>)guKnD
zF6t(Xf~1=+3`>PT>_ZbGv$E7?A4JpX5Mg$a<wwCNNfI}8TfZaQc(rMR@x14p|M{Q)
zdCv1Z$|@hf#KgoLMNy6s3fE{fk*qGK(>adsJO8HM-rhD}d5YQz$tJ+H_)=MQtXBR%
z1><tLLhyyL{=xjnTG8L%|5=^yC5w)Z-mKH<+DV83IL!YJYMuk0_Ve@O)2SntjnWd<
zc;ch;^YfWzv)SSyTp)8RdI>Pv;czs~&d#148XEfHtCggrq)`0TVDljSttRx4br3v2
zu-RlX6?#Z0l81^NVx#QSz`(#`Pb@h(`2n#a{2k<E<98@jl8=Y{C+v26np=@S{tm$D
z-WC)^2)nITYtGo%*o<DUUmp+<&`vxSzwBS5kliDxg!U?_d{dI~b)hsJkO9+x;wdnP
z@$JF)1||DNNkT$G8T(ns_x--UzT-mn3PV3PH<vj$IB1sENNR<^fQloi_~llo1^bLx
z2K!V-;fDD5_$`nbC^SAbHI=2%`><32ki%rYkZ_IQMaZg9a9KSBVrL+$LEUX)71-fm
zJLTj^z9_Tc&;m%O?-A_l*cY(RW8YAdp}HI;wH~sRl#~s!kKpC#WD8lBd!zT#cMtoJ
z@9*#5La>MGnUL8%gfbMFI{RBrp}UZ8!|oz(rp-eNj&qQSf)<hs+ym$al!o-ztj)CS
zz+Z@}Op1J%oSe)U85yyWTaT|4@~e<vQetCcHwFd<z91ozA>=ZI?udwppwQ6Jb|F-^
zDMVn7f*ED=w?fp35GzIV<t8i~TI5&atcLJC)5~Ita{v5j`6Ptf-GoLIHHsqa)eKIq
z+CB;_s1l6#ZbH~XVm^}F2<EC4E&Yb5p5mnx?_!@15}#j078e&6qSb1j0!jt+2vCtP
zLW(xIpC{Aw^mMMpVwv#Z7Ck}iLj;qQJGT?UMhH)+2~pHQ>=dzYbdblvHL2r^$RrRI
z6}2`vIQT6s>q%;p%gkeFgQ!l3<dMX`Th8QC<^PZg0EJ;Fd?GIf$woPAkniIA9pA+q
zp|8HSz$cjiIYa9pYn2Nxwh-~E6fF17EgHab(__PHAYEg#*-k?=yV8_>D&u^`K;ZHu
zq6&c;r`WWwF&d5Dr+UQ!@aPru=*c1Uk}XxkBx{)Dt^W>ysT~GX#l(VqZnC1xaDA?D
deOi{r{{r~-4UH<aSyBK1002ovPDHLkV1iJB>?HsI

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/positioning_active.png b/src/assets/images/homestead/operation/positioning_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d58e06e8dc49d6a1e988f7ff66289ad4f115667
GIT binary patch
literal 1447
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv+!3H9yAL9p7k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo
zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHm#CsQ{|BNroAOJhSrLsusYGgDJ1OG_6=
z12;o+LnlX=UYGpj(%jU%5}4i;gkEEudO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPra
z(>$o&6x?nx#Hm*w=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6x-)wE4h9A$X-^l&
zkcwMVrXKVT2^2YY|4hf@%Z@n<Is(&mRz#X`<mSBIrobUCwBwRcRQ9`DqCePo%!m!_
zXzqKLm3-NRcd|#|1O=nFQ$mUiAN2^Ze*ME&C+=5%ujg^2{P)6lmiMi{?<;=KT`}+Z
zj~lWD@<$x(CoG8Fz;E=RH-3_GQWxU}uB>}2WgB!qO}3kPx-mQKU42rx<4jH?J2uS%
zR+R(1zxElXv8((&vSiVFo+yUtZ?|jdHBEnTLd=9QUvtV<q4$lEMoDLNjoi1XrX0yD
zmOr&>k=ciPtIa>|?Agh1%~7;Ra$`8poS=MDC;0=x2FzVwM152fn)dYwp8n{~yK1TA
z!WC7H5_=xsv8eTYRyTDo&m!wb3z)LrOpBK3{v!RGcT<hrBMr;;1FRDjq%S?y5PJ~u
zHS_fTve~OD{EvKdXqv0{t@ClLz_v;5mURzruvbOK9!*s4(p~*m^Md;CpBz4$SdUzD
zV1GRC^7k_}4Ho^U4JFbhtY+ET8DO6rWRo|0S)s4$WuAW=N?%%kT)p(9an%ahC#9j^
zZpJ)(@><RP<i=^!)0?k%y6)uJxKzza@|Z{dQK`F9PV&>W%-$=1X)3<`AZ@eui3_}D
zS0-6I25|m;p!;}>l3L6oMX}#JUNw3j^NP<Yt9^+ucYoPaeU8)Q2YZHhv)%`RKbc}T
zJl^cGTAft%=HJTao8p6J_viE2Y&`O3)!b~?HK(5L;BBe<ShQlZFe4iS$70R4^n%7#
PP|@k>>gTe~DWM4f%y}2`

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/scale.png b/src/assets/images/homestead/operation/scale.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f6955e282f77ead0b02696ea692f881faad9fee
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS0004=Nkl<ZNK3VqF;0X)6owtBXpG%<Mo%C@X^hy|8P^-=4fF;c0Shg*QBR<r
zKs^8i6B7~}wYAd31R7xfw;9Yh%)kh{bj!m3{qKM84Q#3B<+|>QZQHj+QJf~YbTX`u
zJ{Nz$yKYrgPjMUva|1}?&t+K#DBx=@08t#muW)}3@yoUpj3bhqzc9vDA-oL8F(SGi
zRDmiM%d*CRT#;}aq_YA!7KnZ#o_)&Q^Sq-jNGm{g4yQkGz6H|>#&g#Mq6NsA!}T`B
z0l*_%ZxAGkqD{KTD+vLmiTbk>N`NAk5p+(dne-n)@H-TnOZQdd+5jjTI>E+XbT!jx
zie%?`p6{h;`XM$GF|5PsyXgt=TY)MTWc?;KlSJEQUIm>2<XEySJ8&H5zHVj>F?B6I
z$8_soH<LpSF)??&0LYidZU-~oSbq)=`ihews=&qAg_!fP>H7btlE#>ttp6Z@u$gp_
zeWSr^ZRdR#OnX#NC5VkSU;8=i5})<J<e?$YFgQJfKs7`}_bw8+VZQG#M4X_spfskz
dBHVM$WC}>OF-WzLl(7H+002ovPDHLkV1fc{(3SuI

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/scale_active.png b/src/assets/images/homestead/operation/scale_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..349b4d11d174397f564d572d45086b2afd65582f
GIT binary patch
literal 1144
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo
zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHm}OAAv+V?zs9OJhSrLsus!GgoIfM?*Jf
zQ&%HPBXcL1UYGpj(%jU%5}4i;gkDRWdO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPrg
z(>$o&6x?nx$EjBz=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6+Uw1<yTB~*#?!?y
zq~g|=DF=BE8SuC^A7Qw;pyz_<E=J`icQhqf)fNifk?s_ZZsBxd>f4}nc~@c5%hfAy
z{WyBRbn5pwQ7`t`=3h&{tDH>#-@DR`L4A8cJa5Bf`{rX?ZI_;uchrxVEyZw3>~Vdf
zO2eIL(w}NYH+_9l9&tYAgxGo06G|OU0`6y7u8Xz%O;>2Uad?x)_S7dPlW#xy^F;RH
z=Y=8;Hz%2I-qCbtnqKxYy}z1zz4rf-`h*T_G58lX$%e72VZ-tGPogVtO{nJ=I^roM
zvo*YA&cm$cIYLL?1-l*Y5S`N$6{xqdX__j}#-@de2llZ_Fr+=-9%bfutqW8Zc)I$z
JtaD0e0sseQh&TWM

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/spacing.png b/src/assets/images/homestead/operation/spacing.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec873bba0987444a923e2bb167e297208458a073
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000*N000*V1^@s6;40Lh00004b3#c}2nYxW
zd<bNS0005DNkl<ZNK5UN|5d^;6ooAvK->T)u)+ecflfe2U<2s{;snGAgb9QJfUp50
zumIHW)}|-?5L)0*b52j2_T|g#&3#GGY&LBW1W$Lr&CX`C=lr?SEsCN>tyWvWs%v1H
zrXNA8)k=K|FZ-3KdGL0-ZG>SMyRmSl$Kc5o@a_)WmxbAu^Z7iw1TI;~+%opQkVOwn
zkVygfB1!yYU`>#yZ>^mK*TPw|7Z@>rT?ZPosODyH<Y>!fNHW-LHUr>;o5A(xWN*lP
zf~@AOEM!wBlOY4z_;w}FlFf*$-XsCnn#%x7fc1#!5;G!Zd@^%^^I~Z1`G4&S#Iswn
zZ-SGV^Dzc8EMrHqT?2n8?H1V*xPD(HyyP}={T%Yj{mTJa#7Atma{Y6e`|zn&9{s=F
zVD_G!ss`SXr~lzs$s!-?QnP4o<XxvJ?r3Y#T%YefG}nfewX;Q3#)f~z?7+2E5|~+!
zmiV@+Iti>uHG+i=V?U*zO4;qf2SrhK0)esY!iygtoJ4#q^ehWj9NKH!C=QyV$DE3y
z3e<~L=I^eb!C3$~!OduKL+=uJzLRR}%}#%s`2o^$x~fG#WJ3S|002ovPDHLkV1jMx
B?w<ev

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/spacing_active.png b/src/assets/images/homestead/operation/spacing_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..33cb908867aa3fda9f2ff3bda0e1dd4419c518a1
GIT binary patch
literal 1203
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0DF6BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWfo`&anW2K2iJqZ}
zfu)J1j)IYap@F`kk-mYsuAzaIskxPbp#l^r0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA
zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn!
z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tM$_Q$0h4@XWlF
z{PJS3dS72F&%EN2#JuEGPZwJypb2`JnJHF|hNg}dCQdG{md1vLhOSOdF2-(_u7<A0
zE(R7BE~Z8>y)OC5rManjB{01y2)(X2^@5T@ZUN9{m(-%nveXo}qWoM1u$Qeeal6F{
zr+HAlDY)I@j8m^Z&@uX;h((HMm=G}afSB-P3*^8Perg^twHE=C^-q<Xj~N&k)jeGt
zLn?0F33)5nWWdua^FNjOhJ#xI%bf$fCCrITrOaj%cw0DE2tQ!k;OP6l=}N$a_3`_5
zmpf=={+h(@q1l=fsF0{;o3ixju3HQnn#Jrs@qB)uC~G@CH)6}onR|ZAPIlFqvh-SN
zW}J&lM5Clpz;`hn_YR+lk}v-qlscLHgz;w*FKcz{lU0ve)+PBoUDag0$w@3^W>>66
zSeA12qQbJwDf^eTnqP68wyFD+K=(2;lPA3w{SFt(Tsr-#FsfPIDDD0C9OrzmB0EmW
z?xoB}58PVJ@qhZA6s4zI=DcHlId8M6<?GWgo^S@be|WqzT&(}jQ@+wVl_}2KpG2_V
zu-_5&VfELU)xopNF8O|(5oub!A^DO`oI>Y$>8i_3haQ~RC~)P)GnSLl4U7z5+vi6X
TuRpd1RE&7K`njxgN@xNAw(+HW

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/tensile.png b/src/assets/images/homestead/operation/tensile.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f405b85f7f16036eda4b4064d27e2ecf26c049
GIT binary patch
literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq000vJ000>X1^@s6)5{gA00004b3#c}2nYxW
zd<bNS0007NNkl<ZI8UXOu}&L75QbShWh8h5przr?E+c{I=rB)!c>~-fO%ggfk|&6H
z0*)>nhmzLz#Z8n7mvpgf%XYs1w0l~g*OntrI`4XR_Md;|pWQQC_NmwF&G~$O*z5JK
zoy{M$uK(R`HwmrFX7p35)mp}wZ<<f1(>UWPZvbpA8v!o~*a-oeIF3J7DwUiKj^BB2
zRzyC<@4eP$v)N6*-~UkdGhW0k*saPSw-c!FnM@`}gTdg3zd>L>F}$<Re;8jvhycAM
z*dgy5=D$hxV2POw0ICKTwr2a3Y#6B72-`OA9U`=XHFHKp_`*D*9!<bTQ4}?((J}w;
z1Wv#NMnf1~t*S+^NC1B(olkBP3ZDR&t}Q5wK`>YpDcSTNNG<QPb<ZlWyr;ydTCF~k
z-jhrJ)nFb#0>ktFs+sFO$INaXOHEj+1bW)#lTf6IdV3Uo7w0jl^<A4Ve`fxGJ@ZA;
zy41y%5%gL|usEBn-LkObr$9<ZLDU-V`~uL%r-|>e^R+FrFXzZH!T3vE?wkbXgRA%W
zpW)wOJmXdU?&Tw2<9Z69uWCpOo?3?mrVdzaY3PP(=IZOfu3&SEV~XKK8|17pbgX=)
znlFH{afc`>u8J>(bgVXh7QigJy8B+T)10~-hnu1;fmuLZ$0}+@y74Ap$_g?576N!h
zRl2FvgkcAUZQUO0KoL*=YLWa}Dod|6k&?Q%)Qp#*?}25cZ-&Y<#!tOCS~}=z4Hza8
z#Ij0ZDh4A)wThHh(`qiDh6@<HHLSvFnc_|>r)zJLmM_-YFNjU2!Nv&SJslfBrFarj
Z{2v0Pb}72&?)?A&002ovPDHLkV1gDWLbCt>

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/operation/tensile_active.png b/src/assets/images/homestead/operation/tensile_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..b225ca2f94c83dd83a3bbd71492e7808cdd6a5af
GIT binary patch
literal 1294
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv^!3HERpB7yO;*_{XlmzFem6RtIr7}3C<R_&n
zc;+Uirv{}arc@T5OtoQPU{=Zui71Ki^|4CM&(%u=snM&*Edc6fV6d^TC`e4sPAySL
zN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@$TEfZWuQ
zM1_jnoV;SI3R@+xxmG|nNLXJ<0j#7X+g1tUs0iNx1?T*tR0UH#1Knf;GeZS46Fox{
z14|Q29R(u;Lj!$7BYgvNT|)yaQ*$c=Lj@>M0@_xTl4cd;;s&(~$g@?-C@Cqh($_C9
zFV`zK*2^zS*Eh7ZwA42+(l;{F1**_3uFNY*tkBIXR)(42l3JWxlvz-cnV+WsGBGhJ
zzqG_w3FuOY7jg^W#^x16g9#X5`W1-<`i6Q2ATPlb`ugHmnwtw(U0f2Bif}JhgNs8d
z3sUuiQj7CTi;{s6m!=G|s=&&*C^fMpzbGU>KL-|y0U7xv`NbLe1q#l=rh0}7;hA|U
z`Q^o6^}fDVo_WP3iFwJXo-VdZKoj&bGgGY0O-(IK3|(AZEsYHg4PBiq3=K?NER8HI
z4a|*P98FDNdR_99OLJ56N?>|Z5PIEk>IEf*+ybD@E~!PCWvMA{Mftf3U@u!`;&zKO
zPV=C8Q*gV*1*cwppkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;PYA*sNYY7?C*$fPfO`a}}
zAr-gQgc|xCHV`RY)#LGlEhTMbxymf%Cmfbe{tXGQPVsW6XPAX~Z`dyV>Pk-zr@F!Y
ztHysKwoUf1dHK@3^YgF2|9|_X^$0q+#t6@Mkq}MNPTG)k<kla@hx7c~tv>xx`gTBU
zpP;$myBoV=J#>t7=5rVN*E~00bA$b;b<F&Z_=(fk2V9=>!*fsX)isIH8cL>;ANF)!
z)oD-jmFeKRxJV_hWBrl76@uG??|%82aZDrm=8wB`ZcTEvcFz&@{2{f`aY};F>X~L6
zw!ZHC{a;}7k7FKR6Xs?)FfP|VueL6&E?DQ>k-gH6cC%{}HYV&V{=8fDRl^I{p7bJ~
zj>4#JkCd#yk6Z5qpRaH{DCK;Jjn&$=?r71oAEu84Cr@xXo@1QV;JZ8ds{ps<tz`+-
z?}eM~qJ1_jk`v=NIb%l3-I{}6r_6YEeA54bjf(av``CrjOe6H~ZhZUQ<so-Tb2cxZ
z#5bm7Rl_7z8HJ#&9KHPQ-)2wst?^g+7pb_IPjcH2+e7^f%nYZOJ-fBU<Mw?}3FYbP
K=d#Wzp$Pz=$IUAM

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/positioning_icon.png b/src/assets/images/homestead/positioning_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d301485b17ad3cd43479368e3b0e946b8c9bae9
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000&M000*V1^@s659q(100004b3#c}2nYxW
zd<bNS00058Nkl<ZI8U{efo;Mt5JekUfDM2N2rxj?4d?`AgVIUJ2w?&kAq$YE6Hqo_
z0Z8AE9Au1BIYqS;3EOwicjxaTdI}t~*({Z5Q535Xmng(YHh^;jPC|UTfXgU~s{MXH
zeHcuXOJMJSVh2_-PdQ}Mc8E9PIF3jCet(P8xT>lQcz!;gzXf4^#9G4IlIel<*Rm|@
zJ$u}N1?}~EpBNo4m&?NEB!IEo@pFjX)U~?<lfKf_?YrrFvzEQD_BUWt)0Fh$wn$yN
zDO*W-Rs@qZ`z~0~=Al|`AksKdKii7A0ng|2ifCVmHn$@qssWewrZx6A?4Rs?{1(i&
zfUmsBoHk)&pgX~F?3MwW6%nlkBjpb=s$XF<OgRqBmGKFivIYw%FwT=lzyQAl)&aq#
zK!Qs}h_texQrIaOsr~8l;3T$0@8pKT+9!BdW_EqegHr9YX5IThx-^@%2jzXzNK3cd
z+6NSs-A{ZEs<jD`Ufl=yGH!dvcNCCphJ4bkF0-|t{MwK8#Br8}rSt1BvP$imx_8j2
w(aSlsIduW&2As4h#9r?L{+~b7kSJ}NA7}#za@6*(_5c6?07*qoM6N<$f<jj38~^|S

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/searchBar_close.png b/src/assets/images/homestead/searchBar_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f3789cbbf0095245bb733e9c0f1ee06ccfa5751
GIT binary patch
literal 2546
zcmaJ@c|4T+9v=Hrim1e=)0j|}nR#b0&P-eyGZ-1kl0nKaF9x%id2N%HW9tqo9V41V
zwl<EUDIrBdqU)AaN(;x5G?vDR3g?baI`@y;eLtV~{Vkv8dA{58$1C*oaM98<(1gKY
zS`=53mwYu|dev3s-vL;DzI@pLk!g@OCk%?G^FY{k1}6lBQ&{wH&<mt95@R|*I~Ys}
z!Sta)G^#rxl*2;NmoTUV7FW)O!R#Coxb)B{5Q2w*;Y_wYVzS{j0?uUEBm8Wr0F~<m
zMlf9kJkVR<;S(x|3dJ)J4*!7LB@pBSED)l@6Ijt~J|V##@l}@~-!EOG5%8}ND9Rr3
zS5h>pC)|m{1K~C(02vD4FmRkT3S$l6t?`y{EPw&f7%UpFMPdMgjV%Gdz`s2Rc{Cm)
zjNnCb{uWDqvPVQf5SM^P$H&K`;;m2|UN{<q$K%le7LCOs<p?A{kqyxkkZk_uWd#z*
z59Kkr5R=1(FDcSPII)mDLZ0bgC9t^PW!e01ZIU+(oj~WJF(_cEq-7wL`v0LU)^{`?
z@&f<P_kRlWeG<7K+6&}!VtJwR!G&#J3dJQj@jyDn;rVbl(aT-*jNm{VeguaLck;GD
zVc>pDHiHw-|B9zl2^2OTqO(Im3dtTJS3ohD41yI2z~FEIK*nRq7z~++Cz45|rM_D`
zW2|sw(lVFC35{ieY-pLw_?wIQA$Q3NEUr8<3FI;3K!!7q!-9V;nZW!}E;i2OAL@PM
zGJcecjkEI)xoCMZ=%vB_*PxfL<nCG8ez&ds@ZI<zTkdwA+}3CV=Lr~0HH<>q?vwCb
zk{=YU=d0J=-Dvftm)&qZ@GUz~Gp)oGxf@P1FDGdrR2}vvVN*%Mx0!ar4<)9lb2_?N
z#%-6CTT+B$DZ7L^?r={Boz&!V<YPDQ2s5bR#X@1<sp&(t4btl`$Jn;9;umKc_fOj2
z#*g;%yEi!Zp_HW3#|x2?DkSL@{GsRL`VcC03=!Vv{cG20;j>2lJ?1fE3R#2Vs@M`v
zKQLohA69Tn*WgRlWj?py=Bl)Gw<}MWmAL`4RBK$IwN+Y&vQRDB&_Em)kpBn1?OEwu
zYp%HSXTntTqny|lZHu=TbBS{T(-WSn{(N;{dVNjZU{6zxW3@m0P^rz?#HSkCoh=pO
z=ZwDk)jZqMT6L=1&H>6Q+_-SYxM!%mn5^(|OVcXF%237k^P<X?z)4>V>*RIS*P_`6
zk6MkHBuz7t^IP(X<;_XJc=f*S#W+~^x-9{AI|8E(x@cY&k}mJ7H=aum6vZq;_w7Uu
zT?L*Z>(Z*Cn|Oj`_VqxsPDJK~_w&Xg(H>i+Fy^V+nl|qP%0Tzo+A<(tV>q+eKf4k*
z6ht{8GZM;j7Msoh7h_4+oJdldgKm0~jtkZIfl=GsG0|;3bt{!t|0mON_ns+QBv~>{
z!4>JfL?^AO4dWXXHeZvlU$xiGgbaj<^Ug6MA}PI(Ov+PU9@xm}^);X=X=$i=+>Kah
zJIOlSm-)-^3bh<>Z;w+Q4e<Rr!P=Iv4DF+N1lGDv_RM3Hox8^c&3mtQ1|*&cR>&rf
z2Tr_JJ$?NFCkm~vXW4FBd5Ak~+I**D*WeY($&FT2P}O^~@<CwI$7=uLjHW3~WPN*c
zh27fWtQ~<5nH?%uU-r1|tK8;#`E~7<EnS8cAC22H@QIEwfW#Nyd4Kp_<fI35Lx$-g
z|LLpA)Da*|hRzgryVI}xT{o2jM@CA!-uMSdrzb=wrR<~)xILS#MV;Y9q58tWcv-vo
z>5IjZLc5Qe@AMmkHD&KwovgJth<nasQ5#*Z?F^`?h;cX^sn8;e2`*X#q=_~7_SV@i
z9-MbS66${Z-W(SJb;$at#BA+3de1KunJ{*Ag_YKQZ5=(!-_95AJnLl6(9H}oK3nkU
zu9>%bm*n?nfOVnUInDaiH#-(5Iwl8idFD$t2_;wCftpc`Ptj7B{wTAO)~y+)6EY1A
z)8|Ibh?cnRDJ!*h7vybv00qZ@pGE$zKuUAb+<MWac$?^<0$WG&NsS}nvUHs=an$Uv
z+fbHpkK<EUhmN&msr#3Qq-^YnmKA@tJSChhqjs9tt??s#YI-Z(GzBI+su(%^+@~5h
z`lL|9WMoKTGdn4n91>X01ruZKy`G$#VRAg{uh6e1ml)!w)EZqz`>9OXKvNlqa|WSO
z=U0^!_*62f#tE{&pRxMs!w;X^HdYO;8A$W}lk=G_o<FX3r+NKi-NCw`f*Po?w!vvf
z#FntOvZSO)g<$oX?!yC>!2?FedQw{3QwIJ$I`>=r?y>-2YfsHvQ^q01^cTr#-rCI4
zpmVnhCyIW*Brx_hK>;E&cNo?o?Y(ZYQ3v8*y`K8Rr+SHb+q$nsi9hCE8N0Ln)E$!1
zxZ%C|H8pFS;WT5xlT7SZB2Mpmy77^P6K`y4EBcQH*D2;iTfKG~GPL72kzo9r4Yy~5
zsJ#Lc<aW1e#bXE<%W)*~YR;Ogj)DRo-wiUCTnlzyr|N~_{5^a0MP^y60qM(yg~`^o
zb`-xURTsCbT<55&f<&dyB3@B*Ez-Zk{9>7EX=qDn%liI_jD{Lx^v>MJyhTrcIteiN
zXT|h!RM4k!SA>3j8`3~?QxlE;)7q7hM3~Xc&+{<i5uF{XR)f2-gOLf0p$U9L&nsrG
z<?e{6m`mE(qv>K5B_`yz!}#FLk$JWK^@3yDuN1wAP7OMC$Av1+fPlMaXi}u;(QrzM
zNL632*rkI>qr}s)cbPM|TBBEdZkDjY)16}iuV07T$uV2@8kBvQ%Ca=l$Z=&lNic`!
z_0(04&Hk}(TWkJEI02{qQ@)F@CT316zNs-K7$&-`YH`3`3brVVJd4B1LttZAi3!mG
zu4P8QmUqJ-PY@}V#_iWVxtCgy=Wl#*uX3DkkAU*DeOf)Jn)d$w(Shck>fp1POkNhe
sAZEpMDv=I5p{(DEQ^^q^WkoP0Slp#;E0IT2e3t&gC}a;(6)`yZKMAQg;Q#;t

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/searchBar_close_gray.png b/src/assets/images/homestead/searchBar_close_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..696e65c9e6cc1125732a4751d6a7d043c170b89a
GIT binary patch
literal 2484
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/searchBar_save.png b/src/assets/images/homestead/searchBar_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b6ba128418b9b8c2f5684d9e2d51d3400765134
GIT binary patch
literal 2210
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
UOFO?xoc(KHG5qLd-cj5B28d#pg#Z8m

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/selectionNext_icon.png b/src/assets/images/homestead/selectionNext_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aaea26a6266202d076bd8699d81a69c420b9b34
GIT binary patch
literal 1202
zcmaJ>eP|nH9KN=a*16zj5$UA$<u)_in)^zV_ReH&mP>6|Q$reA5OIBT_og}1`{><e
zNvhVbO*$wd?tc-K4q-?gvI(-aTmRW+V8|F$=@?_88x&?&KT7AQ?{!V*AI5{b_k-to
ze$VfNJC+!D$-QOA7J?w$u|6@0*JkH!a^bI;2vqRWVn@^Vpq{mh&_qO7)-wpiR5*;1
z2+HNrODISX4WyDv+v#|}An7Uv9Sl`c4a_EpV0X!YQXbhLgN79?MBe>wh6IWnA`klG
zOx%c|oYFUDqQS9&lr)x?c$w_p2ZAL53#iD3prnpymQV_j>$(EoJJ&P`)**I2L_Rc?
zjwe7wHxcktj8|d;EC_T^YzM=4@a=$OScYafn(6eijNtDS7#3_iB#vgvSs^L*Zp6Z;
z5Sg=WL!jwmu}Bqtlx_~wEYI^a!_ge)#R#ue)@)evYSzxGf`}~1R190uHQ*@1j9#!q
zBzF2R1=ZM;)vS#&;eyd6XwWRhI4M<u@%aBkRdo|>*-7-s?|%wgsj`9SB(n5^DdEOt
zcRHaAAz~tE>t;&VN2*m!<aArNa=HN`gMNwy2Ng}$i`F_m9v5PoWkXFuF)>791xit5
zf$I!}#b|(y@|=%lqx*S|^>+ohu1J{Ym|kC3l`HB}K}DKf<;st^TurVs3aWu4i^x<C
zBe~bqRj{72pw#r@@2#n~!If)!VQO+|Y=(9k`>#e<ukiFZ+s(1Xht0u98lH9&kM;7A
z)T;zh=ZT5oROzS8-)n2#zJ|i=A&+ZM{kPEL@f5Pz>?jCKxR#(fH8oWR{olZz#9w!B
z%#3eq=)2Oe1fS{|Z)Lhx+r8cg$NXC#TlsoVCi6!94>RwqeL9@a?|u0sOrO7V^~CPF
zFWun#b8p{2{Si6W(<6$zT5ex!oSd9oo&9a`^NZ81FCKnNmZT>>G?%B3J{ODKT3NdF
z%zM<{3r~;lI^oN$v=T>e;IPXtaFvCHg|<Ha-T6wT^6aHRWp3_+HSA}4encqW`#F5d
z{pN#J|3xr9bh0gI{nFq3<96cm>$9_G8h892PNg~~7Qd)-?>7F-K=`=p`Q}sZ`^&#x
z3BGpo$kz17^Per=Yr5=;b_d;cXNzqUPu3rgHt##o(x~2S+BQVIa(xti(*8%$`HRG&
L1L9Zvhu;4Oj{}`p

literal 0
HcmV?d00001

diff --git a/src/assets/images/homestead/selection_icon.png b/src/assets/images/homestead/selection_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..84a0f40e2f8ae0494f64d083bc5e40b42c371b49
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00004b3#c}2nYxW
zd<bNS0003~Nkl<ZI8S5z|NlQT1C;<H-3&7|HJt~vjPJ~uGa(?yo0yoa1yT=z{30N`
z56G5-$${i?x(uke4k%v-H0<HovuBl|hW!E2Km%BS@^CgRl&~6RZf<V>_wV1mAVti~
z%+4oIo;*mFVICeH{I6fXzRSqSC;&8|3FwL@n9azpA<AXO#>RVr2H69>cM#}3XXJ<`
z$uL+r0S)*lA|j%+W5<q<WEqAloX9c^8r69~%?E(t<bo|76YWh~TU+_>-@l&&8p00@
zv!c_dPftQOkZ8j|8Z9j?{eS=d4N8~{tgNiY$B!SsNR~H|q92s9^MJAWKvY!J7&#J1
zav97(VDdN%^r}9PzX3VBkYyOI@FUAG<nRM}_X9BTieSl3Z$Xg-%BOhqCQK4oYJido
z11x4iiJFOt>A|T}rxux+nZ^D4_fG*iyV0*a!<KOIi2(pLjwK^=Ps?op0000<MNUMn
GLSTXkAg@vY

literal 0
HcmV?d00001

diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue
index 804c3f7f..f6838a8a 100644
--- a/src/views/homestead/index.vue
+++ b/src/views/homestead/index.vue
@@ -1,6 +1,46 @@
 <template>
-  <div class="app-container" @touchmove.prevent>
+  <div class="app-container">
     <div class="map_area"></div>
+    <!--列表 定位-->
+    <div class="rightIcon_wrap">
+      <div class="positioning_wrap">
+        <div class="icon"></div>
+      </div>
+      <div class="selectionIcon_wrap">
+        <div class="icon"></div>
+        <div class="text">列表</div>
+      </div>
+    </div>
+    <!--列表拉取详情-->
+    <div class="homesteadList_wrap">
+      <div class="title_m">
+        <div class="more_icon"></div>
+        <div class="name">宅基地列表</div>
+      </div>
+      <div class="main_m">
+        <!--1-->
+        <div class="flex_block">
+          <div class="name_text">孙全礼</div>
+          <div class="square_text">80㎡</div>
+          <div class="operation_mian">
+            <div class="describe yph">已盘活</div>
+          </div>
+        </div>
+        <!--1-->
+        <div class="flex_block">
+          <div class="name_text">杜永俭</div>
+          <div class="square_text">130㎡</div>
+          <div class="operation_mian">
+            <div class="describe dlzdph">待流转待盘活</div>
+          </div>
+        </div>
+      </div>
+      <div class="footerBtn_wrap">
+        <div class="options active">农房</div>
+        <div class="options">农地</div>
+      </div>
+    </div>
+
     <!--选择地址-->
     <div class="address_wrap">
       <div class="address_item">
@@ -39,6 +79,35 @@
 
     <!--搜索栏目-->
     <div class="searchBar_wrap">
+      <div class="actionBar_wrap">
+        <div class="m_list">
+          <div class="tensile active"><div class="icon"></div></div>
+        </div>
+        <div class="m_list">
+          <div class="positioning">
+            <div class="icon"></div>
+          </div>
+        </div>
+        <div class="m_list">
+          <div class="spacing">
+            <div class="icon"></div>
+          </div>
+        </div>
+        <div class="m_list">
+          <div class="scale">
+            <div class="icon"></div>
+          </div>
+        </div>
+
+        <div class="m_list">
+          <div class="closes gray">
+            <div class="icon"></div>
+          </div>
+        </div>
+        <div class="m_list">
+          <div class="correct"></div>
+        </div>
+      </div>
       <div class="searchBar_area">
         <div class="bar_icon"></div>
         <div class="bar_ipt">
@@ -181,122 +250,237 @@
     <div class="landHomesteadEdit_wrap">
       <div class="content_mian">
         <div class="info_title">录入宗地信息</div>
-        <!--1-->
-        <div class="flex_block">
-          <div class="number_s50 mr50">
-            <div class="title_m">农房编号</div>
-            <div class="input_m">
-              <van-field
-                v-model="message"
-                placeholder="请输入农房编号"
-                class="landHomesteadEdit_input"
-              />
+        <div class="flex_main">
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s50 mr50">
+              <div class="title_m">农房编号</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="农房编号"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
+            </div>
+            <div class="number_s50">
+              <div class="title_m">房屋所有人名称</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="房屋所有人名称"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
             </div>
           </div>
-          <div class="number_s50">
-            <div class="title_m">房屋所有人名称</div>
-            <div class="input_m">
-              <van-field
-                v-model="message"
-                placeholder="请输入房屋所有人名称"
-                class="landHomesteadEdit_input"
-              />
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s60 mr50">
+              <div class="title_m">地址</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="地址"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
+            </div>
+            <div class="number_s40">
+              <div class="title_m">农房权属</div>
+              <div class="input_m select">
+                <i class="dropDown_icon"></i>
+                <van-field
+                  v-model="message"
+                  readonly
+                  clickable
+                  name="picker"
+                  placeholder="农房权属"
+                  class="landHomesteadEdit_input"
+                  @click="showPicker = true"
+                />
+                <van-popup v-model="showPicker" position="bottom">
+                  <van-picker
+                    show-toolbar
+                    :columns="columns"
+                    @confirm="onConfirm"
+                    @cancel="showPicker = false"
+                  />
+                </van-popup>
+              </div>
             </div>
           </div>
-        </div>
-        <!--1-->
-        <div class="flex_block">
-          <div class="number_s60 mr50">
-            <div class="title_m">地址</div>
-            <div class="input_m">
-              <van-field
-                v-model="message"
-                placeholder="请输入地址"
-                class="landHomesteadEdit_input"
-              />
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s35 mr50">
+              <div class="title_m">是否有审批手续</div>
+              <div class="input_m select">
+                <i class="dropDown_icon"></i>
+                <van-field
+                  v-model="message"
+                  readonly
+                  clickable
+                  name="picker"
+                  placeholder="审批手续"
+                  class="landHomesteadEdit_input"
+                  @click="showPicker = true"
+                />
+                <van-popup v-model="showPicker" position="bottom">
+                  <van-picker
+                    show-toolbar
+                    :columns="columns"
+                    @confirm="onConfirm"
+                    @cancel="showPicker = false"
+                  />
+                </van-popup>
+              </div>
+            </div>
+            <div class="number_s35 mr50">
+              <div class="title_m">建筑面积</div>
+              <div class="input_m about">
+                <span class="about_symbol">≈</span>
+                <van-field
+                  v-model="message"
+                  placeholder="建筑面积"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
+            </div>
+            <div class="number_s30">
+              <div class="title_m">现状情况</div>
+              <div class="input_m select">
+                <i class="dropDown_icon"></i>
+                <van-field
+                  v-model="message"
+                  readonly
+                  clickable
+                  name="picker"
+                  placeholder="现状情况"
+                  class="landHomesteadEdit_input"
+                  @click="showPicker = true"
+                />
+                <van-popup v-model="showPicker" position="bottom">
+                  <van-picker
+                    show-toolbar
+                    :columns="columns"
+                    @confirm="onConfirm"
+                    @cancel="showPicker = false"
+                  />
+                </van-popup>
+              </div>
             </div>
           </div>
-          <div class="number_s40">
-            <div class="title_m">农房权属</div>
-            <div class="input_m select">
-              <i class="dropDown_icon"></i>
-              <van-field
-                v-model="message"
-                readonly
-                clickable
-                name="picker"
-                placeholder="选择农房权属"
-                class="landHomesteadEdit_input"
-                @click="showPicker = true"
-              />
-              <van-popup v-model="showPicker" position="bottom">
-                <van-picker
-                  show-toolbar
-                  :columns="columns"
-                  @confirm="onConfirm"
-                  @cancel="showPicker = false"
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s50 mr50">
+              <div class="title_m">房屋所有权证号</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="房屋所有权证号"
+                  class="landHomesteadEdit_input"
                 />
-              </van-popup>
+              </div>
+            </div>
+            <div class="number_s50">
+              <div class="title_m">土地证号</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="土地证号"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
             </div>
           </div>
-        </div>
-        <!--1-->
-        <div class="flex_block">
-          <div class="number_s35 mr50">
-            <div class="title_m">是否有审批手续</div>
-            <div class="input_m select">
-              <i class="dropDown_icon"></i>
-              <van-field
-                v-model="message"
-                readonly
-                clickable
-                name="picker"
-                placeholder="审批手续"
-                class="landHomesteadEdit_input"
-                @click="showPicker = true"
-              />
-              <van-popup v-model="showPicker" position="bottom">
-                <van-picker
-                  show-toolbar
-                  :columns="columns"
-                  @confirm="onConfirm"
-                  @cancel="showPicker = false"
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s35 mr50">
+              <div class="title_m">土地性质</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="土地性质"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
+            </div>
+            <div class="number_s35 mr50">
+              <div class="title_m">土地面积</div>
+              <div class="input_m about">
+                <span class="about_symbol">≈</span>
+                <van-field
+                  v-model="message"
+                  placeholder="土地面积"
+                  class="landHomesteadEdit_input"
                 />
-              </van-popup>
+              </div>
+            </div>
+            <div class="number_s30">
+              <div class="title_m">是否有流转意向</div>
+              <div class="input_m select">
+                <i class="dropDown_icon"></i>
+                <van-field
+                  v-model="message"
+                  readonly
+                  clickable
+                  name="picker"
+                  placeholder="是否有流转意向"
+                  class="landHomesteadEdit_input"
+                  @click="showPicker = true"
+                />
+                <van-popup v-model="showPicker" position="bottom">
+                  <van-picker
+                    show-toolbar
+                    :columns="columns"
+                    @confirm="onConfirm"
+                    @cancel="showPicker = false"
+                  />
+                </van-popup>
+              </div>
             </div>
           </div>
-          <div class="number_s35 mr50">
-            <div class="title_m">建筑面积</div>
-            <div class="input_m about">
-              <span class="about_symbol">≈</span>
-              <van-field
-                v-model="message"
-                placeholder="建筑面积"
-                class="landHomesteadEdit_input"
-              />
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s50 mr50">
+              <div class="title_m">租赁人</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="租赁人"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
+            </div>
+            <div class="number_s50">
+              <div class="title_m">租赁年限</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="租赁年限"
+                  class="landHomesteadEdit_input"
+                />
+              </div>
             </div>
           </div>
-          <div class="number_s30">
-            <div class="title_m">现状情况</div>
-            <div class="input_m select">
-              <i class="dropDown_icon"></i>
-              <van-field
-                v-model="message"
-                readonly
-                clickable
-                name="picker"
-                placeholder="现状情况"
-                class="landHomesteadEdit_input"
-                @click="showPicker = true"
-              />
-              <van-popup v-model="showPicker" position="bottom">
-                <van-picker
-                  show-toolbar
-                  :columns="columns"
-                  @confirm="onConfirm"
-                  @cancel="showPicker = false"
+          <!--1-->
+          <div class="flex_block">
+            <div class="number_s100">
+              <div class="title_m">租赁人</div>
+              <div class="input_m">
+                <van-field
+                  v-model="message"
+                  placeholder="租赁人"
+                  class="landHomesteadEdit_input"
                 />
-              </van-popup>
+              </div>
+            </div>
+          </div>
+          <!--2-->
+          <div class="uploadPicturesFlex_block">
+            <div class="title_m">上传图片</div>
+            <div class="main_m">
+              <van-uploader v-model="fileList" multiple :max-count="2" />
             </div>
           </div>
         </div>
@@ -306,6 +490,20 @@
         <div class="save">保存</div>
       </div>
     </div>
+    <!--农地农房选择-->
+    <div class="farmlandEditSwitch_wrap">
+      <div class="mains">
+        <div class="close_btn"></div>
+        <div class="farmhouse">
+          <div class="icons"></div>
+          <p class="names">农房</p>
+        </div>
+        <div class="farmland">
+          <div class="icons"></div>
+          <p class="names">农地</p>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -317,6 +515,7 @@ export default {
       message: "",
       showPicker: false,
       columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"],
+      fileList: [],
     };
   },
   mounted() {},
@@ -333,6 +532,138 @@ export default {
   width: 100vw;
   height: 100vh;
   position: relative;
+  .rightIcon_wrap {
+    position: absolute;
+    right: 16px;
+    bottom: 160px;
+    .selectionIcon_wrap {
+      width: 74px;
+      background: #fff;
+      border-radius: 10px;
+      padding: 14px 0;
+
+      .icon {
+        width: 38px;
+        height: 38px;
+        background: url("../../assets/images/homestead/selection_icon.png")
+          no-repeat;
+        background-size: 100% 100%;
+        margin: 0 auto 4px;
+      }
+      .text {
+        font-size: 24px;
+        text-align: center;
+      }
+    }
+    .positioning_wrap {
+      width: 74px;
+      background: #fff;
+      margin-bottom: 16px;
+      border-radius: 10px;
+      height: 74px;
+      display: flex;
+      justify-content: center; /* 相对父元素水平居中 */
+      align-items: center; /*  子元素相对父元素垂直居中*/
+      .icon {
+        width: 38px;
+        height: 38px;
+        background: url("../../assets/images/homestead/positioning_icon.png")
+          no-repeat;
+        background-size: 100% 100%;
+        margin: 0 auto;
+      }
+    }
+  }
+  .homesteadList_wrap {
+    display: none;
+    // display: flex;
+    position: absolute;
+    right: 0;
+    top: 20px;
+    bottom: 160px;
+    width: 536px;
+    background: #fff;
+    z-index: 999;
+    border-top-left-radius: 15px;
+    border-bottom-left-radius: 15px;
+
+    flex-direction: column;
+
+    .title_m {
+      color: #333;
+      line-height: 36px;
+      padding: 20px 40px 32px;
+      .name {
+        font-size: 40px;
+        line-height: 42px;
+        height: 42px;
+      }
+      .more_icon {
+        width: 38px;
+        height: 38px;
+        background: url("../../assets/images/homestead/selectionNext_icon.png")
+          no-repeat;
+        float: right;
+        margin-top: 2px;
+      }
+    }
+
+    .main_m {
+      overflow-y: auto;
+      padding: 0 40px;
+      // height: 300px;
+      flex: 1;
+      .flex_block {
+        height: 70px;
+        display: flex;
+        // justify-content: center; /* 相对父元素水平居中 */
+        align-items: center; /*  子元素相对父元素垂直居中 */
+        .name_text {
+          font-size: 34px;
+          flex: 1;
+        }
+        .square_text {
+          font-size: 34px;
+          flex: 0.8;
+        }
+        .operation_mian {
+          flex: 0 0 150px;
+          .describe {
+            font-size: 20px;
+            padding: 6px 12px;
+            float: right;
+            color: #fff;
+            &.yph {
+              background: #3cbf5b;
+              border-radius: 30px;
+            }
+          }
+        }
+      }
+    }
+    .footerBtn_wrap {
+      flex: 0 0 90px;
+      display: flex;
+      justify-content: center; /* 相对父元素水平居中 */
+      align-items: center; /*  子元素相对父元素垂直居中 */
+
+      .options {
+        flex: 1;
+        font-size: 38px;
+        display: flex;
+        justify-content: center; /* 相对父元素水平居中 */
+        align-items: center; /*  子元素相对父元素垂直居中 */
+        height: 90px;
+        &:first-child {
+          border-bottom-left-radius: 15px;
+        }
+        &.active {
+          background: #3cbf5b;
+          color: #fff;
+        }
+      }
+    }
+  }
   .map_area {
     width: 100vw;
     height: 100vh;
@@ -403,8 +734,8 @@ export default {
     }
   }
   .searchBar_wrap {
-    display: none;
-    // display: flex;
+    // display: none;
+    display: flex;
     position: fixed;
     bottom: 0;
     left: 0;
@@ -413,6 +744,117 @@ export default {
     background: #fff;
     border-top-left-radius: 15px;
     border-top-right-radius: 15px;
+    .actionBar_wrap {
+      display: flex;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+
+      background: #fff;
+      border-top-left-radius: 15px;
+      border-top-right-radius: 15px;
+      .m_list {
+        flex: 1;
+        display: flex;
+        justify-content: center; /* 相对父元素水平居中 */
+        align-items: center; /*  子元素相对父元素垂直居中 */
+
+        .tensile,
+        .positioning,
+        .spacing,
+        .scale {
+          width: 76px;
+          height: 72px;
+          background: #ffffff;
+          border-radius: 8px;
+          box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.16);
+          .icon {
+            width: 76px;
+            height: 72px;
+          }
+          &.active {
+            background: #333;
+            &.tensile {
+              .icon {
+                background: url("../../assets/images/homestead/operation/tensile_active.png")
+                  center center no-repeat;
+                background-size: 38px 50px;
+              }
+            }
+            &.positioning {
+              .icon {
+                background: url("../../assets/images/homestead/operation/positioning_active.png")
+                  center center no-repeat;
+                background-size: 38px 48px;
+              }
+            }
+            &.spacing {
+              .icon {
+                background: url("../../assets/images/homestead/operation/spacing_active.png")
+                  center center no-repeat;
+                background-size: 46px 46px;
+              }
+            }
+            &.scale {
+              .icon {
+                background: url("../../assets/images/homestead/operation/scale_active.png")
+                  center center no-repeat;
+                background-size: 48px 48px;
+              }
+            }
+          }
+        }
+        .tensile {
+          .icon {
+            background: url("../../assets/images/homestead/operation/tensile.png")
+              center center no-repeat;
+            background-size: 38px 50px;
+          }
+        }
+        .positioning {
+          .icon {
+            background: url("../../assets/images/homestead/operation/positioning.png")
+              center center no-repeat;
+            background-size: 38px 48px;
+          }
+        }
+        .spacing {
+          .icon {
+            background: url("../../assets/images/homestead/operation/spacing.png")
+              center center no-repeat;
+            background-size: 46px 46px;
+          }
+        }
+        .scale {
+          .icon {
+            background: url("../../assets/images/homestead/operation/scale.png")
+              center center no-repeat;
+            background-size: 48px 48px;
+          }
+        }
+        .closes {
+          background: url("../../assets/images/homestead/searchBar_close.png")
+            no-repeat;
+          background-size: 100% 100%;
+          width: 72px;
+          height: 72px;
+          &.gray {
+            background: url("../../assets/images/homestead/searchBar_close_gray.png")
+              no-repeat;
+            background-size: 100% 100%;
+          }
+        }
+        .correct {
+          background: url("../../assets/images/homestead/searchBar_save.png")
+            no-repeat;
+          background-size: 100% 100%;
+          width: 72px;
+          height: 72px;
+        }
+      }
+    }
     .searchBar_area {
       flex: 1;
       height: 80px;
@@ -690,7 +1132,8 @@ export default {
     }
   }
   .landHomesteadEdit_wrap {
-    display: flex;
+    display: none;
+    // display: flex;
     position: absolute;
     left: 0;
     bottom: 0;
@@ -700,7 +1143,7 @@ export default {
     .content_mian {
       flex: 1;
       margin: 0 16px;
-      padding: 28px 40px 28px 40px;
+      padding: 28px 25px 28px 40px;
       background: #fff;
       border-top-left-radius: 15px;
       border-top-right-radius: 15px;
@@ -714,6 +1157,11 @@ export default {
         align-items: center; /*  子元素相对父元素垂直居中 */
         color: #333;
       }
+      .flex_main {
+        height: 890px;
+        padding-right: 15px;
+        overflow-y: auto;
+      }
       .flex_block {
         height: 100px;
         margin-bottom: 20px;
@@ -723,6 +1171,12 @@ export default {
           float: left;
           flex-direction: column;
         }
+        .number_s100 {
+          width: 100%;
+          float: left;
+          display: flex;
+          flex-direction: column;
+        }
         .number_s60 {
           // flex: 0.6;
           width: 60%;
@@ -805,6 +1259,20 @@ export default {
           padding-right: 50px;
         }
       }
+      .uploadPicturesFlex_block {
+        .title_m {
+          font-size: 28px;
+          flex: 0 0 50px;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          word-break: break-all;
+          align-items: center; /*  子元素相对父元素垂直居中 */
+          margin-bottom: 20px;
+        }
+        .main_m {
+        }
+      }
     }
     .footer_main {
       flex: 0 0 120px;
@@ -830,6 +1298,89 @@ export default {
       }
     }
   }
+  .farmlandEditSwitch_wrap {
+    display: none;
+    width: 100vw;
+    height: 100vh;
+    background: url("../../assets/images/homestead/farmlandEditSwitch_bg.png")
+      no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 1001;
+    .mains {
+      width: 544px;
+      height: 480px;
+      background: #fff;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      margin: -272px 0 0 -240px;
+      z-index: 1002;
+      border-radius: 30px;
+      padding: 0 30px;
+      display: flex;
+      justify-content: center; /* 相对父元素水平居中 */
+      align-items: center; /*  子元素相对父元素垂直居中 */
+      .close_btn {
+        position: absolute;
+        width: 28px;
+        height: 28px;
+        background: url("../../assets/images/homestead/farmlandEditSwitch_close.png")
+          no-repeat;
+        background-size: 100% 100%;
+        right: 40px;
+        top: 40px;
+      }
+      .farmhouse {
+        flex: 1;
+        display: flex;
+        justify-content: center; /* 相对父元素水平居中 */
+        align-items: center; /*  子元素相对父元素垂直居中 */
+      }
+      .farmland {
+        flex: 1;
+        display: flex;
+        justify-content: center; /* 相对父元素水平居中 */
+        align-items: center; /*  子元素相对父元素垂直居中 */
+      }
+      .farmhouse,
+      .farmland {
+        flex-direction: column;
+        .icons {
+          width: 146px;
+          height: 146px;
+          margin-bottom: 14px;
+        }
+        .names {
+          font-size: 40px;
+          color: #3cbf5b;
+        }
+      }
+      .farmhouse {
+        .icons {
+          background: url("../../assets/images/homestead/nf.png") no-repeat;
+          background-size: 100% 100%;
+        }
+      }
+      .farmland {
+        .icons {
+          background: url("../../assets/images/homestead/nd.png") no-repeat;
+          background-size: 100% 100%;
+        }
+      }
+
+      // <div class="farmhouse">
+      //     <div class="icons"></div>
+      //     <p class="names">农房</p>
+      //   </div>
+      //   <div class="farmland">
+      //     <div class="icons"></div>
+      //     <p class="names">农地</p>
+      //   </div>
+    }
+  }
 }
 
 ::-webkit-scrollbar {
@@ -837,23 +1388,23 @@ export default {
 }
 
 ::-webkit-scrollbar:vertical {
-  width: 8px;
-  border-radius: 8px;
+  width: 10px;
+  border-radius: 10px;
 }
 
 ::-webkit-scrollbar:horizontal {
-  height: 8px;
-  border-radius: 8px;
+  height: 10px;
+  border-radius: 10px;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: #9f9f9f;
-  border-radius: 8px;
-  border: 1px solid #ffffff;
+  background-color: #eee;
+  border-radius: 10px;
+  border: 3px solid #ffffff;
 }
 
 ::-webkit-scrollbar-track {
-  border-radius: 8px;
+  border-radius: 10px;
   background-color: #ffffff;
 }
 </style>
\ No newline at end of file

From a15b4116fd213becf7d4f1d6aa12e59887e5d4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 20 Jul 2021 17:16:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |   2 +-
 package-lock.json                             |  25 ++-
 package.json                                  |   1 +
 src/api/login/index.js                        |   2 +
 src/api/project/index.js                      |   3 +-
 src/api/register/index.js                     |   8 +
 src/api/user/index.js                         |  42 ++++
 src/main.js                                   |   3 +
 src/permission.js                             |  25 ++-
 src/router/index.js                           |  18 +-
 src/utils/global.js                           |   8 +
 src/utils/utils.js                            |   9 +-
 src/views/biddingHall/index.vue               |   7 +
 src/views/index.vue                           |  25 ++-
 src/views/interaction/index.vue               |   5 +-
 src/views/login.vue                           |  63 ++++--
 src/views/news/index.vue                      |   3 +-
 src/views/project/index.vue                   |  23 +-
 src/views/project/projectDetail.vue           |  22 +-
 src/views/register/companyRegister.vue        | 106 +++++++--
 src/views/register/index.vue                  |  55 +++--
 src/views/register/registerType.vue           |   9 +-
 src/views/register/userRegister.vue           |  78 +++++--
 src/views/user/accountSetting/index.vue       |  22 +-
 .../userInformation/companyInformation.vue    | 207 ++++++++++++++++--
 .../userInformation/userInformation.vue       |  22 +-
 src/views/user/bidding/index.vue              |  97 +++++---
 src/views/user/index.vue                      |  26 ++-
 src/views/user/supply/index.vue               |  46 +++-
 src/views/user/supply/supplyAdd.vue           | 131 ++++++++---
 static/images/zwtpxw.jpg                      | Bin 0 -> 32475 bytes
 31 files changed, 875 insertions(+), 218 deletions(-)
 create mode 100644 src/utils/global.js
 create mode 100644 static/images/zwtpxw.jpg

diff --git a/config/index.js b/config/index.js
index 1c2e2ddf..ad0c4c22 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
       "/dev-api": {
         // 请求的目标主机
         //target: 'http://116.255.135.38:8081/nsgk_test/',
-        target: 'http://192.168.31.47:8080/',
+        target: 'http://192.168.31.107:8080/',
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': ''
diff --git a/package-lock.json b/package-lock.json
index a85bd26c..18df452b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3472,6 +3472,11 @@
         }
       }
     },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -4612,6 +4617,15 @@
         "is-glob": "^4.0.1"
       }
     },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
@@ -6301,6 +6315,14 @@
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "requires": {
+        "dom-walk": "^0.1.0"
+      }
+    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -9759,8 +9781,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
diff --git a/package.json b/package.json
index f1653999..dc260985 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "global": "^4.4.0",
     "js-cookie": "^2.2.1",
     "lib-flexible": "^0.3.2",
     "node-sass": "^5.0.0",
diff --git a/src/api/login/index.js b/src/api/login/index.js
index 52ddc45c..7f83f7ff 100644
--- a/src/api/login/index.js
+++ b/src/api/login/index.js
@@ -52,6 +52,7 @@ export function getCodeImg() {
     method: 'get'
   })
 }
+
 // 发送短信验证码
 export function getSmsCode(mobile) {
 
@@ -65,3 +66,4 @@ export function getSmsCode(mobile) {
     data:data
   })
 }
+
diff --git a/src/api/project/index.js b/src/api/project/index.js
index 34e31def..7e1a8168 100644
--- a/src/api/project/index.js
+++ b/src/api/project/index.js
@@ -11,8 +11,9 @@ export function getDeptList(id) {
 //挂牌项目列表
 export function getOutProjectList(data){
   return request({
-    url:'/transaction/website/outproject/list?deptId=&projectNumber=&',
+    url:'/transaction/website/outproject/list',
     method:'get',
+    params:data
   })
 }
 //挂牌项目详情
diff --git a/src/api/register/index.js b/src/api/register/index.js
index 96ff34aa..537d9803 100644
--- a/src/api/register/index.js
+++ b/src/api/register/index.js
@@ -29,4 +29,12 @@ export function registerOn(memberName, idcard, mobile, smsCode,uuid) {
     data: data
   })
 }
+//注册
+export function userRegister(data) {
+  return request({
+    url: '/transaction/website/addMember',
+    method: 'post',
+    data: data
+  })
+}
 
diff --git a/src/api/user/index.js b/src/api/user/index.js
index d045da0d..cace22f4 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -102,3 +102,45 @@ export function userDemand(query){
     data: query
   })
 }
+
+//发布供求
+export function updateDemand(query){
+  return request({
+    url: '/transaction/demand',
+    method: 'put',
+    data: query
+  })
+}
+
+//供求查询
+export function selectDemand(id){
+  return request({
+    url: '/transaction/demand/'+id,
+    method: 'get',
+  })
+}
+
+//删除供求
+export function deleteSupply(id){
+  return request({
+    url: '/transaction/demand/'+id,
+    method: 'delete'
+  })
+}
+
+// 展示图片
+export function showImg(id){
+  return request({
+    url: '/transaction/website/supplyDemand/showImg/id/'+id,
+    method: 'get',
+  })
+}
+
+//我的竞价
+export function biddinglist(query){
+  return request({
+    url: '/transaction/outproject/biddinglist/member',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/main.js b/src/main.js
index fae73b24..f1fd1c4e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,8 @@ import './config/flexible'
 import store from './store/'
 import './permission' // permission control
 
+import global from '@/utils/global';
+
 import { getDicts } from "@/utils/data";
 import { selectDictLabel , onClickLeft , getNowFormatDate } from "@/utils/utils";
 
@@ -19,6 +21,7 @@ Vue.prototype.getDicts = getDicts
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.onClickLeft = onClickLeft
 Vue.prototype.getNowFormatDate = getNowFormatDate
+Vue.prototype.global = global
 
 // Vant 引用
 import Vant from 'vant';
diff --git a/src/permission.js b/src/permission.js
index 249018f4..e24a2902 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -6,8 +6,29 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/index','/login', '/auth-redirect', '/bind', '/register','/news/index','/notice/index','/supply/index'
-,'/interaction/index','/register/index','/register/registerType','/register/userRegister','/register/companyRegister']
+const whiteList = [
+  '/index',
+  '/login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/news/index',
+  '/news/newDetail',
+  '/notice/index',
+  '/supply/index',
+  '/interaction/index',
+  '/register/index',
+  '/register/registerType',
+  '/register/userRegister',
+  '/register/companyRegister',
+  '/biddingHall',
+  '/project',
+  '/policy',
+  '/policyDetail',
+  '/attestationDetail',
+  '/noticeDetail',
+
+]
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
diff --git a/src/router/index.js b/src/router/index.js
index 9af4f2b2..a0e9a5b5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -81,7 +81,8 @@ export const constantRoutes = [
     path: '/biddingHall',
     name: 'biddingHall',
     meta: {
-      title: '竞价大厅'
+      title: '竞价大厅',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/biddingHall'], resolve)
   },
@@ -106,7 +107,8 @@ export const constantRoutes = [
     path: '/news/index',
     name: 'news',
     meta: {
-      title: '新闻资讯'
+      title: '新闻资讯',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/news/index'], resolve)
   },
@@ -114,7 +116,8 @@ export const constantRoutes = [
     path: '/news/newDetail',
     name: 'newDetail',
     meta: {
-      title: '新闻详情'
+      title: '新闻详情',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/news/newDetail'], resolve)
   },
@@ -122,7 +125,8 @@ export const constantRoutes = [
     path: '/notice/index',
     name: 'notice',
     meta: {
-      title: '项目公告'
+      title: '项目公告',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/notice/index'], resolve)
   },
@@ -130,7 +134,8 @@ export const constantRoutes = [
     path: '/supply/index',
     name: 'supply',
     meta: {
-      title: '个人供求'
+      title: '个人供求',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/supply/index'], resolve)
   },
@@ -138,7 +143,8 @@ export const constantRoutes = [
     path: '/interaction/index',
     name: 'interaction',
     meta: {
-      title: '互动交流'
+      title: '互动交流',
+      hidden: true,
     },
     component: (resolve) => require(['@/views/interaction/index'], resolve)
   },
diff --git a/src/utils/global.js b/src/utils/global.js
new file mode 100644
index 00000000..ea73f392
--- /dev/null
+++ b/src/utils/global.js
@@ -0,0 +1,8 @@
+const deptId = 100 ;
+const severApi = 'http://192.168.31.107:8080';
+
+export default
+{
+  deptId,//区县ID
+  severApi,//全局API
+}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 917995c8..9c2c3965 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -15,8 +15,13 @@ export function onClickLeft(){
   history.back(-1);
 }
 
-export function getNowFormatDate() {
-  var date = new Date();
+export function getNowFormatDate(time) {
+  var date;
+  if (!time){
+    date = new Date();
+  }else{
+    date = time;
+  }
   var seperator1 = "-";
   var seperator2 = ":";
   var month = date.getMonth() + 1;
diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 87d6e7b8..7cde830e 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -1,5 +1,12 @@
 <template>
   <div>
+    <van-nav-bar
+      title="竞价大厅"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
     <van-search
       v-model="value"
       shape="round"
diff --git a/src/views/index.vue b/src/views/index.vue
index a89dc308..eeb4953c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -8,7 +8,7 @@
     </van-row>
     <van-swipe class="my-swipe" :autoplay="3000" height="180" indicator-color="white">
       <van-swipe-item v-for="(item,index) in bannerList" :key="index">
-        <van-image :src="item.img" height="180" />
+        <van-image :src="item.img" height="180" @click="goDetail(item.id)" />
         <p class="bannerTit">{{item.title}}</p>
       </van-swipe-item>
     </van-swipe>
@@ -18,7 +18,7 @@
           <van-image src="../../static/images/icon/icon_new.png" width="40" height="40" />
           <p>新闻资讯</p>
         </van-grid-item>
-        <van-grid-item>
+        <van-grid-item to="/biddingHall">
           <van-image src="../../static/images/icon/icon_bidding.png" width="40" height="40" />
           <p>竞价大厅</p>
         </van-grid-item>
@@ -49,17 +49,20 @@
         @load="getList()"
       >
 <!--        @load="newList"-->
-        <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime">
+        <van-cell v-for="item in newList" :key="item.id" :label="item.newsTime" :to="{name:'newDetail', query: {id:item.id}}">
           <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+          <template #title>
+            <p class="newContent">{{item.title}}</p>
+          </template>
           <template #right-icon>
-            <van-image :src="item.img" class="search-icon" width="30%" />
+            <van-image :src="item.img" class="search-icon" width="30%" v-if="item.img" />
+            <van-image src="../../static/images/zwtpxw.jpg" class="search-icon" width="30%" v-else/>
           </template>
         </van-cell>
       </van-list>
     </div>
   </div>
 </template>
-
 <script>
 import { newList } from "@/api/index";
 export default {
@@ -100,6 +103,7 @@ export default {
             this.newList[i].img = imgStrs[0].substr(10,(imgStrs[0].length-12));
           }
         }
+        console.log(this.newList)
         if(this.newList.length >= response.total){
           this.finished = true;
           return;
@@ -122,6 +126,10 @@ export default {
         }
         this.loading = false;
       });
+    },
+    goDetail(id){
+      console.log(id)
+      window.location = 'news/newDetail?id='+id;
     }
   },
 };
@@ -166,6 +174,13 @@ export default {
   text-align: left;
   color: #333333;
 }
+.newContent{
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  word-break: break-all;
+  overflow: hidden;
+}
 .search-icon {
   line-height: inherit;
   margin-left: 10px;
diff --git a/src/views/interaction/index.vue b/src/views/interaction/index.vue
index 9b5c7636..8ddce9d2 100644
--- a/src/views/interaction/index.vue
+++ b/src/views/interaction/index.vue
@@ -5,6 +5,7 @@
       left-arrow
       fixed
       placeholder
+      @click-left="onClickLeft"
     />
     <van-list
       v-model="loading"
@@ -54,7 +55,9 @@ export default {
       this.loading = true;
       interactionList(this.queryParams).then(response => {
         console.log(response)
-        this.interactionList = response.rows;
+        for (var i = 0; i < response.rows.length; i++) {
+          this.interactionList.push(response.rows[i]);
+        }
         if(this.interactionList.length >= response.total){
           this.finished = true;
           return;
diff --git a/src/views/login.vue b/src/views/login.vue
index b559c98c..d422e46d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,10 +1,17 @@
 <template>
-  <div class="app-container">
-    <div class="focus-logo">
-      <img src="@/assets/images/login-logo.png" />
-      <p class="describe">登录页</p>
+  <div class="app-container" :style="{height:height+'px'}">
+    <van-nav-bar
+      title="登录"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
+    <div class="title">
+      <p class="title_one">PROPERTY RIGHT</p>
+      <p class="title_two">TRANSACTION</p>
+      <p class="title_three">农村产权交易平台</p>
     </div>
-
     <div class="login-main">
       <ul class="head_nav clear">
         <li @click="isSmsLogin = false" :class="{ active: !isSmsLogin }">
@@ -37,7 +44,7 @@
               clearable
               label="验证码"
               placeholder="图形验证码"
-            
+
             >
               <template #button>
                 <img class="code-img" :src="codeUrl" @click="getCode" />
@@ -85,15 +92,15 @@
 
     <div class="reveal-modal-con">
       <div class="dd_txt">
-        <router-link to="/register">注册账户</router-link>
-      </div>
-      <div class="other-login">
-        <p class="desc">—— 更多登录方式 ——</p>
-        <p class="icon-other-logins">
-          <router-link class="wx" to="/"></router-link>
-          <router-link class="rlsb" to="/"></router-link>
-        </p>
+        <router-link to="register/index">注册账户</router-link>
       </div>
+<!--      <div class="other-login">-->
+<!--        <p class="desc">—— 更多登录方式 ——</p>-->
+<!--        <p class="icon-other-logins">-->
+<!--          <router-link class="wx" to="/"></router-link>-->
+<!--          <router-link class="rlsb" to="/"></router-link>-->
+<!--        </p>-->
+<!--      </div>-->
     </div>
   </div>
 </template>
@@ -121,10 +128,12 @@ export default {
       codeUrl: "", //验证码
       isSmsLogin: false, //是否手机验证码
       computeTime: 0,
+      height:0
     };
   },
   created() {
     this.getCode();
+    this.height = document.body.clientHeight
     //调用微信公众号方法
     // wx.config({
     //     debug: true, // 开启调试模式,
@@ -228,7 +237,28 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped lang="scss">
+.title{
+  padding-top: 20%;
+  width: 88%;
+  margin: 0 auto;
+}
+.title_one{
+  color: #666666;
+  font-size: 0.4rem;
+}
+.title_two{
+  color: #007e72;
+  font-size: 0.6rem;
+}
+.title_three{
+  color: #FFF;
+  font-size: 0.8rem;
+}
 .app-container {
+  background: url("../../static/images/index/registerBg.png") no-repeat;
+  background-size: 100% 100%;
+  width: 100%;
+  height: 100%;
   .focus-logo {
     width: 310px;
     margin: 0 auto 40px;
@@ -252,6 +282,7 @@ export default {
     overflow: hidden;
     border: 1px solid #ddd;
     padding-bottom:40px;
+    margin-top: 0.4rem;
   }
   .head_nav {
     li {
@@ -288,7 +319,7 @@ export default {
       text-align: center;
       font-size: 28px;
       a {
-        color: #666;
+        color: #FFF;
       }
     }
     .other-login {
@@ -327,4 +358,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index 1961f38c..d7121111 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -17,7 +17,8 @@
       <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetail', query: {id:item.id}}">
         <!-- 使用 right-icon 插槽来自定义右侧图标 -->
         <template #right-icon>
-          <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" />
+          <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" v-if="item.img" />
+          <van-image src="../../static/images/zwtpxw.jpg" class="search-icon" width="30%" v-else/>
         </template>
       </van-cell>
     </van-list>
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 8725d1f0..1720c8ca 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <van-search v-model="value" placeholder="请输入搜索关键词" @search="onSearch"/>
+
     <van-dropdown-menu>
       <van-dropdown-item v-model="value1" :options="projectTypeOption" @change="getList"/>
       <van-dropdown-item :value="value2" :title="value2" ref="item">
@@ -15,9 +16,10 @@
       </van-dropdown-item>
       <van-dropdown-item v-model="value3" :options="option3" @change="getList"/>
     </van-dropdown-menu>
+
     <van-list v-model="loading" :finished="finished" finished-text="没有更多了">
       <router-link :to="{path:'project/projectDetail',query:{id:item.id}}" v-for="(item,index) in infoList" :key="index">
-        <van-card :thumb="item.fileUrl?''+item.fileUrl:'../../static/images/index/projectImg.png'" >
+        <van-card :thumb="item.fileUrl?global.severApi+item.fileUrl:'../../static/images/zwtpxw.jpg'" >
           <template #tags>
             <p class="title">【{{item.rollout}}】{{item.projectName}}</p>
             <p class="type">{{ item.projectShowStatus }}</p>
@@ -35,7 +37,7 @@
 </template>
 
 <script>
-import {getOutProjectList,getDeptList} from "../../api/project";
+import {getOutProjectList,getDeptList} from "@/api/project/index";
 
 export default {
   name: "project",
@@ -43,7 +45,7 @@ export default {
     return {
       value1: '',
       value2: '标的物位置',
-      activeId: 1,
+      activeId: this.global.deptId,
       activeIndex: 0,
       value3: '',
       value:"",
@@ -57,9 +59,11 @@ export default {
       ],
       option3: [
         { text: '竞价状态', value: '' },
-        { text: '全部', value: '全部' },
-        { text: '竞价中', value: '竞价中' },
-        { text: '竞价结束', value: '竞价结束' },
+        { text: '正在报名', value: '正在报名' },
+        { text: '等待竞价', value: '等待竞价' },
+        { text: '正在竞价', value: '正在竞价' },
+        { text: '等待成交', value: '等待成交' },
+        { text: '已经成交', value: '已经成交' },
       ],
       //标的物类型
       projectTypeOption:[{text:'标的物类型',value:''}],
@@ -72,6 +76,7 @@ export default {
   },
   created() {
     this.getDicts("project_type").then(response => {
+      console.log(response)
       response.data.map(item => {
         this.projectTypeOption.push({ value:item.dictCode, text: item.dictLabel});
       });
@@ -113,11 +118,13 @@ export default {
     },
     getList(){
       let queryDatas = {
-        deptId: this.value1,
-        projectNumber:this.activeId,
+        deptId: this.activeId,
+        projectNumber:this.value1,
         projectShowStatus:this.value3
       }
+      console.log(queryDatas)
       getOutProjectList(queryDatas).then(response =>{
+        console.log(response)
         this.infoList = response.rows
         if(this.infoList.length>0){
           let newList = []
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 179abbc4..220259c9 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -11,10 +11,10 @@
       <van-tab title="竞拍信息" title-style="font-size:12px;">
         <van-swipe class="my-swipe" height="235" indicator-color="white" @change="onChange">
           <template v-if="detail.fileUrlList !== undefined &&detail.fileUrlList.length>0">
-            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?''+item.fileUrl:'../../static/images/index/banner.png'" height="235" /></van-swipe-item>
+            <van-swipe-item v-for="(item,index) in detail.fileUrlList" :key="index"><van-image :src="item.fileUrl?global.severApi+item.fileUrl:'../../static/images/zwtp.jpg'" height="235" /></van-swipe-item>
           </template>
           <template v-else>
-            <van-swipe-item><van-image src="../../static/images/index/banner.png" height="235" /></van-swipe-item>
+            <van-swipe-item><van-image src="../../static/images/zwtp.jpg" height="235" /></van-swipe-item>
           </template>
           <template #indicator>
             <div class="custom-indicator">{{ current + 1 }}/{{ detail.fileUrlList !== undefined &&detail.fileUrlList.length>0 ? detail.fileUrlList.length:1 }}</div>
@@ -28,26 +28,26 @@
             <van-col span="24" class="title">【{{ detail.rollout }}】{{ detail.projectName }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="4">{{ process }}</van-col>
-            <van-col span="20"><van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒" /></van-col>
+            <van-col span="5">{{ process }}</van-col>
+            <van-col span="19"><van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒" /></van-col>
           </van-row>
           <van-row>
-            <van-col span="4">挂牌价</van-col>
-            <van-col span="20" class="price"><span>{{detail.price}}</span> 元/亩/年</van-col>
+            <van-col span="5">挂牌价</van-col>
+            <van-col span="19" class="price"><span>{{detail.price}}</span> 元/亩/年</van-col>
           </van-row>
           <van-row>
-            <van-col span="4">保证金</van-col>
-            <van-col span="20" class="money"><span>{{ detail.deposit }}</span> 元</van-col>
+            <van-col span="5">保证金</van-col>
+            <van-col span="19" class="money"><span>{{ detail.deposit }}</span> 元</van-col>
           </van-row>
         </div>
         <div class="lead">
           <van-row >
-            <van-col span="3"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
+            <van-col span="2"><van-image src="../../static/images/icon/phone.png" style="vertical-align: text-top;" /></van-col>
             <template v-if="biddinglistInformation!=undefined&&biddinglistInformation.length>0">
-              <van-col span="4">{{biddinglistInformation[0].userName}}</van-col>
+              <van-col span="5">{{biddinglistInformation[0].userName}}</van-col>
               <van-col span="4">{{biddinglistInformation[0].money}}元</van-col>
               <van-col span="4">领先</van-col>
-              <van-col span="8">{{biddinglistInformation[0].createTime}}</van-col>
+              <van-col span="9">{{biddinglistInformation[0].createTime}}</van-col>
             </template>
           </van-row>
         </div>
diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue
index 4158b11b..51e79819 100644
--- a/src/views/register/companyRegister.vue
+++ b/src/views/register/companyRegister.vue
@@ -1,34 +1,54 @@
 <template>
   <div class="app-container" :style="{height:height+'px'}">
     <van-nav-bar
-      title="个人注册"
+      title="单位用户注册"
       left-arrow
       fixed
       placeholder
+      @click-left="onClickLeft"
     />
-    <van-form>
-      <van-field v-model="tel" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+    <van-form @submit="getSubmit">
       <van-field
-        center
-        clearable
-        label="短信验证码"
-        placeholder="请输入短信验证码"
+        readonly
+        clickable
+        name="picker"
+        :value="value"
+        label="供求类型"
+        placeholder="点击选择供求类型"
+        @click="showPicker = true"
         required
         :rules="[{ required:true }]"
+      />
+      <van-popup v-model="showPicker" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @confirm="onConfirm"
+          @cancel="showPicker = false"
+        />
+      </van-popup>
+      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+      <van-field
+        v-model="form.code"
+        center
+        clearable
+        label="验证码"
+        placeholder="图形验证码"
+        required :rules="[{ required:true }]"
       >
         <template #button>
-          <van-button size="small" type="primary" native-type="button" :rules="[{ required:true }]">发送验证码</van-button>
+          <img class="code-img" :src="codeUrl" @click="getCode" />
         </template>
       </van-field>
-      <van-field type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
-      <van-field type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.password" type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
+      <van-field v-model="confirmPassWord" type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
 
-      <van-field label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
-      <van-field label="负责人姓名" placeholder="请输入负责人姓名" required :rules="[{ required:true }]"/>
-      <van-field label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
-      <van-field label="社会信用代码" placeholder="请输入公司的社会信用代码" required :rules="[{ required:true }]"/>
-      <van-field label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
-      <van-field label="联系地址" placeholder="请输入联系地址" />
+      <van-field v-model="form.companyName" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.realname" label="负责人姓名" placeholder="请输入负责人姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.idCardNum" label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.companyCode" label="社会信用代码" placeholder="请输入公司的社会信用代码" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.companyLicense" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" />
       <div class="submit">
         <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>
         <van-button round block type="info" color="#007E72" native-type="submit">立即注册</van-button>
@@ -38,24 +58,72 @@
 </template>
 
 <script>
+import { getCodeImg } from "@/api/login";
+import { userRegister } from "@/api/register/index";
 export default {
-  name: "notice",
+  name: "companyRegister",
   data() {
     return {
       height:0,
-      tel:''
+      tel:'',
+      value:'',
+      confirmPassWord:'',
+      showPicker: false,
+      columns:[],
+      form: {
+        phone: "", //账号
+        code: "", //验证码
+        password: "", //密码
+        realname: "", //姓名
+        idCardNum: "", //身份证号
+        address: "", //地址
+        uuid:'',//图形验证码ID
+        memberType:2,
+        economicType:1,
+        companyName:'',
+        companyLicense:'',
+        companyCode:''
+      },
+      codeUrl:''
     };
   },
   created() {
+    this.getCode();
+    this.getDicts("economic_type").then(res => {
+      res.data.map(item => {
+        this.columns.push(item.dictLabel);
+      });
+    });
     this.height = document.body.clientHeight
   },
-  methods: {},
+  methods: {
+    getCode() {
+      getCodeImg().then((res) => {
+        this.form.uuid = res.uuid;
+        this.codeUrl = "data:image/gif;base64," + res.img;
+      });
+    },
+    onConfirm(value, index) {
+      this.value = value;
+      this.showPicker = false;
+      this.form.supplyDemandType = index + 1 ;
+    },
+    getSubmit(){
+      console.log(this.form)
+      userRegister(this.form).then((res) => {
+        console.log(res)
+      });
+    }
+  },
 };
 </script>
 
 <style scoped lang="scss">
 .app-container {
   background-color: #FFF;
+  .code-img {
+    width: 220px;
+  }
 }
 .submit{
   position: absolute;
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index d74089a3..639b7520 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -1,5 +1,12 @@
 <template>
   <div class="app-container" :style="{height:height+'px'}">
+    <van-nav-bar
+      title="注册"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
     <div class="title">
       <p class="title_one">PROPERTY RIGHT</p>
       <p class="title_two">TRANSACTION</p>
@@ -106,25 +113,48 @@
         <p>农村产权交易网</p>
       </div>
     </div>
+    <van-form @submit="onSubmit">
     <div class="agree_box">
-      <label class="agree"><input type="checkbox">我已仔细阅读该须知，并同意该须知相关规定。</label>
-      <van-button round color="#007e72" block to="registerType">注册</van-button>
+      <van-field name="checkbox">
+        <template #input>
+          <van-checkbox v-model="checkbox" checked-color="#007e72" shape="square"/><p style="color: #FFF;margin-left: 5px;">我已仔细阅读该须知，并同意该须知相关规定。</p>
+        </template>
+      </van-field>
     </div>
+    <van-button native-type="submit" type="info" round color="#007e72" block style="width: 90%;margin:0 auto;">注册</van-button>
+    </van-form>
   </div>
 </template>
 
 <script>
+import {Dialog} from "vant";
+
 export default {
   name: "notice",
   data() {
     return {
-      height:0
+      height:0,
+      checkbox:false
     };
   },
   created() {
     this.height = document.body.clientHeight
   },
-  methods: {},
+  methods: {
+    onSubmit(){
+      console.log(this.checkbox);
+      if(this.checkbox == true){
+        window.location='registerType';
+      }else{
+        Dialog.confirm({
+          title: '系统提示',
+          message: '请选择同意协议',
+          confirmButtonText: '确定',
+          showCancelButton:false
+        })
+      }
+    }
+  },
 };
 </script>
 
@@ -136,7 +166,7 @@ export default {
   height: 100%;
 }
 .title{
-  padding-top: 30%;
+  padding-top: 20%;
   width: 88%;
   margin: 0 auto;
 }
@@ -176,15 +206,12 @@ export default {
   width: 90%;
   margin: 0 auto;
   margin-top: 0.4rem;
+  margin-bottom: 15px;
 }
-.agree{
-  color: #FFF;
-  margin-bottom:0.4rem;
-  display: block;
+
+.van-cell{
+  padding: 0;
+  background-color: transparent;
+  margin: 0 auto;
 }
-  .agree_box input[type='checkbox']{
-    margin-right: 5px;
-    position: relative;
-    top: 5px;
-  }
 </style>
diff --git a/src/views/register/registerType.vue b/src/views/register/registerType.vue
index 7618550d..8d18b44c 100644
--- a/src/views/register/registerType.vue
+++ b/src/views/register/registerType.vue
@@ -1,5 +1,12 @@
 <template>
   <div class="app-container" :style="{height:height+'px'}">
+    <van-nav-bar
+      title="注册"
+      left-arrow
+      fixed
+      placeholder
+      @click-left="onClickLeft"
+    />
     <div class="title">
       <p class="title_one">PROPERTY RIGHT</p>
       <p class="title_two">TRANSACTION</p>
@@ -56,7 +63,7 @@ export default {
   overflow: hidden;
 }
 .title{
-  padding-top: 30%;
+  padding-top: 20%;
   width: 88%;
   margin: 0 auto;
 }
diff --git a/src/views/register/userRegister.vue b/src/views/register/userRegister.vue
index f3e3a181..07f95de3 100644
--- a/src/views/register/userRegister.vue
+++ b/src/views/register/userRegister.vue
@@ -1,30 +1,44 @@
 <template>
   <div class="app-container" :style="{height:height+'px'}">
     <van-nav-bar
-      title="个人注册"
+      title="个人用户注册"
       left-arrow
       fixed
       placeholder
+      @click-left="onClickLeft"
     />
-    <van-form>
-      <van-field v-model="tel" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+    <van-form @submit="getSubmit">
+      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+<!--      <van-field-->
+<!--        center-->
+<!--        clearable-->
+<!--        label="短信验证码"-->
+<!--        placeholder="请输入短信验证码"-->
+<!--        required-->
+<!--        v-model="form.sms"-->
+<!--        :rules="[{ required:true }]"-->
+<!--      >-->
+<!--        <template #button>-->
+<!--          <van-button size="small" type="primary" native-type="button" :rules="[{ required:true }]">发送验证码</van-button>-->
+<!--        </template>-->
+<!--      </van-field>-->
       <van-field
+        v-model="form.code"
         center
         clearable
-        label="短信验证码"
-        placeholder="请输入短信验证码"
-        required
-        :rules="[{ required:true }]"
+        label="验证码"
+        placeholder="图形验证码"
+        required :rules="[{ required:true }]"
       >
         <template #button>
-          <van-button size="small" type="primary" native-type="button" :rules="[{ required:true }]">发送验证码</van-button>
+          <img class="code-img" :src="codeUrl" @click="getCode" />
         </template>
       </van-field>
-      <van-field type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
-      <van-field type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
-      <van-field label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
-      <van-field label="身份证号" placeholder="请输入身份证号" required :rules="[{ required:true }]"/>
-      <van-field label="联系地址" placeholder="请输入联系地址" />
+      <van-field v-model="form.password" type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
+      <van-field v-model="confirmPassWord" type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.idCardNum" label="身份证号" placeholder="请输入身份证号" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" />
       <div class="submit">
         <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>
         <van-button round block type="info" color="#007E72" native-type="submit">立即注册</van-button>
@@ -34,24 +48,56 @@
 </template>
 
 <script>
+import { getCodeImg } from "@/api/login";
+import { userRegister } from "@/api/register/index";
 export default {
-  name: "notice",
+  name: "userRegister",
   data() {
     return {
       height:0,
-      tel:''
+      tel:'',
+      confirmPassWord:'',
+      form: {
+        phone: "", //账号
+        code: "", //验证码
+        password: "", //密码
+        realname: "", //姓名
+        idCardNum: "", //身份证号
+        address: "", //地址
+        uuid:'',//图形验证码ID
+        memberType:1,
+        economicType:1
+      },
+      codeUrl:''
     };
   },
   created() {
+    this.getCode()
     this.height = document.body.clientHeight
   },
-  methods: {},
+  methods: {
+    getCode() {
+      getCodeImg().then((res) => {
+        this.form.uuid = res.uuid;
+        this.codeUrl = "data:image/gif;base64," + res.img;
+      });
+    },
+    getSubmit(){
+      console.log(this.form)
+      userRegister(this.form).then((res) => {
+        console.log(res)
+      });
+    }
+  },
 };
 </script>
 
 <style scoped lang="scss">
 .app-container {
   background-color: #FFF;
+  .code-img {
+    width: 220px;
+  }
 }
 .submit{
   position: absolute;
diff --git a/src/views/user/accountSetting/index.vue b/src/views/user/accountSetting/index.vue
index cda7fe65..0d4b17e5 100644
--- a/src/views/user/accountSetting/index.vue
+++ b/src/views/user/accountSetting/index.vue
@@ -7,21 +7,37 @@
       placeholder
       @click-left="onClickLeft"
     />
-    <van-cell title="用户资料修改" to="userInformation" is-link icon="points" />
+    <van-cell title="用户资料修改" @click="goInformation" to="userInformation" is-link icon="points" />
     <van-cell title="银行账户信息修改" to="bankInformation" is-link icon="credit-pay" />
   </div>
 </template>
 
 <script>
+import { getInfo } from "@/api/login/index";
+import { getMember , showUserImg } from "@/api/user/index";
 export default {
-  name: "notice",
+  name: "Setting",
   data() {
     return {
     };
   },
   created() {
+    getInfo().then(response => {
+      getMember(response.user.userId).then(response => {
+        this.memberType = response.data.memberType;
+        console.log(this.memberType)
+      });
+    });
+  },
+  methods: {
+    goInformation(){
+      if(this.memberType == 1){
+        window.location = 'userInformation';
+      }else{
+        window.location = 'companyInformation';
+      }
+    }
   },
-  methods: {},
 };
 </script>
 
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index 93aaf4e1..b80ec2d5 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -5,57 +5,226 @@
       left-arrow
       fixed
       placeholder
+      @click-left="onClickLeft"
     />
-    <van-form>
-      <van-field value="15314031621" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" >
+    <van-form @submit="submitForm">
+      <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" >
         <template #extra >
           <p style="color: #007e72">修改手机号</p>
         </template>
       </van-field>
-      <van-field value="15314031621" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
-      <van-field value="北京农燊高科" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
-      <van-field value="庞东旭" label="负责人姓名" placeholder="请输入负责人姓名" required :rules="[{ required:true }]"/>
-      <van-field value="230381199705255156" label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
-      <van-field value="1122334" label="社会信用代码" placeholder="请输入公司的社会信用代码" required :rules="[{ required:true }]"/>
-      <van-field value="私企" label="企业性质" placeholder="请输入企业性质" />
-      <van-field value="软件程序开发" label="经营范围" placeholder="请输入经营范围" />
-      <van-field value="2010.9-2020.5" label="经营期限" placeholder="请输入经营期限" />
-      <van-field value="2010年9月10日" label="成立时间" placeholder="请输入成立时间" />
-      <van-field value="2100万" label="注册资金" placeholder="请输入注册资金" />
-      <van-field value="124578963" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
-      <van-field value="山东威海" label="联系地址" placeholder="请输入联系地址" />
+<!--      <van-field value="15314031621" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>-->
+      <van-field v-model="userForm.companyName" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.realname" label="负责人姓名" placeholder="请输入负责人姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.idCardNum" label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.companyCode" label="社会信用代码" placeholder="请输入公司的社会信用代码" required :rules="[{ required:true }]"/>
+
+      <van-field
+        readonly
+        clickable
+        label="企业性质"
+        :value="companyNameValue"
+        placeholder="选择企业性质"
+        @click="showPickerPiker = true"
+        required :rules="[{ required:true }]"
+      />
+      <van-popup v-model="showPickerPiker" round position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="companyNameList"
+          @cancel="showPickerPiker = false"
+          @confirm="onConfirmCompany"
+        />
+      </van-popup>
+<!--      <van-field v-model="userForm.companyNature" label="企业性质" placeholder="请输入企业性质" required :rules="[{ required:true }]" />-->
+
+
+      <van-field v-model="userForm.companyScope" label="经营范围" placeholder="请输入经营范围" required :rules="[{ required:true }]" />
+      <van-field v-model="userForm.companyTimeLimit" label="经营期限" placeholder="请输入经营期限" required :rules="[{ required:true }]" />
+      <van-field
+        readonly
+        clickable
+        label="成立时间"
+        :value="userForm.companySetupTime"
+        placeholder="选择成立时间"
+        @click="showPicker = true"
+        required :rules="[{ required:true }]"
+      />
+      <van-popup v-model="showPicker" round position="bottom">
+        <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          title="选择年月日"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @cancel="showPicker = false"
+          @confirm="onConfirm"
+        />
+      </van-popup>
+<!--      <van-field v-model="userForm.companySetupTime" label="成立时间" placeholder="请输入成立时间" required :rules="[{ required:true }]" />-->
+      <van-field v-model="userForm.companyCapital" label="注册资金" placeholder="请输入注册资金" required :rules="[{ required:true }]" />
+      <van-field v-model="userForm.companyLicense" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.address" label="联系地址" placeholder="请输入联系地址" required :rules="[{ required:true }]" />
       <van-field name="uploader" label="上传相关附件">
         <template #input>
-          <van-uploader :after-read="afterRead" v-model="fileList" multiple  />
+          <van-uploader :after-read="afterRead" :before-delete="deleteFile" v-model="fileList" multiple :max-count="5" />
         </template>
       </van-field>
       <p style="color: red; text-align: center;">*身份证照片、本人和身份证的合影</p>
       <div class="submit">
-        <van-button round block type="info" color="#007E72" native-type="submit" style="width: 90%;margin: 0 auto;">立即注册</van-button>
+        <van-button round block type="info" color="#007E72" native-type="submit" style="width: 90%;margin: 0 auto;">保存</van-button>
       </div>
     </van-form>
   </div>
 </template>
 
 <script>
+import { getInfo } from "@/api/login/index";
+import { getMember , base64Attach , userUpdate , showUserImg , deleteUserImg} from "@/api/user/index";
+import {Dialog} from "vant";
 export default {
-  name: "notice",
+  name: "companyInformation",
   data() {
     return {
       height:0,
       tel:'',
-      fileList:[]
+      showPicker: false,
+      showPickerPiker: false,
+      minDate: new Date(1900, 0, 1),
+      maxDate: new Date(),
+      currentDate: new Date(),
+      value:'',
+      companyNameValue:'',
+      fileList:[],
+      companyNameList:[],
+      form: {
+        files:[],
+        fileType:'',
+        bizPath:'transaction',
+        tableName:'t_transaction_member',
+        tableId:''
+      },
+      userForm:{
+        companyName:'',
+        idCardNum:'',
+        realname:'',
+        companyCode:'',
+        companyName:'',
+        companyNature:'',
+        companyScope:'',
+        companyTimeLimit:'',
+        companySetupTime:'',
+        companyCapital:'',
+        companyLicense:'',
+        address:'',
+      },
+      userInfo:[],
+      upLoadList:[]
     };
   },
   created() {
     this.height = document.body.clientHeight
+    this.getInfo()
+    this.getDicts("company_nature").then(res => {
+      console.log(res);
+      for (var i = 0 ; i < res.data.length ; i++ ){
+        this.companyNameList.push(res.data[i].dictLabel)
+      }
+      //this.value = this.selectDictLabel(res.data,response.data.supplyDemandType);
+    });
   },
   methods: {
+    onConfirmCompany(value,index){
+      console.log(value)
+      this.companyNameValue = value;
+      this.showPickerPiker = false;
+      this.userForm.companyNature = index+1
+      console.log(this.userForm.companyName)
+    },
+    onConfirm(value) {
+      this.userForm.companySetupTime = this.getNowFormatDate(value).substr(0,10);
+      console.log(new Date())
+      this.showPicker = false;
+    },
+    getInfo(){
+      getInfo().then(response => {
+        getMember(response.user.userId).then(response => {
+          console.log(response)
+
+          this.userForm.companyName = response.data.companyName;
+          this.userForm.idCardNum = response.data.idCardNum;
+          this.userForm.realname = response.data.realname;
+          this.userForm.companyCode = response.data.companyCode;
+          this.userForm.companyName = response.data.companyName;
+          this.userForm.companyNature = response.data.companyNature;
+          this.userForm.companyScope = response.data.companyScope;
+          this.userForm.companyTimeLimit = response.data.companyTimeLimit;
+          this.userForm.companySetupTime = response.data.companySetupTime;
+          this.userForm.companyCapital = response.data.companyCapital;
+          this.userForm.companyLicense = response.data.companyLicense;
+          this.userForm.address = response.data.address;
+
+          this.tel = response.data.phone
+
+          this.getDicts("company_nature").then(res => {
+            console.log(res);
+            this.companyNameValue = this.selectDictLabel(res.data,response.data.companyNature);
+          });
+
+          this.userForm.id = response.data.id;
+          this.form.tableId = response.data.id;
+          showUserImg(response.data.id).then(responseSecond => {
+            console.log(responseSecond)
+            this.form.files = responseSecond.data
+            for (var i = 0 ; i < responseSecond.data.length ; i++){
+              this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
+            }
+          });
+        });
+      });
+    },
     afterRead(file) {
       // 此时可以自行将文件上传至服务器
       console.log(this.fileList)
-      console.log(file);
+      for ( var i = 0 ; i < this.fileList.length ; i++){
+        console.log(this.fileList[i].url)
+        if(this.fileList[i].url == undefined&&this.fileList!='') {
+          this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
+        }
+      }
+    },
+    deleteFile(elIndex){
+      if(elIndex.id != ''){
+        deleteUserImg(elIndex.id).then(response => {});
+      }
+      return (file, name) => {
+        let fileIndex = name.index
+        this.fileList[elIndex].splice(fileIndex, 1)
+        this.upLoadList[elIndex].splice(fileIndex, 1)
+      }
     },
+    submitForm(){
+      this.form.files = [];
+      userUpdate(this.userForm).then(response => {
+        var imgList = [];
+        console.log(this.fileList)
+        for (var i = 0 ; i < this.fileList.length ; i++){
+          if(this.fileList[i].url.indexOf('http') == -1&&this.fileList!=''){
+            this.form.files.push(this.fileList[i].url);
+          }
+        }
+        console.log(this.form.files)
+        base64Attach(this.form).then(responseSecond => {
+          if(response.code == 200 && responseSecond.code == 200){
+            Dialog.confirm({
+              title: '系统提示',
+              message: '修改成功',
+              confirmButtonText: '确定',
+            })
+          }
+        });
+      });
+    }
   },
 };
 </script>
diff --git a/src/views/user/accountSetting/userInformation/userInformation.vue b/src/views/user/accountSetting/userInformation/userInformation.vue
index 614aed4c..b4350609 100644
--- a/src/views/user/accountSetting/userInformation/userInformation.vue
+++ b/src/views/user/accountSetting/userInformation/userInformation.vue
@@ -8,7 +8,7 @@
       @click-left="onClickLeft"
     />
     <van-form @submit="submitForm">
-      <van-field v-model="userForm.phone" type="tel" label="手机号" placeholder="请输入手机号" readonly required :rules="[{ required:true }]" >
+      <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" readonly required :rules="[{ required:true }]" >
         <template #extra >
             <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>
         </template>
@@ -47,7 +47,6 @@ export default {
         tableId:''
       },
       userForm:{
-        phone:'',
         idCardNum:'',
         realname:'',
         address:'',
@@ -64,16 +63,17 @@ export default {
     getInfo(){
       getInfo().then(response => {
         getMember(response.user.userId).then(response => {
+          console.log(response)
           this.userForm.idCardNum = response.data.idCardNum;
           this.userForm.realname = response.data.realname;
           this.userForm.address = response.data.address;
-          this.userForm.phone = response.data.phone;
           this.userForm.id = response.data.id;
           this.form.tableId = response.data.id;
+          this.tel = response.data.phone
           showUserImg(response.data.id).then(responseSecond => {
             console.log(responseSecond)
             for (var i = 0 ; i < responseSecond.data.length ; i++){
-              this.fileList.push({url:'http://116.255.135.38:8081/nsgk_test'+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
+              this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
             }
           });
         });
@@ -81,10 +81,17 @@ export default {
     },
     afterRead(file) {
       // 此时可以自行将文件上传至服务器
-      this.fileList[this.fileList.length-1] = {url:file.content,id:'',isImage: true};
+      for ( var i = 0 ; i < this.fileList.length ; i++){
+        console.log(this.fileList[i].url)
+        if(this.fileList[i].url == undefined&&this.fileList!='') {
+          this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
+        }
+      }
     },
     deleteFile(elIndex){
-      deleteUserImg(elIndex.id).then(response => {});
+      if(elIndex.id != ''){
+        deleteUserImg(elIndex.id).then(response => {});
+      }
       return (file, name) => {
         let fileIndex = name.index
         this.fileList[elIndex].splice(fileIndex, 1)
@@ -122,10 +129,11 @@ export default {
   background-color: #FFF;
 }
 .submit{
-  position: absolute;
+  position: fixed;
   bottom: 5%;
   width: 90%;
   left: 5%;
+  background-color: #FFFFFF;
   p{
     text-align: center;
     margin-bottom: 0.2rem;
diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue
index 2b216dd9..174d00e8 100644
--- a/src/views/user/bidding/index.vue
+++ b/src/views/user/bidding/index.vue
@@ -11,57 +11,98 @@
       v-model="loading"
       :finished="finished"
       finished-text="没有更多了"
-      @load="onLoad"
+      @load="getList"
       class="biddingList"
     >
-      <van-row>
-        <van-col span="11" style="font-size: 0.4rem;line-height: 0.65rem">管家堡乡张村张三丰500亩水田出租出</van-col>
-        <van-col span="13">
-          <van-row class="row">
-            <van-col span="9">距竞价结束</van-col>
-            <van-col span="15" class="col"><van-count-down :time="time" format="DD天HH时mm分ss秒" style="font-size: 0.2rem;color: #C21F3A" /></van-col>
-          </van-row>
-          <van-row class="row">
-            <van-col span="9">当前价格</van-col>
-            <van-col span="15" class="col"><span>500</span>元/亩/年</van-col>
-          </van-row>
-          <van-row class="row" style="margin: 0;">
-            <van-col span="9">我的出价</van-col>
-            <van-col span="15" class="col"><span>500</span>元/亩/年</van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-divider :style="{borderColor:'#B4B4B4'}"/>
+      <van-cell v-for="(item , index) in biddinglist" :key="index">
 
+        <van-row>
+          <van-col span="24" style="font-size: 0.4rem;margin-bottom: 0.1rem;">{{item.projectName}}</van-col>
+        </van-row>
+
+        <van-row>
+          <van-col span="24">
+            <van-row class="row">
+              <van-col span="4" style="font-size: 0.2rem;">当前价格</van-col>
+              <van-col span="8" class="col"><span>{{item.money}}</span>{{item.unit}}</van-col>
+              <van-col span="4" style="font-size: 0.2rem;">我的出价</van-col>
+              <van-col span="8" class="col"><span>{{item.memberMoney}}</span>{{item.unit}}</van-col>
+            </van-row>
+            <van-row class="row">
+              <van-col span="5" style="font-size: 0.2rem;">距竞价结束</van-col>
+              <van-col span="19" class="col">
+                <van-count-down :time="item.biddingStopTime" format="DD天HH时mm分ss秒" style="font-size: 0.2rem;color: #C21F3A;margin-top: 3px;" />
+              </van-col>
+            </van-row>
+          </van-col>
+        </van-row>
+
+      </van-cell>
     </van-list>
   </div>
 </template>
 
 <script>
+import { getMember , biddinglist } from "@/api/user/index";
+import { getInfo } from "@/api/login/index";
 export default {
-  name: "notice",
+  name: "userBidding",
   data() {
     return {
       loading: false,
-      finished: true,
-      time: 30 * 60 * 60 * 1000,
+      finished: false,
+      biddinglist:[],
+      queryParams:{
+        memberId:'',
+        pageNum:1,
+        pageSize:10
+      }
     };
   },
   created() {
+    this.getInfo();
+  },
+  methods: {
+    getInfo(){
+      getInfo().then(response => {
+        getMember(response.user.userId).then(response => {
+          this.queryParams.memberId = response.data.id;
+          this.getList();
+        });
+      });
+    },
+    getList(){
+      this.loading = true;
+      biddinglist(this.queryParams).then(response => {
+        console.log(response)
+        for (var i = 0; i < response.rows.length; i++) {
+          var nowTime = Date.parse(new Date());
+          var timeTest = response.rows[i].biddingStopTime;
+          var endTimes=timeTest.substring(0,10).split('-');
+          timeTest = endTimes[1]+'/'+endTimes[2]+'/'+endTimes[0]+' '+timeTest.substring(10,19);
+          var leftTime = Date.parse(timeTest)-nowTime;
+          response.rows[i].biddingStopTime = leftTime ;
+          this.biddinglist.push(response.rows[i]);
+        }
+        if(this.biddinglist.length >= response.total){
+          this.finished = true;
+          this.loading = false;
+          return;
+        }
+        this.finished = true;
+        this.loading = false;
+      });
+    },
   },
-  methods: {},
 };
 </script>
 
 <style scoped lang="scss">
 .app-container {
-
+  background-color: #FFF;
 }
 .biddingList{
-  padding: 0.5rem 2% 0;
-  .van-row{
-    padding: 0 3%;
-  }
+  padding: 0 2%;
 }
 .row{
   color: #666666;
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 9c39d959..39e24242 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -12,7 +12,7 @@
           />
         </van-col>
         <van-col span="17">
-          <p>13306310001</p>
+          <p>{{phone}}</p>
           <p onclick="window.location='accountSetting'">账户设置</p>
         </van-col>
       </van-row>
@@ -22,25 +22,38 @@
       <van-cell title="我的咨询" is-link icon="service-o" to="userInteraction" />
       <van-cell title="我的供求" is-link icon="bag-o" to="userSupply" />
     </div>
-    <van-button plain type="warning" class="loginOut" @click="loginOut">退出登录</van-button>
+    <van-button class="loginOut" color="linear-gradient(to right, #ff6034, #ee0a24)" @click="loginOut">
+      退出登录
+    </van-button>
   </div>
 </template>
 
 <script>
-import { logout } from "@/api/login/index";
+import { getMember , supplyList , deleteSupply} from "@/api/user/index";
+import { logout ,getInfo } from "@/api/login/index";
 export default {
-  name: "notice",
+  name: "user",
   data() {
     return {
+      phone:''
     };
   },
   created() {
-
+    this.getInfo();
   },
   methods: {
     loginOut(){
       logout().then(response => {
+        location.reload(true);
+      });
+    },
+    getInfo(){
+      getInfo().then(response => {
         console.log(response)
+        getMember(response.user.userId).then(response => {
+          console.log(response)
+          this.phone = response.data.phone;
+        });
       });
     },
   },
@@ -76,8 +89,5 @@ export default {
   .loginOut{
     width: 94%;
     margin-left: 3%;
-    background-color: transparent;
-    color:red;
-    border-color: red;
   }
 </style>
diff --git a/src/views/user/supply/index.vue b/src/views/user/supply/index.vue
index 474b1a61..4c841b98 100644
--- a/src/views/user/supply/index.vue
+++ b/src/views/user/supply/index.vue
@@ -17,7 +17,6 @@
           :finished="finished"
           finished-text="没有更多了"
           style="margin-top: 10px;"
-          @load="getList"
         >
           <van-cell icon="play" v-for="(item , index) in supplyList" v-if="item.supplyDemandType == 1" :key="index">
             <template #title>
@@ -25,12 +24,12 @@
             </template>
             <template #label>
               联系电话：{{item.phone}} <p style="float: right;">发布时间：{{item.logintime}}</p>
-              <van-row style="margin-top: 5px;">
+              <van-row style="margin-top: 5px;" v-if="item.isAuditStatus == 'N'">
                 <van-col span="16"></van-col>
                 <van-col span="4" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="item.reply == null">
                   <van-icon name="edit" size="15" style="top:3px"/>修改
                 </van-col>
-                <van-col span="4" style="color: #007E72;text-align: right;" @click="deleteInteraction(item.id)" v-if="item.reply == null">
+                <van-col span="4" style="color: #007E72;text-align: right;" @click="deleteSupply(item.id)" v-if="item.reply == null">
                   <van-icon name="delete-o" size="15" style="top:3px"/>删除
                 </van-col>
               </van-row>
@@ -52,6 +51,15 @@
             </template>
             <template #label>
               联系电话：{{item.phone}} <p style="float: right;">发布时间：{{item.logintime}}</p>
+              <van-row style="margin-top: 5px;" v-if="item.isAuditStatus == 'N'">
+                <van-col span="16"></van-col>
+                <van-col span="4" style="color: #007E72;text-align: right;" @click="goAdd('update',item.id)" v-if="item.reply == null">
+                  <van-icon name="edit" size="15" style="top:3px"/>修改
+                </van-col>
+                <van-col span="4" style="color: #007E72;text-align: right;" @click="deleteSupply(item.id)" v-if="item.reply == null">
+                  <van-icon name="delete-o" size="15" style="top:3px"/>删除
+                </van-col>
+              </van-row>
             </template>
           </van-cell>
         </van-list>
@@ -61,8 +69,9 @@
 </template>
 
 <script>
-import { getMember , supplyList } from "@/api/user/index";
+import { getMember , supplyList , deleteSupply} from "@/api/user/index";
 import { getInfo } from "@/api/login/index";
+import {Dialog} from "vant";
 export default {
   name: "userSupply",
   data() {
@@ -76,8 +85,6 @@ export default {
       //查询参数
       queryParams:{
         memberId:'',
-        pageNum:1,
-        pageSize:10
       }
     };
   },
@@ -100,6 +107,7 @@ export default {
       getInfo().then(response => {
         getMember(response.user.userId).then(response => {
           this.queryParams.memberId = response.data.id;
+          this.getList();
         });
       });
     },
@@ -110,14 +118,30 @@ export default {
         for (var i = 0; i < response.rows.length; i++) {
           this.supplyList.push(response.rows[i]);
         }
-        if(this.supplyList.length >= response.total){
-          this.finished = true;
-          return;
-        }
-        this.queryParams.pageNum += 1 ;
+        this.finished = true;
         this.loading = false;
       });
     },
+    deleteSupply(id){
+      Dialog.confirm({
+        title: '系统提示',
+        message: '是否删除？',
+        confirmButtonText: '确定',
+      }).then(() => {
+        deleteSupply(id).then(response => {
+          Dialog.confirm({
+            title: '系统提示',
+            message: '删除成功',
+            confirmButtonText: '确定',
+            showCancelButton:false
+          }).then(() => {
+            this.supplyList = [];
+            this.getList();
+          })
+        });
+      })
+    }
+
   },
 };
 </script>
diff --git a/src/views/user/supply/supplyAdd.vue b/src/views/user/supply/supplyAdd.vue
index 74f633cd..03b39bbc 100644
--- a/src/views/user/supply/supplyAdd.vue
+++ b/src/views/user/supply/supplyAdd.vue
@@ -13,9 +13,11 @@
         clickable
         name="picker"
         :value="value"
-        label="选择器"
-        placeholder="点击选择城市"
+        label="供求类型"
+        placeholder="点击选择供求类型"
         @click="showPicker = true"
+        required
+        :rules="[{ required:true }]"
       />
       <van-popup v-model="showPicker" position="bottom">
         <van-picker
@@ -25,11 +27,16 @@
           @cancel="showPicker = false"
         />
       </van-popup>
-      <van-field v-model="form.projectName" label="项目名称" placeholder="请输入标题" required :rules="[{ required:true }]"/>
-      <van-field v-model="form.location" label="项目地址" placeholder="请输入标题" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.projectName" label="项目名称" placeholder="请输入项目名称" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.location" label="项目地址" placeholder="请输入项目地址" required :rules="[{ required:true }]"/>
       <van-field v-model="form.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
       <van-field v-model="form.phone" label="联系电话" placeholder="请输入联系电话" required :rules="[{ required:true }]"/>
-      <van-field v-model="form.projectContent" label="项目详情" type="textarea" autosize placeholder="请输入咨询内容" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.projectContent" label="项目详情" type="textarea" autosize placeholder="请输入项目详情" required :rules="[{ required:true }]"/>
+      <van-field name="uploader" label="上传相关附件" required :rules="[{ required:true }]">
+        <template #input>
+          <van-uploader :after-read="afterRead" :before-delete="deleteFile" v-model="fileList" multiple :max-count="5" />
+        </template>
+      </van-field>
       <div class="submit">
         <van-button round block type="info" color="#007E72" native-type="submit">发布</van-button>
       </div>
@@ -38,7 +45,7 @@
 </template>
 
 <script>
-import { getMember , userDemand , updateCommunicate , selectCommunicate } from "@/api/user/index";
+import { getMember , userDemand , updateDemand , selectDemand , base64Attach , showImg , deleteUserImg} from "@/api/user/index";
 import { getInfo } from "@/api/login/index";
 import {Dialog} from "vant";
 export default {
@@ -50,6 +57,7 @@ export default {
       value: '',
       showPicker: false,
       columns:['供应','需求'],
+      fileList:[],
       form:{
         projectName:'',
         location:'',
@@ -58,7 +66,16 @@ export default {
         projectContent:'',
         logintime:'',
         deptId:100,
-      }
+        supplyDemandType:''
+      },
+      file:{
+        tableName:'t_transaction_supply_demand',
+        tableId:'',
+        files:[],
+        fileType:'',
+        bizPath:'transaction'
+      },
+      upLoadList:[]
     };
   },
   created() {
@@ -73,10 +90,29 @@ export default {
     }
   },
   methods: {
+    afterRead(file) {
+      // 此时可以自行将文件上传至服务器
+      for ( var i = 0 ; i < this.fileList.length ; i++){
+        if(this.fileList[i].url == undefined&&this.fileList!='') {
+          this.fileList[i] = {url:this.fileList[i].content, id: '', isImage: true};
+        }
+      }
+    },
+    deleteFile(elIndex){
+      // deleteUserImg(elIndex.id).then(response => {});
+      if(elIndex.id != ''){
+        deleteUserImg(elIndex.id).then(response => {});
+      }
+      return (file, name) => {
+        let fileIndex = name.index
+        this.fileList[elIndex].splice(fileIndex, 1)
+        this.upLoadList[elIndex].splice(fileIndex, 1)
+      }
+    },
     onConfirm(value, index) {
       this.value = value;
       this.showPicker = false;
-      Toast(`当前值：${value}, 当前索引：${index}`);
+      this.form.supplyDemandType = index + 1 ;
     },
     getInfo(){
       getInfo().then(response => {
@@ -88,46 +124,68 @@ export default {
       });
     },
     getInteraction(){
-      selectCommunicate(this.$route.query.id).then(response => {
-          this.form.content = response.data.content;
-          this.form.title = response.data.title;
-          this.form.realname = response.data.realname;
-          this.form.phone = response.data.phone;
-          this.form.id = this.$route.query.id;
+      selectDemand(this.$route.query.id).then(response => {
+        this.form.projectName = response.data.projectName;
+        this.form.location = response.data.location;
+        this.form.projectContent = response.data.projectContent;
+        this.form.realname = response.data.realname;
+        this.form.phone = response.data.phone;
+        this.form.id = this.$route.query.id;
+        this.form.supplyDemandType = response.data.supplyDemandType;
+        this.getDicts("supply_demand_type").then(res => {
+          this.value = this.selectDictLabel(res.data,response.data.supplyDemandType);
+        });
+        showImg(response.data.id).then(responseSecond => {
+          for (var i = 0 ; i < responseSecond.data.length ; i++){
+            this.fileList.push({url:this.global.severApi+responseSecond.data[i].fileUrl,id:responseSecond.data[i].id})
+          }
+        });
       });
     },
     submitInteraction(){
       this.form.logintime = this.getNowFormatDate();
       if(this.$route.query.type == 'update'){
-        updateCommunicate(this.form).then(response => {
-          if (response.code == 200){
-            Dialog.confirm({
-              title: '系统提示',
-              message: '修改成功',
-              confirmButtonText: '确定',
-              showCancelButton:false
-            }).then(() => {
-              self.location=document.referrer;
-            })
+        this.file.tableId = this.$route.query.id ;
+        updateDemand(this.form).then(response => {
+          for (var i = 0 ; i < this.fileList.length ; i++){
+            if(this.fileList[i].url.indexOf('http://') == -1&&this.fileList!=''){
+              this.file.files.push(this.fileList[i].url);
+            }
           }
+          base64Attach(this.file).then(response => {
+            if (response.code == 200){
+              Dialog.confirm({
+                title: '系统提示',
+                message: '修改成功',
+                confirmButtonText: '确定',
+                showCancelButton:false
+              }).then(() => {
+                self.location=document.referrer;
+              })
+            }
+          });
         });
       }else{
         userDemand(this.form).then(response => {
-          if (response.code == 200){
-            Dialog.confirm({
-              title: '系统提示',
-              message: '发布成功',
-              confirmButtonText: '确定',
-              showCancelButton:false
-            }).then(() => {
-              self.location=document.referrer;
-            })
+          this.file.tableId = response.data;
+          for(var i = 0 ; i < this.fileList.length ; i++){
+            this.file.files.push(this.fileList[i].url);
           }
+          base64Attach(this.file).then(response => {
+            if (response.code == 200){
+              Dialog.confirm({
+                title: '系统提示',
+                message: '发布成功',
+                confirmButtonText: '确定',
+                showCancelButton:false
+              }).then(() => {
+                self.location=document.referrer;
+              })
+            }
+          });
         });
       }
-
     },
-
   },
 };
 </script>
@@ -137,10 +195,11 @@ export default {
     background-color: #FFF;
   }
   .submit{
-    position: absolute;
+    position: fixed;
     bottom: 5%;
     width: 90%;
     left: 5%;
+    background-color: #FFFFFF;
     p{
       text-align: center;
       margin-bottom: 0.2rem;
diff --git a/static/images/zwtpxw.jpg b/static/images/zwtpxw.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..594b8a00e05c77d6bbbde5c102b71ae466f04107
GIT binary patch
literal 32475
zcmdSAbzGEN*FQW+sR&3bEg%NnFqDXtlp@lh3_T1rbcrBc0@B?G3<wNeN)6o%F);Ly
zLraT4Joh>0Id`1<ecs>u*SkI+xc1(2?Obbp*IIk;>*wUp1;8CSH!E`hKuPH_;5y)c
z=;s!I?3ptN><+*I;9V6<002K1aA_@_oa})-Jho8ox2AR`X51h<2#?!admcV+ULJsi
zw441~5ZKI#*~HAk%2twPr=f*~*~(OsMO#RfSJhtD%+gBH!_n-OhngnH0}K)~Ws#O*
zmT&{QLF^%BPH&mrAU3v8pqnJiZ;b=5(!Yv%SeSo%#R)9QBJ-<PW*yZR%(8ZlX3Rp|
z!dxIeK~ZKAF>XF#L0$o2PG){yJ~19%Q64@4E?zz$uP{(Zg!y-3x$4c))EubsO#b)2
zu5ywrzfa25)s@>-fZNW|f`?B`?5YiZ9)5nVt2ely?zT>E-MDO_tberd%nS;0w6b@y
zva@CW)#6(dJ7*_JmaCEeV+s&^Rn<Qm{*S8#f&7}+Z*N1LG|c{I82|BYsHVHU8IOh;
z)Xv!vWOnsB>mQY`*6zP|^y|f|(Ey*>ft(>`woXdVBw4OXxJ|80fr5Pe{IViqymF#K
zf_!{(PoMG$%gW2h3O|#1#>+3vC-6sIC0nS|TU(IXA9bz%tSc)2U+V&89nIc4**R+3
z+1dQTy%&~tPIgdBJNqkE@$)ikTiKf0xk7)f?C%3LbF^|XGnIF=gE0TLG(fArbT1??
zA|o#*C;LoLRzyx#;F++f5U(hokO04!km$3gqVg=i*D?LebpIdg@LYAy^NWvv;p-no
zSHkiu`KOd#W&V_NGutcScD$0}pW6VE-((YD`t?d%aDJiy9{>b+czF1D1o-#_Hwdo&
zh^`Y5TqnA9^Cr>Fo40P?`i*YiA|bs^N^*;Wf|8Pgf}W0!j-KgH!XYFiB)&y_=l1P8
zv{YnNw158azfJu73Lv|F4R8&Bi$eyuMuvk+hV!!>FnFcX*Kl!gaQ;Wz2?+7<uj5|(
zRrb$60C4f}uMyzf2H@c0Uc<%3C%Aq6CIJ!7Z!M7F;gb{G<0F(|p?LY0pYpoH`_WHu
zs_3U0jw7rBv9Fz}g|%oz?qm&{_`RxR(=7iMlPwEv`;Z%uvn1#wl(zu#e`eY~c3;j+
zK91~aKseW~;Su9q!@<SFy&4$KHC!^hdweo4$?<pJI=qk0Dj#Oy*Px*Mwje<D)bW*x
zU-n)Ft6<EC?BdU9z^$tq*T`_m0MdYsPgiUH|0lZRfY}{cHV%)xoH~8jVOn8RA^-;v
z8{PpTu8GqaCXE`3iiTIExHv~nXe;wMZaw+`Kr%+(D_xg`x5pzAr<#m@0`7|xSDWuf
zM-wC{o(zsO3`5*Q#~iY>geMn~OG5)YlI=@~-Q5(ibo8R9`%-O9^w1!Y|6;rdbyJj8
zvBAX6+cJyS^<I&3QSbrVGV4LeS^*82z!|ytDQ!Tn=k~3@g{8m*l51iNQ-`Gz_{6l(
z1IW1qD0X<ubATt$u65S?UH#;1y~S()_jI#znmZ#}m_6h2IZx~W3?gMG@Syo!s5I&@
z0mwy|d|N+_Z_~6kaVltLFlLqhI`tF@Pdq_7ttq`B8z}M2e1GvF-78^~kq~BT@;G&L
zp}P}!mT*Dw%>mDqdSBR*-7@A8=w6>E{o@Itw)c1rc#kPaWhp3V+ptW}{;vg$$^veI
zQH@#>ZB_?X!A~3e(oZiR{sh>K7_7k=t(a3lt5a26t|~8y!e961+C+xE%D{<OiA#c0
zg2PnlA4|a5w5018N(Z0!VeO8V9smc6d!jy5#g?Xi*XDzlnpC9?HhvYGv#nq+4Hq42
zo{5#OFVM=6n{lTolu5xe?irfe!3H{|3vL_()$O)9rRF;;Swrd|{l(o@P-}WbC^-Ut
zoV@Vz>v?17KoxssZj&(mc(>8Gg^rE(qyOtU|Mw}68IpqyM<qZ8Lwbge*Ck{K7S+H4
z(1YIbV~bsdjOl>y;#ruQyRgqx3U_Vox9A%TAWs;70)ln~%8P8o)59L_G?b<7ok^m1
z6f~l>bySZA(NoxhXpzLvPi%aJG05ljcax`wBr_wqKIa6H?ZkDeIJk{y37@AdR988n
z5p$E0a}kh^*mms_yQ4nn%&jlA_EM@gpSK%tGVvAOP2y915H^N&b?P?+WvH+f31wXY
z<lhkf>oK1i)I5)I$kz_4OL=Y@SAOz00rQ~<dFmuaeCL;61$P&%@k_*Q$G{Rvbm+ry
z=u`onM^??+<<@LU0<p7uS`GM(&HHK^m_^W1XhS<K_$e#1$P3D?MHvIzM|uMvQyOaS
z@*~anmeb*<Plj**Exk@3&PWoL4qrT#*g%eA4){G+PjY^=C_%G_+zT|E6ppMy&o(nY
zbybQ;OEg)yyu<gp99w_V3<G8ipEDpR_T97;EYhvGKYEZE;<kr8TI-%>LUqpuRNHT}
zH$I5v@tz${SS%wtH^6@CSmx8cu{U*x0pe+crFeSz=77HTw!&?NYod`vPpd;B-eUGa
zRa`=FE8ZU+W{!7KKis8v+OBS@cBwVD;B{vte2-_(yvzE2KE6c7id`Z;FMB+Vok4k&
zVMl5g71=d|5}wA~n1zUg*g98*!hNcP94w_Cu&CEp9DugeqIAn=)vR6e1=F0AKPmhD
zXArpwh7Eszyu^XuOij1WtM0F4E+Kig!gi9*`vJVH2XJ-m?kvKf$_p56)DFTAEJKeP
zXq|lO9|ynFp;HvbMlbJ1E3ta+m>%sZ9*y^d{rz<=73!^FUNjr=&%C!Jd>)^@ZD`tb
z`3Y!jZMn-ers@<&ZpsqXR>vh&?95v&e2}O2)oU{trSU-XXh#BBW??L?jL2;uPN{LA
zMhm7&`jXGBJG}KN3SPu>pzT$)Qd<*b9`+tgD5n=|cJ&$EF^=k`pH;%Ut^bXosSy%*
zU5_>N;aBjT&QKwk<vf5MK*VjfvB<)z=$*6X`*-A5auj~iU4CIf)4i%yogtDGJ15=2
zggsMEqxSCy#%4=bs%TFbT;$6o)t#<vidUX+tRD3^Wg6d>bDdDLr)xzfgzxgd?9{c2
z4)?B*0{Yq)lJmDb-+7dUH?ABeIGS)@6*-WU6V;DgEl!VhzDD0$uG+3Dk@>N=5OJgp
z*9;;GS`WWQ2v{UF<M?JN?_pJ1CT6?SPrY^IjZTm~Tr!Kuss?pRy_FoR0Ah~hC))PX
zk?`P6gtA^|bwLL3=8y%Z8&zGVP=WGJ^-fQB{PZxs{co_B(N!2Zp|!7X(B6$*u`>PA
zHFP9akO)<kA-WQlUlJyfS~Z>)-d|9sqGe;>ZY+ZM!p-fHY#+m5>cH19pcXS7qm_QE
zseTW$@4ZlUE+*<#**jC+l)e{PJtbfy#f+FkE1qC7$4+v<Aj=17bgZTY%|*5a`j(U1
zp;lo=b-O>bJW9s@&`K|L2mD5!^hNo$TOiGtu6ZP!WMt{dwP#W)?eY~7%k>$f7f{;s
zaBOi~1fcpIjLAzsMDcj6Jn&$s*!zg~0PbFUPJ1iJ*u&d;o;haYg3-3d7f$Mm;EkJs
z*gZbpvEl30J@7ny%VgOfI|Yh4A7dh^zfg8deFqIILYH|i9Y;)k{|RW@r#$PDqLL<`
zwLkqaz+LRow9|qXF#QQ|==R<q4N`Bf2{}GbHPrg<iQ*t>aN59dL5);RcGe1Nq6dBg
zvM5AOv<0dg?-zK?r$hNL$JQU0>ix_2`8v-HR-y%H6)0o*A1Sf>x@p8K8Dk1psdBPR
zQu?%3EEOriEPv|bm5mlSU`Onw8b3(WoAyGRt9$(fP`;~K=XTN~72Hq@zU=3dHiYgc
zQJb%>CX{Rs&X;AN9*w;B`mcVDjDNznw@_XpFIc!px!`z2T7*xG+w0s=_-X4#b>eaq
z`(v~q{8<I(R>>ADr>fFV9BdiD;zwN-Zpq$+gabt5_RTF)ijW+%&#Xwz_J)3Gk3Y?W
z_>M)aD)RX@9mgA|lgg%Yc&(qTi~|*WYQkj6-~*a&J^AXid%D}CmXI>jB}Q7L4cs@X
zy1sfSK3YS@)9}8`g6y5+*U1nri4*<<*G}L?`Sf=;52{kTQidlzLc<7GMq!#S<$F^K
znaLT-?H{{23|GN^m4;QUoqfINq_WYe{d?M{oRRYLGt1ohjkU~z{SK^o-h}r)FQ?zM
z432zG(*y%fJIC{%E&sMQG8tims}A>9X`<`O_pb93xf|bhu;Y^XK=^8)S+87TfnB1e
zpjUwL**QKIr^&{MF4pF*CDC{3_BVcpg8A`Mw~?gI!*$x#$jV-S1sczlvi`g#qd~_W
zl%eaCJBVInJC@Yt2QgP2Z6=RH9-V+FK~2>N0lwZjSb>{MLUJ?o;=w`&Q_Ea-TTNX}
zou7D^m9AtXj5O48h7lpun$>S#$b1^-9zpw(kFUhhgY_Q>^}j$P_5X-Qf2h?zKfTl?
zsCShd99ZA_Q77Gxe@ffQmt6`?wFKaX+-G58H(}MaazO2vo7#Ho4GLLsAwuRWnC`-$
zbCawj%-u$<(*ZM!aOelhSrhm=b;QeoobM(RHfnup{5Y{Q0z*VEluUt$>5C@=2dRtl
zi5)lStsl>7EPR_@lDMbu-V*+5s>G#iVIf<$np@ylltbwlzfmj69XDdUksf5>Jq;+%
zUCL4QM1%(J(e5tS`Pm7EG+LPtJAV3Iu4Mue`xou2d767>5f;`xNF~GPA4jm9^yo!e
zOQfIr8$+#1fn3(^cz6T^_%s=9G&CaGYgGj~6wYfAn}O3Xf;3;G<CgdHdv0m%VWsl9
zSDS%+h;(oCPr%cxKJ)$4lnJ91+m*(8XN3@su)>kWtEQ8O3@njDBwtIl%E@y1D$J@@
z_0=lA8NUp^&gO<rwQKwo5jjEVA|&$4SkN5JFEOIJP<f&WO^zO^QcVXtmYhp|rWVgk
zd)n{-5r|?^Gb$H1G=_eqC|q?`)G2Vnq<bjDdrw#2I)b9j+6*tnU|6mgSEkIjL>awh
znt73!-U(ylx-IWi5vlaM$}Btg_MV&pDfTzV&VLB27cmk}4SGxj90^8AR7M@$ICb8u
zyG-FR^!CA&o@W`#S0^HfKZ%rFCKCnwOMMs!n8TDVL6ziuHU=qLg$~Y#!%O>T6XSa>
zB3ZVl@2IlXdhzVatQ^0%Wr22#spF8y(`HBAm$L2??1f*uM%;;>J&&~=Fl#ft4<EBW
zc~268`Bc2<Q#fPQ75&Y@%eh8WHORpW3bT+Kt@O?;*B&s-U-1Q%8d&nY9osZfl8ROP
z%(_KCBd%nrxeqayGUDp5@kGw>E0}wnNt;#KIpFt^&FFVcWhQ0qDbx8U9*Mp#1qaCB
zIo{Juw0YLv`Q=<;_{xRE*TvpFjRl?b@N7Kzcf*{JZCoj#-f#trT7QMbp1*@dnShj5
zkbqlvxx1pbN#~M!1W7@qR!~q)W9!6CvCLhLqG>R&Rid^yrYXfCL|eZ&(^F&T?!B)H
z?Be$+=-=3dp1zH{xNhU8aeQ;cx2iSnGs$wvD`(4eiMJ^k^$z_$q=8)zWU7Z6&=Vpe
zN2SsNPge=LMkF|DB>3KA?dRw5KH#>K8Fff)oM{I=4|0Ap!P$rC#qN#|7mKa`5jIdE
zUI0e}P>~5t;l$mTL}U7Bzh~4tmIWvSNq&a@2+0rRBPAxN{@TIo=C<bpwav5_THh6d
zUS)`otPR?7%o+5drMBOGdp`!g^AMjkB9kv}gd^7h;|9B_!9goKfEo0Pg%xPQoIc11
zPyb*<pTCbti}z<TU(lMFqquFq9i7d~z*@xc0t-}+llAVfZt-uZSYFDHUearLH??Cm
zIeh9FvcG@)-b@uPC=r=BV_NtVpsUVb>^)wPKv2!NhA>VxN0*U4Z)=ClklYQZEpcv&
z%&#hQBIAp6v*WVGebtis+SAA)6<)rOC#4f?L-Xh#UJ9)W8Zj+4NH(RSTGd`L+Fm<!
zS8TKw+c(N%G0wdiGrsbWAM3DuT1<gGERH~It%jybL0Ue>jJ$&NSJg9eK1=5Wnc60l
z=fo+xYgsj<Cz_jYTMyEzr5lrae4dpQojtcOND?Qc6OO?@WP<qm&JQhO_RO>8Gj0oJ
zuvDpx*E}+{m|E^QP#|fJB7MxC`}($0wZ)4X?vdK@hz!G&5T}#VqBTavd>FIeggpc1
zqub3f`<Kfd`UiR_JDxzFy9?t(Yp}4f*`|htVVj-T-JL@g2o?F}*WAIodv}Q4BBfqD
zrgkw9P-h*%x{meJi|QA*B^zWLT%q)9pQ|85OFBIJGTRw!b>N;Pd2sRaaxS-S+)`rn
zv&a2&fp*Ut=|^$qwm$A216!9jPk&UT7SjBkbBD+1psz2-Rv|~h8skdXcLWz~`brQa
z8l^ad)8Re7&q3C`)+`l#{TE3+NGEb*tF4Xx@{LF(ruQB(=+3aV*nq_U7=;&xDx2P&
zD&kaCxiQFg(XjB3B~TSY_Kxo1N_d9i{`_NxcO)n^VR!6~hiWsu7i$^pMX}9Wyiw3$
z4%GH*Z($;*0|^^__>#ZB0q%#Fk%u1~_JuPeo)kJ-z$A)MhJh+G?%FVKEJ-|s;R|d0
z^q8Tk?o&q^!I&4@5+KS^Ch0t?0{++ZNmx79A?(qeJ%?cAtYbo<_Fw&4s)5}#m(c;j
z8ITU|)HPAyY|i+MXHE;Db58x}F+ZBUK%+bgYJITSKjUg7kqX`&3`@wF$vU=epFwG@
zw)X19e_hI_n=Cqa=g=eQmQi3}TX$wq6VxtWfz?S|E`ehyFJ7*$DU5{<Dtm@t3nCZM
z3bGR1q@g-9dPkD^FsQ*p8N%oryysUtJFPzf>p^-;eb4)(FkUXFGys(TC0U2KZ+-}2
zb~h>CbD^04V%$P=)Ou%QdKd`pUAMKoVB6d>3n_|tkAts$1#)p$ASb=S{?8z%brpU5
z2675lAouxy2XcRUgfc6xt`G|d*Z3GLaGD^AJ!x4829{G|D=VjM)*B`(*@wEm_9%ze
zv-@yRugcV9JF5#fulEa)euUn_dmVlWtsN3kARrmMi#edX+)b^VD(l8-ZM5-Wtt?#K
zp$xEGp4z%k>!Ej&jgFaE^`>KDfk2q~Xs$!t@#w&Z$)$F8t}&z$x(?>#Hu(Iyp`k)M
z^N58b<)PS_!S$>Js6cC(OyzcASx0R6cPE9GsTKW9z(Y}-uE!D4|GaZR7=Vq4`%w~~
zfZUta>y=@n;H!||xGkqQFOx-OY+^1ZR>d-$+xaECK4d5*g-e$!zndH8IgoK@snqgo
zar21!T{<;dRpamD3!c=gM$~WY#EZatpd|*Q9b&H{XMK}kZrfPrxTCTloVwL<%MJeC
zNB5S<mRZvfsXhuB3N;NK@B{4kC9OHv<M<2$rG;Usp8(S76HOyunb+s?K4z0X{848i
zaj=4ZDfvHLcIRI%yKTs2-yS1&uqRJ9B_rLavO(If`JGL{P5ixop5MRb2$#^Ee1o3;
zIztAlqC)`D7^SCX{b_m|CFjX2C*iNc^?hb93`Bw0EeW=FF}!Z&Ed#E!1nY0UO)W{F
zL5(5@@t#7btP=|hi?G*$`XFD_sm-MZr#UyS<XE%1Tm(VDj_U|qJH%jmPY0>7&}I|A
zg%qu~D_{`p*g}zSRBsB{PaDofKNqgr%_bavgT*>5dg4N%<|%_A8!q~f7a|+f#Z*3V
zWd9ks{E@iX_W1{W`CyxrK0Y0!a>g`<OkU2(y;l6AX(@)OD?>Rw%YtMP-0IF>GmE;*
z0#Tzmy1XP`RhmynyK`-`ItjEc(U&U{86n`q{ZRGWGL+1)I|<2&iD~ySQDME=k}p6>
zBxC)9O89q!>p$(<FQY6(kA4CajC`WT{FR|W7g<fSDLX#_X{+7a#~w5$xwEg0hFg-V
znZiMr*=ASBsvaHvM?@d*-(R1S{jO3%`X4&A^gr=b>)$yJf9RBqqVwQqH4>lEHiH*0
zY6JwmPJRNmzs(_EZGzW@3{h`?0v;XkHjH}y1RRw71k^Olt!--D+{8}_Y&R9St88Nq
zWR+YQJ(Rn1#uht?^i`64?^Tt}s;d;mP-Y2p?=3naY3sn=5{Gd4#-F`lc;~5hSjOPr
z)rpL-JL%@&;nr<zvK_TD5E>CX>`}?q`)4ozA33dAoplMibi$Q#P8;z+>OFee-fF=Y
ze9J>O0P~0pnCngIsc#vTt?mLM=hu4~iY_kaNJ(jg2l0kf*(f^K3PL(!+IRIZb@`Ft
zWH&$3Yt-S&eJUzyF((QL)x&pJ);><OK*#u_fEz|o1#4i-a`<eX5m?-+)-&`&h`@G<
z)Z95z<GbW+<9XGHkM-Gw&r#X5$bl@=$+wKL=k?QGqswx?b0Pg|U*$J0a7v&5rXo@Q
zdlkWxE)vH`=2g#0s1ZJLFS_OA43X`1>(kp9FNaEyGB6($rI2vXHa^$KPE6&utVlFn
zT0B;ln4nOS*azyaICxbwCP?l$6sN8-vc<N?RIxBVH#c{Vxz3($IqxT;ELeIgl>OSO
z*nl8dZ@4|i9WRN6-9pisQ0WXxGTIgv)|Ci7hQXGrNcnh&s%InVA3oAv$83+_YMFaA
z)h%>yRMUyJ8CtBS`z&Lh4E-k--M;<G&~ZJ7n+r2rn@{FUB-4Wusv?(1Gm2Zai}{ak
zaqZY=jYA<R7iJ;o6fV%Vc7}SBEXSbKB;;aS7B>mryEH@RYWc%v?D51kA_D|KW&{&6
zD%%b9=*Ur03gTRX>oqPod@rz{v}H_rvwuY5T5O1}`W88_chtdQgutCfTtm}Kq*AFi
zvDYNV&$*k2CvsS>2<*HJ-NYH2rTCF_CB$f-*N^*Vy!OARO<hnOoSTWh;Q5Ew@SE%K
z@BgGsV?=YDDr)(KudOz<6I5kt#;7xs?OQ0Yf9G&lsy}|+aZc}J7j!NK6qq8qky9s#
zRCtYPl(RA-(k7AWcXB7*UfnTGT3eITEDFoX^u$RZXPAl!20k<ZwRi4r^NaYe77%=#
zlS@6HuA}z*yj}4V5H2EKU{!W?Hq(gyzExQBcMcJK%lP)yvBzqYNsowEcQkj*STY%9
zT=D$EB-*C%(9MDCzSVs1bfg4YyU``X`V7%4Ma%ry1<GkwflKbdD9~&x5Z0o-P=L6_
zx5<#XCdjdBE;NxhH&bI#c?sNTH#PwN0+RptB8+b_kv8o>r(2ui8jr>(XFK5eq0C?O
zSxc2>eUkX*SXqUDRc)9ZmoAk@RnlX()}hwJ?tuqp*sFcoS}gC;a(Sir>-Ix7IU>=n
z19cICiT4h;RSq#fk~hk$zlqsV1sP82Oi${dCZ`2jtEwVCeq&G?rH2q(7KgC=y2Ql_
zlx!RcmT0lCev+I(JpBW}|K&+caxz_wDu5U+vX4xe+BPVq5>6Lb+?ms$e^TZ=wv-z^
zos014uhO1<6JCp{#O&8m?~h;xwmrr3@03Dvodnvgw3;HhpsErdxGdA$8l8)Ul0sHV
zDIJ+Nq=KI_joRpogPhycTcE5hoxkm{8#@pF1pL}#|68s3U6&kPHIKz+^pTg?DALMm
z*Uyvj@pbuklxUMN?+X?8*9j+HTF)1lf7z$I_z8e=4nDJwBGqHdd*viuc{E}cIG12=
zpzx#e;bO1r?Z+sceo;+Ak@k<|ZbQB!mB+e5X~6W@df^|*E~{xx=}g%Z|Lx$7#QW&O
zv`McJq!yN>$S>R4z)VXN9OT@N^luM$WYSQ#ZmDW6FL*WJ+B{cj+4wF&nkT6IWwDI|
zp^6jjLWRvk7RFEfeGEHYtM4Mrw{w;}A~(|PTRUG*oBRtW{+hi$p&>$4ec97vYT^<W
zP2+DV>u<oG7(9tVR&kD(ra#GTQyb5wa;<AdbLi)F_3AFAFf;_z4OnnGP>++N`?{(E
z6V|LGPl*&jblOb32I$$uac=roF?%}eE|L*(RS|Jbam5ni`Z`m$$i~w6I){+e`ME<R
z<I%rFChi|1lkm49bM4yo1kGJsv5E@ntmJ}_bjcc=mu!ZZp@#UfXBqb%8&GdeQy!oA
zU>*fM;L`qh+bO8>+^V8`fAGPHmdhr_!*=bG2RQILIs2~@{+IO4SJMi@_{~fN2zWx%
zaShpM^DJ&_!1%tnL5qyxw07#3^G%+cql4Q&G)?Ni>PrnwQX6jTZ?(TKwdDqMy)Vu0
zcT|=|snN5VMhKndX}dx=3iLsBd*B$zA)=<$@Ma}C{0~e2?@yUkD3OJqqTyQC$mmX4
zIZu29NP*3n$fmzW#B5s(%fhlCRM|DcK-siV&^M}eo@Kq*VqM?pa)7tgEu=shIuLQ>
zS!db+w4A=qYtSq*0sqL<hV~eoRcJq)9R@BQz^Gmq{eJ!CKR#A2YggEsH|`&rVZF4-
z+Q2w=pl2ou@KeQjZJ1=0Q%;X-z8cbM&;E(#*0J&-DJAC-o~zuqfo_9-hn@h~+uH=O
zsAKXSZ}V*!>>}#rtmwI@^I5^s4{BiP=zq3S|0sQVIU*Vuv`~2~c*8zs#Jxd0SBXe^
z;A3%vGBl9X8*~c69Qzc>8NTI?GM_2d_fBqa8sv_DSh`>_f<qDRn87E-`A)X)^A1Pr
z{koYt(dp)Qq#8$>`iuX<*S}^-1ZVGFcN9<H`skNW)Y}`fSSCsSe6{A}=47swPEg38
zTeY$t&|I%$<N;{w!YdJ55Lh11M~OVr+8eyH^+|q?;^M3%JQkL3Gyzc?03tMHZEIEj
z<BI-XSbFw70y3xmpq7VA^gNMUPpYsEU8bHT`8uLx-Nnvh)IdP;6~&oPshOTS=NBN=
zJIS(_C7Hp#y=%5ytA%Is?G}`mUR*D1L3)CoMF)2mf!~iWBhz)GH2+JVd(91z13in|
zYGkO+Q=@k=oe504Jms{#Df*QZl4=k1d2St-SH>Tmp$EuxOU+FAqE-~=hcE84J4G03
zG<^<^OaPZ?*ZsyH6SIALlRfPuao<%LGrR=ys!!ZpA$iNfxi^#TKO2K-2O{~69_hjl
zpGG0h6;>{tNxBwc1NR4oB4-*6`1!X9^=EWhlhOTLV?KFCX}MOdZeOhCgt1<)BL`t_
zi~F@(rNCQ}K$n>*gBk+?foS?D;4jyFkMR9s;dCWMZcX_zY?HcVlf1BI(0J}`ys)?t
z9e9#!0~NOEdyHVc_!vCLpf^`s=2;m)1Y4Tkq@9YY-?8n7BXZlF&SSSzc3w6Lk2>1=
zkC$f0AtxLnIj@3}+IoIfr@AtNpx~9xI9_waWOW2_{OZoDs{Gg<jX3hj-;eP82QZ6t
zV0T*!m*6*`+_*#bh&N+PGOxO>ma$pyYD@dY)p27Wc-7=5AQ=+Ls(oEZk=scl!+A_s
zZ|^)KWuVN5&1x|0%H%+8Cwdt&jDwP#u>FXT8J$GO#JWa(E4SNjQX)~$#pn>qDMqYw
z^bcQijDUg4P!j9qGV8`T#7mFm8AiEDSko<<8kg<7m9eulBKpU-RBdeELf>PYUpOwh
z>vmLQ<tzHot_7$X^JEo-U{s#>GoOQwndS`w{pAuPq(KFj5nT%N{V3a___3-sRrSXc
zp<z<o?I-arbb~FrNI^LJ2Gy@<5f55;^uowS;zFS26&*<M>pO0OyNTYbU#Qscj_kr3
zOZ17eJqpG<y25mqG`Q0Y`@t=|<gJ#+#xi8m-ARiNqV|n6-9dWl(H0g~;p3wlK}MVj
z75_!&twg$6&1|oUl0`JK?vNTTo#yoTJ6~vBZS@_A?tvTiUCUb}tA7HPIHWfxYkT(x
zqopQJtuBYLF0@^qGQYxE!hjzUupbc}5hw{|{n`w?y|EfiN5QIA7;~uqWOMsEu&&8u
zm`@_FXZG1T@|DFhyzAD<=NWJLLr447?B^c*IEU_0!ug!#ZhMXK2NpKMKLG{VdNw}m
zGolxA+l)PDI(&7s9xIiKBbStdY}U5<$Huu4vi?OhP{kyqdse<DvQj4_&^^V%X62aM
zh*Rq^5A~wj0eT~NG5j_ITO?o|1irkd@kANTLEG(*UxBJLvMrtxmuj<m!_q$0H1ctY
zYrHMsR;4Ilb)AZs(vq0LmxOIk%$;9#Ro7#-6wNzYNxUEN=63@jb8^Hl4-}(iMEFez
zwPyN%^}9(yqPO9y%Ht9!+Zm*JB3_W8Syw<!@oK*JB2$bhpWZ9e`fWc=6kYdD^{c>X
zM7Km!7n;V&_7<Cn{bE@jJn~HX=6ZQF+Abj&Xdq5MO}3(;7j0`jS&5G3(;d~~=Aio6
zYs!oOWjgm`d*QM~VzGUDf&iTM*smlH{LaD8<SUjK#f^sbIxD#g)=OK1%;!~eav`1a
z>#gAPz)->FPh?+)L^}ui4Z0r$Sn^*vm4hLh!upDBs$$dbc}4fXUGa~g!1al(aJn_l
z0GOx{agb$ixRenpQRqrmDz5NDV9TL?!YzN*tcw*bdY6>l6hiO4KB;|IN_YPON-YWe
zOAsFaE(pJb;opfM*4xK)o2erq<AKKxO+TY1UD;yG*<d*$%y1FaA9jkZX}LRfkrfu+
z!g)$9+|sLl6b1egFFW;*5Jc>}WLB%XuiCKc1C+g!Z+_1Bg{aEOY#~3z6rF)+qlZF*
z>u5{Ow}K7{v}<F{-n&bnSChcR^6qzNVO%voXjCd|W~;AZh0mjt`&gD=7>nD^^%lq$
z(V2DxmK?F%7#j8epj+;;)Y(vhRwHsoy4Oe1d_t_0@0vP{R%3cr>KBqygIBtSu7YFI
z+ir{;+~Ze!6dQZL<6w_5!=HiDBdMzI&*xg}rrrGMx4l6<Gx0%HpQIfkt7yM5ta|g@
zL$A2n1zqF?pgq?{93}?0UlwiR-<xb0IJaC)`cxHB$=Am_t6%Tm9xy-xl`T|O)w|9L
zcZs|yQM<U8Jum?kwVMul4Qc8QnQ;qttgZ99!Yt}^(uk#zNcp`H%++=z6&_WBhpL5=
z$Bfw3fkx53&BSk)lW2c*u$rJw#hBJAMqI^b$ZF%p#abms^B#0_^XZe`MnR})wi`JJ
zMT}86JALB=>hWG7SIXXPe8q$cYVqkmr}ytspioM7k21D0p(1QMK}-8~<z{Y3KhuJt
zh7<fb=XWd!?%ZBGY$Ks;Rb|IgF?+{zDl!pL2Fs5|%OeB~)Q5;tI;#>@{e}(VlGYMk
zG!ULIe@PBOnbV}fvT&zS>liN7)yx5pm<?derUsUI5U2EymJd@va0RgtM~p~*%GI<V
zQH#}ri(R{Zkkr-%DrSb0*m>pEJNa_7R-Nf3<9`+_CMzv_q#CcUUpbYyzwac4o7bRE
zQDu(Wf5LOuWB4F$%=ZTSM@RcSCjzEAIO9%Qdu)acGR6AP&E?K|RC#{=!QP3}!~XRV
zhEcy>Aia0ofHvJDZg_ol$Vh`?fs0lrLslys_HcV(h<j;JUxAVQ+sv_xipxm3a9Ie{
zN!!-^i#VrDe0ZDWc-wY%wF7W5WDBG>0Y4+TA2997(HU7tc}x?g?{C+@i(=&B8U+><
z5&Usy#lL6!ky%ypL(^UJ=tvtVjt1iP6K8Qtx3Vv%mPwH$ia!kPT2dutF?4e}dlHXN
zcy^16RlTg;^f(UB;77<X?d=IwXSbcU{?fFhiME26pMc3(*01xt6jRG@qgX$7%PlOg
z+5??vnFwfy`$39?+Js_X#RF*RWZB)}oAiPnTxG7K4D4Kcs&(gCFYE>)w>e2v=LGc(
z%p3%0QObC>@mlX#%;j(3x4c$;(C0?vRzqgF)T)DO-fkB6;u9_l5=t0St*rf0tMXyW
zG7lbjWDXo@wZ};2^J2OmMWBO1v?7_w>5MdAA8Uss4j0Ud@;p~T1vU}My$1i1G{KbR
z=!zN~`cC29s76WGC`{C2;)y-|9~P5K9i@8^bSD)W<@N6TuO{g?B>KZ7{W}W%RzgT&
zI6Y|PEL4IWmTZ`%ERl?Q%VmFd5Atkd7g^H2&co)2^&~=ho)dvLU9D^CLt<NZIM^(q
z>O&l~Af@4LD@*t@#3RqL$Pa%#mH3zR?aMM_b+gg%nJ?nXbCmWJ7a<r^b;ff>%}G}M
z)&#d{u-_;nZSN<ooUXiCwlAUQg_ELYhq?j<Oonz87>m>40BZM<n7Y}+FpCoPz*NIG
z73q!t9-RDHBGWCY-q{_wLEtjGO$yzfbG*K9sIicPCLadBO|v3pYA&!4%0ZMBgmUL<
zI!7t(+jTn~+z@ZmJIVa6flS`5^31f7a-968tGk)EvUx;<eOqz@KeSiY{JXnjzj^LA
zGo}R|b_rKY)3ZU%n;P~6Zw~Lt&{b_5GqIV6B1c*%ds&<9@<q!G&L!>*a>!tiQI(y7
z26oCRh*qOs4v~5>t8XzqM|_Q5rQzKdkE^$R7-(k)RUP}Tjy5;e##0Zo{~90sOPa*(
zD71|ZG7kD=3Nh8CGbDABT<y2rkf?Rf@p@|s;et82H=iK#6>AJUCGKf*s04i9noEi}
zDXFHKe)drf)z$6l-k;<r;ycHBOLgfYPr=oQk4I)^N{UV!QM9ayGWnP8{+cCmJo+#|
zH@iZ@7v&H{Ws7X)2N0*ft8RoJ2t~D>5h;KTIm-0=j+>2;MuVe_bJt(@^gbGr8W8m-
znCme!Fd+Wk%M8Arqs*1`;wXK(-c|62byh>oouKS(8xIZSW`@OOv9qR4@GtTI8{#l(
zp7*hzk`|TkOxhEuFxepg2_R6fQbdlPs)5ol)|FM&@uRQ=^kjohgRx2-%(Ai7Y8cyU
zpK{E2TpQ-OZ^QkNR*B*x>*B_X8~!(>o@C9us!}rA-kJ>`9+!}mZYYY^M+W~*-&e&F
zW!%^j?1RR7x6tWn5mkwNIGEK6nrgL-;~hNVpQ6V>A<#n)&gdOX>Yp>Sz^_0LvaJMk
zOykZd>)hCSvmM1h33H0LGNDRMn9)&A{O@#SM<h2+7*awyx+a9(m`Q3u!S^elt5j6y
z1kkb0T<h+&9nUu!v<ky6!n{<^{&d0ql>NUXWFle_sO9n+xAWu_&o0xN6r~*a^AW_0
zBU-AX2TJ4p>(nJkcjXBFNmQzl#tt1+U8f>h*<IOM&yX%m$%@&2;hT+?bA-`@`|R<_
zgQ6y7r3|j4vqSy;@Dl!jg$cQI;$2#6ZkFwCtr~x4k2l`Re%-xl{rQZ&78%=1VNQpq
z8bY*Pe*pKtJ^j9HBDYS<z_%pf$#(qPyK}j<WHvoOBQDkvppFb?WW@p;r4JtK*?}NH
zOy**!$yNO9gGUz1F2gh8a}4H3VEFsX8V@2_)ciLED^DecDTaK3?>(FoTga=gZGyJV
zg4b51?1&jm|2tAVc_K5|JcKetCZQm0w=Bl@Rc_BpSPRw$z^xo4hfA4ppPc!<{*m`R
z0+<eM=CyKbbgZfQ2~ao5(VE<p&eC5<G&tBzs1OD1Z-bcUR|yQqgaw{h4l@G{oYL=A
zW#Sc~QoRe2K-#A9`Yq#f2^e<w2Loeedg5Q0^iN5dlT{%Yw?od8&kwr%qeU(^eb#4b
zbf3`of)q=ZyoH3RwN<UA7nP%cT5)=lpQlQr=o)6cXJTz5KR7Fvtl3#Km7us<95Ryp
zk&aQj*ls{Ps#S5`st_DgMU_Qtr75C~blUJxTl+SZi*`p%R#VB>{u^KZTHr@9-rwS$
zI{ivdPyT*VsZBTp-&t^sY<d6D7d;L$#@#kCzI77a_(vvjd(ROHoVHvsBG)E_`URQ&
z+iz>-boW`F!>jA+>jS5!BI7Zx)uOBxG-5mVV3r3l8WsxENOPx1+bNwg$G_bq*zMA-
zIBLZVD2RpEh3wY#3EGodSuvlwm6Ze4O6`osRGe$i9kDhTRJT+cm(7}~70V+_6%Dwz
zggP^!NK{kT(5~KLqn=Pu_@LhjEH4WS7Y;ObGMoSM#ZTec`W;k5^_O~aw^<G2d&PR<
zFb7L++Rri_UfnSqw7sxq^b~}QY<0sKDb+f`1hNBJ4w6hGg*$FJvxmPK8GeQMs4D;*
zC<8s0Ghq>vz31ihpC?gP!(`wh%m}i>8!@w>8sCs93&{n@nL(3ViQOw-i@y$qz@*q+
zY!5q>Mx=OH*d+5%#gVf>@Zf~#=*%u<OVHA*%bm+8<E<o!E!?K*n>V#&RC4Q)tI$UU
zm(HpR$*;${tn^37Y=5ofWSkCJ@1|nf()k@u-3OIDURI0mGntw98yeu1H8GfNODr~<
zHZNV9fG;P`VD<L3bF$(U7*&MD2Nsbgll6|&eHnJM7$vf-U6y2XM)X#6`EUc;F<$sM
zJwV(w^5#HV8F*l{<cCOobo8w+A^W02*_IX{Yd6<)-K?AegXRJB-Vml~#qVA3IG4}H
z+U3CPwu=Rw^M<STJDcylPrG6HY@uCi-*Q3<gvF{PRG*)#c6@Gqxw^fj+x&PSR+6tf
zuDo8nMi@5APoTsvrgc*R%1dl&Iz~bHv|fqeL*2l^ORwJA6#EsDqo!GvSJS5@>4mh!
z)QfZa%C^Ujr=l>-!jDufrG~E`RbB=)3XYDjq&wf|)0@dM7T#o(PIi(hZORe$#|@|o
zxELVttt*!wT_tRHxWpHPa82B#-bwW)v%p5dwFZ-hE4F)%#u|N(0}*UCWg_H^j86{u
zn@!X5GOXtA6r`$fdI>|xQp(LPA8(8IYVYo`2;~$q<SmVWeC>-3aBemg3#Hx9i{i4Q
zMLGvMt}y%h-E9EYR0_|OR;RB_)NBEbEzIdSCS~lUSVL@VxS*DLhQ)pP`9!)34(L1O
z_DM*OES=@1oMXxu|A-Dfy|(;-8j_fWv&O7G-ka|5Vm^3elG$9doxm=Vbz=LCES9)A
zhpn0J26*zsl=3HlMXR)hyjjp;?rweY!m2JEF3e38!RdApOBdGLg+bsFg=M96v?%Tq
z1kq>`i1*>9J}*nK6I!BwTL9kynw>y)QPUMv=83-k6b};H7c*(@ig$5lI*d$lv)QO}
zX8~p0sRZf$&Z&}?7f(5^%<FBx<+I~al;kxuI5o0p<GUr1(`fG|0qJ~Ex^PV#(Q!5H
zKGG|CXZZbjr%ln7r|qcu6Y!d_?P`o@ws$j&8#Tpf)I$B-=vESl$&(#u#gtWU)TukT
zp2jMnm^>$*PD70{q5$nk2(OR!E@VR?P&??=*ES;+p6+@~l*6@>kyeZJ6T+GPm=`LR
zE&9(o%e&X2%96|?AI@=>ks<DId(J!o>)|W0?c*@9J860zl*Q|uszxGhbcq7R`qR%|
zEZNSoe+m|a_qZPy7sLr^2Q=#IrVE3%&!;)snC@<_{TOfAEc@IN_-+B_b3^yS!&yMO
za`3xH&P;+$h9%uvzFGR#o4OiL-@BrB?s7a<RVn8sXv)qR0{DuF7CJ&eY1+a~JA6RX
zB?ccx#@7=;{fh!xoXs7E2zTo<4aGD)@*yk_{p9@BCqn=QOHHh9$cTR8K5`Fcp<`aE
zas4`resPhf07PsTjrQm`AZ7qr;#K0lxb8|_{y_`w`F{VAl^=4sAmd#a&5bmRA}SyK
zX;~4r989WeRU=DQ=lY1+s>62lLL#o4i)+)kb%Wx1yq4N&%L$UT7cn#T4U5|X%4q+n
z+kf}!66l(u<uQ@L#JigtE^t|fo#Y2u_BN5lkO<^mJNopTc>5ht0qd(^%Lm`y5p;>2
zGPLGpK2GA*YnC6Fco!u?qP20%ZcVj-L*OsgQf+%<FzQi4ji1{L-Tejwv!vY6h?mcp
zm={*8V`^cxFUk^J!<hOl6>Ndn(Zt+aX3L}SgBWplS%roY-k*SLF~SpC>EFLGNaY6E
z?EJ{9%Z;HII=83|$lBMhD+_%x+L~2CumL#Wf{AJ;zMP{f9-!v6-CJ4EUHteE`Rp$d
z2c@*}anpKtC0J*sUR=?{CP`RcStX_$ZE83F7>Q7LLCav^=354F=uG?Uet9&j4#u|c
zuD^P`M0PKupaDHc>-cJcdkJm}vvpD<wY0oH;PuW4{Dd(!MULLAwBEW>T%z1)4C$os
zDYTcy%((^%Su-hbvg|ckv<+TNnr4s4hTlpgq;*){-3H*~K0Xy5uer0p#Z}|JjG$HT
zFeZsBi`;Bc+n(n)FdU3>bC#eBW`lN}Wxk=P&KM{v76-SPq;2|v!u#Aov&F9(Br~gj
zq}7E%Ivrh0aaH!q_w@OzN;9$KO|Aa*0D5okj&b2iX%RfS$m2ZF{7J$1&P!B~vn@l1
zBe#Ia2wJiQ3J$ihDFmE2z=gs~qYYW3tec+8x${<9G%F!Ti#6+?GRN4UGi_D#98Ejb
z7;N@ckQCP54c(MuIz)>0nLC31t*NyS_f24@Fi4GSoAj;SjWq+&p8!iN?0$pcyNIUh
zI-v=ADayT2isy=}txGR2e2dgZX33`typ|G|C@9vCS@d_x#3V}05fFZZ*GcDjOTBVq
zzBR+PF$=dz9)uYfSc=vJYb;K;JJe9APIydT@LljtjGjMEVvA9_+Nk7-Uas45_{^3Z
zql9@5?@Ahvi)_X4+j=@w)6fh=2FgGvR=CO@uaRV*3J0%pe-1^Snpkx0H+^aTl8U;r
z4q$r#``yVkG|tMbJwA(xyOdt6?g&W9Z2s!&Z5;Q_M9(SC)jWC~88Cv86!ad1U{u5R
z`gND8p(FWZRc|27!p>7c<!e_B3Fq_2&a;yZ%7t`oSaMo&!@d(=_c(nlFt04A*&=Rp
z?bv6XX@{b`QPQV4dR))VhZ5K{*I;!?#k8p3UiG8%*9R3FKLI|@y&`F*@prUZD8gL{
zdnVple<CD*eDtG_?0HqQL!rN%6c=1Od@tT*vxz4*K#KNkJhY<cxiCWIIDRE0K@@e3
z(+JCQ<a#|DBg4hLBXMnn#Md&X*?J-sHa}(7ON$hBt~up??|f~9y_rC7`Gz1LN>xG7
zT|IJAVd$~wtcDiPtXNKb>~e-rF#gfiB`zk%P5pB#2zS!clLw%j==y-G8)erEg<iF{
z?_2z1p;TN7bdJ+!L&dcQW&)*n@AT?_HO|V6B<mtFh0s16QnEaYqdNLtu|3!5xU^7O
zzNDiiHKG#)KRcpcB-E~Fj*Gn}k=rQSp`Dg`sQkR?yHWCBP*%=N^RQT0Et8#Zxvfw~
zXF{b|WpCzf`NZC55cX7X*#)>B!Xmb(Jvc|5I1)Xzcd+}tDC{Cqmep~yB%rUxl?MQH
zN3SzJp#;>mr{5fVrob+@16Hd}Gdr*Vd3xLTf;rr|OHB`%10tih3mAzl*~%*U=zEY5
z;4?5+akbQUuyR_>zN+P-5<C?k-DTk2^S#x$qxTRs%*Bz6sjd1Ng!`2A+I7QBMPZ+d
z8BevX!O#pWPg#VSZ~?0Og=n2`P2<Cdn2(+u&jT1$UiyH=y=Qj^sxm~Lw$&cR^a6)V
zs#{SAcbOt9cCToP>1S8p>@%$tvRW`eI9$i!3p(RCvxW+@s0>Ya@kP$wuz+yfR$m9a
zYsfvH81eev;Qi0*fmO=`gN@w@m~;k1Vs2LAPkqK6Z^Nr&wzo}iS;93B@(UPMEz4*`
zeZ{q1;LpGh`If3ypLbSN+IXiPKdVOHN6U{)JK~rU@7>RnQ#P7M`YLd5XRW?2a5c(@
zd8V)-?gq=cCaBd&4LjNPJV8u9$KIaPZ!qBY`M5a!aYFE5{wQ>4B=gbL_0Q9X+b-_B
z7sG9^yms@76VFbx$@WS`9e|XahMIh69?OmEpR6pWw@p~(YTe!$6U3;m;asxL@c<u7
zT3<3fxqtN03}h+v@tt{6d$OOw*R?eXKOsHT^FeN63B$dZ7D2ftBgPK_%_H%Qr3PD+
z*-I6C_9KJ)7rgKKUtZFGzq&f+OzYL?Rp_(78M!_v4{=z+=+oR(>|*0i!({GdDAN;?
zs1RcbvQ(oWdIyVnbvr6aqS^~l#(4%Dx7u@T4+lMMuj@KQc1n+-^_4&Oz74OMQyINy
z<tZn+hOgi?UM8mBR?!<HRAR5lbB5c3%_RSdQeKV0@w;)@h&%0N-a5c&@o>pmNvFjL
z6TFan`s0k_e9QYtYW*kyxj#LtpiX`xacvp$gau|#82k^FG5QT#R9y!3jyuU<f%@?)
z5W2S3rjjV!*J?@c$+c1mvgaj2>9Cu2<VPe2y=oMag?s0t^5@D5dDGSFBn3`HUuC4;
z!9yRuBkgSZG53S9W$Fgn5H#BmG3fUwlH<-cV}bP|J?5j#o;j`2S<s6}Vrh+hL=DW#
zF{f^aKFQ6iY9q?ydVxi-Bv+{|mn~~;b=<DOv-y+!h>j>w&}~c|ocTlI_)&FY8Yrb0
zsNKMGEHzluWqL>MP~E$#y<U*tLgDHCH}s-aZLc2+S!d#yt>$V?%TCycP$W?5&79uv
zq5AeeTZs4qW07IDk{u1(m7=Hy89R^3uqpd>Rwuhq;SRMWwz2DPoZX;#qM9>pwV@MA
zCU&0Hr~InLe7QB=0&BC?6SZOz@Go;KPVWJr8=*5}8&LX7ZU@R8D~M>RfUURzYm9e-
zOXnl3ene9kmzFgL?08tUsdgp)^4pxy$_g|$UW@oe-@)@F*1{|{50wIPC6dRTT<sGd
z_5y7;8y>}mdkJea1m)4~5I(Y*?B-$Kv8pd8sSOYGRgQcQ^N$*>D#8jNXE`NMw<b?J
zo7Eor#VKJe%-lU4d-Wf()z!shi{1m}Mz`Ng<FaJiy&*u>KMod7V-bogs{rE0bSW@w
zW0FobwS6%<9qM}aP*tG>LSddf!F!0rdwH7O^}!29T;63)(=(1<eB-0%Tr=vbN8H?G
zRHfu&>n>TGdto8ga#HKUHIWAIvp?G))8jiO<7pLcB5I~D2A!77FjzCc9V$FWMNvak
zXO{)IP}YF$4c<D;a-*i_rnXS=h}qO)H?1n@`%BNVtOf)zTg=kpDdt;tw*FhCuk#Pr
zZt$=dtP9yMeKX3(R1W&%I?TFT?O(iHJiaHQ|4!0^H*kl}*-oJ8PF|qA=tS3qAeDsP
zgFN|3JBr+PL{e>sQ?Ji5W*4^W`f|vc-{1?1KMvP_b$8l*pI)1~UvXVM3Y0wBTDiJ_
zHAo@N(y@`HbFFRHHAsYpy`gf>1;u)n5%brls+FrrMG?!V8}<$Mw$kaVZNNn57Hf)+
z_4p9<4%MR5cj*A&J43inuK5DQ07X?Mg6_tkEgozd_#K35wsOrFZ_6fJP>2frp8n?5
z&GPR3u`u~q+SZ&|^q{czE2&Kz!|L{0;l%SayTC@=Fmu{v%K}>JhA2yV*wSpDSD!Zm
z+CEUbs!n-6Uag<=L$))7@j`j~EhtQ%D<?_n3n`(nFa;NB+IyYS#n_R)?%Ap0OW>*K
zC02cz`{)N__l4Th7R@`CCi|d0#~;*(%F;9=&6&$H3k2jC=2qM^r(tW+qbT}L!;9%s
zNP6_h4r7~8otD>yWU;#Gx%AZ1wn@uO4cS~jQB@_=b@s_<J-1Rfa4vmh8W%&*i}|AE
zS(V*lW5_I-?gZQB;+p;z=uT&O1Tp9du_Yyd1OT9t@00yb5bJC++fr|XpKmg$oGCuO
zP3zQ8l>X3=?pzF4RxA0YUqil9$*xQ->J_Jz<x5ZhsdIOoUIXQYUQ`UOQ(g4|PJV7v
zOfB!t-R-XDO{(J-83Y8jYrVz^i%|+ed88Qy=a?HA6i1g&>H<GhOzYC^NJc=_8#RaH
zo9y$%Rmy=bkTp|Ky;;jXdE)%n+46oW_C;weyT<hk;f(BNHERXsA{(fFoW)?<^cUfl
zO4wGE>3RI=7uhE}uPT8nLRQ7b94T1=rFl+4+C5@L$FqnNxV@{yAbl(*iqvDRb>99&
zoO;p(!dh8n$3()n4)nG5j4(KUL2?lCI1MJ8W>yzQ<<J=yaWB12acuP{e`e;kn^>xs
zh%Yf`G&Z+{iX`X0ZPHy0(RKTx?V9BMPhu{I-L!f_uk_2NmLA>OSFg5Ba<(dXWwV`@
zZU2M;*(fM~mVBmX)f*+`m{R)_z|Ou@hovYLLjnsjg0d)oJa-n^6}eC?X#M<-CCxem
zX>sQ5u%qbm6HwW?Qt#wwUOM0TRnGX91tRsff>Yqgy_ZJ2?gh~b-m{<ts#M8A_frhV
zX528mS_?fL&t287zsA2VLc`AheU1secKj3Y9)^>h@2gp)%dc7xW@lHO|8V3Bx|Etx
z+r=dzenj8!8$&-lJLVgQ-jOIYCwX4R*u=@J%H-E|{-R@rO60ZggSB60rD^y+Q;*<E
z*4=9au$_b#*QKc);9IABj`Y&Kd!8M?q_lNTHK3f;Bv+Z#7uv&dl03A-IPG?r!E2NM
z=&@9lPDKCx6rasO-38jy`;0EFbHwg%QKz(#RMeGZhq9Kr=T(~lcJ048K^Ttgv}avX
zTsoM^Zx0_J8sfr<7mO|-Jc-%~nK{*q(Ie$i4FdW(>O6tPuS}gD;0DAcOns(HYzDhM
zIl{3-h~7MADD2X6emRi2WXSCM+8`w<o$MQ|YP;xF#O0&!K9}^=e*dSv?+j~dYqyP?
zEm%NA>D59J5D@8IMFgZNNDV~@)zCu6P!t8E1O%iDs5EIogaimprI&!T1QG}(6zLrT
zA>qco&pF@u?mhS3=iKK!_t#m!)|y!*$(qlc?>pWx#-vG~AJq2$__2Nrtnjk9*7%g#
z`4)6HjUymf?iNMn?8hB$7Gc$D-RUwE&P2{HH}uj6-zL^&`Wsyf7PZ&CI4^9i<_Zco
zMTod&BrQ0!*tCnZ?TkaK<&;$(&u)%>IF2Mt<&SH`OoT?HtYhJ9CjbtqL9hErQdr{N
z`5Pc#X``CR^`WIoUVNxPkDr&igjxq%do63iyD@Tu+zFu5NQ!yV*+awSy}?HhS_e?#
zDmei-)Jn!qa4Yf|2Ren{(vtNdJ}R>dl-WkeQwA)E$^Kh@LC@Kn5>y22-SI#k*9r-s
z@z@m*DE^t8Ecg!Z!!j8ebfuLRNC$THY~Ck6jk-Q`a@vs51y2#)ZdGx!x|aly10yt~
z25WRXOF>~+i)+16#uJn4`I^wv(eneNqQ?`o=Hc);;f%!?(L)!KZv|izF6GM11&<b(
z$-WulUm<?{$GrU49>e>6%ubDbP^S3Z&tM#{_(p-=97ZI2S&;~PnN%bFD#Z#wM>s=f
z$zS@PF8og(((~)dM0ZG6cH05Rsutq?`^sM{CSDEpF#i`3bjUEv{Bw)Bn^Myp><ZF0
z_>{Y{%<l1m;i3hvGcp#)!1jEL9Q(J;%Ku8l3Ayd+=$qBey{Pc&m5v~^M!PHHFUNvc
z+I0%e!+6R>voVhwv}JtRF)N{h`4wkKR*>(o)+7Ws@sZvGqZ%&vNmV&Zey_U72^SW0
zy~_YG%1pVGvb8Z%Ny%j{8&#j{=%98`N7DloSZF#Ly9+_K<JSX{ty~w9na*6*l$J&Z
z)W$uiQf{66H#~QE-D9dY09_{OYYs!Y7reRtF(jEi_HBnO2ltaF+iYy&C{VVKW*$WU
zaYgZcZVlI*ghTF5t2q$(4ZXJ3g|t^VzrMvs!4Y{|60?sINbRFu=1mT>GK!7uugysf
zX*RfrryQ%Y_RaO8<?GDjti@DJ!DbGAX=$pdjbKX*R~)hG6hrFhXhmUTx`N4V0^w?@
zWuZ5Sdl0v%_~LH}mxX)ajOGRkJshX&7&&e)o7AB9n#Dj|m#-qJd~-r|rpE$Lc+Ofu
zu(;;81_h$48|4=kYO_LwRy?ykr@QfmTTPKa@=XMp{Fy-|nwoRsaYRIL@%Q>73rq?e
z)-$8{@9P2ov>%bP!eO=nQSkLBKi??+ts`z_%LWqkLh&~Lx3xb_DXBBs5Dt0LwJ=eK
zgTx>Mk+tDGeeyfCc658+wzYN7;kpncq*`b8puT_BdQrI`WzqbTZ17=C--;?BjqChz
z=&<Cfq)-hip_zBHX|M^wD(kDGdiT?z^kwvZdRBjxvfc-jFJ{8b3db8Tmzky%HQJ0k
z()Lhv{R|1DZ`(1vGFWh=x*N-d9Oeag|Jn~-1a>+fOJE1pH<+)Dm|Ar;A1n(KaO|kc
zf~~KYWNhHd*HkSPe_q~W{JfhpCtJd5Ol((}D?t%V7$J)zpA<BJ3eC=zTwvcFt+=||
zgn@=Dr`l>z;izZDe^^;DkCctz%~ahPDT`^x#nt>$&lL`Ro4|HGjHyO4D=Cz$lr?NA
zTe!H?sF!{@A=iI)RtXlhmEKnCO@8n=>0oSTxB9j;!HxGlW`y6r0tl4E7ggBgJ?}Hj
z4E85uVTJRB^EH9;DV@F^H_A=g7Mc=xOR=(VO+{fmqcv7?F&MV!$EX>Xh`MyP7YV9S
zx)CXpO1O%dP%X;`SzVjrR*Lj_q8D7N<2>Yvs+qw4e|3}5TC8=Ro46cQA0Lm6LS^$z
z>SVd{nBAY0u6{u*{AgPtZu{t4Z(Xx4so1R0FVc1Q1OQiZ7mi~*0mQv)uTi-_iVfsa
zy>kKjA_+00&7IJCx6rH?83#$Yguw+Cme90-Y@y&OuXS{N-P5fv<7d18Y$5K-PESib
z>@L@I^(3{LXqoaDgZp_%fvnv$xZK@yL*iyd0je?gw*iCGKMEBK*KKtrT+6{S1vk_`
z?%}AEZ4k0-%E<w%^wqJ6Yr#X7QqE$LjbkqE9h_xb1-d542U8ZGqyJK47KIX~t`$J1
zu20gCBxtv9F40(bR#ylJ>T7<yB|es;J>b5QzwF7uxnwKgpYS%1>G-8DvjEePmK?L(
z-A{3noGq!o;HGA-nT{sIS9lxCvBO{73yz>F)U<%h^M&tMd}CahB$Wj##3vxD70jpa
zktA%RKYb@~e$`eJDGd^|R9)v_d*->V@Y4#ouX_{b8u-UFj|oBW0stbWjB!auZ)1`w
zimtH|cJ?FRq4W$&0ATu}<3%4_-PZLdxBf-5e~zG5Inq9H(DFcWXJCn+hSz>Zdp7lE
zLvzx)Cv4>gZU-6bY@CH_Jib`qP6gkqwK8k`n3N6)$&>9v+<E&<k);d%wy43btN}~s
z*NHmPPtDPWxja93$oo_DfzFyyVzh*C>cY7wlKAhebh9@hct5|?967d3=s^=LeI*|-
zI{kFr%NFkjUe4Hgq-jfGdh0z69Dn#CNKE1TvjGVpNu`x-1zu&joR%2qzXB#+O=ILz
za(^>|QTm8Rg1#48?-Vo!BwqM9^+XB2wdSEpy2sS{oLJyy6iZV{UwbtHO_8bln(VlZ
zrJr4zmTLrnIH$DYU8gaz6mFU_sd6aEVu&9q4|c45He8ONG7>moGY#M2d6%LM;eM53
zaD;ZjQkfSbFd-Z~b+mA8uKjZ@Mq-i><@{ySy?kv!EA*<#Jr0gec9@Vn6MD-Kkvd<4
zA|rhse`Q?Zd(-scLRv!d`1-V>(uby0!7Rl`%tc~p1{L|~?E6zqRrp9M*IrQ2voEW)
z7ydX>=mn+F1|%6>0miK^Or8=L#ui-Aspw`dC(+{&^2_XS<pJ&+P?^_y&}sYYtqe;#
zyilVv>TcEp0l!~f&}crn(*}uNVBeW@D)8;j1lh`VFY}x`p0LHbTD6(_-bs{MG>7Ih
z9P-S|)dc0A-ZLfywSuzUPPPPQl|0{&>WbotA<3UI(p>RH{8aH{r`|QmnJZr{(9C~a
zNWWm{R?J>^5o+FRCM=sCv~87A;i7Acm%-7oKzTfBRp`|>&B=}uzH51%kydiuTpxE5
za0w3+49Yuuc6mGxD(W0()I!g5Ww*F>dy><f%lW*x{?Lu=6M~7n^+h}qI{|o38V|ub
z)a2I8jc$rd>|j^G;xQ1iE$4<1O)TeFR1)z4vS~GRo<xzp;yumFWcnUx6EvQV+Hfu3
zhiq-_2B$vIF5%g^s+2`k3BoGUr`;8=AbvOjjJDEjBiKH->ilxFgJunv<3e*=nMZ7v
zVp}4%8Jk83=Mg;Mn8GxM*hfg6iRFvh%r_R!$cnm~W(;fc???y>OQ`2wNE-tZ`5HE1
zEl7T*KJC_~8ew?sLvyrQ9R%FcaSq*^;HIpmKJ0Hz>yNuXbn^d0!60OP(+S;ifbO{N
z3wP?ak-hiRdiKC@n)9c)iR~#c@etItmHj5O*Ry$qY_4F4y81erg<jhikJ=FO8NBiJ
zZL{JUZpN&t?{wji$?)hmpW<^_!GSXH)H&Svfz7ol_oRyA{F1U|se9aAb3GpH+_xAE
z-bhLcUbx`L94weSc|qMqB*omKR*hY&alLZ8^VfmsUy{%(xeA)9hSI&PFA%Fx1757`
z)}Ji*&NW<W{jCVCs+t7m3DCk##`d+s>a!9N=QBa^m!7#|6fX$*%9iiEem9U@Rbb_y
zT7JHvp{zGX(sLnscEO~Sru~CXgus1cg#20Z<E)(hb8ly_5@74-ZdUU|5G149uRh)U
z%5qWyvGhiC@Q<huITC7-cT*r%n~UOj&$aIK#9ljY5M*`q3Njcu5Isp>*D)^P_h8Wk
zb^djw1lxk^21Ju*;L_@W)CG3p9A%W<moDwQV?n2rM2?3)hrCKkwlUpUuu{?cGiEEU
zHDE^fx{8F!><7s|9BGLKh=1YhUG17nbT5c)0r2-=sj(}$vq5Xqu%Q8&*O2?)tPh$x
zU|=gTU6B{3gmq#vhd2xe_k*@1+WVIpLT)!lrm=fES$0v7<_tBtPZ6&MN{qW3j)2)=
zix|0Xb=S?!6<wdO0X+ADm?diY$I~HB()<>;wYL9&`^UByQ0|4#M1NPS7C(oKnQ~F|
z)-Y3dO`%^p%hAHkl$p5?;P|J{m|Qc$KS4$mFB^8GKPt=EF{7GEu7E;RN!ZG%kvDXP
zS05Ja*EcnyBos`#m7Wf@icf4aynQAd!*X#Mles8W9;SQ(xE{!t6WN$<?vs2yf<3)y
zgiZF3#up`a!VZev4-JZSU`{`C6o0`*E<5y2_JY}{4)&k%5C8lEtcj3ylXFZY5+I)$
z2IosgWITmk9&SHZOAjzhg6m)ipEpkcgHPuI2vgm6@F7w1xMlV~t~-9I!inARdlG1%
za<7sjV_t%1rZ8XkO{&lcJX#NC-{YY(Uti6pph&ol=Ck?!^XD@tKvqJ|d(r&KQbV+F
z<@s9&P1tc#)mB2KPoCM>C&oq^7bvYMp_9i$XmX+`K1z5w5ETOBE7;_taS2$sdmDq+
zf`_Wg;cMBe2MJE)3eX}q;RbK!FnI?0`#sotL0DOCu=!nA21ILYVT!-T>?A%=%MUA}
zUXVrp7)pcI+nM5#MykaTv*xPM2$zQgJ5M0>jS@iA7kzJ-Ds|7k>F9Fqk2dn^&4fM+
z*@F+@GY#>V!UvI`?hF>ez4+DN{88Gk)(3pO>Ezi^x=S>QRSV<i7Ta@rw~Iv9p>kEA
zu6b&0G-WF%&h|iYlL-to*4+{8PehdWE%9Qb^_8!5;n_g}->_Y-WOq$c)Xxa)1i)37
z8oyaw*ohK#p4c^Qs#<SSznQdfKu*_9kP(QoVsvyHG-REB7|bTT5Nr22hhZ<XsK?_<
z*IW{=ur>L5e2UEjhGg!3*>!G(oHNs-zU+&J?DiWfWtMB8U1(E}(bf1aqNf4;9tNnA
z_CjB#YOpyvX=s}1TmyT|Tx*kr<<MY3RXR=LYE-Otse8dG@oL?tbb%PJU}QhHq)6c%
zZX?cdTgTX>UppgW3lnYL2_7DK0amooi)4-!$FkG}bnpvz#<%0GmR#+Vl4{$0wIzHm
z+R~8qwo<chw?&C#Xo%k-_+qRV9JW?YiBASed~A2-#Nh|dhbY?K6}dn7#qBDtu2JF9
zOdpf5H89RBXe-hH8$j$9U<~k>L8I%f%``8+&ErdYiNPZK2W6!ehWjAAXRg1w{*qVw
zbUv*p|7C|u8kd%Zlg)6Df(tyR`EuO8k>U8;e@XVzqGA>Ru%N3w1~bd;{v`<(!`OOq
zv|M)7kw5@=YLPFt=quv#hW}VjkTCV}{G_POj>Mw8!W2j#EIG*A*~`dfBJyKxx?8jU
zYa?Yz33x$F@|Ue^4;tTOECjF^Xb#wJ^g%!8WfB%q!m{L$kh1dy6vaGeP$koRujg$g
zhFcTz+!+>K{%=~(XJHldE~Z~%NPaH{UPR+_d9zfQ-c6UUDC0~JbpJ%q`j>;d+t=Rc
zI5D~=ePd8P_4#GjrNk`tq}{t8CdkasJe|W2p!9l*+?D}7ohq(pSd-pCm_~HKrMP`j
z(X`QdvBUk0?c>3XJ6>wp`}p0XG_!5)=V7;EpOLeGOsrcCwfZs@6C=NBYO@1BHV82L
z_11&3MN|McJytS)WzC>}2+P6LiF=Y#^);llTL-pchAj%IPfOQW=qoi4`_vf(`*=2I
z<u#9x+nbu>#%DL@+`!{D*HG4CsEUQgB<Jt?Nrm}OBt2iapOsRx|FnJsLAM;ATV=BR
zYyo8zu3j46(;O=^spyYQOnFl6xf)thE2qK)i^Z5@pHP;B^GnP~UpZQg`~tyROxsoy
z^IjLQ{8DMMUL5CX!bhZe;iN{7&bZ`e+RR$Xs8{J&^15Kl=p=jo-l#EFj#y|S+{tu^
zQOoTB{L0f`IRU)FqE{5`&Y_Ou_VTIK48tpV&y6DS8N9soj9RbR^}Su+{`iK~(DEZC
z?&fM4aa{U@SeTdxvvY%B;w((D^EY0+(##oyYN#%Dr?%lIjIPq_y&Yy<ACiTc+_$_6
z@GdG8^1(G0+DQ(x8)a3g^LgC*RjL2-Py6~{PtQb>lMPkt=x4a)tEIhxCh_(eZ&C&$
zXTyz~_K?%7wXmw_i=yUkbdQVO9^r;nvC^{@*B`cNN{0koxiV_&AyEePA!ql=!O(qC
zUybByZmV^?+fYIa!ihrp?|OJVws8Jg7?*D55N8I4*xS6$%D8X6Myz;EUgetY(GT)9
zrHAsFzpK^n4jry{GtT$iJw-36%@*JNO=4T#+x8nT|J6EJ@)w#e*Dc7ql5Jl?y1RV~
zGg$aZq$keW&#S2Rvbx)?a^~Q&*S^;Gdk!;sVc^i|LRkCJs7Qmi{>u11l4Jm@xfP`_
zyTy*#(X>0acqe3S<cw^VfiZ+WH+gnk!qX?49m}tgR>eQ17gT3)@gi8J0pzv#;o^ey
zCIRsQk&u+%_7w6b$>*F}>IZl-hiN1B-KXA&%<Fm&K2I&16xqFOnf0Wy=^b*cnEw6d
zpy4ma$soYbTcj=ter^jFu)n^Q;U}#Anz5pJ&ph8(T4!-#pQ1hTnyNBB@`wF@5^4JH
z)BivI0}Sz4q_@GJmj`%FCX(^4x%-H1rF@fD+y>TnW?h??B%KE@v&f)V|AE{63w{>{
zb{S><6jg)_eROo=**_n6y$fX(_<ZKfElB2suzA~I<yDXH>7}hE8u&I?it=}rEcDAV
z^_R<7JhPORe&{UH)o)#J@hsqy0bo}5ZXzhT)A5>&g^gz5Wt+mGyVo6E{pmjIon;%E
zHXn~k@N|2Qk2frj{M()JpHQlQK6s_ubbCDH!FXfW%qp7tfSLJQ4P!{w-b0K^y+Ftk
zD6TG;BWUHahe$G0zn%#%uBzhwVzWZnDj_(Ihv(QR8k%@p{-)zC^lZAS+z`X96p?(+
zY0*115Msr3i}b8X&)Y6F_p$MQ5TkG_imgagf2hWKU`xjbGAFeXq`7mTv2|2_OmW}y
z-BmgPTyCPu{{Fz8617OxFinY5TS<*BI^fAua=3ZhY|C)bQZ4!Z6w6m-MQ)%-2v}LW
z`NMk%ezjBRXx)QTM2M*OpiwQh4D5&X+2hC9^u9+ovxrZ!<<G_UFCyTOu&9-oqz-H{
zH)azKr$dhJm<zOC?E3z-yFRfV8rFPqlDfu7xu$XX1W;)m<`Sc^o40q=;(Orcvcy8l
zqdX6Dc|%R1wwSLsm<lhWmgW1Fg}oF`6Y%}V;|{&f?LsXT6ZqwKItLs}kqI<^??KxT
zws=cX3sSzB=Z;6V&@2RB&F$X@Ww9Ie0*33g?C{XWdSl9}olz;927~_zK!j?hVcO(D
zkvswPc~P0v_oa$Q8K&1;=1u@TU2yt=Qp={{B)nO6?tJ>#01rke?P&F0sO{tPHSEif
zvYa0kysXG9vnmfIQmV8$BqSw4N*Qanottphe7UxwrEuyHb^`eRx%u~9&xgN4od8l!
z0OA6r1SB;*d_jRG56FXZ3@^Xh47A%0pLZk{L4nYxVLr#jy~isn>dZ8}-?gr8b2lhg
zWD+;2j8I5dzTs<&9Iob;a{uDgSvgS)wvi>utQm})UuF=epIJ_S<P&5zmCeg8wC(1>
zC+M-sYY%P%wK6B0UxId`hO~knO_g_u-Cydkg$mmFXSu=ORW7w+db-K#Gh0E2+gwb2
z9;<5^j=3(lSh@T@A;FZcQ*F7YLg35JesBE4epQIeXD_kLQV2l_5l?00^_$z)s{&nV
z9Kto+@)HJE@2$JwZ@<~6d><uH89BlN(gy}o+?b=zlmnNrHM6M#X3}Sp>CTR-u0~;E
z*(f=$!L)XXjw(hodzEPm*Ap-=I|vhSE(=3{I|0NdMjG{P2@G|PE>p&`)fXXtJD)Ll
z4WZ|r-kE$ik?`VMr1l?Y9TMQuO2ej!y!9zoa=q(1@$c5O6?njQ9=Xz1{^ca?l-S?u
z_H&x!`Dw%xfDa8mfNv;s+H_OHyhZ~{4F>7iz3C#m=-PPPTFS&rcU}jF>28ZlxiF(c
z@+f3V99zy5nz4C-s<cgwb9>_czn5P8{mI|HE6Iv~`L1-lkUf{IyL#qOCO-@5_2`RP
z=-r<6z8y(H1zYJVScUt*o8Bu-+=P9T*4IG}d3vo8L*22?NfyB{<aR3BJsq1U#VkVa
zWvX25m8bX}39np@tW5As$oJ&81#MCncFGK+edkU48ToRcRw`2muN{Zi(D?=-y1({c
zk2%uK*qz%Cx;b+K(D`r-BxPyfX}cwRBL<!JbtviNK2RGBQNQ`x!7Qp}EwC?U6wr|A
zwx<6iYwk_n1^OLXM;yAWC!F$@DXHZsCl)Usz-dsw6D7%f`5THo&}Vs6JePWG#3<|g
zW}5X-+SsFffIR>kn42*xY5<-~+uSp$U^?B86Quoocc~Yw3r3-keQAnqoy9Q)dmK(0
zkA$s6n`}2rp@YtYPXG)?am$!mU)NC^<(h}f=DLL;aV2<Tr5@$LBIq$9X8S%FJ0{2W
zg#R^7AED!?oEb_+1q%8*8k63|@9;O!V(*_9%NlZ7W4|<1646i+Bqv;pP@+JiV6t}J
z4_8-+KEj54((?7)9*v&N>rH7bY*?|0+D2PgO@Cp(WaM^rFa9+;#2wtrjQhx4;O2iu
z%6oWhh*_?KK&yE;ff|?6wpa_imkxr0l9=k&>pdo(aK?Kw#UozVRa-+8lMgr)o2Vjg
zVqi*{VYQe=xD=lQqLO}iI}yjRDQgFfn=$8$S95FLKUmt_Mbr~M?p4!0>s@V%XAgiw
z9l&|4j!GNgT+CplZxg$~7Q8Hut?u5<1~f(yGstpw>Y)st2mwuI4yY4U-CuNq7$38D
zi)T&q$>e-~F<4M@4k9;y*Fpw^$hn?HZI!f6U9&SB&~9R0PF$;XJpuGK+g;0M-U1G+
znoNc7SDgUxCjgYWPr>9xUk#n-u-D_SBz6ioWS*Y@%1G+vW0OV<ZKGvCBK56toSr&Y
zbCzmLpqFSg0vAIpmQrq~5ao>yc=HGqR6cW>V{?|>-=yiVt!xo;g3*TA3E)Crj2Fw_
zcFn8qc{RfQ^&OM=R;Q$`q9`3AmiH9u{Sf^p;lOjbs^`c&!27#OEzsGlzWcz@4b3CH
zQC0e%t%R|;wRIXaMC^oN`d~k@xN&?w+MTGPfhaHKAL)S`OHtMAF+{bq0~=gl!|Ud#
zdtRH%%rrCT@W0KVF)6(K9d+jz0Ing+WmdoE_y5x-hmRA9?6CLTknsdVB%UU0SbL^M
zrYLF^4k9WgFGzi4wK1mIOfAI8tyt+#%`cgUr#27R{RFj~0B+k+b1cZgjbUkCbMB}z
zn(&@14u{V_4}KdUidRcpm5ymYC<CgGK{k&i?)D{`i)@?SGTW+j%O-H$!dLItEMav9
z9TWnfs)&!D82tgoyp9Ew%co7lI=lo53lDiDY5a5&bs+Qv5Qtnq5>Kwfd%)@fGeWI3
zFMn{-+O^+>q3!vO_N6jD4W_ABp8#Bd4aNc0vWKApa}$0h`%Y0OfZ#*xvYgHV(T2Z$
z(LF!d8S|qBX!dN>dD<i=-q0V#;S-*hy=SwW;&0`od{_giS84RyH($@{ag&&ba-DJu
zF}f*)$l!kBZ3afvbTo1WtKj)O<T7f{Zb8SU8l8KoGs)x$0mf#kP@`dZ{a>ZTn6&*j
z_~hBjYaKYd_O~Io<@+tKztR-))dA(`+I)u-yDAYlpsliE_Y`Z^fU^Yry%O{%A$d>S
z-F?FUIQYCueWjN(C>}Yhpzs4$1JZ#KKVI-1Xr{e<Y{sBo!$I992Krcez!*wn@VBfh
zNi}`n?4iAUYgvuI9^Xjopmqn0>4a&LBdvcXu0#B3J<Dn4Xs70DJy6xDDU~eJl&cby
zbNveAh1BmAlGhyEOgdhMATfj7n}LZ<5W=8E93+pU$*~kICp{=I0GpvArfwuzPaGrc
z4_vnAHkb63bA}r#h+wzndIgIKVqY?_ZN|dx`imiJptfwpp!UIM@duy3%&+=MZXkWL
zuImoj1CC2qgug4xVBmc-v;IsIulpuX?F!n+H2>IM-$*z+|Dc4-x$QG^^90a>!XIzp
zDx-~>uBs36m@I(&Zmx&<v3j8kWdGPkYY`O7LT;_E`7KlLC2mPn#(>E2p*eoJSo4jU
zxn}|UJ(GM|O^69R&g(oQePfuUSSMWJ@hJG2KBRl^{)#v6Qekhy99(e~n{`vgJv%c#
zGtBnQ=C3{Yn=287Gt&|B?SC53Jk|ghX&5WbW9=J25x^#zHgW&H+c}d`4di702|)5N
zBz9e3wl;69^?w>n9)%4A-4uS}LiOv!+mX~urjPoh(fQ`EGQ%&+<~kK@l+hyDAzLU)
z+L!_#xxc-*Xsz+KL1Y)owWSjN<q35SHIE?GHOC%ZIgT9H$R8Vs!BZka@&4Wa6^&OL
zXe$M=(!Dt4{r*2fPX5t$_tk&Ghghq{IOp~;6D@2G+$^>0YOyNb%TUj=CXZsxQI>8A
zhsE0(r)hx(2SyD#8i^j2CE2o9Jg`xnGBh>2<$|>xsfM=Nv#nA}2MkeQH9d|!(P61?
zQ(Fq*=gMdx0L~8c^eEJK!@>VDSkr!}VfDg9XAfylYkB|CSx-TtU$@=EOn&G?a_rF@
zW@s@uLcBK1SasqE7?w(0uOid2xCQ>1hL!HTnszqJ^19vv^w+}MGrJAuT#LXSk4WJ<
z@MUhJ_0-R4Bhl5`G?4ZLP#<1v9+<-@NsD$h6qXxCg;z}FhjGIX4~tqYx@F<Mb4mL@
z>-&AXec#X0AWFex)Ed5mac!$_MK1BadiZr@;<RdbyFHohU>yiI>ge3X4xY=ae7trX
znybJN(~i?jX-@A9Mn(wtU30SNcpQ)29~bx$y`*D?MD_LcZ8`>)8&|PbfDmerXVACm
z##Eq8!@x32NScqMgtQ5bdm`Mm<9)@qAnB`8v&f_vaBk+|jr^PF!(F)H(7W%_1z@&3
z!#7iRzHr`*8f?lv0q}tXZ*{3fSk5GvN1d_1ipo7(Xl=lnU8WCwy(=DQC<f&1Ycpye
zosG;q<f{okMWl)|kCjgOO!|x*yN4TuUfiw4k)3e?*1*}DA9H0&l|Z#IiEexq-mX`+
z?1cAo)5pFih**?A=aK6%{XIr_%(PNO5AVk=EY6o*ZqP^<iPrymAYy&{i;EYMI)&e8
z?85btgXZ2g-&<^(<=1MIz$_dXsE;W^cBJ0nA7u4y24*)&aAX;yaH>jSYarwXP@${H
z`Pb9Uowqj6!iFshruRuK81tn+P$J$3<~EH_<~tsT=3v6JplqAJ7MHvn_JhY;FG@Jo
zqr&ceT<=1l-A3~blUOc1O*DW0-sTw5Igfv`H9=}n1}pE8f`SHX-NWGSBAH0^&et)d
zX+I*d@%&wIPHF$W^_{Lld!gO6b4K-vBIqBcEgZhJ#0046=C1>Y4pJLvXfAPqP9-*N
zK;~vMz`w!z*YO>j&$^eXc=jwnsN|5}i~MfnkX+1kHDW`3vVjAhwiV><_B@~Lfz#MN
z0i<^|v>u!7kS}_*kS$ICYbSt7@p@y=H#fXo+>zq^3JjHm@2*aJM$DZ_NzaCf%fscd
zL!V0b*Q=FXcPInNh&8Y@Z;NU7ArKMHICktT@YPg(5><#e<fN7!Jw2|#wM4mx$uN(L
z;A@}cB_%Fb7BTlsmXVx0iMJ@pp$-1Jf1PN*0<J?+Ce~^Z-8gH*b*5NRA{2c(NDeNN
zd?=goi&m7&91<4kACsi%o&GPIm|^}NbD&0`*4KSsMoVED!|u-qwg>7`9Ga?DRpsuU
zBa8fU^A7_nX4-8Bo=s$sCl`$B_p3ts=&FxsQ+x3Ha8lwC0z1(@lDKt{XI_4sNP{0|
z7DApLbBFfXXcIToD=h-T?Py*|xh_rK+GJUB1}d?W5Ni9yo!Ua>cj;jMUQD|<Onqm0
zFE5$;)BBZ-jDFJAa#B)IpHM&DU_S9Dc#LoI;BsyBXEIM05w}-Mxw<R~(vYJvc-JT>
zC6x8<1{p!QDVOARS~aamxp!tBV$=W758l%9%a|AEn`}htX4x%PMwd91qVLkn>j{D4
zztnZv^<Ak(*e3_)SjkoFoJ$UQ0a1-0v&blGW)s9OyUm}|d}`^a{Awf)HlGyJ*A8-I
zM!;}!e<qy(#%DmK1nJGx-I=nCjk0=Y>EUYL`Bya+wOor5%~quQVJ$~+rp3d&oMStG
zisq<(xNI;Gm^WKXbD*Ky_dV`uK6Vn>yC`}Pu8^5GG1acIc65)%n)&g^InXDKJf2nx
zxcTw5`uf9Xt?L8x-7`a9YN=BbT;+7-Na`JjjY(Bs<>$?69!}6^!KY2pkK9HWoY+Fl
zV*9JPYifhMp1bL;_Lu&w#&Nj&K+t1W+_}<(ppTR9{cKUM51S*ZX^W9~aYTPiFFN3$
zJmwES0Sw~?aLgk1K6r`2+B`3x&TuzBq0O$2B(otL#ESg&&zy22?%vXarZQ#6q7<4t
z@ovj`On>g&vApsj>2NL}trg0ZkQ=Bo>0JY@e1!K1vTi2?c?=h)x88^2BwF63;T7C_
z^=O7j*)A#Z+A>+V`b3t#$@}Nh=``mb8&-YysnS~t8hT!Q@I>t~1-T}07}z^!Mk}|m
zHBvj|$tM6rB6W%~)Q~E?!XXjPufi7mHhta9ThIFhP!SWkczk{hWI5QOw-1(Ij#l%_
zE99)0ifQVaTlc(@z}4Q!gp@`W(x6-j)bR*8ocwbj*G*ZoKQQb^eVKgCfcoo|1K;ty
zscnsrSJO`f(mg-Bh8x7e36&6X{p!HRp+NK9P0_=E<yS}UHUWFk#K{5Y@bE6mHuFoP
z-r6Su!wxI8WfN^ZP{rvSkOJCLrN}NS<rGS~`O-`q0|`>~jo*~F{^zzGxFIK~H9iMz
zpw5*O;@%wL8IRQFN&ev^7&7c2z!{-yQ!=Y0C)=jWR^XW!sXOh~{V`<H_?iQ#5bL*y
zD3h%vRhXK>|6>94KUx<(7SsD2l$W4yTgQ)QlA>ETCFlgMhBZPt*XKfa9@OQY*W`16
zxY1Ie?1?#qg732qBuz1eXr=*XfxBu`G`vi%bF6a@%C7Ncf=1I^t~wfDUi{@t6@ebR
z{Z4gT$xH*sVPygpx$v-PjaeG-mIo3TUHyMLyBaunzPDlh^J1mfwN1(O3iv`@L?lWu
zd7VQo%Z9*h?WWo8Uk?*yInw|i_Gm8(?lVGiEPvRQidl>zaEatTpapkQY36S+axgaE
z_e5H7mu!4>+nFXHU}#bZ^DTi!s1+luHZpM(<DO?7y&qyH4BgD`4HSCacKcR`_(WBO
zB&e7z?BH|S56sCyRJ#i@vzv>bmT(O&T*xnJr1wxdhu3D7ZrXaHbk>!N1PK4;v?8E{
zu;YdSX52DoyM_qaFzQ>~m|baE=FgzIZZ~^|$4;%Nw=s_o?1+)K-sO$lDV{tgI9*tv
zivC_uj{Q?9hUUo2$8t;}2&~v_$FQLXdd&m^!X=F^yo>ux29{Xf?Bh}^OW#ug1D#(v
zND95_RS|@CZ?@`7jtmV>$!>2xo@u%!TO;A+?Sl9;wpMW82U|QAlXHk=s<GMG=UF@-
zVC)9x19&@XW^AnvL<}tcaW8$%p;mNrr-W*|!7*S1>OShE4=t{t|Jj2_4M6OjV!5oj
ze=YH?a)Xz2_^+v|zD%$a0lN|}B{!`lY!$8?wN8@wU#?e+eyvA-ZOBB!5+ckky31bt
zAs+ndy4?Ja>$~Rt7^@xsePnRG{{160lXXiTu$P6$gb<wjTN5Vj<qw62nz{asU9+=v
zT6*t;Pg@;i8-5-B9wj{_&im2WUwa>46FxsBl?4228s#K!P%#?h@PmizPqIG?Sk(#!
zdBg?M2@VIRQrkTVOG1g{`YTyWn+W;*q^m}?MaXR#@_+(}wbP&uN-=7Vdz$lRi4v0(
znKGwWIq&A}T`<DJVtDswRa8tJvUXejz*(|`lLiVTMrSJhWiu=q_A1PGePgejigfbz
z|Ba*Ab*Hpe_=$OZ|G(4$PM>euC>p1D#Q8Z&2&Qv+W12a%9yaBEmT(-hd9VViOT(rr
znc8;pHQHn>?2yY0`LGi;Au{WOHz_knsa+0QBAYn##4g6`($oRx^NN{84cZT-oTk|!
zgGf*QO7d>)0bBdSHt`%s=V|tWotq`3v@L-N`{ml`_y6t|CN#pUMqTTu7qiM1;U}5(
zTwKV@#c!G%E)8N~LXFx7oG9A8U6uJxuiHIeSDT!E-UP$OfBT`=jQ3aZl$ATO!UlP`
zK-1+nXA36!v>Zw)*vlcc-9<^tM~kKd;ZP<RtbO&Uk;fuW7R7D7CS6mHvr<gC+img&
z<L5z3D>HK=SyCq&ddn=iZUu3wX?oq;xHP|g>6EJm*uNKVE1c?XP|2^hrX0CERF`kL
z@U1&ra(goN!Mn}Hbzn9R$U#2pip5ysrCBTGqr-1!Mc!U;$xV|l))a5;*A*_(PYK2V
zd2A}Yu{w*xYHpWcPOx`h60gD<zNEHS*=h<h`vyn#{P>|2I=Ww7u)MIlW(KObySoye
zn`7g+-#`B~GYL7}3uk|IU3dt?jc7;ZL%C_L8PtpG9NV+xEUQYj>Pf0>ziQI(%z|M{
zkVNF3LQAmM_-74vTFio<**an-oVO3vTB1qnYiBNRd4_vMcmA?8@b=Y=z9uH#dMsA`
zcmTt7sO&PbI^Aoff9$L~)U2Rs@IX}XcB?pDjr48_C{l|lX!B!>9QhqgskPrkVRo_h
znL1C<J?Ig6X=4|w5fr#Zd)%79+7}XqVP&JZW!RcBGu4q7=Sy~1*U&V{T#kMqqcx>G
zc0?o$Fn1>Z<kAd*rN4$z-E6QIbmpRk$>8uTxt*)&`5$f*G=1GyQ_DC>y=$CUbq+cB
z=^3i1U(P~opxt)^fk4AZo-p42DqP~FF1665O*eI+!Rt%+>5ECOWnmJyaJ>E2(Z%-$
z6s$3-!6_42lgy~j^CLX=&PdnV#G(C`fu4V_bWvKKc5gwdTK*bwxabLl5D3hu(QdUH
zPA@W_k!9N!W4`x+_qLk(vX0}X9=O)KQ~#$9|M_cRGCJrqO1RF~FAD<J9(E;$M~MZ^
zFNR4F!lVnuXO{9V=us-bR@^j|(g(U105RtKzvr?dWoEmc&?&nmOS|SixM!GEl}g#+
z?I3@+zX9?ebKQTu*U<%%t``qC>%wUUdp+8qpOx=HYbFhCYTf&-aY8QvAEd$T%Z^`-
z3*?igV(;#suWazF*Cb^$XVEhCe``H^;DHsHbvOe5dbQ2$7?wy36J;0^nXI+Wi-}vR
z{KVX)mUN^6BNYfd%?p_H2@{qoYJNlCI<{9iM^%`88yfppqW}AzSL<t$wa5q>Ehh7H
zBMpq;#Bp}WeR^2|b_MV|we^?G(w2UrEyuOO-^!QRiI>Oxz=`WQCj<Xvbk{%KQ4saz
zR9j`WjOxU1g64G{M=6^B7bllK{dtL*<D~>-v-Feup7sgG-)QJ^kZi?iS5!rj(nFP*
zLaJ-bHi9<PQD8?JiKH4k2O1l5<z4vi@BV>ex9T-`9Nzwk%t~ua*^&;G+f|sRe}RcT
z_3c#GY3|m`BGGM5_U=k5H>5t=k94hHbF2WD7~E0i=H>^lT7gpHh!sS=`$nn76zf%u
zZ|oXDE?bh+y`!I0et{x2hUG<jDxiwosu82UcQnx2y4(5TALoe>S}aLHVHvvuWjWEL
zKRP!Use)weiUu?DFn{#M|9a`i`c5KbYz5+xh=}SRyEMbp=n<2u+MfmxGrugOIy{tG
z?q)H>B~C1EGuym>XvgXf+i7XbM7y5e7~(2vd#<g=jm!OZ*}UsbH14m}XyizfO%d&A
y*|CYxruVf1fgvonZ&L*i;_j@8moyG2Y3s`ttXRAm{X(mX{`dA@_z#4ijQ<ZK3)`{)

literal 0
HcmV?d00001


From 9046b5ccf7e2a7f903e1eccf1f2616faa4dbb84e Mon Sep 17 00:00:00 2001
From: liuminjian <xxb_lmj@jiajiayue.com>
Date: Wed, 21 Jul 2021 10:12:09 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json             |  5 +++
 package.json                  |  1 +
 src/views/homestead/index.vue | 75 ++++++++++++++++++++++++++++++-----
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a85bd26c..59df8745 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5662,6 +5662,11 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz?cache=0&sync_timestamp=1614705639458&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.6.0.tgz",
+      "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA="
+    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
diff --git a/package.json b/package.json
index f1653999..10c99b8f 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "jquery": "^3.6.0",
     "js-cookie": "^2.2.1",
     "lib-flexible": "^0.3.2",
     "node-sass": "^5.0.0",
diff --git a/src/views/homestead/index.vue b/src/views/homestead/index.vue
index f6838a8a..39e76d16 100644
--- a/src/views/homestead/index.vue
+++ b/src/views/homestead/index.vue
@@ -6,7 +6,7 @@
       <div class="positioning_wrap">
         <div class="icon"></div>
       </div>
-      <div class="selectionIcon_wrap">
+      <div class="selectionIcon_wrap" @click="selectionPush">
         <div class="icon"></div>
         <div class="text">列表</div>
       </div>
@@ -14,7 +14,7 @@
     <!--列表拉取详情-->
     <div class="homesteadList_wrap">
       <div class="title_m">
-        <div class="more_icon"></div>
+        <div class="more_icon" @click="homesteadListShrink"></div>
         <div class="name">宅基地列表</div>
       </div>
       <div class="main_m">
@@ -69,17 +69,17 @@
       </div>
       <div class="address_item">
         <div class="portrait"></div>
-        <div class="name">南郊村南郊村</div>
+        <div class="name">南郊村</div>
       </div>
       <div class="address_item more">
         <div class="portrait"></div>
-        <div class="name"></div>
+        <div class="name" @click="addressPush"></div>
       </div>
     </div>
 
     <!--搜索栏目-->
     <div class="searchBar_wrap">
-      <div class="actionBar_wrap">
+      <div class="actionBar_wrap" v-if="searchBarOperVisbile">
         <div class="m_list">
           <div class="tensile active"><div class="icon"></div></div>
         </div>
@@ -100,7 +100,7 @@
         </div>
 
         <div class="m_list">
-          <div class="closes gray">
+          <div class="closes gray" @click="searchBarOperFun('false')">
             <div class="icon"></div>
           </div>
         </div>
@@ -115,7 +115,7 @@
         </div>
         <div class="bar_text">搜索</div>
       </div>
-      <div class="searchBar_more"></div>
+      <div class="searchBar_more" @click="searchBarOperFun('true')"></div>
     </div>
 
     <!--点击房地-显示的搜索--->
@@ -508,10 +508,14 @@
 </template>
 
 <script>
+import $ from "jquery";
 export default {
   name: "homesteadLogin",
   data() {
     return {
+      //搜索栏目-操作栏显隐
+      searchBarOperVisbile: false,
+      //以下删
       message: "",
       showPicker: false,
       columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"],
@@ -520,6 +524,51 @@ export default {
   },
   mounted() {},
   methods: {
+    searchBarOperFun(statue) {
+      if (statue == "true") {
+        this.searchBarOperVisbile = true;
+      } else {
+        this.searchBarOperVisbile = false;
+      }
+    },
+
+    /*右侧列表 --展开收缩*/
+    selectionPush() {
+      $(".homesteadList_wrap").animate(
+        {
+          right: "0",
+        },
+        300
+      );
+    },
+    homesteadListShrink() {
+      $(".homesteadList_wrap").animate(
+        {
+          right: "-300px",
+        },
+        300
+      );
+    },
+    /*点击顶部村庄--伸缩样式*/
+    addressPush() {
+      let addressWrapBlock = $(".address_wrap .address_item.more .name");
+      let lefValue = 0;
+      if (addressWrapBlock.hasClass("shrink")) {
+        addressWrapBlock.removeClass("shrink");
+        lefValue = "-40px";
+      } else {
+        addressWrapBlock.addClass("shrink");
+        lefValue = "8px";
+      }
+
+      $(".address_wrap").animate(
+        {
+          left: lefValue,
+        },
+        300
+      );
+    },
+    /*以下删*/
     onConfirm(time) {
       this.message = time;
       this.showPicker = false;
@@ -575,10 +624,10 @@ export default {
     }
   }
   .homesteadList_wrap {
-    display: none;
-    // display: flex;
+    // display: none;
+    display: flex;
     position: absolute;
-    right: 0;
+    right: -536px;
     top: 20px;
     bottom: 160px;
     width: 536px;
@@ -676,7 +725,8 @@ export default {
     position: fixed;
     z-index: 9;
     top: 24px;
-    left: 16px;
+    // left: 16px;
+    left: -80px;
     display: flex;
     .address_item {
       display: flex;
@@ -710,6 +760,9 @@ export default {
           width: 40px;
           height: 40px;
           padding: 0;
+          &.shrink {
+            transform: rotate(180deg);
+          }
         }
       }
       .address_suspension {

From d75539cede2f9a87e372c636d7d5afab99f32591 Mon Sep 17 00:00:00 2001
From: liuminjian <xxb_lmj@jiajiayue.com>
Date: Fri, 23 Jul 2021 09:11:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 53bb8e5a..ead2e8df 100644
--- a/package.json
+++ b/package.json
@@ -11,11 +11,8 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-<<<<<<< HEAD
     "jquery": "^3.6.0",
-=======
     "global": "^4.4.0",
->>>>>>> e0b10598d66107bf1e5143918ed011a0be798972
     "js-cookie": "^2.2.1",
     "lib-flexible": "^0.3.2",
     "node-sass": "^5.0.0",
@@ -79,4 +76,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}
\ No newline at end of file