From 32274bc8e1d1192108f82cc86f867e5fc9671ec4 Mon Sep 17 00:00:00 2001
From: jiangx <jiangx@1000mu.com>
Date: Fri, 17 Nov 2023 16:12:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ScrollList/ScrollList.vue      |  4 +--
 .../ScrollListItem/ScrollListItem.vue         | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/ScrollList/ScrollList.vue b/src/components/ScrollList/ScrollList.vue
index 53eaca4..3d2434c 100644
--- a/src/components/ScrollList/ScrollList.vue
+++ b/src/components/ScrollList/ScrollList.vue
@@ -16,9 +16,9 @@
         </SwiperSlide>
       </Swiper>
     </div>
-    <div class="flex shrink-0 flex-col items-center w-[104px] rounded-[10px] bg-[#C70082] pt-[120px]">
+    <div class="flex shrink-0 flex-col items-center w-[104px] rounded-[10px] bg-[#C70082] pt-[56px]">
       <img src="../../assets/images/arrow.svg" alt="" />
-      <p class="text-20 text-white pt-4 tb tracking-[10px]">请在右边的写字台书写您的心声和建议吧</p>
+      <p class="text-32 text-white pt-4 tb tracking-[10px]">请在右边的写字台书写您的心声和建议吧</p>
       <i class="text-20 text-white">!</i>
     </div>
   </div>
diff --git a/src/components/ScrollListItem/ScrollListItem.vue b/src/components/ScrollListItem/ScrollListItem.vue
index 749a02b..39bfff8 100644
--- a/src/components/ScrollListItem/ScrollListItem.vue
+++ b/src/components/ScrollListItem/ScrollListItem.vue
@@ -4,7 +4,7 @@
   >
     <div class="flex-1 shrink-0 justify-between">
       <div class="flex items-center text-justify text-[#808080] text-20 font-normal leading-[18px] mb-2">
-        <div class="p-2.5 mr-3 bg-[#B60081] rounded-xl">
+        <div class="flex-center mr-3 w-8 h-8 bg-[#B60081] rounded-xl">
           <svg class="w-4 h-6" xmlns="http://www.w3.org/2000/svg" width="16" height="24" viewBox="0 0 16 24" fill="none">
             <path
               d="M7.71206 16.7038C10.6401 16.7038 12.5601 14.0638 12.5601 9.7918C12.5601 5.6638 10.6401 3.1198 7.71206 3.1198C4.78406 3.1198 2.88806 5.6638 2.88806 9.7918C2.88806 14.0638 4.78406 16.7038 7.71206 16.7038ZM13.2561 23.3038C9.84806 23.3038 7.49606 21.4318 6.39206 18.9358C2.57606 18.3118 0.00805664 14.9038 0.00805664 9.7918C0.00805664 4.0798 3.17606 0.695801 7.71206 0.695801C12.2721 0.695801 15.4161 4.1038 15.4161 9.7918C15.4161 14.7598 13.0161 18.0958 9.39206 18.8638C10.1841 20.3278 11.7921 20.9998 13.5681 20.9998C14.3361 20.9998 14.9601 20.8798 15.4641 20.7118L15.9921 22.8238C15.3921 23.0878 14.4081 23.3038 13.2561 23.3038Z"
@@ -22,8 +22,8 @@
     </div>
     <div class="flex-1 shrink-0">
       <div class="flex items-center text-justify text-[#808080] text-20 font-normal leading-[18px] mb-2">
-        <div class="p-2.5 mr-3 rounded-xl bg-[#F5F5F5] border border-solid border-[#808080]">
-          <svg class="w-4 h-[18px]" xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 16 18" fill="none">
+        <div class="flex-center mr-3 w-8 h-8 rounded-xl bg-[#F5F5F5] border border-solid border-[#808080]">
+          <svg class="w-4 h-6" xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 16 18" fill="none">
             <path
               d="M0.535889 17.8438L6.39189 0.155762H9.60789L15.4639 17.8438H12.5119L11.0239 12.8278H4.87989L3.39189 17.8438H0.535889ZM5.55189 10.6198H10.3519L9.65589 8.24376C9.07989 6.32376 8.55189 4.35576 7.99989 2.36376H7.90389C7.37589 4.37976 6.82389 6.32376 6.24789 8.24376L5.55189 10.6198Z"
               fill="#808080"
@@ -44,14 +44,8 @@
               <p class="text-24 text-[#333]">改善后</p>
               <img v-for="pic of after(customer)" :key="pic.filePath" :src="config.smallUrl + pic.filePath" class="block w-full" alt="" />
             </div>
-            <template v-if="customer.fileList?.length">
-              <img
-                v-for="item of customer.fileList"
-                :key="item.fileName"
-                :src="config.smallUrl + item.filePath"
-                class="block w-full"
-                alt=""
-              />
+            <template v-if="filterPic?.length">
+              <img v-for="item of filterPic" :key="item.fileName" :src="config.smallUrl + item.filePath" class="block w-full" alt="" />
             </template>
           </div>
           <div v-if="customer.sign" class="text-[#333] text-24">店铺店长: {{ customer.sign }}</div>
@@ -79,7 +73,7 @@
 </template>
 
 <script setup lang="ts">
-import { toRefs } from 'vue'
+import { toRefs, computed } from 'vue'
 import { useRootStore } from '@/store/root'
 import ScrollView from '@/base/ScrollView/ScrollView.vue'
 
@@ -87,14 +81,20 @@ type Props = {
   customer: Customer
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   customer: () => ({} as Customer)
 })
 
+//筛选改善前后图片
+const filterPic = computed(() => props.customer.fileList?.filter(item => item.type !== 'before' && item.type !== 'after'))
+
 const store = useRootStore()
 const { config } = toRefs(store)
 
 function formatDate(date: string) {
+  if (!date) {
+    return
+  }
   const newDate = new Date(date)
   const year = newDate.getFullYear()
   const month = String(newDate.getMonth() + 1).padStart(2, '0')