1

miniprogram/pages/main/main.wxml

@@ -20,6 +20,7 @@
   <!-- 信息类型 -->
   <view class="filter-lists">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     <view wx:if="{{filterList == 1}}" class="filter-list1" id="list1">
       <view wx:for="{{filterName[1].list}}" wx:for-item="item" wx:key="type">
@@ -53,6 +54,8 @@
             wx:if="{{filterItem[1] == name}}">✔</view>
 =======
 =======
+>>>>>>> master
+=======
 >>>>>>> master
     <view wx:if="{{filterList == 1}}" class="filter-list" id="list1">
       <view wx:for="{{filterName[1].children}}" wx:for-item="item" wx:key="title">
@@ -68,6 +71,9 @@
               wx:if="{{filterItem[1] == title}}">✔</view>
           </view>
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> master
+=======
 >>>>>>> master
 =======
 >>>>>>> master
@@ -78,6 +84,7 @@
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 2}}" class="filter-list" id="list2">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       <view class="filter-list-item secondary-text-color" wx:for="{{filterName[2].item}}" wx:for-item="name"
         wx:key="*this" data-filter-list="2" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
@@ -87,6 +94,11 @@
         wx:key="*this" data-filter-list="2" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
           wx:if="{{filterItem[2] == title}}">✔</view>
 >>>>>>> master
+=======
+      <view class="filter-list-item secondary-text-color" wx:for="{{filterName[2].children}}" wx:for-item="title"
+        wx:key="*this" data-filter-list="2" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
+          wx:if="{{filterItem[2] == title}}">✔</view>
+>>>>>>> master
 =======
       <view class="filter-list-item secondary-text-color" wx:for="{{filterName[2].children}}" wx:for-item="title"
         wx:key="*this" data-filter-list="2" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
@@ -98,6 +110,7 @@
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 3}}" class="filter-list" id="list3">
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       <view class="filter-list-item secondary-text-color" wx:for="{{filterName[3].item}}" wx:for-item="name"
         wx:key="*this" data-filter-list="3" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
@@ -107,6 +120,11 @@
         wx:key="*this" data-filter-list="3" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
           wx:if="{{filterItem[3] == title}}">✔</view>
 >>>>>>> master
+=======
+      <view class="filter-list-item secondary-text-color" wx:for="{{filterName[3].children}}" wx:for-item="title"
+        wx:key="*this" data-filter-list="3" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
+          wx:if="{{filterItem[3] == title}}">✔</view>
+>>>>>>> master
 =======
       <view class="filter-list-item secondary-text-color" wx:for="{{filterName[3].children}}" wx:for-item="title"
         wx:key="*this" data-filter-list="3" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view