Commit 27b622eb by biao

111

parent 8b8a82b3
...@@ -20,7 +20,8 @@ Page({ ...@@ -20,7 +20,8 @@ Page({
isCircleOwner: false, isCircleOwner: false,
personalMemberList:[], personalMemberList:[],
circleMemberList:[], circleMemberList:[],
menuText:'' menuText:'',
showActionButton:false
}, },
/** /**
...@@ -59,17 +60,20 @@ Page({ ...@@ -59,17 +60,20 @@ Page({
//按钮文字控制 //按钮文字控制
if (res.data.result.isMember == false && res.data.result.isEnrollFinish==false){ if (res.data.result.isMember == false && res.data.result.isEnrollFinish==false){
that.setData({ that.setData({
menuText:'报名参加' menuText:'报名参加',
showActionButton:true
}) })
} }
if (res.data.result.isMember == true && res.data.result.isEnrollFinish == false) { if (res.data.result.isMember == true && res.data.result.isEnrollFinish == false) {
that.setData({ that.setData({
menuText: '取消报名' menuText: '取消报名',
showActionButton: true
}) })
} }
if (res.data.result.isMember == true && res.data.result.isEnrollFinish == true && res.data.result.isComplete ==false) { if (res.data.result.isMember == true && res.data.result.isEnrollFinish == true && res.data.result.isComplete ==false) {
that.setData({ that.setData({
menuText: '上传凭证' menuText: '上传凭证',
showActionButton: true
}) })
} }
} }
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</view> </view>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
<view class='actionBtn' bindtap='userAction'>{{menuText}}</view> <view class='actionBtn' bindtap='userAction' wx:if="{{showActionButton}}">{{menuText}}</view>
</view> </view>
</view> </view>
<van-dialog id="van-dialog" /> <van-dialog id="van-dialog" />
......
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
width: 100%; width: 100%;
} }
.con_activeDetails{ .con_activeDetails{
width: 80%; width: 90%;
margin: 30px auto; margin: 30px auto;
} }
.con_activeDetails>text{ .con_activeDetails>text{
display: block; display: block;
width: 100%; width: 100%;
font-size: 12px; font-size: 13px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.botCon_activeDetails{ .botCon_activeDetails{
width: 100%; width: 100%;
height: 76px; height: 100px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.botCon_activeDetails>view{ .botCon_activeDetails>view{
width: 150px; width: 180px;
float: right; float: right;
color: #666; color: #666;
font-size: 10px; font-size: 12px;
} }
.botCon_activeDetails>view>text{ .botCon_activeDetails>view>text{
display: block; display: block;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment