diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js
index c04fcbc..9cdfce9 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.js
+++ b/subpages/heart/pages/heartDetail/heartDetail.js
@@ -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 => {
diff --git a/subpages/heart/pages/heartDetail/heartDetail.json b/subpages/heart/pages/heartDetail/heartDetail.json
index c20e21a..0a5a32d 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.json
+++ b/subpages/heart/pages/heartDetail/heartDetail.json
@@ -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"
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml
index bfde797..0641639 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxml
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxml
@@ -1,5 +1,6 @@
-
+
+
@@ -8,141 +9,121 @@
-
-
-
-
-
- 报名截止时间
-
-
- {{signupEndTime}}
-
-
-
-
-
-
- 活动时间
+
+
+
+
+
+ 报名截止时间
+
+
+ {{signupEndTime}}
+
-
- {{actStartTime}}至
- {{actEndTime}}
+
+
+
+ 活动时间
+
+
+ {{actStartTime}}至
+ {{actEndTime}}
+
-
-
-
-
-
- 活动地点
-
-
- {{detail.actAddress}}
+
+
+
+ 活动地点
+
+
+ {{detail.actAddress}}
+
-
-
-
-
-
- 活动名额
-
-
-
- 不限名额
-
-
- {{detail.actQuota}}人
+
+
+
+ 活动名额
+
+
+ 不限名额
+
+
+ {{detail.actQuota}}人
+
-
-
-
-
-
- 联系人
-
-
- {{detail.contacts}}
+
+
+
+ 联系人
+
+
+ {{detail.contacts}}
+
-
-
-
-
-
- 联系电话
-
-
- {{detail.tel}}
+
+
+
+ 联系电话
+
+
+ {{detail.tel}}
+
-
-
-
-
-
- 积分奖励
-
-
- {{detail.reward}}
+
+
+
+ 积分奖励
+
+
+ {{detail.reward}}
+
-
-
-
-
-
-
- 招募要求
+
+
+
+
+ 招募要求
+
-
-
-
- {{detail.requirement}}
-
-
-
+
+
-
- 3. 专业不限，具有美术教育者优先。
- -->
-
-
+
-
-
-
- 活动详情
+ class="require {{detail.currentUserStatus == 0||detail.currentUserStatus == 1||detail.currentUserStatus == 2||detail.currentUserStatus == 3? 'margin-bottom':''}}">
+
+
+
+ 活动详情
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -159,7 +140,6 @@
{{clockNum}}次
-
@@ -205,7 +185,6 @@
-
diff --git a/subpages/heart/pages/heartDetail/heartDetail.wxss b/subpages/heart/pages/heartDetail/heartDetail.wxss
index dc79851..f7bc4d8 100644
--- a/subpages/heart/pages/heartDetail/heartDetail.wxss
+++ b/subpages/heart/pages/heartDetail/heartDetail.wxss
@@ -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 {
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
new file mode 100644
index 0000000..eb4eb23
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
@@ -0,0 +1,23 @@
+// subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
new file mode 100644
index 0000000..8107baf
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss
new file mode 100644
index 0000000..a308efc
--- /dev/null
+++ b/subpages/heart/pages/heartDetail/preloadDetailItem/preloadDetailItem.wxss
@@ -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%
+ }
+}
\ No newline at end of file