1hjz
/
1hjz-mini
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

拼团接口对接和bug修改

feature/v1.1.0
lfs3 7 years ago
parent
b9d497c588
commit
19805c5ed4
3 changed files with 103 additions and 70 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      pages/activity_detail/activity_detail.js
  2. 12
      pages/activity_detail/activity_detail.wxml
  3. 141
      pages/activity_detail/activity_detail.wxss

20
pages/activity_detail/activity_detail.js
View File

@ -24,9 +24,9 @@ Page({
countDownSecond: 0,
countdownSec: 0,
//根据状态切换样式
grounpInfo: "block",
grounpInfo: "none",
grounpInfo2: "none",
one_content: "block",
one_content: "none",
two_content: "none",
bottomBGColor: '#F36619',
buttomText: '我要开团',
@ -122,14 +122,14 @@ Page({
activityDetail: data.response,
activityNo: data.response.activityNo,
groupNo: data.response.groupNo == undefined ? that.data.groupNo : data.response.groupNo,
memberList: data.response.memberList,
memberList: data.response.memberList == undefined ? [] : data.response.memberList,
groupStatus: data.response.status,
currentMemberType: data.response.currentMemberType == undefined ? -1 : data.response.currentMemberType,
currentMemberType: that.data.currentMemberType == undefined ? -1 : data.response.currentMemberType,
countdownSec: data.response.countdownSec,
});
let activityContent = data.response.activityContent;
WxParse.wxParse('activityContent', 'html', activityContent, that);
console.log("currentMemberType:" + that.data.groupNo + "status:" + that.data.groupStatus);
console.log("currentMemberType:" + data.response.currentMemberType + "&&status:" + that.data.groupStatus + "&&groupNo" + that.data.groupNo);
//根据状态切换样式
if (that.data.groupNo !=""){
//开团后页面变化
@ -148,7 +148,7 @@ Page({
that.setData({
one_content: "none",
two_content: "block",
buttomText: '我要开团',
buttomText: '参与拼团',
});
} else if (that.data.currentMemberType == 0 || that.data.currentMemberType == 10){
//发起人和邀请人
@ -167,7 +167,7 @@ Page({
one_content: "block",
two_content: "none",
bottomBGColor: '#F36619',
buttomText: '我要开团',
buttomText: '团',
grounpInfo: "none",
grounpInfo2: "block",
@ -214,8 +214,10 @@ Page({
}
}else{
that.countActivityTime(data.response.countdownSec);
that.setData({
grounpInfo: "none",
one_content: "block",
grounpInfo: "none",
grounpInfo2: "none",
});
}
@ -542,7 +544,7 @@ Page({
return {
title: '1号家政',
imageUrl: this.data.qrImageUrl,
path: '/pages/index/index',
path: '/pages/activity_detail/activity_detail?activityNo=' + this.data.activityNo + '&groupNo=' + this.data.groupNo,
};
},
})

12
pages/activity_detail/activity_detail.wxml
View File

@ -5,8 +5,16 @@
<view class='activity_info'>
<view class='row0'>
<text class='title'>{{activityDetail.activityName}}</text>
<view class='countdown' style='display: {{groupNo == "" ? "block" : "none"}};'>
<text >{{activityDetail.countdownDesc}}</text>
<view >
<text class="sec">{{countDownDay}}</text>天
<text class="sec">{{countDownHour}}</text>时
<text class="sec">{{countDownMinute}}</text>分
<text class="sec">{{countDownSecond}}</text>秒
</view>
</view>
</view>
<view class="row">
<text class="num">{{activityDetail.limitNum}}人团</text>
<text class="limit_type">{{activityDetail.limitTypeDesc}}</text>
@ -71,7 +79,7 @@
</scroll-view>
<view class='bottom_view'>
<view class='one_content' id='one_button' style='display: {{one_content}};background-color:{{bottomBGColor}};' bindtap='groupTap'>{{buttomText}}</view>
<view class='two_content' id='two_content' style='display: {{one_content}};'>
<view class='two_content' id='two_content' style='display: {{two_content}};'>
<view class='left'>￥{{activityDetail.participantPrice / 100}}</view>
<view class='right' bindtap='groupTap'>{{buttomText}}</view>
</view>

141
pages/activity_detail/activity_detail.wxss
View File

@ -9,24 +9,46 @@ image{
.activity_info{
width: 100%;
background: white;
height: 220rpx;
height: 260rpx;
margin: -10rpx auto;
}
.activity_info .row0{
width: 100%;
height: 50rpx;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
margin-top: 39rpx;
}
.activity_info .row0 .sec{
color: #FFA043;
}
.activity_info .title{
width: 50%;
padding-top: 29rpx;
padding-top: 10rpx;
padding-left: 36rpx;
font-weight: bold;
font-size: 36rpx;
text-align: left
}
.activity_info .countdown{
width: 50%;
text-align: right;
margin: 10rpx 26rpx auto;
font-size: 20rpx;
color: #999;
}
.activity_info .row{
width: 100%;
height: 40rpx;
float: left;
margin-top: 10rpx;
}
.activity_info .row .num{
padding: 5rpx 20rpx;
font-size: 20rpx;
font-size: 24rpx;
width:150px;
height:36px;
background:rgba(255,160,67,1);
@ -38,20 +60,20 @@ image{
.activity_info .row .limit_type{
padding-left: 20rpx;
height: 100%;
font-size: 20rpx;
font-size: 24rpx;
color: #F44053;
}
.activity_info .row .sucess_tip{
margin-left: 26rpx;
color: #666666;
font-size: 20rpx;
font-size: 24rpx;
}
.activity_info .row .sucess_card{
margin-left: 13rpx;
color: #333333;
font-size: 24rpx;
font-size: 28rpx;
font-weight: bold;
}
@ -66,21 +88,22 @@ image{
justify-content: space-between;
align-items: center;
padding-top: 45px;
margin-top: 20rpx;
}
.common666{
color: #999;
font-size: 24rpx;
font-size: 28rpx;
}
.common666del{
color: #999;
font-size: 24rpx;
font-size: 28rpx;
text-decoration: line-through;
}
.commonRed{
color: #F44053;
font-size: 32rpx;
font-size: 36rpx;
}
.grounp_info{
@ -88,68 +111,31 @@ image{
background: white;
height: 220rpx;
margin: 30rpx auto;
}
.grounp_info2{
width: 100%;
background: white;
height: 220rpx;
margin: 30rpx auto;
}
.grounp_info2 .row1{
width: 100%;
height: 33px;
margin: 20px auto;
display: flex;
flex-direction: row;
justify-content:center;
}
.grounp_info2 .row1 .image{
margin-top: 14px;
width: 27px;
height: 33px;
}
.grounp_info2 .row1 .text{
margin-top: 18px;
width: 90px;
height: 33px;
margin-left: 10px;
color: #999999;
font-size: 18px;
}
.grounp_info2 .row2{
margin-top: 10px;
width: 100%;
height: 20px;
color: #F44054;
font-size: 16px;
text-align: center;
overflow:hidden;
}
.grounp_info .status{
width: 100%;
height: 80rpx;
margin: 10rpx auto;
height: 40px;
padding-top: 15px;
}
.grounp_info .status .tag{
padding: 5rpx 20rpx;
font-size: 20rpx;
font-size: 24rpx;
width:110px;
height:36px;
border-radius:18px;
border-width: 2rpx;
border-style: solid;
margin-left: 26rpx;
}
.grounp_info .status .remark{
width: 300rpx;
height: 30rpx;
margin: -45rpx 150rpx auto;
margin: -28px 82px auto;
color: #666666;
font-size: 26rpx;
}
@ -169,8 +155,8 @@ image{
.grounp_info .status .countDownTimeView{
width: 300rpx;
height: 20rpx;
margin: -15rpx 150rpx auto;
height: 24rpx;
margin: -6rpx 150rpx auto;
}
.grounp_info .status .countDownTimeView .countDownTimeText{
@ -226,6 +212,44 @@ image{
display: none;
}
.grounp_info2{
width: 100%;
background: white;
height: 220rpx;
margin: 30rpx auto;
}
.grounp_info2 .row1{
width: 100%;
height: 33px;
margin: 20px auto;
display: flex;
flex-direction: row;
justify-content:center;
}
.grounp_info2 .row1 .image{
margin-top: 14px;
width: 27px;
height: 33px;
}
.grounp_info2 .row1 .text{
margin-top: 18px;
width: 90px;
height: 33px;
margin-left: 10px;
color: #999999;
font-size: 18px;
}
.grounp_info2 .row2{
margin-top: 10px;
width: 100%;
height: 20px;
color: #F44054;
font-size: 16px;
text-align: center;
}
.bottom_view{
width:100%;
height: 50px;
@ -246,21 +270,19 @@ image{
.bottom_view .two_content{
width:100%;
line-height: 50px;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: space-between;
float: left;
}
.bottom_view .two_content .left{
width: 35%;
line-height: 50px;
font-size: 16px;
font-size: 23px;
color: #F44054;
font-weight: bold;
margin-left: 0px;
background-color: white;
text-align: center;
float: left;
}
.bottom_view .two_content .right{
width: 65%;
@ -271,4 +293,5 @@ image{
margin-right: 0px;
background:#F36619;
text-align: center;
float: left;
}
Write Preview
Loading…
Cancel
Save