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

Merge branch 'release'

master tagv1.6.3
lihenian 5 years ago
parent
5badee0d10 1d370e3668
commit
f1f9edb782
11 changed files with 294 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. 3
      app.json
  2. 9
      pages/heartNew/heartNew.js
  3. 2
      pages/heartNew/heartNew.wxml
  4. 2
      pages/toRegister/toRegister.js
  5. BIN
      subpages/heart/images/ic_yueduliang.png
  6. 23
      subpages/heart/pages/bannerDetail/bannerDetail.js
  7. 6
      subpages/heart/pages/bannerDetail/bannerDetail.json
  8. 28
      subpages/heart/pages/bannerDetail/bannerDetail.wxml
  9. 126
      subpages/heart/pages/bannerDetail/bannerDetail.wxss
  10. 206
      subpages/oneKeyService/pages/moduleList/moduleList.wxml
  11. 8
      utils/activity.js

3
app.json
View File

@ -114,7 +114,8 @@
"pages/noticeDetail/noticeDetail", "pages/noticeDetail/noticeDetail",
"pages/myApply/myApply", "pages/myApply/myApply",
"pages/myApplyList/myApplyList", "pages/myApplyList/myApplyList",
"pages/myApplyDetail/myApplyDetail" "pages/myApplyDetail/myApplyDetail",
"pages/bannerDetail/bannerDetail"
] ]
}, },
{ {

9
pages/heartNew/heartNew.js
View File

@ -448,5 +448,12 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: "/subpages/heart/pages/myApply/myApply" url: "/subpages/heart/pages/myApply/myApply"
}) })
} },
//banner跳转到详情
toBannerDetail (e) {
wx.navigateTo({
url: `/subpages/heart/pages/bannerDetail/bannerDetail?id=${e.currentTarget.dataset.id}`
})
},
}) })

2
pages/heartNew/heartNew.wxml
View File

@ -30,7 +30,7 @@
<block wx:if="{{banner.length > 0}}"> <block wx:if="{{banner.length > 0}}">
<block wx:for="{{banner}}" wx:key="*this"> <block wx:for="{{banner}}" wx:key="*this">
<swiper-item> <swiper-item>
<view class="swiper-item" data-id="{{item.actId}}"> <view class="swiper-item" data-id="{{item.id}}" bindtap="toBannerDetail">
<image class="banner" src='{{item.bannerImg}}' mode="aspectFill" /> <image class="banner" src='{{item.bannerImg}}' mode="aspectFill" />
</view> </view>
</swiper-item> </swiper-item>

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

BIN
subpages/heart/images/ic_yueduliang.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

23
subpages/heart/pages/bannerDetail/bannerDetail.js
View File

@ -0,0 +1,23 @@
const api = require("../../../../utils/activity")
import util from "../../../../utils/util"
Page({
data: {
noticeObj: {},
noticeObjContent: "", //富文本内容
preloadVisible: true
},
onLoad (options) {
this.getNoticeDetail(options.id)
},
getNoticeDetail (id) {
api.getBannerDetail(id).then(res => {
this.setData({
noticeObj: res.data,
noticeObjContent: util.formatRichText(res.data.content),
preloadVisible: false
})
}).catch(err => {
console.log(err)
})
}
})

6
subpages/heart/pages/bannerDetail/bannerDetail.json
View File

@ -0,0 +1,6 @@
{
"usingComponents": {
"parser": "../../../../components/parser/parser"
},
"navigationBarTitleText": "详情"
}

28
subpages/heart/pages/bannerDetail/bannerDetail.wxml
View File

@ -0,0 +1,28 @@
<wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
<view class="notice-detail">
<view class="selfContent" wx:if="{{!preloadVisible}}">
<view class="detail-title">
<view>{{noticeObj.title}}</view>
</view>
<view class="detail-subtitle">
<view class="left">
<!-- <span>{{noticeObj.deptName}}</span> -->
<span>{{filter.formatTime(noticeObj.createdTime, 'yyyy-MM-dd')}}</span>
</view>
<view class="right">
<view class="readNum">
<image src="../../images/ic_yueduliang.png" />
</view>
<view class="num">{{noticeObj.browseNum}}</view>
</view>
</view>
<view class="richContent">
<!-- <rich-text space="nbsp" nodes="{{noticeObjContent}}"></rich-text> -->
<parser html="{{noticeObjContent}}"></parser>
</view>
</view>
<view class="preload" wx:else>
<view class="preload-title"></view>
<view class="preload-content"></view>
</view>
</view>

126
subpages/heart/pages/bannerDetail/bannerDetail.wxss
View File

@ -0,0 +1,126 @@
.notice-detail {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 20rpx;
background: #f7f7f7;
}
.selfContent {
width: 100%;
display: table;
background: #ffffff;
border-radius: 16rpx;
box-sizing: border-box;
padding: 0 25rpx 38rpx;
}
.detail-title {
font-family: PingFang-SC-Bold;
font-size: 48rpx;
font-weight: bold;
line-height: 68rpx;
color: #333333;
padding-top: 40rpx;
margin-bottom: 20rpx;
position: relative;
}
.detail-title-img {
text-align: right;
}
.detail-title image {
width: 176rpx;
height: 66rpx;
vertical-align: middle;
}
.detail-subtitle {
display: flex;
width: 100%;
justify-content: space-between;
font-size: 22rpx;
color: #999999;
margin-top:45rpx;
margin-bottom: 20rpx;
}
.detail-subtitle .left span:nth-child(1){
margin-right: 32rpx;
}
.detail-subtitle .right{
display: flex;
height: 32rpx;
line-height: 32rpx;
}
.detail-subtitle .right .readNum {
/* display: inline-block; */
width: 32rpx;
height: 32rpx;
margin-right: 10rpx;
}
.detail-subtitle .right .readNum image{
width: 100%;
height: 100%;
float:left;
object-fit: cover;
}
.banner {
width: 100%;
height: 400rpx;
margin: 39rpx 0 19rpx 0;
}
.banner image{
width: 100%;
height: 100%;
float:left;
object-fit: cover;
border-radius: 16rpx;
overflow: hidden;
}
.paragraph {
font-size: 38rpx;
line-height: 58rpx;
color: #333333;
text-indent: 76rpx;
margin-top:22rpx;
}
.richContent{
word-break: break-all;
}
/* preload start */
.preload {
width: 100%;
background: #fff;
box-sizing: border-box;
border-radius: 16rpx;
padding: 0 24rpx;
overflow: hidden;
margin-bottom: 20rpx;
}
.preload-title {
width: 100%;
height: 80rpx;
border-radius: 8rpx;
background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
animation: loading 1.4s ease infinite;
background-size: 400% 100%;
margin-top: 20rpx;
}
.preload-content {
width: 100%;
height: 200rpx;
border-radius: 8rpx;
background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
animation: loading 1.4s ease infinite;
background-size: 400% 100%;
margin-top: 20rpx;
}
@keyframes loading {
0% {
background-position: 100% 50%
}
100% {
background-position: 0 50%
}
}
/* preload end */

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>

8
utils/activity.js
View File

@ -5,7 +5,8 @@ module.exports = {
bannerListV2, bannerListV2,
volunteerlist, volunteerlist,
volunteerV2list, volunteerV2list,
getImgUrl getImgUrl,
getBannerDetail
} }
function getActivityList (params) { function getActivityList (params) {
@ -30,4 +31,9 @@ function volunteerV2list (params) {
// 获取配置图片 // 获取配置图片
function getImgUrl (imgType) { function getImgUrl (imgType) {
return fly.get(`imgConfig/getImgUrl/${imgType}`) return fly.get(`imgConfig/getImgUrl/${imgType}`)
}
//banner跳转详情
function getBannerDetail (id) {
return fly.get(`heart/act/banner/detail/${id}`)
} }
Write Preview
Loading…
Cancel
Save