正在显示
4 个修改的文件
包含
8 行增加
和
7 行删除
1 | <!--pages/my/my-wallet/detail/detail.wxml--> | 1 | <!--pages/my/my-wallet/detail/detail.wxml--> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | - <view class="section {{detail.type === 1?'change-bg':''}} {{detail.status === 6?'change-bg-end':''}}" style=""> | 3 | + <view class="section {{detail.type === 1?'change-bg':''}} {{detail.status === 6?'change-bg-end':''}}" style="height:{{screenHeight}}px"> |
4 | <view class="detail"> | 4 | <view class="detail"> |
5 | <view class="bg"> | 5 | <view class="bg"> |
6 | <view class="head"> | 6 | <view class="head"> |
@@ -28,8 +28,8 @@ | @@ -28,8 +28,8 @@ | ||
28 | <view wx:for="{{join}}" wx:key="index" class="list"> | 28 | <view wx:for="{{join}}" wx:key="index" class="list"> |
29 | <image src="{{item.pic}}"></image> | 29 | <image src="{{item.pic}}"></image> |
30 | <view class="people-name">{{item.name}}</view> | 30 | <view class="people-name">{{item.name}}</view> |
31 | - <text class="people-phone" selectable="true">手机号: {{item.tel}}</text> | ||
32 | - <text class="people-phone" selectable="true">微信号: {{item.wx}}</text> | 31 | + <text class="people-phone" selectable="true">手机: {{item.tel}}</text> |
32 | + <text class="people-phone" selectable="true">微信: {{item.wx}}</text> | ||
33 | </view> | 33 | </view> |
34 | </scroll-view> | 34 | </scroll-view> |
35 | </view> | 35 | </view> |
@@ -115,6 +115,7 @@ page { | @@ -115,6 +115,7 @@ page { | ||
115 | } | 115 | } |
116 | .people .list { | 116 | .people .list { |
117 | display: flex; | 117 | display: flex; |
118 | + align-items: center; | ||
118 | justify-content: flex-start; | 119 | justify-content: flex-start; |
119 | margin-bottom: 30rpx; | 120 | margin-bottom: 30rpx; |
120 | } | 121 | } |
@@ -3,13 +3,13 @@ | @@ -3,13 +3,13 @@ | ||
3 | <view class="bg"> | 3 | <view class="bg"> |
4 | <!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除--> | 4 | <!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除--> |
5 | <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view> | 5 | <view class="no-data" wx:if="{{list.length===0}}">钱包是空的~</view> |
6 | - <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}} {{item.status === 10?'change-bg-cancel':''}}" | 6 | + <view class="list-item {{item.type === 1?'change-bg':''}} {{item.status === 6?'change-bg-end':''}} {{item.status === 10||item.status === 5?'change-bg-cancel':''}}" |
7 | wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail"> | 7 | wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goDetail"> |
8 | <!--已完成icon--> | 8 | <!--已完成icon--> |
9 | <image src="../../../images/end-flag@2x.png" wx:if="{{item.status === 6}}" class="flag-img"></image> | 9 | <image src="../../../images/end-flag@2x.png" wx:if="{{item.status === 6}}" class="flag-img"></image> |
10 | <!--已取消icon--> | 10 | <!--已取消icon--> |
11 | - <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10}}" class="flag-img"></image> | ||
12 | - <view class="detail {{item.status === 6 || item.status === 10?'change-color':''}}"> | 11 | + <image src="../../../images/quxiao@2x.png" wx:if="{{item.status === 10 ||item.status === 5}}" class="flag-img"></image> |
12 | + <view class="detail {{item.status === 5 || item.status === 6 || item.status === 10?'change-color':''}}"> | ||
13 | <view class="area"> | 13 | <view class="area"> |
14 | <text class="addr">{{item.title}}</text> | 14 | <text class="addr">{{item.title}}</text> |
15 | <text>{{nickName}}</text> | 15 | <text>{{nickName}}</text> |
@@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
49 | </view> | 49 | </view> |
50 | 50 | ||
51 | <view class="bottom"> | 51 | <view class="bottom"> |
52 | - <!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除--> | 52 | + <!-- // (0全部,2待拼成,3人数不足未拼成,4已拼成,5已取消,6已完成,7已评价,8已拼成(活动未结束),9删除,10已取消(已拼成取消),11已过期--> |
53 | <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text> | 53 | <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text> |
54 | <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text> | 54 | <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text> |
55 | <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>--> | 55 | <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>--> |
-
请 注册 或 登录 后发表评论