diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 0a0b81b..cd162fc 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -16,7 +16,7 @@ Page({
addUrl: imgurl.add.url,
tingcheHr: imgurl.tingcheHr.url,
cheUrl: imgurl.che.url,
- ruleUrl: imgurl.rule.url,
+ jiaofei: imgurl.jiaofei.url,
wentiHr: imgurl.wentiHr.url,
park: null,
carList: [],
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index 181a685..b02f81b 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -91,7 +91,7 @@
-
+
缴费规则
diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml
index fcd2fe7..3563096 100644
--- a/pages/radetail/index.wxml
+++ b/pages/radetail/index.wxml
@@ -18,12 +18,14 @@
活动说明
{{data.detail}}
- 活动人数:{{data.personLimit}}人
- 消耗积分:{{data.credit}} 积分
- 报名开始时间:{{startTime}}
- 报名结束时间:{{endTime}}
- 活动开始时间:{{activityStartTime}}
- 活动结束时间:{{activityEndTime}}
+
+ 1、活动人数:{{data.personLimit}}人
+ 消耗积分:{{data.credit}} 积分
+
+ 2、报名有效日期
+ {{startTime}}--{{endTime}}
+ 3、活动有效日期
+ {{activityStartTime}}--{{activityEndTime}}
diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss
index e898425..ec6913c 100644
--- a/pages/radetail/index.wxss
+++ b/pages/radetail/index.wxss
@@ -599,7 +599,7 @@ button::after{ border: none; }
background: #fff;
border-radius: 12rpx;
width:94%;
- margin: 44rpx auto 0;
+ /* margin: 44rpx auto 0; */
padding-bottom: 20rpx;
padding:0 3%;
}
@@ -627,22 +627,28 @@ button::after{ border: none; }
color: #A6A6A6;
margin-top: 40rpx;
}
+.num{
+ line-height: 50rpx;
+}
.member{
font-size: 24rpx;
color: #A6A6A6;
+ padding-left: 2%;
+ float: left;
}
.integral{
display: block;
- margin-top: 20rpx;
font-size: 24rpx;
color: #A6A6A6;
+ float: left;
+ margin-left: 20rpx;
}
.integral text{
float: left;
}
.integralNum{
color: #FD782D;
- margin-left: 10rpx;
+ margin: 0 5rpx 0 10rpx ;
}
.txt002 {
font-size: 24rpx;
@@ -1161,6 +1167,7 @@ scroll-view {
font-size: 24rpx;
line-height: 50rpx;
color: #A6A6A6;
+ padding-left: 2%;
}
.ques{
display: block;
@@ -1177,4 +1184,5 @@ scroll-view {
line-height: 40rpx;
margin-bottom: 20rpx;
color: #666;
+ padding-left: 2%;
}
\ No newline at end of file
diff --git a/pages/user/myactivity/index.js b/pages/user/myactivity/index.js
index 925a0c8..5999a75 100644
--- a/pages/user/myactivity/index.js
+++ b/pages/user/myactivity/index.js
@@ -115,8 +115,8 @@ Page({
list: tmpArr
})
for (let i = 0; i < that.data.list.length; i++) {
- var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy.MM.dd" );//"yyyy-MM-dd hh:mm:ss"
- var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy.MM.dd");//"yyyy-MM-dd hh:mm:ss"
+ var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy-MM-dd hh:mm:ss" );
+ var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy-MM-dd hh:mm:ss");
/**
* 修改list的endtime
* 渲染到页面
diff --git a/pages/user/myactivity/index.wxml b/pages/user/myactivity/index.wxml
index 3fae471..cf0ce06 100644
--- a/pages/user/myactivity/index.wxml
+++ b/pages/user/myactivity/index.wxml
@@ -8,8 +8,11 @@
-
+
{{item.title}}
+ {{item.activityStartTime}}--{{item.activityEndTime}}
+
+
报名中
报名成功
报名失败
@@ -18,11 +21,10 @@
- {{item.activityStartTime}}--{{item.activityEndTime}}
-
+
diff --git a/pages/user/myactivity/index.wxss b/pages/user/myactivity/index.wxss
index 631ed10..2481689 100644
--- a/pages/user/myactivity/index.wxss
+++ b/pages/user/myactivity/index.wxss
@@ -28,6 +28,13 @@
border-radius: 16rpx;
overflow: hidden;
}
+.bottom{
+ background: #FFF;
+ /* display: flex;
+ justify-content: space-between; */
+ padding: 10rpx 10rpx;
+ text-align: center;
+}
.sendImg{
position: absolute;
width: 100rpx;
@@ -50,19 +57,13 @@
.section{
margin-bottom: 25rpx;
}
-.info view:nth-child(1) {
- font-size: 32rpx;
- margin-top: 40rpx;
- justify-content: space-between;
- padding: 0 0 0 4%;
- /* font-weight: 600; */
+.bottom view:nth-child(1) {
+ font-size: 30rpx;
+ color: #3C3C3C;
}
-.info text,view{
+.bottom view:nth-child(2){
font-size: 26rpx;
- text-align: center;
- display: block;
- color: #fff;
- /* font-weight: 600; */
+ color: #FD832D;
}
.info {
width: 100%;
@@ -74,7 +75,7 @@
margin: auto;
text-align: center;
color: #fff;
- background: rgba(0, 0, 0, 0.5)
+ /* background: rgba(0, 0, 0, 0.5) */
}
.sub {
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 4d6aafa..c86e7cb 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -697,5 +697,9 @@ module.exports = {
'url': baseUrl + "wentiHr.png",
'name': ''
},
-
+ 'jiaofei': {
+ 'url': baseUrl + "jiaofei.png",
+ 'name': ''
+ },
+
}
\ No newline at end of file