1

miniprogram/pages/main/main.wxml

@@ -19,6 +19,7 @@
   </view>
   <!-- 信息类型 -->
   <view class="filter-lists">
+<<<<<<< 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">
@@ -51,6 +52,8 @@
           data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
             wx:if="{{filterItem[1] == name}}">✔</view>
 =======
+=======
+>>>>>>> master
     <view wx:if="{{filterList == 1}}" class="filter-list" id="list1">
       <view wx:for="{{filterName[1].children}}" wx:for-item="item" wx:key="title">
         <view class="filter-list-title primary-text-color">{{item.title}}</view>
@@ -64,6 +67,9 @@
             wx:key="title" data-filter-list="1" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
               wx:if="{{filterItem[1] == title}}">✔</view>
           </view>
+<<<<<<< HEAD
+>>>>>>> master
+=======
 >>>>>>> master
         </view>
       </view>
@@ -71,10 +77,16 @@
     <!-- 发布来源 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 2}}" class="filter-list" id="list2">
+<<<<<<< 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
           wx:if="{{filterItem[2] == name}}">✔</view>
+=======
+      <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
@@ -85,10 +97,16 @@
     <!-- 我的需求 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 3}}" class="filter-list" id="list3">
+<<<<<<< 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
           wx:if="{{filterItem[3] == name}}">✔</view>
+=======
+      <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