From a26fb8a67e0da62a0a844e4325d62bf8468ff210 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 21 Sep 2020 20:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E6=9C=89=E4=BA=8B=E8=AF=B4-=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/discussion/top-flag.png                  | Bin 0 -> 916 bytes
 .../components/projectItem/projectItem.wxml     |   5 ++++-
 .../components/projectItem/projectItem.wxss     |  11 ++++++++++-
 project.config.json                             |  16 ++++++++--------
 4 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 images/discussion/top-flag.png

diff --git a/images/discussion/top-flag.png b/images/discussion/top-flag.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac9998e711c371e676822411c6b089bb2c6ae5dc
GIT binary patch
literal 916
zcmV;F18e+=P)<h;3K|Lk000e1NJLTq0027x000~a1^@s6-;BpS0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Hc3Q5RCwClSxsmYK@{GN@un@SUc3lK
zJcu<dL_rV_LIf{*OTe?z9z`$Npx{MJ_T<@sf?k9Myb2mY1VN;M`iBQ`(NhJ*Q0-A0
zzp*p;9OrjyOp^!Srn@t<GvB`VzInS1`&R><9Re-`M}di8H0>*J4>%vx`%9sQ>}lW{
za1po*^foM=dSBnx2qPRX04ITiDzXLODR2yUz2SXlBKw>40*-M`(R3ELITA$O?G3O~
zMfM1AKNv6D1ANFU8m564nn5hYXERRN0#b6`H1ur)703I=mJntRodTZAWOoBAz-P_S
z5>Vrd5esMM9iU74l!1hdtMPU*CgRt0mRi~=nFM)j641ggKK1^xO!feK0uEEOIU+(N
zCLR-Hdm3Ww`ZjX@fd3vR?QLny7d}Tz5-8hF!6Nk~`$Hx><4Cq95vXv2!fTX(&U%(>
zJ#w!y@wn|CvK4_v71^TViBe<XS~WZXQx0`Jb9{lP1hskTylPpmaNunfS?2Of1~L^(
zZUly06S<yv5bkRF7c2s&OifC5E8B~Jw+7MZSVEf$mF^zC)+Soe^-}6aIEmv9F)t-M
z#S4ia7Ew}d8<8c4;&twmLgW&Mu$3eA6+~>6o#a%i<v4Lc5{g9OxdQJS4XKzYQo+qj
zWEVa2$rhG9kK$kuHp7KZN%oG%jfO$O_w9>`(+!zy&ZD3ZmN;xDWyN-p#Y)}+*9bS^
zxSytGp5)diVA*2<^Z(JKC6YR>wij4}IIYNJO~t>?ssr{cRoz)WSIUWt{kLmT;y)ra
zuTm{Xt2r0z*-R7@*Lmc{e7+`cvu$TZ*@1bYTDLMRW{{pOk*ZDJUz>b8o3nVfrSq&U
zjGGEIE?LH?O2}9mAMxKd30d)Ck#a&Ug~!Eu<_z1;U!G+p)ppNP&b7Wx4Sgf>Hq#*w
zLA>q6hOvqCFl8lXe6~QG-pgdyN~$1OUDp?ZY+o)~ma;VK1D{rD5ZhmO0q@4_n-lv8
z@I=1IJo^#YH#RgIAuA-#0EbnceFSU<t_-nY{}&`D0Y>s6a1QyJsyzE0I1#M<2Y@B?
q#E6j;e|-ZU1E)arnX2ng0R{l970jTMq-CW50000<MNUMnLSTYE&y$V-

literal 0
HcmV?d00001

diff --git a/pages/discussion/components/projectItem/projectItem.wxml b/pages/discussion/components/projectItem/projectItem.wxml
index b379b0e..5045bc5 100644
--- a/pages/discussion/components/projectItem/projectItem.wxml
+++ b/pages/discussion/components/projectItem/projectItem.wxml
@@ -7,7 +7,10 @@
       <view class="name">{{projectObj.nickname}}</view>
       <image class="dang" wx:if="{{projectObj.partyFlag == '1'}}" src="../../../../images/mine/ic_dangbiaoqian.png" />
     </view>
-    <view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view>
+    <view class="state">
+      <image  wx:if="{{projectObj.topFlag == '1' ? true : false}}" src="../../../../images/discussion/top-flag.png" />
+      <view class="issue-state" style="background: {{projectObj.stateName == '已结案' ? '#4E9BF2' : '#FFC438'}}">{{projectObj.stateName}}</view>    
+    </view>
   </view>
 
   <view class="content">{{projectObj.itemContent}}</view>
diff --git a/pages/discussion/components/projectItem/projectItem.wxss b/pages/discussion/components/projectItem/projectItem.wxss
index 5423f81..9691021 100644
--- a/pages/discussion/components/projectItem/projectItem.wxss
+++ b/pages/discussion/components/projectItem/projectItem.wxss
@@ -46,7 +46,16 @@
   text-align: center;
   padding: 0 8rpx;
 }
-
+.project-item .header .state {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.project-item .header .state image{
+  width: 65rpx;
+  height: 30rpx;
+  margin-right: 20rpx;
+}
 .project-item .content {
   color: #333;
   font-size: 36rpx;
diff --git a/project.config.json b/project.config.json
index 0e8739b..76ed0e0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -38,23 +38,23 @@
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
+    "plugin": {
       "current": -1,
       "list": []
     },
-    "conversation": {
-      "current": -1,
+    "game": {
+      "currentL": -1,
       "list": []
     },
-    "plugin": {
+    "gamePlugin": {
       "current": -1,
       "list": []
     },
-    "game": {
-      "currentL": -1,
+    "search": {
+      "current": -1,
       "list": []
     },
-    "gamePlugin": {
+    "conversation": {
       "current": -1,
       "list": []
     },
@@ -65,7 +65,7 @@
           "id": 0,
           "name": "pages/formid/formid",
           "pathName": "pages/formid/formid",
-          "query": "gid=1233592630168813569",
+          "query": "gid=1252832420898570242",
           "scene": 1011
         },
         {