1

11

miniprogram/app.json

@@ -1,15 +1,5 @@
 {
   "pages": [
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "pages/user/user",
-    "pages/opinion/opinion",
-    "pages/aboutUs/aboutUs",
-    "pages/myQuestion/myQuestion",
-=======
->>>>>>> master
-=======
->>>>>>> master
     "pages/main/main",
     "pages/publisher/publisher",
     "pages/publisherPage/publisherPage",
@@ -21,8 +11,11 @@
     "pages/myFollow/myFollow",
     "pages/publisherLogin/publisherLogin",
     "pages/activityPublish/activityPublish",
+    "pages/myQuestion/myQuestion",
     "pages/receivedQuestion/receivedQuestion",
     "pages/publisherInfoChange/publisherInfoChange",
+    "pages/aboutUs/aboutUs",
+    "pages/opinion/opinion",
     "pages/myPublish/myPublish",
     "pages/administratorSetting/administratorSetting",
     "pages/myColor/myColor",

miniprogram/pages/main/main.wxml

@@ -1,5 +1,5 @@
 <!-- 为首页，含component：itemCard；data:mainData.js -->
-<!-- 活动和纳新未更新完全-->
+<!-- 更新了filter中的活动内容，但是由于有二级标题、还未给出页面美化需求，因此仅在js文件中更新，wxml未更新完全-->
 <view class="page">
   <view class="filter">
     <view class="filter-item secondary-text-color" data-filter-list="1" bindtap="toggleFilterList">
@@ -17,52 +17,7 @@
       <image class="filter-arrow" id="arrow3" mode="aspectFit" src="/images/arrow.png"></image>
     </view>
   </view>
-  <!-- 信息类型 -->
   <view class="filter-lists">
-<<<<<<< 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">
-        <view class="filter-list-title primary-text-color">{{item.sub}}</view>
-        <!-- 生活通知 -->
-        <view class="filter-list-subtitle primary-text-color">{{item.item[0].secondSub}}</view>
-        <view class="filter-list-item secondary-text-color" wx:for="{{item.item[0].subitem}}" wx:for-item="name"
-          wx:key="*this" data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
-            wx:if="{{filterItem[1] == name}}">✔</view>
-        </view>
-        <!-- 学业通知 -->
-        <view class="filter-list-subtitle primary-text-color">{{item.item[1].secondSub}}</view>
-        <view class="filter-list-item secondary-text-color" wx:for="{{item.item[1].subitem}}" wx:for-item="name"
-          wx:key="*this" data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
-            wx:if="{{filterItem[1] == name}}">✔</view>
-        </view>
-        <!-- 其他通知 -->
-        <view class="filter-list-subtitle primary-text-color">{{item.item[2].secondSub}}</view>
-        <view class="filter-list-item secondary-text-color" wx:for="{{item.item[2].subitem}}" wx:for-item="name"
-          wx:key="*this" data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
-            wx:if="{{filterItem[1] == name}}">✔</view>
-        </view>
-        <!-- 活动 -->
-        <view class="filter-list-item secondary-text-color" wx:for="{{item.item}}" wx:for-item="name" wx:key="*this"
-          data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
-            wx:if="{{filterItem[1] == name}}">✔</view>
-        </view>
-        <!-- 纳新 -->
-        <view class="filter-list-item secondary-text-color" wx:for="{{item.item}}" wx:for-item="name" wx:key="*this"
-          data-filter-list="1" data-filter-item="{{name}}" bindtap="toggleFilterItem">{{name}}<view
-            wx:if="{{filterItem[1] == name}}">✔</view>
-=======
-=======
->>>>>>> master
-=======
->>>>>>> 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">
         <view class="filter-list-title primary-text-color">{{item.title}}</view>
@@ -76,96 +31,21 @@
             wx:key="title" data-filter-list="1" data-filter-item="{{title}}" bindtap="toggleFilterItem">{{title}}<view
               wx:if="{{filterItem[1] == title}}">✔</view>
           </view>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> master
-=======
->>>>>>> master
-=======
->>>>>>> master
-=======
->>>>>>> master
-=======
->>>>>>> master
         </view>
       </view>
     </view>
-    <!-- 发布来源 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 2}}" class="filter-list" id="list2">
-<<<<<<< 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
-          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
-          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
-          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>
     </view>
-    <!-- 我的需求 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 3}}" class="filter-list" id="list3">
-<<<<<<< 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
-          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
-          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
-          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>
     </view>
   </view>