版本1.6.3 锦水清风-我要举报按钮暂时隐藏掉

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

project.config.json

@@ -32,10 +32,6 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-<<<<<<< HEAD
-    "userConfirmedBundleSwitch": false,
-=======
->>>>>>> feature/volunteer
     "minifyWXSS": true
   },
   "compileType": "miniprogram",

subpages/oneKeyService/pages/moduleList/moduleList.wxml

@@ -10,7 +10,7 @@
               <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'/>
+                  <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>
@@ -26,7 +26,6 @@
       </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">
@@ -38,31 +37,23 @@
       </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-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}}
+        <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-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">
@@ -72,15 +63,13 @@
       </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-name">{{item.noticeTitle}}</view>
           <view class="item-info-time">
             <text>{{item.deptName}}</text>
             <text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
@@ -89,7 +78,7 @@
       </view>
     </view>
   </view>
-    <!-- 6. 图片、标题-->
+  <!-- 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">
@@ -103,7 +92,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}}"/>
+          <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>
@@ -113,25 +102,14 @@
   <!-- 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>
-
+    <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>
-