Merge branch 'dev' of http://1.94.207.143:3000/xyy/xyy-m into dev

src/pages/travel-notes/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="filterList.length" class="sticky top-50 z-50 bg-white w-full border-t">
+    <div v-if="filterList.length" class="sticky top-50 z-50 bg-white w-full">
       <van-dropdown-menu active-color="#FF9300" ref="dropDownMenuRef">
         <van-dropdown-item @closed="onAreaFilterClose" :title="areaFilterTitle" ref="itemRef">
           <van-tree-select @click-nav="handleAreaClick" @click-item="handleFilterClick" v-model:active-id="activeId"
@@ -17,14 +17,14 @@
             <div class="aspect-[120/80] h-80 shrink-0 rounded overflow-hidden bg-[#ddd]">
               <img v-if="Array.isArray(itemData?.tourismUrlsAfterConvert)" :src="itemData?.tourismUrlsAfterConvert[0]" class="w-full h-full rounded object-cover" alt="" srcset="" />
             </div>
-            <div class="h-80  pl-[5px] flex flex-col text-[#FD9A00] justify-between  w-[calc(100%-120px)]">
+            <div class="h-80  pl-[8px] flex flex-col text-[#FD9A00] justify-between  w-[calc(100%-120px)]">
               <div class="truncate w-full text-[14px] font-bold">
                 <img v-if="itemData.isOriginal == 1" src="~/assets/img/yuanchuang.png"  class="mt-3 w-[30px] h-[16px]" alt="" style="float:left;">
                 {{ itemData.projectTitle }}
               </div>
               <div class="w-full overflow-x-auto scrollbar" v-if="itemData.noteLabel">
                 <div class="flex flex-nowrap">
-                  <div v-for="tag in convertTag(itemData.noteLabel)" class=" rounded-full border border-[#FD9A00] text-[10px] pr-6 pl-6 float-left mr-10 shrink-0">{{ tag }}</div>
+                  <div v-for="tag in convertTag(itemData.noteLabel)" class=" rounded-full border-[#FD9A00] text-[10px] pr-6 pl-6 float-left mr-10 shrink-0" style="border:0.5px solid #FD9A00">{{ tag }}</div>
                 </div>
               </div>
               <div class="flex justify-end items-center text-[12px] text-[#999]">
@@ -68,7 +68,7 @@ const activeIndex = ref('');
 const dropDownMenuRef = ref(null)
 // 获取筛选列表
 async function getFilters() {
-  const { data } = await request(`website/tourism/projectTravelNotes/travelNotesDirectoryList`).finally(()=>{closeToast()})
+  const { data } = await request(`/website/tourism/projectTravelNotes/travelNotesDirectoryList`).finally(()=>{closeToast()})
   
   if (!Array.isArray(data)) return getList()
   const routerAreaId = null
@@ -146,7 +146,7 @@ async function getList() {
     param.travelWriteType = travelWriteType.value
   }
   loading.value = true
-  const { data } = await request(`website/tourism/projectTravelNotes/travelNotesPageList`, { query: param }).finally(()=>closeToast())
+  const { data } = await request(`/website/tourism/projectTravelNotes/travelNotesPageList`, { query: param }).finally(()=>closeToast())
 
   dataList.value = dataList.value.concat(data.dataList)
   loading.value = false

src/pages/yj/[id].vue

@@ -192,7 +192,7 @@
             <div class="text-[16px] font-bold text-black-3">热门游记</div>
           </div>
           <div class="">
-            <NuxtLink :to="`/yj/${item.id}`" class="group flex cursor-pointer items-center space-x-10 py-10" v-for="(item, index) in dataList.dataList
+            <NuxtLink :to="`/yj/${item.id}`" class="group flex cursor-pointer items-center space-x-10 py-10 border-b" v-for="(item, index) in dataList.dataList
 " :key="item.id">
               <div v-if="index<4" class="w-[15px] h-[15px] bg-[#000] text-[#fff] rounded flex items-center justify-center" :style="{background:['#FD9A00','#33B724','#F02626','#CACACA'][index]}" >
                 {{ index + 1 }}
@@ -213,7 +213,7 @@
           </div>
         </div>
         <div class="h-[100px]"></div>
-        <div @click.stop="" class="fixed bottom-0 left-0 w-full bg-[#fff] pt-10 pb-20 border">
+        <div @click.stop="" class="fixed bottom-0 left-0 w-full bg-[#fff] pt-10 pb-30 border">
           <div v-if="replyComment.id" class="text-center relative">
             回复 <span class="text-[#f40]">{{ replyComment?.commentUserIdDictMap?.name }}:</span>
             <div class="absolute right-10 top-0">