1

1

miniprogram/app.json

@@ -1,11 +1,14 @@
 {
   "pages": [
+<<<<<<< HEAD
 <<<<<<< HEAD
     "pages/user/user",
     "pages/opinion/opinion",
     "pages/aboutUs/aboutUs",
     "pages/myQuestion/myQuestion",
 =======
+>>>>>>> master
+=======
 >>>>>>> master
     "pages/main/main",
     "pages/publisher/publisher",

miniprogram/pages/main/main.wxml

@@ -22,6 +22,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< 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">
@@ -59,6 +60,8 @@
 =======
 >>>>>>> master
 =======
+>>>>>>> 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">
@@ -76,6 +79,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> master
+=======
 >>>>>>> master
 =======
 >>>>>>> master
@@ -92,6 +98,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< 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
@@ -111,6 +118,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
@@ -124,6 +136,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< 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
@@ -143,6 +156,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