冲突合并

pages/index/position.vue

@@ -1,17 +1,18 @@
 <template>
   <view class="box defaultBgc">
     <scroll-view class="scrollBox" scroll-y="true" @scrolltolower="loadingMore" @refresherrefresh="refresh" style="position:relative;">
-      <uni-search-bar
-        class="ss-flex-1 white-bgc"
-        radius="8"
-        placeholder="请输入关键字"
-        cancelButton="none"
-        :focus="false"
-        @confirm="onSearch($event.value)"
-      />
-      <view class="block">
-        <SwiperAd class="pb-20" :list="swiperAdList"></SwiperAd>
-        <FilterList class="pb-10" :list="filterList" idValue="label"></FilterList>
+      <view class="white-bgc">
+        <uni-search-bar
+          radius="8"
+          placeholder="请输入关键字"
+          cancelButton="none"
+          :focus="false"
+          @confirm="onSearch($event.value)"
+        />
+      </view>
+      <view class="white-bgc px-10 pb-10 mb-10">
+        <SwiperAd :list="swiperAdList"></SwiperAd>
+        <!-- <FilterList :list="filterList" idValue="label"></FilterList> -->
       </view>
       <PositionList class="pb-10" :list="positionListData" :noMore="noMore"></PositionList>
     </scroll-view>
@@ -21,7 +22,7 @@
 <script setup>
 import SwiperAd from '@/components/SwiperAd'
 // import SearchBar from '@/components/SearchBar'
-import FilterList from '@/components/FilterList'
+// import FilterList from '@/components/FilterList'
 import PositionList from '@/components/PositionList'
 import { swiperAdListTest } from '@/utils/testData'
 import { dealDictObjData } from '@/utils/position'
@@ -88,16 +89,14 @@ onPullDownRefresh(() => { // 下拉刷新
 </script>
 
 <style scoped lang="scss">
+.px-0 { padding-left: 0 !important; padding-right: 0 !important; }
 .pb-10 { padding-bottom: 10px; }
 .pb-20 { padding-bottom: 20px; }
+.px-10 { padding-left: 10px; padding-right: 10px; }
+.mb-10 { margin-bottom: 10px; }
 .box {
   height: calc(100vh - 110px);
   overflow: hidden;
-  .block{
-    margin-bottom: 10px;
-    padding: 0 10px;
-    background-color: #fff;
-  }
 }
 .scrollBox{
   height: 100%;