From 7709422b026c709fac6d520679a62207f0a078d8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 7 Apr 2023 15:37:59 +0800
Subject: [PATCH 1/3] bug230

---
 src/project/fengdu/AppMine/myIntegral.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/project/fengdu/AppMine/myIntegral.vue b/src/project/fengdu/AppMine/myIntegral.vue
index ed02555..7f24e88 100644
--- a/src/project/fengdu/AppMine/myIntegral.vue
+++ b/src/project/fengdu/AppMine/myIntegral.vue
@@ -85,6 +85,7 @@ export default {
   overflow-x: hidden;
   height: calc(100% - 136px);
   background-color: #f3f6f9;
+  padding-bottom: 30px;
 
   .header-content {
     width: 690px;
@@ -154,7 +155,7 @@ export default {
     background: #FFF;
     border-radius: 16px;
     margin: 0 0 0 32px;
-    padding: 30px 30px 94px;
+    padding: 16px 30px;
     box-sizing: border-box;
 
     .item {
@@ -194,6 +195,9 @@ export default {
         line-height: 50px;
       }
     }
+    .item:last-child {
+      border-bottom: none;
+    }
   }
   .color-1 {
     color: #2C51CE !important;

From 80f062ffc9f03cffc78cc16504f5b1b36f8e68b3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 7 Apr 2023 15:52:00 +0800
Subject: [PATCH 2/3] bug

---
 src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue | 3 +--
 src/project/fengdu/AppNewFarmerBank/handpick.vue         | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
index ec1b435..f30d1bd 100644
--- a/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
+++ b/src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
@@ -55,8 +55,7 @@
             <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">
-            <!-- <video v-for="(video, ins) in item.videos" :key="ins" class="file-img" :src="video.url"/> -->
-            <image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="img.facePicture"/>
+            <image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="video.facePicture.toString()"/>
           </div>
         </div>
       </div>
diff --git a/src/project/fengdu/AppNewFarmerBank/handpick.vue b/src/project/fengdu/AppNewFarmerBank/handpick.vue
index e73af38..c6f61e2 100644
--- a/src/project/fengdu/AppNewFarmerBank/handpick.vue
+++ b/src/project/fengdu/AppNewFarmerBank/handpick.vue
@@ -16,8 +16,7 @@
         <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}`)">
-        <!-- <video v-for="(video, ins) in item.videos" :key="ins" class="file-img" :src="video.url"/> -->
-        <image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="img.facePicture"/>
+        <image v-for="(video, i) in item.videos" :key="i" class="banner" :src="video.facePicture.toString()"/>
       </div>
     </div>
   </div>
@@ -61,8 +60,8 @@ export default {
           let mapList = newList.map(e => {
             return {
               ...e,
-              images: e?.files.filter(i => i.name.split('.')[1] == 'jpeg') || e?.files.filter(i => i.name.split('.')[1] == 'jpg') || e?.files.filter(i => i.name.split('.')[1] == 'png') || [],
-              videos: e?.files.filter(i => i.name.split('.')[1] == 'mp4') || [],
+              images: e?.files.filter(i => (i.postfix == '.jpg' || i.postfix == '.jpeg' || i.postfix == '.png')),
+              videos: e?.files.filter(i => (i.postfix == '.mp4' || i.postfix == '.MP4')),
             }
           })
           this.list = mapList.map(v => {

From 772d1f0a825d2fa2f92017dddaae7f77e4509b0d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 7 Apr 2023 16:11:16 +0800
Subject: [PATCH 3/3] MP4

---
 src/project/fengdu/AppNewFarmerBank/pickDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/project/fengdu/AppNewFarmerBank/pickDetail.vue b/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
index de05785..5b046ad 100644
--- a/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
+++ b/src/project/fengdu/AppNewFarmerBank/pickDetail.vue
@@ -32,7 +32,7 @@ export default {
         if(res?.data) {
           this.data = res.data
           this.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.name.split('.')[1])))
-          this.videos = res.data.files.filter(e => (['mp4'].includes(e.name.split('.')[1])))
+          this.videos = res.data.files.filter(e => (['mp4','MP4'].includes(e.name.split('.')[1])))
         }
       })
     },