From edc50dccb8f949e649d06f0935c370c8e7e2b72a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 24 Apr 2023 10:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E9=80=89=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppNewFarmerBank/AppNewFarmerBank.vue     | 23 +++++++++++++++----
 .../fengdu/AppNewFarmerBank/handpick.vue      | 23 +++++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index ea229cd..6f343fa 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -48,15 +48,17 @@
       </div>
       <div class="list" v-if="list.length">
         <div class="card" v-for="(item,index) in list" :key="index">
+          <div class="title-info">
+            <p v-if="item.girdName"><span>社区网格：</span>{{item.girdName}}</p>
+            <p v-if="item.title"><span>事件类型：</span>{{item.title}}</p>
+          </div>
           <div class="top">
             <div class="left" @click="$linkTo(`./pickDetail?id=${item.id}`)">
               <p>{{ item.content }}</p>
             </div>
             <div class="right" @click="upCount(item.id,index)">
               <img :src="item.upStatus==0? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png':'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png'" alt="">
-              <div>
-                <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
-              </div>
+              <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
             </div>
           </div>
           <div class="imgs" v-if="item.images.length">
@@ -305,11 +307,21 @@ export default {
         box-sizing: border-box;
         background: #FFF;
         border-radius: 12px;
+        .title-info {
+          line-height: 44px;
+          font-size: 28px;
+          color: #333;
+          margin-bottom: 8px;
+          span {
+            color: #666;
+          }
+        }
         .top {
           display: flex;
           justify-content: space-between;
+          margin-bottom: 16px;
           .left {
-            width: 562px;
+            width: calc(100% - 100px);
             p {
               overflow:hidden; 
               text-overflow: ellipsis;
@@ -319,11 +331,12 @@ export default {
             }
           }
           .right {
-            width: 52px;
+            width: 100px;
             text-align: center;
             img {
               width: 40px;
               height: 40px;
+              vertical-align: bottom;
             }
             span {
               font-size: 28px;
diff --git a/src/project/fengdu/AppNewFarmerBank/handpick.vue b/src/project/fengdu/AppNewFarmerBank/handpick.vue
index 0a08bc4..1453cee 100644
--- a/src/project/fengdu/AppNewFarmerBank/handpick.vue
+++ b/src/project/fengdu/AppNewFarmerBank/handpick.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="handpick">
     <div class="list" v-for="(item,index) in list" :key="index">
+      <div class="title">
+        <p v-if="item.girdName"><span>社区网格：</span>{{item.girdName}}</p>
+        <p v-if="item.title"><span>事件类型：</span>{{item.title}}</p>
+      </div>
       <div class="top">
         <div class="left" @click="$linkTo(`./pickDetail?id=${item.id}`)">
           <p>{{ item.content }}</p>
         </div>
         <div class="right" @click="upCount(item.id, index)">
           <img :src="item.upStatus == 0 ? 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan.png' : 'https://cdn.cunwuyun.cn/wxmp/fengdu/zan-active.png'" alt="">
-          <div>
-            <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
-          </div>
+          <span>{{ item.upCount || 0 }}</span><span v-if="item.upCount > 99">+</span>
         </div>
       </div>
       <div class="imgs" v-if="item.images.length" @click="$linkTo(`./pickDetail?id=${item.id}`)">
@@ -111,11 +113,21 @@ export default {
     background: #FFF;
     border-radius: 12px;
     margin-bottom: 24px;
+    .title {
+      line-height: 44px;
+      font-size: 28px;
+      color: #333;
+      margin-bottom: 8px;
+      span {
+        color: #666;
+      }
+    }
     .top {
       display: flex;
       justify-content: space-between;
+      margin-bottom: 16px;
       .left {
-        width: 562px;
+        width: calc(100% - 100px);
         p {
           overflow:hidden; 
           text-overflow: ellipsis;
@@ -125,11 +137,12 @@ export default {
         }
       }
       .right {
-        width: 52px;
+        width: 100px;
         text-align: center;
         img {
           width: 40px;
           height: 40px;
+          vertical-align: bottom;
         }
         span {
           font-size: 28px;