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

优化

master
zhaoyongnian 5 years ago
parent
b49ea1d940
commit
cb15cc8dc6
8 changed files with 261 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      subpages/heart/pages/heartDetail/heartDetail.js
  2. 1
      subpages/heart/pages/heartDetail/heartDetail.json
  3. 207
      subpages/heart/pages/heartDetail/heartDetail.wxml
  4. 28
      subpages/heart/pages/heartDetail/heartDetail.wxss
  5. 23
      subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
  6. 4
      subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
  7. 35
      subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
  8. 84
      subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss

2
subpages/heart/pages/heartDetail/heartDetail.js
View File

@ -23,6 +23,7 @@ Page({
cancelSignupTipValue: '',
cancelSignupTipVisible: false,
selectedTab:'',//用来判断详情是否显示志愿者打卡
preloadVisible: true,
},
onLoad: function(options) {
this.setData({
@ -49,6 +50,7 @@ Page({
actStartTime: res.data.actStartTime.substring(0, 16),
actEndTime: res.data.actEndTime.substring(0, 16),
signupEndTime: res.data.signupEndTime.substring(0, 16),
preloadVisible:false
})
}
}).catch(err => {

1
subpages/heart/pages/heartDetail/heartDetail.json
View File

@ -1,6 +1,7 @@
{
"navigationBarTitleText": "详情",
"usingComponents": {
"preload-detail-item": "../preloadDetailItem/preloadDetailItem",
"wux-dialog": "../../../../dist/dialog/index",
"coverview-dialog": "../../components/coverViewDialog/coverViewDialog",
"cancel-signup-dialog": "../../components/cancelSignupDialog/cancelSignupDialog"

207
subpages/heart/pages/heartDetail/heartDetail.wxml
View File

@ -1,5 +1,6 @@
<wux-dialog id="wux-dialog" />
<view class="container">
<preload-detail-item wx:if= "{{preloadVisible}}"></preload-detail-item>
<view wx:else class="container">
<view class="top-bg">
<image src="../../images/heartDetail-bg.png" />
</view>
@ -8,141 +9,121 @@
<view class="{{detail.title.length < 32 ? 'position-absolute-top1' : 'position-absolute-top2'}} position-absolute">
<!-- 点击进入活动页面详情只显示志愿者打卡内容，志愿者打卡以上的内容去掉，用新闻稿替代。 -->
<block wx:if="{{selectedTab != 'tab2' || detail.currentUserStatus != 6}}">
<!-- 详细内容 -->
<view class="info">
<view class="info-box">
<view class="info-left">
<image src="../../images/rili.png"></image>
<view class="info-font display-inline">报名截止时间</view>
</view>
<view class="info-right color">
{{signupEndTime}}
</view>
<view class="clear"></view>
</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/shijian.png"></image>
<view class="info-font display-inline">活动时间</view>
<!-- 详细内容 -->
<view class="info">
<view class="info-box">
<view class="info-left">
<image src="../../images/rili.png"></image>
<view class="info-font display-inline">报名截止时间</view>
</view>
<view class="info-right color">
{{signupEndTime}}
</view>
</view>
<view class="info-right color">
<view>{{actStartTime}}至</view>
<view>{{actEndTime}}</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/shijian.png"></image>
<view class="info-font display-inline">活动时间</view>
</view>
<view class="info-right color">
<view>{{actStartTime}}至</view>
<view>{{actEndTime}}</view>
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/didian.png"></image>
<view class="info-font display-inline">活动地点</view>
</view>
<view class="info-right color">
{{detail.actAddress}}
<view class="info-box">
<view class="info-left">
<image src="../../images/didian.png"></image>
<view class="info-font display-inline">活动地点</view>
</view>
<view class="info-right color">
{{detail.actAddress}}
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/mdsz.png"></image>
<view class="info-font display-inline">活动名额</view>
</view>
<!-- <view class="info-right color">
{{ detail.actQuotaCategory === 0 ? '不限名额' : detail.actQuota + '人'}}
</view> -->
<view class="info-right color" wx:if="{{detail.actQuotaCategory === 0}}">
不限名额
</view>
<view class="info-right color" wx:else>
{{detail.actQuota}}人
<view class="info-box">
<view class="info-left">
<image src="../../images/mdsz.png"></image>
<view class="info-font display-inline">活动名额</view>
</view>
<view class="info-right color" wx:if="{{detail.actQuotaCategory === 0}}">
不限名额
</view>
<view class="info-right color" wx:else>
{{detail.actQuota}}人
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/ren.png"></image>
<view class="info-font display-inline">联系人</view>
</view>
<view class="info-right color">
{{detail.contacts}}
<view class="info-box">
<view class="info-left">
<image src="../../images/ren.png"></image>
<view class="info-font display-inline">联系人</view>
</view>
<view class="info-right color">
{{detail.contacts}}
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box">
<view class="info-left">
<image src="../../images/dianhua.png"></image>
<view class="info-font display-inline">联系电话</view>
</view>
<view class="info-right color">
{{detail.tel}}
<view class="info-box">
<view class="info-left">
<image src="../../images/dianhua.png"></image>
<view class="info-font display-inline">联系电话</view>
</view>
<view class="info-right color">
{{detail.tel}}
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box-last">
<view class="info-left">
<image src="../../images/jifen.png"></image>
<view class="info-font display-inline">积分奖励</view>
</view>
<view class="info-right color">
{{detail.reward}}
<view class="info-box-last">
<view class="info-left">
<image src="../../images/jifen.png"></image>
<view class="info-font display-inline">积分奖励</view>
</view>
<view class="info-right color">
{{detail.reward}}
</view>
</view>
<view class="clear"></view>
</view>
</view>
<!-- 招募要求 -->
<view class="require">
<view class="info-box-title">
<view class="info-left">
<image src="../../images/dingdan.png"></image>
<view class="info-font-zhaomu display-inline">招募要求</view>
<view class="require">
<view class="info-box-title">
<view class="info-left">
<image src="../../images/dingdan.png"></image>
<view class="info-font-zhaomu display-inline">招募要求</view>
</view>
</view>
<view class="clear"></view>
</view>
<view class="info-box-last-require">
{{detail.requirement}}
<!-- 1. 年满18周岁，具有独立民事行为能力的年满18周岁，具有独立民事行为能力的 -->
</view>
<!-- <view class="info-box-last-require">
2. 认同志愿者精神，热爱生活，心态阳光，具 有较强的创新能力，影响他人能力，良好的组 织能力，解决能力。
<view class="info-box-last-require">
{{detail.requirement}}
<!-- 1. 年满18周岁，具有独立民事行为能力的年满18周岁，具有独立民事行为能力的 -->
</view>
<!-- <view class="info-box-last-require">
2. 认同志愿者精神，热爱生活，心态阳光，具 有较强的创新能力，影响他人能力，良好的组 织能力，解决能力。
</view>
<view class="info-box-last-require">
3. 专业不限，具有美术教育者优先。
</view> -->
</view>
<view class="info-box-last-require">
3. 专业不限，具有美术教育者优先。
</view> -->
</view>
<!-- 活动详情 -->
<!-- 活动详情 -->
<view
class="require {{detail.currentUserStatus == 0||detail.currentUserStatus == 1||detail.currentUserStatus == 2||detail.currentUserStatus == 3? 'margin-bottom':''}}">
<view class="info-box-title">
<view class="info-left">
<image src="../../images/xiangqing.png"></image>
<view class="info-font-zhaomu display-inline">活动详情</view>
class="require {{detail.currentUserStatus == 0||detail.currentUserStatus == 1||detail.currentUserStatus == 2||detail.currentUserStatus == 3? 'margin-bottom':''}}">
<view class="info-box-title">
<view class="info-left">
<image src="../../images/xiangqing.png"></image>
<view class="info-font-zhaomu display-inline">活动详情</view>
</view>
</view>
<view class="info-box-last-require">
<rich-text space="nbsp" nodes="{{actContent}}"></rich-text>
</view>
<view class="clear"></view>
</view>
<view class="info-box-last-require">
<rich-text space="nbsp" nodes="{{actContent}}"></rich-text>
</view>
</view>
</block>
<block wx:else>
<!-- 新闻稿 -->
<view
class="require">
<!-- <view class="info-box-title">
<view class="info-left">
<image src="../../images/xiangqing.png"></image>
<view class="info-font-zhaomu display-inline">活动详情</view>
<view class="require">
<view class="info-box-last-require">
<rich-text space="nbsp" nodes="{{actNewsContent}}"></rich-text>
</view>
<view class="clear"></view>
</view> -->
<view class="info-box-last-require">
<rich-text space="nbsp" nodes="{{actNewsContent}}"></rich-text>
</view>
</view>
</block>
<!-- 志愿者打卡 -->
@ -159,7 +140,6 @@
<view class="info-right volunteer">
{{clockNum}}次
</view>
<view class="clear"></view>
</view>
@ -205,7 +185,6 @@
</block>
</block>
</view>
<view class="clear"></view>
</view>
</block>

28
subpages/heart/pages/heartDetail/heartDetail.wxss
View File

@ -50,6 +50,8 @@ page{
border-bottom: 1rpx solid #e7eeee;
padding: 20rpx 0rpx;
margin: 0rpx 20rpx;
display: flex;
justify-content: space-between;
}
.info-box-title {
@ -58,6 +60,8 @@ page{
border-bottom: 1rpx solid #e7eeee;
padding: 35rpx 0rpx;
margin: 0rpx 20rpx;
display: flex;
justify-content: space-between;
}
.display-inline {
@ -66,18 +70,20 @@ page{
.info-left {
width: 40%;
float: left;
/* float: left; */
display: flex;
align-items: center;
word-wrap: break-word;
}
.info-right {
width: 60%;
float: left;
/* float: left; */
font-size: 32rpx;
text-align: right;
word-wrap: break-word;
position: relative;
top: 5rpx;
/* position: relative;
top: 5rpx; */
}
.info-right .color {
@ -88,16 +94,18 @@ page{
.info-left image {
width: 34rpx;
height: 34rpx;
position: relative;
top: 5rpx;
/* position: relative; */
/* top: 5rpx; */
}
.info-font {
font-size: 32rpx;
line-height: 32rpx;
color: #999;
padding: 5rpx;
top: -4rpx;
position: relative;
margin-left: 5rpx;
/* padding: 5rpx; */
/* top: -4rpx;
position: relative; */
}
.info-box-last {
@ -105,6 +113,8 @@ page{
height: auto;
padding: 25rpx 0rpx;
margin: 0rpx 20rpx;
display: flex;
justify-content: space-between;
}
.clear {

23
subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
View File

@ -0,0 +1,23 @@
// subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

4
subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

35
subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
View File

@ -0,0 +1,35 @@
<view class="preload-project-item">
<view class="item-list">
<view class="left"></view>
<view class="right"></view>
</view>
<view class="item-list">
<view class="left"></view>
<view class="right"></view>
</view>
<view class="item-list">
<view class="left"></view>
<view class="right"></view>
</view>
</view>
<view class="preload-project-item">
<view class="item-list">
<view class="left"></view>
<view class="right"></view>
</view>
<view class="item-list">
<view class="left"></view>
<view class="right"></view>
</view>
</view>
<view class="preload-project-item paddingBottom">
<view class="item-list-last">
<view class="left"></view>
</view>
<view class="bottom">
<view class="bottom-every"></view>
<view class="bottom-every"></view>
<view class="bottom-every"></view>
</view>
</view>

84
subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss
View File

@ -0,0 +1,84 @@
page {
background: #f7f7f7;
}
.preload-project-item {
margin-top: 20rpx;
margin-left: 20rpx;
width: calc(100% - 40rpx);
background: #fff;
box-sizing: border-box;
border-radius: 16rpx;
padding: 0rpx 22rpx;
overflow: hidden;
}
.preload-project-item .item-list {
height: 100rpx;
width: 100%;
border-bottom: 1rpx solid #EAEAEA;
display: flex;
justify-content: space-between;
align-items: center;
}
.preload-project-item .item-list:last-child {
border: none;
}
.preload-project-item .left {
height: 30rpx;
width: 190rpx;
border-radius: 8rpx;
background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
animation: loading 1.4s ease infinite;
background-size: 400% 100%;
}
.preload-project-item .right {
height: 30rpx;
width: 325rpx;
border-radius: 8rpx;
background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
animation: loading 1.4s ease infinite;
background-size: 400% 100%;
}
.item-list-last {
height: 100rpx;
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.bottom {
width: 100%;
height: 160rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.bottom .bottom-every {
width: 220rpx;
height: 160rpx;
border-radius: 8rpx;
background: linear-gradient(90deg, #f2f2f2 25%, #e6e6e6 37%, #f2f2f2 63%);
animation: loading 1.4s ease infinite;
background-size: 400% 100%;
}
.paddingBottom {
padding-bottom: 35rpx;
}
@keyframes loading {
0% {
background-position: 100% 50%
}
100% {
background-position: 0 50%
}
}
Write Preview
Loading…
Cancel
Save