From 1d370e3668d2af8d635c1da7723a1edbb3f3d8cd Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Fri, 6 Nov 2020 15:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.6.3=20=E9=94=A6=E6=B0=B4?=
 =?UTF-8?q?=E6=B8=85=E9=A3=8E-=E6=88=91=E8=A6=81=E4=B8=BE=E6=8A=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                |   2 +-
 project.config.json                           |   4 -
 .../pages/moduleList/moduleList.wxml          | 206 ++++++++----------
 3 files changed, 93 insertions(+), 119 deletions(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 6196831..30b0e52 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.1"
+    const versionNum = "1.6.3"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/project.config.json b/project.config.json
index cc7159e..4af217b 100644
--- a/project.config.json
+++ b/project.config.json
@@ -32,10 +32,6 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-<<<<<<< HEAD
-    "userConfirmedBundleSwitch": false,
-=======
->>>>>>> feature/volunteer
     "minifyWXSS": true
   },
   "compileType": "miniprogram",
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.wxml b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
index c9008a5..8ce894b 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.wxml
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
@@ -1,137 +1,115 @@
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <view class="dept-list">
-    <!-- 视频图片 banner -->
-    <view class="banner" wx:if="{{swiperBannerList.length > 0}}">
-        <view class="page-section page-section-spacing swiper">
-            <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
-            <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
-                <swiper-item>
-                <view data-banner="{{item}}">
-                    <view class="swiper-item" data-id="{{item.id}}">
-                    <image wx:if="{{item.imgUrl}}" class="banner-item" src='{{item.imgUrl}}' mode="aspectFill" />
-                    <block wx:elif="{{item.videoUrl}}">
-                        <video id="video{{index}}" class="banner-item" src="{{item.videoUrl}}" title="{{item.title}}" bindcontrolstoggle="bindcontrolstoggle" bindpause="bindended" bindplay='bindplay' bindended='bindended'/>
-                        <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>              
-                    </block>
-                    </view>
-                </view>
-                </swiper-item>
-            </block>
-            </swiper>
-            <!-- 重置小圆点的样式 -->
-            <view class="dots">
-            <block wx:for="{{ swiperBannerList }}" wx:key="index">
-                <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
-            </block>
+  <!-- 视频图片 banner -->
+  <view class="banner" wx:if="{{swiperBannerList.length > 0}}">
+    <view class="page-section page-section-spacing swiper">
+      <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange">
+        <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+          <swiper-item>
+            <view data-banner="{{item}}">
+              <view class="swiper-item" data-id="{{item.id}}">
+                <image wx:if="{{item.imgUrl}}" class="banner-item" src='{{item.imgUrl}}' mode="aspectFill" />
+                <block wx:elif="{{item.videoUrl}}">
+                  <video id="video{{index}}" class="banner-item" src="{{item.videoUrl}}" title="{{item.title}}" bindcontrolstoggle="bindcontrolstoggle" bindpause="bindended" bindplay='bindplay' bindended='bindended' />
+                  <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>
+                </block>
+              </view>
             </view>
-        </view>
+          </swiper-item>
+        </block>
+      </swiper>
+      <!-- 重置小圆点的样式 -->
+      <view class="dots">
+        <block wx:for="{{ swiperBannerList }}" wx:key="index">
+          <view class="dot {{index == currentSwiper ? ' active' : '' }}"></view>
+        </block>
+      </view>
     </view>
-
-    <!-- 1. 标题、部门、时间 -->
-    <view class="type-1" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '1'}}">
-        <view class="list-li" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-        <view class="item-name">{{item.noticeTitle}}</view>
-        <view class="item-info">
-            <image src="../../images/ic_zhengce.png" />
-            <view class="street">{{item.deptName}}</view>
-            <view class="time">{{item.noticeTime}}</view>
-        </view>
-        </view>
+  </view>
+  <!-- 1. 标题、部门、时间 -->
+  <view class="type-1" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '1'}}">
+    <view class="list-li" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+      <view class="item-name">{{item.noticeTitle}}</view>
+      <view class="item-info">
+        <image src="../../images/ic_zhengce.png" />
+        <view class="street">{{item.deptName}}</view>
+        <view class="time">{{item.noticeTime}}</view>
+      </view>
     </view>
-
-    <!-- 2. 图标、模块类别名称 -->
-    <view class="type-2" wx:if="{{modulelist.length > 0 && moduleInfo.modulestyle == '2'}}">
-        <view 
-            class="list-item"
-            wx:for="{{modulelist}}" 
-            wx:for-index="index" 
-            wx:for-item="item" 
-            wx:key="index"  
-            bindtap="navigateToType" 
-            data-info="{{item}}">
-            <view class="list-name">
-                <image src="{{item.imgUrl}}" class="list-icon"/>{{item.categoryName}}
-            </view>
-            <image src="../../images/right.png" class="list-arrow"></image>
-        </view> 
-        <movable-area class="movable-area" wx:if="{{moduleInfo.categorycode == 'notice_jsqf'}}">
+  </view>
+  <!-- 2. 图标、模块类别名称 -->
+  <view class="type-2" wx:if="{{modulelist.length > 0 && moduleInfo.modulestyle == '2'}}">
+    <view class="list-item" wx:for="{{modulelist}}" wx:for-index="index" wx:for-item="item" wx:key="index" bindtap="navigateToType" data-info="{{item}}">
+      <view class="list-name">
+        <image src="{{item.imgUrl}}" class="list-icon" />
+        {{item.categoryName}}
+      </view>
+      <image src="../../images/right.png" class="list-arrow"></image>
+    </view>
+    <!-- <movable-area class="movable-area" wx:if="{{moduleInfo.categorycode == 'notice_jsqf'}}">
             <movable-view class="movable-view" direction="all" inertia="true" friction="10">
                     <view class="report-issue" bindtap="toReportIssue">
                         <image src="../../images/reportissue.png" />
                     </view>
             </movable-view>
-        </movable-area>         
+        </movable-area> -->
+  </view>
+  <!-- 3. 标题、内容 -->
+  <view class="type-3" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '3'}}">
+    <view class="list-item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+      <view class="name">{{item.noticeTitle}}</view>
+      <view class="info">
+        <text>{{common.getStr(item.noticeContent)}}</text>
+      </view>
     </view>
-
-    <!-- 3. 标题、内容 -->
-    <view class="type-3" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '3'}}">
-        <view class="list-item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-            <view class="name">{{item.noticeTitle}}</view>
-            <view class="info">
-                <text>{{common.getStr(item.noticeContent)}}</text>
-            </view>
-        </view> 
-    </view>
-
-    <!-- 5. 图片、标题、部门、时间 -->
-    <view class="type-5" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '5'}}">
-        <view class="list-all">
-            <view class="list-item" wx:for="{{noticelist}}" data-id="{{item.id}}" bindtap="toDetail" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <image src="{{item.imgUrl}}"></image>
-                <view class="item-info">
-                <view class="item-info-name">{{item.noticeTitle}}
-                </view>
-                <view class="item-info-time">
-                    <text>{{item.deptName}}</text>
-                    <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
-                </view>
-                </view>
-            </view>
-        </view>    
+  </view>
+  <!-- 5. 图片、标题、部门、时间 -->
+  <view class="type-5" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '5'}}">
+    <view class="list-all">
+      <view class="list-item" wx:for="{{noticelist}}" data-id="{{item.id}}" bindtap="toDetail" wx:for-index="index" wx:for-item="item" wx:key="index">
+        <image src="{{item.imgUrl}}"></image>
+        <view class="item-info">
+          <view class="item-info-name">{{item.noticeTitle}}</view>
+          <view class="item-info-time">
+            <text>{{item.deptName}}</text>
+            <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
+          </view>
+        </view>
+      </view>
     </view>
-    <!-- 6. 图片、标题-->
-    <view class="type-6" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '6'}}">
-        <view class="box">
-            <view class="item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <image src="{{item.imgUrl}}"></image>
-                <view class="name">{{item.noticeTitle}}</view>
-            </view>
-        </view>        
+  </view>
+  <!-- 6. 图片、标题 -->
+  <view class="type-6" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '6'}}">
+    <view class="box">
+      <view class="item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+        <image src="{{item.imgUrl}}"></image>
+        <view class="name">{{item.noticeTitle}}</view>
+      </view>
     </view>
-    <!-- 7. 视频列表 -->
-    <view class="type-7" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '7'}}">
-        <view class="video-list">
-            <block wx:for="{{noticelist}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view class="video-item">
-                    <video id="videoItem{{index}}" src="{{item.noticeVideoUrl}}" title="{{item.noticeTitle}}" bindcontrolstoggle="videoitemtoggle" bindplay='videoitemplay' data-index="{{index}}"/>
-                    <view class="video-title" hidden="{{!item.showTitle}}">{{item.noticeTitle}}</view>
-                </view>
-                <view class="video-line"></view>
-            </block>
+  </view>
+  <!-- 7. 视频列表 -->
+  <view class="type-7" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '7'}}">
+    <view class="video-list">
+      <block wx:for="{{noticelist}}" wx:for-index="index" wx:for-item="item" wx:key="index">
+        <view class="video-item">
+          <video id="videoItem{{index}}" src="{{item.noticeVideoUrl}}" title="{{item.noticeTitle}}" bindcontrolstoggle="videoitemtoggle" bindplay='videoitemplay' data-index="{{index}}" />
+          <view class="video-title" hidden="{{!item.showTitle}}">{{item.noticeTitle}}</view>
         </view>
+        <view class="video-line"></view>
+      </block>
     </view>
-    <!-- 8. 顶部标签、通知列表 -->
-    <view class="type-8" wx:if="{{newsCategoryList.length > 0 && moduleInfo.modulestyle == '8'}}">
-        <view style="height:40rpx" wx:if="{{swiperBannerList.length > 0}}"></view>
-        <news-list
-            newsCategoryList="{{newsCategoryList}}"
-            newsList="{{noticelist}}"
-            preloadVisible="{{preloadVisible}}"
-            bind:newsCategoryCallback="newsCategoryCallback">
-        </news-list>
-    </view>
-
+  </view>
+  <!-- 8. 顶部标签、通知列表 -->
+  <view class="type-8" wx:if="{{newsCategoryList.length > 0 && moduleInfo.modulestyle == '8'}}">
+    <view style="height:40rpx" wx:if="{{swiperBannerList.length > 0}}"></view>
+    <news-list newsCategoryList="{{newsCategoryList}}" newsList="{{noticelist}}" preloadVisible="{{preloadVisible}}" bind:newsCategoryCallback="newsCategoryCallback"></news-list>
+  </view>
 </view>
-
 <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
-
 <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible && isLoadMore}}"></load-more>
-
 <no-data isShow="{{nodata}}"></no-data>
-
 <wxs module="common">
     module.exports.getStr = function(content) {
         return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
     }
-</wxs>
-
+</wxs>
\ No newline at end of file