From 714f64676aca78bc1b53c63bac8c71c86ee3929e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 24 Apr 2023 11:14:23 +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     | 26 ++++++++++---
 .../fengdu/AppNewFarmerBank/handpick.vue      | 38 +++++++++++++------
 .../fengdu/AppNewFarmerBank/pickDetail.vue    | 30 +++++++++++++--
 3 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index 6277bac..f780ecd 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -48,10 +48,10 @@
       </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 class="title-info" v-if="item.girdName">
+            {{item.girdName}}
           </div>
+          <div class="type-info">{{item.createUserName}}<span>{{item.title}}</span></div>
           <div class="top">
             <div class="left" @click="$linkTo(`./pickDetail?id=${item.id}`)">
               <p>{{ item.content }}</p>
@@ -308,12 +308,26 @@ export default {
         background: #FFF;
         border-radius: 12px;
         .title-info {
-          line-height: 44px;
-          font-size: 28px;
+          font-family: PingFangSC-SNaNpxibold;
+          font-weight: 600;
+          font-size: 34px;
           color: #333;
-          margin-bottom: 8px;
+          letter-spacing: 0;
+          line-height: 40px;
+          margin-bottom: 16px;
+        }
+        .type-info {
+          font-family: PingFangSC-Regular;
+          font-size: 34px;
+          color: #687DA6;
+          line-height: 40px;
           span {
+            display: inline-block;
+            font-family: PingFangSC-Regular;
+            font-size: 26px;
             color: #666;
+            line-height: 40px;
+            margin-left: 20px;
           }
         }
         .top {
diff --git a/src/project/fengdu/AppNewFarmerBank/handpick.vue b/src/project/fengdu/AppNewFarmerBank/handpick.vue
index b9f3f4e..1b03fa9 100644
--- a/src/project/fengdu/AppNewFarmerBank/handpick.vue
+++ b/src/project/fengdu/AppNewFarmerBank/handpick.vue
@@ -1,23 +1,23 @@
 <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 class="list" v-for="(item,index) in list" :key="index" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+      <div class="title-info" v-if="item.girdName">
+        {{item.girdName}}
       </div>
+      <div class="type-info">{{item.createUserName}}<span>{{item.title}}</span></div>
       <div class="top">
-        <div class="left" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+        <div class="left" >
           <p>{{ item.content }}</p>
         </div>
-        <div class="right" @click="upCount(item.id, index)">
+        <div class="right" @click.stop="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="">
           <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}`)">
+      <div class="imgs" v-if="item.images.length">
         <image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/>
       </div>
-      <div class="imgs" v-if="!item.images.length && item.videos.length" @click="$linkTo(`./pickDetail?id=${item.id}`)">
+      <div class="imgs" v-if="!item.images.length && item.videos.length">
         <image v-for="(video, i) in item.videos" :key="i" class="banner" :src="video.facePicture.toString()"/>
       </div>
     </div>
@@ -113,13 +113,27 @@ export default {
     background: #FFF;
     border-radius: 12px;
     margin-bottom: 24px;
-    .title {
-      line-height: 44px;
-      font-size: 28px;
+    .title-info {
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 34px;
       color: #333;
-      margin-bottom: 8px;
+      letter-spacing: 0;
+      line-height: 40px;
+      margin-bottom: 16px;
+    }
+    .type-info {
+      font-family: PingFangSC-Regular;
+      font-size: 34px;
+      color: #687DA6;
+      line-height: 40px;
       span {
+        display: inline-block;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
         color: #666;
+        line-height: 40px;
+        margin-left: 20px;
       }
     }
     .top {
diff --git a/src/project/fengdu/AppNewFarmerBank/pickDetail.vue b/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
index 5e25f9c..f302b7f 100644
--- a/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="pickDetail">
     <div class="container">
-      <div class="title">{{ data.title }}</div>
-      <p class="avatar">{{ data.createUserName }}</p>
+      <div class="title-info" v-if="data.girdName">
+        {{data.girdName}}
+      </div>
+      <div class="type-info">{{data.createUserName}}<span>{{data.title}}</span></div>
       <div class="content">{{ data.content }}</div>
       <div class="imgs" v-if="images.length">
         <image v-for="(img, i) in images" @click="preview(img.url, images)" :key="i" class="banner" :src="img.url"/>
@@ -59,6 +61,29 @@ export default {
     padding: 32px;
     box-sizing: border-box;
     background: #FFF;
+    .title-info {
+      font-family: PingFangSC-SNaNpxibold;
+      font-weight: 600;
+      font-size: 34px;
+      color: #333;
+      letter-spacing: 0;
+      line-height: 40px;
+      margin-bottom: 16px;
+    }
+    .type-info {
+      font-family: PingFangSC-Regular;
+      font-size: 34px;
+      color: #687DA6;
+      line-height: 40px;
+      span {
+        display: inline-block;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
+        color: #666;
+        line-height: 40px;
+        margin-left: 20px;
+      }
+    }
     .title {
       font-size: 34px;
       font-weight: 600;
@@ -71,7 +96,6 @@ export default {
       margin-top: 16px;
     }
     .content {
-      margin-top: 32px;
       font-size: 28px;
       font-weight: 400;
       color: #333333;