elink-star
/
epdc-resident-mp-js
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature/optimise
lihenian 5 years ago
parent
364b105b8e
commit
1d370e3668
3 changed files with 93 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/toRegister/toRegister.js
  2. 4
      project.config.json
  3. 206
      subpages/oneKeyService/pages/moduleList/moduleList.wxml

2
pages/toRegister/toRegister.js
View File

@ -21,7 +21,7 @@ Page({
// } // }
// }) // })
let that = this let that = this
const versionNum = "1.6.1" const versionNum = "1.6.3"
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag

4
project.config.json
View File

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

206
subpages/oneKeyService/pages/moduleList/moduleList.wxml
View File

@ -1,137 +1,115 @@
<wxs module="filter" src="../../../../utils/filter.wxs"></wxs> <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
<view class="dept-list"> <view class="dept-list">
<!-- 视频图片 banner --> <!-- 视频图片 banner -->
<view class="banner" wx:if="{{swiperBannerList.length > 0}}"> <view class="banner" wx:if="{{swiperBannerList.length > 0}}">
<view class="page-section page-section-spacing swiper"> <view class="page-section page-section-spacing swiper">
<swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}" bindchange="swiperChange"> <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"> <block wx:for="{{swiperBannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<swiper-item> <swiper-item>
<view data-banner="{{item}}"> <view data-banner="{{item}}">
<view class="swiper-item" data-id="{{item.id}}"> <view class="swiper-item" data-id="{{item.id}}">
<image wx:if="{{item.imgUrl}}" class="banner-item" src='{{item.imgUrl}}' mode="aspectFill" /> <image wx:if="{{item.imgUrl}}" class="banner-item" src='{{item.imgUrl}}' mode="aspectFill" />
<block wx:elif="{{item.videoUrl}}"> <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> <view class="video-title" hidden="{{!showTitle}}">{{item.title}}</view>
</block> </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>
</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> </view>
</view>
<!-- 1. 标题、部门、时间 --> <!-- 1. 标题、部门、时间 -->
<view class="type-1" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '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="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-name">{{item.noticeTitle}}</view>
<view class="item-info"> <view class="item-info">
<image src="../../images/ic_zhengce.png" /> <image src="../../images/ic_zhengce.png" />
<view class="street">{{item.deptName}}</view> <view class="street">{{item.deptName}}</view>
<view class="time">{{item.noticeTime}}</view> <view class="time">{{item.noticeTime}}</view>
</view> </view>
</view>
</view> </view>
</view>
<!-- 2. 图标、模块类别名称 --> <!-- 2. 图标、模块类别名称 -->
<view class="type-2" wx:if="{{modulelist.length > 0 && moduleInfo.modulestyle == '2'}}"> <view class="type-2" wx:if="{{modulelist.length > 0 && moduleInfo.modulestyle == '2'}}">
<view <view class="list-item" wx:for="{{modulelist}}" wx:for-index="index" wx:for-item="item" wx:key="index" bindtap="navigateToType" data-info="{{item}}">
class="list-item" <view class="list-name">
wx:for="{{modulelist}}" <image src="{{item.imgUrl}}" class="list-icon" />
wx:for-index="index" {{item.categoryName}}
wx:for-item="item" </view>
wx:key="index" <image src="../../images/right.png" class="list-arrow"></image>
bindtap="navigateToType" </view>
data-info="{{item}}"> <!-- <movable-area class="movable-area" wx:if="{{moduleInfo.categorycode == 'notice_jsqf'}}">
<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"> <movable-view class="movable-view" direction="all" inertia="true" friction="10">
<view class="report-issue" bindtap="toReportIssue"> <view class="report-issue" bindtap="toReportIssue">
<image src="../../images/reportissue.png" /> <image src="../../images/reportissue.png" />
</view> </view>
</movable-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> </view>
</view>
<!-- 3. 标题、内容 --> <!-- 5. 图片、标题、部门、时间 -->
<view class="type-3" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '3'}}"> <view class="type-5" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '5'}}">
<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="list-all">
<view class="name">{{item.noticeTitle}}</view> <view class="list-item" wx:for="{{noticelist}}" data-id="{{item.id}}" bindtap="toDetail" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="info"> <image src="{{item.imgUrl}}"></image>
<text>{{common.getStr(item.noticeContent)}}</text> <view class="item-info">
</view> <view class="item-info-name">{{item.noticeTitle}}</view>
</view> <view class="item-info-time">
</view> <text>{{item.deptName}}</text>
<text>{{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}</text>
<!-- 5. 图片、标题、部门、时间 --> </view>
<view class="type-5" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '5'}}"> </view>
<view class="list-all"> </view>
<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> </view>
<!-- 6. 图片、标题--> </view>
<view class="type-6" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '6'}}"> <!-- 6. 图片、标题 -->
<view class="box"> <view class="type-6" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '6'}}">
<view class="item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <view class="box">
<image src="{{item.imgUrl}}"></image> <view class="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> <image src="{{item.imgUrl}}"></image>
</view> <view class="name">{{item.noticeTitle}}</view>
</view> </view>
</view> </view>
<!-- 7. 视频列表 --> </view>
<view class="type-7" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '7'}}"> <!-- 7. 视频列表 -->
<view class="video-list"> <view class="type-7" wx:if="{{noticelist.length > 0 && moduleInfo.modulestyle == '7'}}">
<block wx:for="{{noticelist}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <view class="video-list">
<view class="video-item"> <block wx:for="{{noticelist}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<video id="videoItem{{index}}" src="{{item.noticeVideoUrl}}" title="{{item.noticeTitle}}" bindcontrolstoggle="videoitemtoggle" bindplay='videoitemplay' data-index="{{index}}"/> <view class="video-item">
<view class="video-title" hidden="{{!item.showTitle}}">{{item.noticeTitle}}</view> <video id="videoItem{{index}}" src="{{item.noticeVideoUrl}}" title="{{item.noticeTitle}}" bindcontrolstoggle="videoitemtoggle" bindplay='videoitemplay' data-index="{{index}}" />
</view> <view class="video-title" hidden="{{!item.showTitle}}">{{item.noticeTitle}}</view>
<view class="video-line"></view>
</block>
</view> </view>
<view class="video-line"></view>
</block>
</view> </view>
<!-- 8. 顶部标签、通知列表 --> </view>
<view class="type-8" wx:if="{{newsCategoryList.length > 0 && moduleInfo.modulestyle == '8'}}"> <!-- 8. 顶部标签、通知列表 -->
<view style="height:40rpx" wx:if="{{swiperBannerList.length > 0}}"></view> <view class="type-8" wx:if="{{newsCategoryList.length > 0 && moduleInfo.modulestyle == '8'}}">
<news-list <view style="height:40rpx" wx:if="{{swiperBannerList.length > 0}}"></view>
newsCategoryList="{{newsCategoryList}}" <news-list newsCategoryList="{{newsCategoryList}}" newsList="{{noticelist}}" preloadVisible="{{preloadVisible}}" bind:newsCategoryCallback="newsCategoryCallback"></news-list>
newsList="{{noticelist}}" </view>
preloadVisible="{{preloadVisible}}"
bind:newsCategoryCallback="newsCategoryCallback">
</news-list>
</view>
</view> </view>
<complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog> <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
<load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible && isLoadMore}}"></load-more> <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible && isLoadMore}}"></load-more>
<no-data isShow="{{nodata}}"></no-data> <no-data isShow="{{nodata}}"></no-data>
<wxs module="common"> <wxs module="common">
module.exports.getStr = function(content) { module.exports.getStr = function(content) {
return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'') return content.replace(getRegExp('<\/?.+?\/?>|[&nbsp;]','g'),'')
} }
</wxs> </wxs>
Write Preview
Loading…
Cancel
Save