Explorar o código

main-update

更新main界面
Chicolor %!s(int64=4) %!d(string=hai) anos
pai
achega
180104257e
Modificáronse 3 ficheiros con 29 adicións e 13 borrados
  1. 2 2
      miniprogram/app.json
  2. 26 10
      miniprogram/pages/main/main.wxml
  3. 1 1
      project.config.json

+ 2 - 2
miniprogram/app.json

@@ -1,7 +1,8 @@
 {
   "pages": [
-    "pages/user/user",
+    "pages/myQuestion/myQuestion",
     "pages/main/main",
+    "pages/user/user",
     "pages/message/message",
     "pages/search/search",
     "pages/setting/setting",
@@ -11,7 +12,6 @@
     "pages/publisherPage/publisherPage",
     "pages/publisherLogin/publisherLogin",
     "pages/activityPublish/activityPublish",
-    "pages/myQuestion/myQuestion",
     "pages/receivedQuestion/receivedQuestion",
     "pages/publisherInfoChange/publisherInfoChange",
     "pages/aboutUs/aboutUs",

+ 26 - 10
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,38 +17,54 @@
       <image class="filter-arrow" id="arrow3" mode="aspectFit" src="/images/arrow.png"></image>
     </view>
   </view>
+  <!-- 信息类型 -->
   <view class="filter-lists">
     <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
+        <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
+        <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"
+        <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>
         </view>
       </view>
     </view>
+    <!-- 发布来源 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 2}}" class="filter-list" id="list2">
-      <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
+      <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>
     </view>
+    <!-- 我的需求 -->
     <view class="filter-list"></view>
     <view wx:if="{{filterList == 3}}" class="filter-list" id="list3">
-      <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
+      <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>
     </view>

+ 1 - 1
project.config.json

@@ -19,7 +19,7 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
+    "useMultiFrameRuntime": false,
     "useApiHook": true,
     "babelSetting": {
       "ignore": [],