正在显示
1 个修改的文件
包含
15 行增加
和
5 行删除
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | <!--<image src="../../images/lishi@2x.png" class="thumb"></image>--> | 17 | <!--<image src="../../images/lishi@2x.png" class="thumb"></image>--> |
18 | <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image> | 18 | <image src="{{item.pic}}" class="thumb" mode="aspectFill"></image> |
19 | <view class="lish-right"> | 19 | <view class="lish-right"> |
20 | - <!--(0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除--> | 20 | + <!--(0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除,10已取消(发起人已拼成后取消)--> |
21 | <view class="title-box"> | 21 | <view class="title-box"> |
22 | <view class="title">{{item.title}}</view> | 22 | <view class="title">{{item.title}}</view> |
23 | <text wx:if="{{item.status === 2}}" class="state">待拼成</text> | 23 | <text wx:if="{{item.status === 2}}" class="state">待拼成</text> |
@@ -32,11 +32,21 @@ | @@ -32,11 +32,21 @@ | ||
32 | <view class="name-left"> | 32 | <view class="name-left"> |
33 | <!--<image src="../../images/avatar@2x.png" class="avatar"></image>--> | 33 | <!--<image src="../../images/avatar@2x.png" class="avatar"></image>--> |
34 | <image src="{{item.userPic}}" class="avatar"></image> | 34 | <image src="{{item.userPic}}" class="avatar"></image> |
35 | - <image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}" class="sex-icon"></image> | 35 | + <image src="{{item.userSex === 1?'../../images/man.png':'../../images/women.png'}}" |
36 | + class="sex-icon"></image> | ||
36 | <text>{{item.userName}}</text> | 37 | <text>{{item.userName}}</text> |
37 | </view> | 38 | </view> |
38 | <view class="btn"> | 39 | <view class="btn"> |
39 | - <text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}" catchtap="cancel" data-id="{{item.id}}">删除</text> | 40 | + <!--2参与人--> |
41 | + <block wx:if="{{item.type === 2}}"> | ||
42 | + <text wx:if="{{item.status === 5 || item.status === 6 || item.status === 3 || item.status === 7}}" | ||
43 | + catchtap="cancel" data-id="{{item.id}}">删除</text> | ||
44 | + </block> | ||
45 | + <!--1发起人--> | ||
46 | + <block wx:if="{{item.type === 1}}"> | ||
47 | + <text wx:if="{{item.status === 10 || item.status === 6 || item.status === 3 || item.status === 7}}" | ||
48 | + catchtap="cancel" data-id="{{item.id}}">删除</text> | ||
49 | + </block> | ||
40 | <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text> | 50 | <text wx:if="{{item.status === 4}}" catchtap="complete" data-id="{{item.id}}">完成</text> |
41 | </view> | 51 | </view> |
42 | </view> | 52 | </view> |
@@ -44,8 +54,8 @@ | @@ -44,8 +54,8 @@ | ||
44 | </view> | 54 | </view> |
45 | </view> | 55 | </view> |
46 | <!--底部tab--> | 56 | <!--底部tab--> |
47 | -<import src="/templates/templates.wxml" /> | ||
48 | -<template is="tabBar" data='{{...tabcurrent}}' /> | 57 | +<import src="/templates/templates.wxml"/> |
58 | +<template is="tabBar" data='{{...tabcurrent}}'/> | ||
49 | <!--去答题弹框--> | 59 | <!--去答题弹框--> |
50 | <view class="input-box" wx:if="{{is_showAnswer}}" catchtouchmove="disableScroll"> | 60 | <view class="input-box" wx:if="{{is_showAnswer}}" catchtouchmove="disableScroll"> |
51 | <image class="sorry-img" src="../../images/sorry@2x.png"></image> | 61 | <image class="sorry-img" src="../../images/sorry@2x.png"></image> |
-
请 注册 或 登录 后发表评论