From 11d96285d0a9f7211445de5c72f4ebe9235bfcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 25 Aug 2021 13:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                                    |  38 +++++++++-------
 static/css/index.css                          |   6 +--
 static/images/answer_red.png                  | Bin 0 -> 1457 bytes
 static/images/detail_red.png                  | Bin 0 -> 1245 bytes
 static/images/modify_red.png                  | Bin 0 -> 1228 bytes
 static/images/questions_red.png               | Bin 0 -> 1388 bytes
 static/images/user_index_icon5_red.png        | Bin 0 -> 1398 bytes
 static/images/user_index_icon6_red.png        | Bin 0 -> 1452 bytes
 static/images/user_index_icon7_red.png        | Bin 0 -> 1399 bytes
 static/images/user_index_icon8_red.png        | Bin 0 -> 1444 bytes
 static/js/common/tools.js                     |   1 +
 .../project/announcementList/warrantDetail.js |   1 +
 static/js/project/bidding/biddingList.js      |  14 +++++-
 static/js/project/interact/interact.js        |  23 ++++++++--
 static/js/project/user/index.js               |  43 ++++++++++++++++--
 view/bidding/biddingList.html                 |   2 +-
 view/interact/interactList.html               |   8 ++--
 view/listingItems/itemsList.html              |  18 +++++++-
 view/user/user.html                           |   4 +-
 19 files changed, 122 insertions(+), 36 deletions(-)
 create mode 100644 static/images/answer_red.png
 create mode 100644 static/images/detail_red.png
 create mode 100644 static/images/modify_red.png
 create mode 100644 static/images/questions_red.png
 create mode 100644 static/images/user_index_icon5_red.png
 create mode 100644 static/images/user_index_icon6_red.png
 create mode 100644 static/images/user_index_icon7_red.png
 create mode 100644 static/images/user_index_icon8_red.png

diff --git a/index.html b/index.html
index 077c7f4..98bb2e0 100644
--- a/index.html
+++ b/index.html
@@ -276,27 +276,34 @@
                                 <span onclick="goListing()">更多></span>
                             </p>
                             <script id="collectiveAssetsData" type="text/html">
-                                {{if collectiveAssetsList}}
                                 {{each collectiveAssetsList as value i}}
                                 <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
-                                    {if value.projectShowStatus == '已经成交'}}
+                                    {{if value.projectShowStatus == '已经成交'}}
                                     <p class="centerLeft-center-lable" style="background: #d7d7d7;color: #626262">
-                                        {{/if}}
-                                        {{if value.projectShowStatus == '项目公示'}}
+                                        {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
+                                    </p>
+                                    {{/if}}
+                                    {{if value.projectShowStatus == '项目公示'}}
                                     <p class="centerLeft-center-lable" style="background: #007b76">
-                                        {{/if}}
-                                        {{if value.projectShowStatus == '正在报名'}}
+                                        {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
+                                    </p>
+                                    {{/if}}
+                                    {{if value.projectShowStatus == '正在报名'}}
                                     <p class="centerLeft-center-lable" style="background: #e8041f">
-                                        {{/if}}
-                                        {{if value.projectShowStatus == '等待竞价' || value.projectShowStatus == '等待成交'}}
+                                        {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
+                                    </p>
+                                    {{/if}}
+                                    {{if value.projectShowStatus == '等待竞价' || value.projectShowStatus == '等待成交'}}
                                     <p class="centerLeft-center-lable" style="background: #e7851c">
-                                        {{/if}}
-                                        {{if value.projectShowStatus == '正在竞价'}}
+                                        {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
+                                    </p>
+                                    {{/if}}
+                                    {{if value.projectShowStatus == '正在竞价'}}
                                     <p class="centerLeft-center-lable" style="background: #1c58bb">
-                                        {{/if}}
                                         {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
                                     </p>
+                                    {{/if}}
                                     <img src="{{serverApi}}{{# value.fileUrl}}" alt="" width="100%" height="152px" />
                                     <div>
                                         <p class="centerLeft-center-middle-tit01">
@@ -335,7 +342,6 @@
                                     </div>
                                 </div>
                                 {{/each}}
-                                {{/if}}
                             </script>
                             <div class="container" id="collectiveAssetsContent"></div>
                         </div>
@@ -348,7 +354,7 @@
                                 {{each productionEquipmentList as value i}}
                                 <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
-                                    {if value.projectShowStatus == '已经成交'}}
+                                    {{if value.projectShowStatus == '已经成交'}}
                                     <p class="centerLeft-center-lable" style="background: #d7d7d7;color: #626262">
                                         {{/if}}
                                         {{if value.projectShowStatus == '项目公示'}}
@@ -415,7 +421,7 @@
                                 {{each waterConservancyFacilitiesList as value i}}
                                 <div class="centerLeft-center-middle" onclick="goDetail({{value.id}})">
                                     <!--                                    项目<br />公示-->
-                                    {if value.projectShowStatus == '已经成交'}}
+                                    {{if value.projectShowStatus == '已经成交'}}
                                     <p class="centerLeft-center-lable" style="background: #d7d7d7;color: #626262">
                                     {{/if}}
                                     {{if value.projectShowStatus == '项目公示'}}
@@ -755,8 +761,8 @@
                     <script id="communicateData" type="text/html">
                         {{each communicateList as value i}}
                             <tr>
-                                <td width="600">{{i+1}}. {{value.content}}</td>
-                                <td>已回复</td>
+                                <td width="650">{{i+1}}. {{value.content}}</td>
+                                <td width="70">已回复</td>
                                 <td>{{value.replyTime}}</td>
                             </tr>
                         {{/each}}
diff --git a/static/css/index.css b/static/css/index.css
index b6d80ad..1abced8 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -789,7 +789,7 @@ select {
 }
 
 .notStart-row {
-  color: var(--color);
+  color: #007b76;
 }
 
 .tableType {
@@ -811,7 +811,7 @@ select {
 }
 
 .tableType p:nth-child(1) {
-  color: var(--color);
+  color: #007b76;
 }
 
 .tableType p:nth-child(2) {
@@ -823,7 +823,7 @@ select {
 }
 
 .tableType p:nth-child(1) i {
-  background-color: var(--color);
+  background-color: #007b76;
 }
 
 .tableType p:nth-child(2) i {
diff --git a/static/images/answer_red.png b/static/images/answer_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..d98fd538f7639d49ded1d67b33e2ba3b237fe803
GIT binary patch
literal 1457
zcmaJ>eM}Q)96n??0-9}LKp>d&{0KPOyK8%;ccVhvYo$n`R@6Fm;o5tlC-knnUTtNL
zp#mFYjx8IwKNuM-OGaRXsc~^GXr~0pFtC8cnM@6CVP<4t_T_|qT#>r{!Mx<|{rWx6
z?|FY8*JLl*wmKm_0fL~_)<W7LkExM2ex>}qy=CG9c}SDYPHCr5Aq5!`Kn7ND0odwg
zDuDwq?BN%OK^_Ff@?4oya@vY1x8PMW5gTR5>yyzCl$Rg!G43iL!7fnA@p@$T`~?K&
zSUs|buwgcz33#}|8WHTQDJgT;RJlnO$=?d+g(#W83nT^(d8>Ip71AS%yp%kTY@-Og
zXd+eVk%yw3Halz*L;w>?t-_6KbZ{=I#I+hst<8Z|7*3*?4#m|945u(HMdZRu4<dUL
z*$T=*Tb6vuD?Q?oBp-#M!C+7sR4WCs62(bU=1`$3l|r^q_z&|E6H@U04N(Rf_}wDs
zlQ@BgBaDno2uONFR{HP?UZ2hOh?w^;1xgMX8e)7XuEbEUH*&8<Yro_G|H@d_+Fy3q
z2T%v_3jxtB=c8gn6fDQ?@s1*fvKp#X<m99<)wJLacmXe2X+0vJC|QoB2#wCAa}ipF
zhQYN86{{f?WCf#EXjA}K;h0)S;!KohIXq^dEi`VyF@nHx+-x$^7PZ-=))`H-)=XoD
zDAvmRC5Cr{sBcd8y@bUci=|8=U?f2-6NKt$71%w3B=|jo4>p+=vkqtN;doXE`m-Zx
zdU$IZh}<E-T13GMFUFbTmeHWjwdmBjW{p8hsAT;{QmZ1&Y6E7{S}Z1mi9nXH>@u-i
z!V>?BMP)H)q)7f#G|?@&5+l<`Eg&x*H4)(D&JpDn3AaG~5ES!`l{S=xZk%bgWzjp<
zHjZNE<V{S@M18C4)tvX<rrD1+=7Wvq;l>jU{he!eYftTP7VhmgB!NzLJy%^lR($<R
zzPs=DiRS_t(|@hHx@WZgrCD<N{n>%(_F2kUQrhvfD<xDH>zR7xnQQUXz0*)Sy#i@U
z>zPX4pY}^b_*~|_)Z+tIdpv*f_z|1$s{ziwqA#qU|Eczm*wL1++lKP~hPpqW*UYU_
zg*RnEr8C>70}08t$;!UhEob+QypVt%-+&c;YTG=QFnO`4w`08Ei;Op7&?_-p$6{{Q
zCDzwvj2x{U>q^3tW+x7uJbJ*M_}l&Bn!LCN1^Uy$?v#lwDO|${RluBkt+jmJcRlr=
zT>gygPMsO=%6#zS9cB9M&b=)|Z472YPlvOe-y07uj63XcH_5&e?wrA%yMdmomz+bH
z;Mt!ypMA329t@pXyWJmt!t>@(o2R`_U85MXNP||#rC;yA6Iy9LHc~d;l(?=d=fmOM
zQ@7U4INrVU!^_uuePr?F=5V|jsV2VtQ};2JGn2JH)zh4`Ycv)ytk=&nX@QI*rxsGu
zPd#6o-H~6kuQzE<ywGFh!>iT%dZ*r+C$$R|UmhBad#dRCkzJD~*Y~r;-EDO-&_LtC
UTi0&XG)I1-R&xp6XDmPV52if}u>b%7

literal 0
HcmV?d00001

diff --git a/static/images/detail_red.png b/static/images/detail_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f2919d307ce4857c63c31e8a9ab631f97ece315
GIT binary patch
literal 1245
zcmaJ>ZEVzJ953>wTP7?_9U!rGYFx5j`?Pnxw%JMUu08J1JGSGJEy@VJ_PJZR^@aAC
zcbf`IvgnLpq9kgV5tsrW%uH~JL1G9&@Fm88_(f0z^@A7_vJYxZH1X-}Zu();q<!B0
zzu*7&{9iiRm)q3VvaW?7h_*~x$>Z_P;JtkX{@$0SFXCY>QU}pir-Z7S2Z^}h6d{?h
zv@*;?%^2JD8SEv9rM6iZM1$GKWZkhsT3{2ZSuREsMDNC$tLYVp$RaG8c8t1t>NG`~
zMvNMWWZA5ngu`Zf+=E-ka|M08qDuy~@e#7OCSw8%B8{wBBepNsVpN@1#`9pCp~$)k
zs>G;yQG?k&GU<4bjD!SQ2Vs$nN+BSGSzhQNITlC^D>8tmSs=559Ep;Rhr-@Gqa^2*
zRKpiu#i(I~T$y32)oQ59ha9iW07=3e9K&%mwxInn8)-G#_Pd%43iNf)bdl-UWWcBu
zolz8{u+sS}SZ+4EKy3SsK;e)vHO*x}h-EA*xL4iUM|t?Kj76>e!k7!0JoKGWPsjNv
zbv3~_cDHsE7-BW@7SF^<(MA+UAGM&3GD?iXCn3W$<VaX7ip7XPhczJ3oDr62sig6A
zn1g@=EH6qxYw|3HS6H6oc_GC{A|e24G9DJAi3kvclqhj=MQvg;wvRMhhfUum_T9j$
zx5Uax4{FHq3XU_<tb)E_2RZ(*<C4i_J?rGd1Ey^_Rlhq()BLR!=$TJKBjq_3S&y@9
zE}|jH@d*~FTwIJNu>M4xjRKWTMMW_YPYQsi8dzhI*fp^H|6&;|h6#$~KSk5r!j%|I
z7g_)>7Mcj!xN|(*A}GJ@M}k<gJfp-5waf2*b!PKz{T=7$-sq?L9yq@2yL9W}EOX(Z
z%L9og;_f|a>)~TAGxJp2rHR>!_VtM)>ax`O_RkN!ePhp!Q|?EbUqIJZ@@FOg%P&q|
zfAqxa+OGXQ=RaIEw{K~*dve3C*W1Sm7tXx)>IW~cu=|xO9W%w&a_6DR1M)Yl`ry6O
zaQkX`dV4zd`UW_)<I4V>`W-jd{g&@~=i<5huYUX2r`<1skK2U<+s?^3kk4JK&JMjb
z_uRlU$NtQ0*==|9biUuR=9iAl@$#O#ckhgqe!6Su;E{;)-WvblrB{+|fBdYkUG@0c
zqux>Z_u1*nzUuSq4R>Pb&8hGG&QIn}|2=i`hfU8eA)emLUR}O&;>F;HlTmZZOk&60
Fe*laFq6Gi|

literal 0
HcmV?d00001

diff --git a/static/images/modify_red.png b/static/images/modify_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ea9394340f8e53564d0f1c356ac79f152dc8f7
GIT binary patch
literal 1228
zcmaJ>Pi)&%9Cnj+W!c(g5(t4N`tT4M5{~`s*s;B)%^xQu8VMzfwBA-berc@4c51sM
ztvIBdGEE4LAtBMjK$<`r8WKAUq%l^B3IPXT9MC|BLx!{qqN+fsNWgeblft3QlKtMZ
zf8Y1}e*b)Sw)o6==+O{C5aaorQo`$me?PDvKPPk4ExbJ9W#+t7cGYXC4kD7ets#&%
z)df^Ss=mDVIhrDfpk<Wjyt%@&a>X_ys&5l%n@x-+h^d)&Q?1mI2Q;)`SaEXm`b`oT
zdYnAX7nnjbjcP`2#X+Z5isi~my&~!4%ruy4%b37Ko(kG#!*b<zob2<;c<;ZaNzga(
z>Tz;M)LdZ}q-_TQJ|a*R7!^TGia;UCaKh7oWuQbeA`Ll;fife=d<+aO5_@y>s$5dC
z17G+QCu^S9lxe!vYDHRH#C8^FC`p)urCFB37L>bed1{-o++#xq1-TW+XnKZi0iRLT
z>?JQwVx>DFn9V|Am)LR#iNYzP+iH`B5r#HRKd!#D>y^;IGWN7~%gaqfmyl~OITc)w
z>aigh=kETFd_$~8e$Fv)QPhTFSC&j<d3hyH;x7^1&}BX<YNEyqR8)lm#p+RslBz04
zMOg${$Z(<r)gjMbc!f>HI398g&x;Ud(qbwJ6-mkpLMkd`L^#CeE!R`63L5%0u<rqu
zy)RZyJ4p3xr)=AeVHeESY|nOUb`zx2{i=iGrwvQDTkcbSnRcR9kYl`n^sHl>pr2>i
z*h52_<x&h(l1VX{!unH5CI&N1HYVag(gNhj0ao85cLQwdf3Y+cL;FqgpQahU!ky@E
zcSispc83UAcyb&(B42(&UBlz`TV6?)+uv({-n%ywlsa3Z=cXR#&vkAe=-%nHFK%y+
z%_pA>yip8n&4A)a??&S2z6<N`EK=cm03Hr+650~@g}ih`zrcil9odS3A440Ho$Z6u
zFW+6=j)hMo{s1>`?C-sv_~GoyI|snup$#FYT}}Kvv4IjF9bNl${OeBQ+e?QwUg>-|
z*}Z<=oL~Ls#Om$w2je;Ca^l5<-FMFiN59MF!L>kdZT9YZBVb$(^n}J+V^`k~cRwH&
zp9tGy+Vfx{*bDu%zW(;D$GTr7|N1@HJ^AL5>4(pJK^Xd|R<G%2_Gvu$xWHU_b?vi}
Zz#-yd6~0EM9-8$3FZoPSc`r5p(mzchkq-a>

literal 0
HcmV?d00001

diff --git a/static/images/questions_red.png b/static/images/questions_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..28c8fba887a5680e17fddfea128d5bfc0c8e9cb9
GIT binary patch
literal 1388
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0DF6BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`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)DJWnQpS7iG_l>rJkXg
ziGi`1j)IYap{2fog}$M&u7RPIfti)5xdId@0c|TvNwW%aaf8|g<k>1^l#~=$>Fbx5
zm+O@q>*W`v>l<2H0?jbeH!{)%s?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(ImatnNY;RfdwLjwvJWcn3}1^R}12Ku?VAb){X7ncO3BAkI$b#X{#L8^XG
zYH@yPQ8F+-(v)GEfnkT=B9KC$Ypnc>GJ%njnB$V4T$-DjSK{ens|1wMOUX>JGBvSC
zvPd#D(=|ynG}ARoF|pLOOiMJ@H8DyxG%_?Wwy-ozgqed)zoC<hn~9mZn}MmRp`oFx
zvm=n{XlCqeY-VC%=xk^P)9aa6T#}fVoC>o$6KFS7uPa`?R?bDKi6!|(A^G_^uv8F`
zkzbNuoRMFk;Oq>Jbp?&^%)FHR@?uR;G(mjrl3J8mmYU*Ll%J~r4ri-OEN(D1cd;<D
zv~+PaGc^Lb-^tR<$kf%?(ZJcv&CS`-*;EOtHw8=BLG`-g)T<A4j6NulASD`@5HKZz
znD8tB<iImgY927>6alkH@TF5t3=E7@JY5_^DsF9=dRChyQRaAh`SEC(D{8Jq4?Og`
z_G&y*VP}t-GI{l8>A+9yZ>~n_>7C%*`t*=z;Z5DAxz}$C33;zMAH08MX4Sl#vb%q;
z_Wyk5bM-Up&o=v~bKbr6R(V?LS|{NrtwB0G>%ELyewa3gt!5H4t9fZBv-4g3L-%!7
zCEu1Fu{Z52ebFqu^F5QalGLINYc8Hxne1u!;)=!b1nIm70`GWt$F$^Gd^ofJrk(pX
z)knGp4>#wr&nxAd{KIBWR|VU-2S=agH}Kv3$bN-Q(0|u9$#&7RvpjD!Owg?LebjqF
z=dnBIow=v&SzbD=%n+ZrPK$N5s<zDP=|7t)<9c>nU-e+OOuXF01!s3Y6S@%3_c73-
z-S>J7PueL(JG~ie_~tcr*dLhMpTIXwg||FWp`+qVh=gC};aMzO*_V}chve^kax1K{
zZ#K6#U-+S{D;s?dH+|t=@5=qg%XAI5v(KYf5r6KjW7@{vEEVsSH2H6S>$9c(GS$zF
zgIsO~oxXo^-jbgC3$IVP?bv<drT$?9ZTt2TL;k;<1`Hq9NAdG|M-_p}KTlUbmvv4F
FO#qQ#@ZkUe

literal 0
HcmV?d00001

diff --git a/static/images/user_index_icon5_red.png b/static/images/user_index_icon5_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82a4e344cd31a8e080a205741e6ed4b6b9ad127
GIT binary patch
literal 1398
zcmaJ>eM}p581BFU<IDL0WV(^#hzgGOKKgkVIw-vYofb+dDawMq_Kx-jz3c7{TEM9|
zry0uT5H)VuCVx1c5kZ!PEdnyPi6dsyv4n|c&MZKLn2}5!`p5KFXwg4#m)!ln-sgFr
z-}`a<>=k8c$&Vx}6pA!!IpqN3!;v>B0erjmZAk;eCfQOeR|^eth!$Cei4i<3WDU?h
z*1^(D>#mDzp+XVQbIw}1*7h{%6#^<cVxtNNf&i^h6c&Ypw6~F!ArI^0cq4r4^DkhC
zV~ns%YeQ{8GwbKd+eEgyt-|STYxEKfT(k`;43mH$z{)ff4m9x+88*Vpyd;=Mwh<Uw
zHjx{R@QSEfn;kL>A`59%I;9uW7$7~N!gLx`tt)_V6eAGSfM9ARijk;})as$=0|Rd&
z(?B|?(x@-6GQxgY4w48G3WZc5wMr0u2u2Wq14nRN2`rRSD=*VwB`@X17${cqid<0U
z1Rjbo(jK8%Ho`#Z$`t}Zn{Abtm!g3JAw$A+5W!R^5(q@@wQMcP4)$LeYg$Xr)*y>G
zSV?FWy&xYAxiK(^-Mt+}41pT5Qsh8V=q5_=HV0T<wo*nIoTwO%A+;KV$KcWGlo}e-
zDRD+aD2WDIt<>NwhGVGOKwxx?XDz%zk83QL8b`HSJ%(A#29sK6QByh%LFn{a6B@%>
zc}b>uFB|jC0pC$9c26v67Fk*rM5iD$#j3#W7i2;53qi<iUd}p{=i+!q2ub;oG_Bm4
zVnwcnWlBXM04>Lv<krxD;sl{aEgF-a!h!x0gPJO(%#=k#lu#zB6oaE!W{ucIvD*K|
zB0vlhDU$ybO>7HPVr0770${P)L@W<FM+7Z0{LbhJg<{=ND`j$qr$4#+R325eIbl&6
z|2EvyaPG=PZtmXhHw(VMR-2qMb8xV`Z0F!c>q&>Mr|*1E-(a<)d%S|_yujr4`_ZX8
z$42XhCU>9sbE==aG;(KQxJy30ow$mAQ<99QUw*xJ?2n?9s`6J)W%=IE{3|E@2m2+(
zL#g3C_vcN<mG#!erS!%ha=)E@BWc=wa3u9CLS1Y5sChQi^Wf>!-KoSLVic0Ti=P{~
zkaKq|A(gmqwlt@sYv8K`swH$H=Y=mf?3mtGI3taBkGby7-+u4s!c*rm<|=1DUVo*&
z<MFxiY=1BbKQL*(tb6O%_WBM!<7V7rH3OYX>#v)(zH#RHrk`Frykn-Ke+<o<$uGXe
zY<ZG-b~tV;oj4nx-g;j6I-g(4c=x8S=7EB<BhR_Dn~Pmz+577{651C(7+Fk8LpMTA
z$DUAT<sBY+rM-$vte@U~=I<XTZgl$kiU~diy;w)hZ`$e3Iv$taTJl-qu6oyo>xKn1
zX=?t(-(lC0-xeR;|I3lvE%77v4+HL@?#8}n()ZAZj!*dZI*%??zO+tp(&ut!)(n!7
OKcUr9L48`{e)%7*G3@RD

literal 0
HcmV?d00001

diff --git a/static/images/user_index_icon6_red.png b/static/images/user_index_icon6_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..a31d063613cbc78a6c6a2c96415893b9debe8468
GIT binary patch
literal 1452
zcmaJ>eNYs27+zEmArQhwA#~Q2L7?vT<M!@$HxB36J>Y^vK5mc(OqSa{Smk!l-G#fO
z8B81+`7k4>x$=*w8N<r_ATtRyF+~~EjLD%<$Cxxqn<>l5(kX2ZIO-2_XLf&I@AJIR
z@BP^JlH&Zhn3Na*0OITgOqn(=3BA!#+IL6$@;GfsR&AAPx#U)Ttjq&ePO9ZWyN9jg
z%XpRxY#!ya0bsr;I4jjkM-k<cJbE@{qxXBf8X5qy*Z94xYZI@6wS1i*TA*KsK7&Ak
zvq0;N4#eT5`Ff$CS?0@|i=D3KO)ipy*5rWMeo7<o@G1-XJq@Bl`7O{CFQv^x+b{%9
znW&pA(6p#ZM+rzvG7lQ{CY=k#3D8XHQ4@|BOizOtf|4*oz^FlopcG=FjAn4=fi!P2
z=cdY-ycu8G$^zA^s+WRcpU<cF8T67|2csmZabPfp=`;(S5)f6^uM?G3VFrd*T(aO*
z1xW-$jBKscs9GRR>GTymUWa3rSX5>LrG*UkvtAh0Be2I4y4RGoqL%Uh%9ztyaR$6R
zT*fO>qwLc1;a(L6Yq5K@qmZGdhFU8NT2j~sMshWJcu}=87DzkMa{@;haiW%}HJWrd
zi<)#8hm$(e%^Gw##-kXD7zh$&!#s203C4gSwAF|hjb;?J(IjEcrBRGFlMIUBxFL+S
zi;BvME<WsA(0tEe@ke4QTIN|*lAV&&5UzrfdP$X(ddUmY^i<ZtjCF#@Nj@brl&0xh
zGrTM`@m!uPdBCYSQ^Fh?tTrr<rmY66nL#!ExdcvI3EGfH+i=Ec!$@cb%gqtH87%(4
zSXdJShl=DsMHAlADls&jZ2@gD+eEymb&jmHNHytg27rjK?Tppwzr45Ck#WkpY~+vF
zrK9;7V<THD;%{89`NXuay)3Q2F`;{Y$JHCTgJ;{eJx+dja>U;LWK5yGqo?2ycjf!s
zEADZ_?|&H`9}UG{yMO7zal@BK?`*l2e5dogIL74sIPX|reC54|Puy;eyS+!B)s++c
zB4s!eIsfg3iG*w=Y4urNOze8U)g&}TywI22&>EN+cW#J$X*l`^Q|p25-lwwX=`Vin
z+8wj<@Zz7XZ<M~>HcEChJ}fOd6|raG?wYC`cVrOw=|ul?!T6@GtllHQ-+f8MW5X5c
zXI>kvcvFd`PGl0-GrJP*Ssy%)EEuo6`vG+1*)y)x{G00Qcz-Z;+uBP@jJ13BEx&pY
z+c2;*Yu7uSD@*KXVigE%>}gL=s*VcO6x|=OrgS5WYw?TtD~ob#+6LtkooC~_rN25`
zS4>P2;G$3KyAr>fJi0Y%#|8aR%?R}IxwMQ|(*rj*CbgZ4%et647<uSmY|HxN?rr_6
z347G`w6nHvFmm9W*mCB;Slw^X`s#t`{#)|){duN8C#r(C*yu5QbEn9acM%ayO~>jd
ze1~6ttMjzm*tfX%cJO4M66j~lr|F*5)GdYk?<NH!3okEyX2s534-72}mI0HQ;`n<b
RU&V(0pLSa@voE)%^&hI>0<!=B

literal 0
HcmV?d00001

diff --git a/static/images/user_index_icon7_red.png b/static/images/user_index_icon7_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..66bb12826b065acb3318121e167dd33eab160f93
GIT binary patch
literal 1399
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2c=Df_1h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v(@i!su~0C#)H5_Q
zF)%jMQ7|$vwA44S&^I*JH88X?Ftai>SAYT~plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2pczK`Mn<|o6}rWhc_oPzx_QOQFcVx-i<65o3raHc^AtcPCMM;V
zme?u*T?+9+Zh@~a+~B-oXg~pjOur(rK;KZ$KtDGZ<S(%5;*y|Lgfp<JE)J<INYxKY
zEzU13N(RP9nlel?FzoPK1X2iejg@~<CNNSGb6oP1OLJ56N<3X`m4GsODVZr&rY06i
z7D=XNx+aN+X1YcxCYHLEX^F<VCPt}-MurB)7M6yIFmtf!w{UYZvNW}HGB7nYH#Bs0
zcCs{gwy<=vbaXN>Gcq!EhUxXpD=taQOHPH^oe8uXs@D;(UMuIK)WnkfqLBRj99Sv{
z$jC3rFV4s>P;hnz$GU<>cxGNoetEGbD4HO?c1bPDEK5ysE6UGR0Ee?xCKfli7@0dc
zIa?Yyn!6YR-S6aNXzAz*^tp+Jshg>*shbj1Zwi*MgX%TJsaGH97=2J8K}s|*Az(@b
zG2vMN$bn~~)I4C$DFSAZV|6PwGB7aC_jGX#skpUfimwK1phVmAn8RN;Z&>KPZb!7e
zXV;|OB{@g9Him?4I(&>xb>qj)q0>~PrCTEuCJJ<G2d!IFow~f^PtW(=dlx5X#k6go
zx34(u*`CjH^Uu|2rHM%d$h~0ycv63fgNRSV<pbVF3=BD%iYKI1go|r1t0!4FZT2*H
zesGN(PqX3$owl8O4EgeGB;H*#h*q=va6sCz|MuDRnr*zfKW(L!8ASOVw!U|Vp?$%e
z>${iUxHC<IrOZ?8daaka4Kwe8X=$~4?0CHnGCZHVpzBLRwYl@khmEn^850W|3%d(l
zqc=a%nYyx<`=A<sx!U<<D@1vkHl)cUon5!%UH8IAKRQ27d%<P>OfdJ)s=uZmb<;E4
z;!4iW$V#tZd38V};#rtTd>K#KmZPc*j@c=Nm_By3@il2LIZ_+&WRfG_=I@`?J&I0l
z5<07>C27}`bm3gEettc>=mOp|4Q>Wrn?pAoi#=h(_Uvu`f*bqpsPMBp=u0r?E8KjW
zm>Iv1h4uXfsrIDVzrs3st{*fzK0V>v`nE-4-%c)*-&$~bQ_ue^?F`HeSB^wB&psS)
Q1S$$WUHx3vIVCg!0N~m0uK)l5

literal 0
HcmV?d00001

diff --git a/static/images/user_index_icon8_red.png b/static/images/user_index_icon8_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..7de9ee68c64256d8d450de03ac0f6ae3c5e7a9ea
GIT binary patch
literal 1444
zcmaJ>drTX396u15fNaS`!GY{Nz_4L^kG@YzQ~Hq3l@X{Ln~QS29`pvi>#o<)0X~o@
zvV}PlAnp+{8<|160WO=2x{PE?3@@G8NKj@NASi^Xh!V(j`YTZM58Nepzt{Kk`F?)i
z$JOQKz8D+5B^rXDSWAvEAB=Iq_pwOut*?6~77R~|rb4lRFBZ!wfr0c6-p;@l7gfUK
zGnC`-!Cod4f*#>mTcKEJ-AU5COG*W8q&}A$pdlzz=W|nZDI>ymriA6R$S;9w2+TUP
z$R33iv$_q8lg+6Rn1YI28(mRKYaEC!3(oYBfWXCw6zp@AaURmAMV5I<Fb{5{2)t|}
zmTHj|QH9n#*uV=6tdJ@tG%i=eDvcCZ$}ySpd6>X(4T`BzTqePA5>t{26}<W&z?<MG
zCi9KvRbODGMVzAOCQ-D!yj)r?lk!3difc50gFp#F0xTq+!<<O@B%CKD#9(ARw7|MW
zmgnFgBW35kq80&4SFYf4TdixvoM$yqAY`bIa-+BuLtU=my_T&#Vm|Y)jCHL&w!>})
z&1XEkSD-;Yic>;h5W9yv3K{}6<Su~)NukP&JneNcoM<s>5pW`PuntloSKHNgg;FA?
zaHWKB$Tbp8F(s482?i%{Os3Z0RETFiyoLZK%4|8NP^fU+WYFtP8dJ6m*DG<EL60dy
zSPSP7DUN1BzFFXV6)SrvmNW<qCGvue=gUG>kmuw@-s9xmu)(mLbvS(w%Q^UR&$eKi
zR&H%%1ojZ)Fblj3UXC-#uA?E_kZqPLRYtwahynfCYO`JmbQ{%}*+9q*Dr6PwSSNO?
zSkwPvQ6L5l7Ri5#CbR`AF*sdo0kBwWB8CH<BY+kOXWOnpP}qRQsJHpPYq>p|@%_Q1
zFX!ebQ+waH(+5(bPbINU`%au}$Pc_6unC=AA2bHWcHFvhx8=~dP90y`+S{JK`|RbR
zr<%5=9Z21O9GmpLG2@*XnZB?6F{8QScg^crqw_z{PyF?uaKi(8bL~R%V8V^EGn)!B
zBVr~}`tX{s?nln{Ku2!Z-ke<M)LA;V{Gl6qvnST<uAU1-_-~*CV@F+IY-JO!mn2nw
z`&)s3{DqTAQz<i^tEb0gemV-Bn0mLPz42>Wwzr4$ZyRpwy0Yu1Z%%9a&7Yj#+jkxA
zR$P8BvX(!)STo~bZ?zRob&PgL$nGh^Kg@}{>31K^N?h7F|7@BN^PD%ef3Z5A%c!cY
zCF3h&whybSOxoQIxtE5$G3xWW1$Lyf_!zaL8X-sCBJM^dPsE+bt<xT{J>IstX?%Oj
zlQE0+n`hHEsNCm1yK`|=@Ly^RuiCei_~++?ry#~x)OOs}aHcP=X7bmn$?2Vcckllp
zia7pGY5j?pDvm|>PgFYj>57DndCo)~5#Kl-s0<jxl3PEu5BeAHv<pNlofZ{0G~#@9
z)}ZZ5+|iu$#K8WKUei68-gM#7kC!q=hR;b;{Bz2S_g)E$gc7bguOB1lT7&;hiz(N5
JA-m}9e*ogd6g&U`

literal 0
HcmV?d00001

diff --git a/static/js/common/tools.js b/static/js/common/tools.js
index 3624290..876ac2e 100644
--- a/static/js/common/tools.js
+++ b/static/js/common/tools.js
@@ -440,6 +440,7 @@ define(['jquery', 'dialog'], function ($, dialog) {
 			if (data.code == 200) {
 				var content = data.data;
 				console.log(content)
+				content[13].configValue = 'red'
 				if (content[13].configValue == 'red'){
 					themeColor = 'red';
 					document.documentElement.style.setProperty('--color', '#e8041f');
diff --git a/static/js/project/announcementList/warrantDetail.js b/static/js/project/announcementList/warrantDetail.js
index 69b68a6..bd71dcf 100644
--- a/static/js/project/announcementList/warrantDetail.js
+++ b/static/js/project/announcementList/warrantDetail.js
@@ -40,6 +40,7 @@ define(['jquery', "template", "Tools", "announApi", "paging"], function ($, temp
         }
     }
     module.announDetail = function(data){
+        console.log(data)
         module.data.jyqzNumOne = data.rows[0].jyqzNumOne
         module.data.jyqzNumTwo = data.rows[0].jyqzNumTwo
         tools.doGet(announDetail+'/'+data.rows[0].publicityId, {}, module.announInformation,true);
diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js
index 909db7f..a22f69c 100644
--- a/static/js/project/bidding/biddingList.js
+++ b/static/js/project/bidding/biddingList.js
@@ -96,8 +96,20 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT
                 console.log(res)
             }
         })
-    };
 
+        setTimeout(function(){
+            //主题图片切换
+            module.switchTheme();
+        },500)
+    };
+    //主题图片切换
+    module.switchTheme = function(){
+        if(themeColor == 'red'){
+            document.getElementById('bannerBottom').src = '../../static/images/bannerBottom_red.jpg'
+        }else if(themeColor == 'green'){
+            document.getElementById('bannerBottom').src = '../../static/images/bannerBottom.jpg'
+        }
+    }
     //挂牌项目列表
     module.biddingList = function (data) {
         if (data.code == 200) {
diff --git a/static/js/project/interact/interact.js b/static/js/project/interact/interact.js
index eb04e13..6eb0549 100644
--- a/static/js/project/interact/interact.js
+++ b/static/js/project/interact/interact.js
@@ -16,7 +16,9 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
             //每页数量
             pageSize: 5,
             //总页数
-            pageCount:0
+            pageCount:0,
+            questionsUrl:'',
+            answerUrl:''
         },
     };
     var tools = new Tools();
@@ -29,12 +31,27 @@ define(['jquery', "template", "Tools", "interactApi", "paging"], function ($, te
             goSearch()
         }
 
-        //互动交流
-        tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize,reply:'notnull'}, module.interactInformation,true);
 
         //网站配置信息（网站名称 底部联系方式 公安备案号 网站备案号）
         tools.getWebConfig();
+        setTimeout(function(){
+            //主题图片切换
+            module.switchTheme();
+            //互动交流
+            tools.doGet(interactList, {deptId:100,pageNum:module.data.pageNum,pageSize:module.data.pageSize,reply:'notnull'}, module.interactInformation,true);
+
+        },500)
     };
+    //主题图片切换
+    module.switchTheme = function(){
+        if(themeColor == 'red'){
+            module.data.questionsUrl='../../static/images/questions_red.png';
+            module.data.answerUrl='../../static/images/answer_red.png';
+        }else if(themeColor == 'green'){
+            module.data.questionsUrl='../../static/images/questions.png';
+            module.data.answerUrl='../../static/images/answer.png';
+        }
+    }
     //获取地址栏参数
     function getQueryVariable(variable){
         var query = window.location.search.substring(1);
diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js
index 9582443..2117cb7 100644
--- a/static/js/project/user/index.js
+++ b/static/js/project/user/index.js
@@ -22,7 +22,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
             //用户资料form
             form:{
 
-            }
+            },
+            modifyUrl:'',
+            detailUrl:''
         },
     };
     var tools = new Tools();
@@ -48,8 +50,23 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
         var type = tools.getParam('type');
 
         module.getType(type);
+        setTimeout(function(){
+            //主题图片切换
+            module.switchTheme();
+        },500)
 
     };
+
+    //主题图片切换
+    module.switchTheme = function(){
+        if(themeColor == 'red'){
+            module.data.modifyUrl = '../../static/images/modify_red.png';
+            module.data.detailUrl = '../../static/images/detail_red.png';
+        }else if(themeColor == 'green'){
+            module.data.modifyUrl = '../../static/images/modify.png';
+            module.data.detailUrl = '../../static/images/detail.png';
+        }
+    }
     //底部友情链接
     module.bottomFriendsLinks = function (data) {
         if (data.code == 200) {
@@ -742,28 +759,44 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor"],
             document.getElementById('icon1').src = '../../static/images/user_index_icon1.png'
         }
         document.getElementById('icon-list1').onmouseover = function(){
-            document.getElementById('icon1').src = '../../static/images/user_index_icon5.png'
+            if(themeColor == 'red'){
+                document.getElementById('icon1').src = '../../static/images/user_index_icon5_red.png'
+            }else if(themeColor == 'green'){
+                document.getElementById('icon1').src = '../../static/images/user_index_icon5.png'
+            }
         }
 
         document.getElementById('icon-list2').onmouseout = function(){
             document.getElementById('icon2').src = '../../static/images/user_index_icon2.png'
         }
         document.getElementById('icon-list2').onmouseover = function(){
-            document.getElementById('icon2').src = '../../static/images/user_index_icon6.png'
+            if(themeColor == 'red'){
+                document.getElementById('icon2').src = '../../static/images/user_index_icon6_red.png'
+            }else if(themeColor == 'green') {
+                document.getElementById('icon2').src = '../../static/images/user_index_icon6.png'
+            }
         }
 
         document.getElementById('icon-list3').onmouseout = function(){
             document.getElementById('icon3').src = '../../static/images/user_index_icon3.png'
         }
         document.getElementById('icon-list3').onmouseover = function(){
-            document.getElementById('icon3').src = '../../static/images/user_index_icon7.png'
+            if(themeColor == 'red'){
+                document.getElementById('icon3').src = '../../static/images/user_index_icon7_red.png'
+            }else if(themeColor == 'green') {
+                document.getElementById('icon3').src = '../../static/images/user_index_icon7.png'
+            }
         }
 
         document.getElementById('icon-list4').onmouseout = function(){
             document.getElementById('icon4').src = '../../static/images/user_index_icon4.png'
         }
         document.getElementById('icon-list4').onmouseover = function(){
-            document.getElementById('icon4').src = '../../static/images/user_index_icon8.png'
+            if(themeColor == 'red'){
+                document.getElementById('icon4').src = '../../static/images/user_index_icon8_red.png'
+            }else if(themeColor == 'green') {
+                document.getElementById('icon4').src = '../../static/images/user_index_icon8.png'
+            }
         }
 
 
diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html
index 7be3707..063f8d1 100644
--- a/view/bidding/biddingList.html
+++ b/view/bidding/biddingList.html
@@ -221,7 +221,7 @@
                 </tr>
             </table>
         </div>
-        <img src="../../static/images/bannerBottom.jpg" alt="" class="m-t-30"/>
+        <img src="" id="bannerBottom" alt="" class="m-t-30"/>
         <div class="tableType" style="background: none">
             <p><i></i>未开始</p>
             <p><i></i>进行中</p>
diff --git a/view/interact/interactList.html b/view/interact/interactList.html
index 1e17ccb..34fd77b 100644
--- a/view/interact/interactList.html
+++ b/view/interact/interactList.html
@@ -142,13 +142,13 @@
                     {{each interactInformationList as value i}}
                         <li>
                             <div class="m-b-20">
-                                <img src="../../static/images/questions.png" alt="" class="fl m-r-20"/>
+                                <img src="{{questionsUrl}}" alt="" class="fl m-r-20"/>
                                 <p class="fl">{{i+1}}.{{value.title}}？</p>
                                 <p class="fr">{{value.logintime}}</p>
                                 <div class="clear"></div>
                             </div>
                             <div>
-                                <img src="../../static/images/answer.png" alt="" class="fl m-r-20"/>
+                                <img src="{{answerUrl}}" alt="" class="fl m-r-20"/>
                                 <p class="fl wid80">{{value.reply}}</p>
                                 <p class="fr">{{value.replyTime}}</p>
                                 <div class="clear"></div>
@@ -169,13 +169,13 @@
                     {{each searchInformationList as value i}}
                     <li>
                         <div class="m-b-20">
-                            <img src="../../static/images/questions.png" alt="" class="fl m-r-20"/>
+                            <img src="{{questionsUrl}}" alt="" class="fl m-r-20"/>
                             <p class="fl">{{i+1}}.{{value.title}}？</p>
                             <p class="fr">{{value.logintime}}</p>
                             <div class="clear"></div>
                         </div>
                         <div>
-                            <img src="../../static/images/answer.png" alt="" class="fl m-r-20"/>
+                            <img src="{{answerUrl}}" alt="" class="fl m-r-20"/>
                             <p class="fl wid80">{{value.reply}}</p>
                             <p class="fr">{{value.replyTime}}</p>
                             <div class="clear"></div>
diff --git a/view/listingItems/itemsList.html b/view/listingItems/itemsList.html
index 611e966..e333aaa 100644
--- a/view/listingItems/itemsList.html
+++ b/view/listingItems/itemsList.html
@@ -226,7 +226,23 @@
             {{each itemsInformationList as value i}}
                 <div class="centerLeft-center-middle m-t-40">
                     <a href="itemsDetail.html?id={{value.id}}">
-                        <p class="centerLeft-center-lable">{{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}</p>
+                        {{if value.projectShowStatus == '已经成交'}}
+                        <p class="centerLeft-center-lable" style="background: #d7d7d7;color: #626262">
+                            {{/if}}
+                            {{if value.projectShowStatus == '项目公示'}}
+                        <p class="centerLeft-center-lable" style="background: #007b76">
+                            {{/if}}
+                            {{if value.projectShowStatus == '正在报名'}}
+                        <p class="centerLeft-center-lable" style="background: #e8041f">
+                            {{/if}}
+                            {{if value.projectShowStatus == '等待竞价' || value.projectShowStatus == '等待成交'}}
+                        <p class="centerLeft-center-lable" style="background: #e7851c">
+                            {{/if}}
+                            {{if value.projectShowStatus == '正在竞价'}}
+                        <p class="centerLeft-center-lable" style="background: #1c58bb">
+                            {{/if}}
+                            {{# value.projectShowStatus.slice(0,2)+'<br/>'+value.projectShowStatus.slice(2)}}
+                        </p>
                         {{if value.fileUrl == null}}
                             <img src="../../static/images/zwtp.jpg" alt="" width="100%" height="152px"/>
                         {{else}}
diff --git a/view/user/user.html b/view/user/user.html
index 688b53c..518eee1 100644
--- a/view/user/user.html
+++ b/view/user/user.html
@@ -356,12 +356,12 @@
                     <td width="130">
                         {{if value.isAuditStatus == 'N'}}
                             <div class="fl" onclick="selectUserSupply({{value.id}})">
-                                <img src="../../static/images/modify.png" alt="" class="fl"/>
+                                <img src="{{modifyUrl}}" alt="" class="fl"/>
                                 <p class="fl">修改</p>
                                 <div class="clear"></div>
                             </div>
                             <div class="fr" onclick="deleteUserSupply({{value.id}})">
-                                <img src="../../static/images/detail.png" alt="" class="fl"/>
+                                <img src="{{detailUrl}}" alt="" class="fl"/>
                                 <p class="fl">删除</p>
                                 <div class="clear"></div>
                             </div>