Commit 9063b92cdbdf3598133dfb89592a2394e4091c5b
1 parent
9de3c974
充值有礼
Showing
2 changed files
with
38 additions
and
30 deletions
packageA/pages/chongzhi/chongzhi.wxml
1 | 1 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
2 | -<view class="container" style="background-color: {{ad_color?ad_color:'#e85f93'}};height: 100%;"> | |
2 | +<view class="container" style="background-color: {{ad_color?ad_color:'#f2f2f2'}};height: 100%;"> | |
3 | 3 | <!-- 封面 --> |
4 | 4 | <view class="banner-container" wx:if="{{imgAd}}"> |
5 | 5 | <image class="img-block" src="{{url + imgAd}}" binderror="onerror" data-errimg="imgAd"></image> |
6 | + <!-- <image class="img-block" src="../../../images/banner.jpg" binderror="onerror" data-errimg="imgAd"></image> --> | |
6 | 7 | </view> |
7 | 8 | <!-- 列表 --> |
8 | 9 | <view> |
... | ... | @@ -12,37 +13,40 @@ |
12 | 13 | <view class="t-item {{currentIndex == 1 ? 'active':''}}" data-index="1">已核销</view> |
13 | 14 | </view> |
14 | 15 | <!-- 内容 --> |
15 | - <view class="list" > | |
16 | - <block wx:for="{{list}}" > | |
17 | - <view class="l-item" bindtap="goDetails" data-id="{{item.ID}}" > | |
18 | - <!-- 上 --> | |
19 | - <view class="{{currentIndex == 0 ? 'top flex':'flex'}}"> | |
20 | - <!-- 左 --> | |
21 | - <!-- <view class="left"> | |
22 | - <image class="img-block"></image> | |
23 | - </view> --> | |
24 | - <!-- 右 --> | |
25 | - <view class="right"> | |
26 | - <view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view> | |
27 | - <view> | |
28 | - <view class="price fs24">零售价:¥{{item.PosPrice}}</view> | |
29 | - <view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view> | |
16 | + <view class="list"> | |
17 | + <!-- <scroll-view scroll-y> --> | |
18 | + <block wx:for="{{list}}" > | |
19 | + <view class="l-item" bindtap="goDetails" data-id="{{item.ID}}" > | |
20 | + <!-- 上 --> | |
21 | + <view class="{{currentIndex == 0 ? 'top flex':'flex'}}"> | |
22 | + <!-- 左 --> | |
23 | + <!-- <view class="left"> | |
24 | + <image class="img-block"></image> | |
25 | + </view> --> | |
26 | + <!-- 右 --> | |
27 | + <view class="right"> | |
28 | + <view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view> | |
29 | + <view> | |
30 | + <view class="price fs24">零售价:¥{{item.PosPrice}}</view> | |
31 | + <view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view> | |
32 | + </view> | |
30 | 33 | </view> |
31 | 34 | </view> |
32 | - </view> | |
33 | - <!-- 下 --> | |
34 | - <view class="bottom" wx:if="{{currentIndex == 0}}" > | |
35 | - <text wx:if="{{g_filter.is_acting(item.EndDate)}}" | |
36 | - catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text> | |
37 | - <text data-index="{{index}}" class="btn details" >详情</text> | |
38 | - </view> | |
39 | - <view class="bottom" wx:if="{{currentIndex == 1}}" > | |
40 | - <text data-index="{{index}}" class="btn" >已核销</text> | |
41 | - <text data-index="{{index}}" class="btn details" >详情</text> | |
42 | - </view> | |
43 | - | |
44 | - </view> | |
45 | - </block> | |
35 | + <!-- 下 --> | |
36 | + <view class="bottom" wx:if="{{currentIndex == 0}}" > | |
37 | + <text wx:if="{{g_filter.is_acting(item.EndDate)}}" | |
38 | + catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text> | |
39 | + <text data-index="{{index}}" class="btn details" >详情</text> | |
40 | + </view> | |
41 | + <view class="bottom" wx:if="{{currentIndex == 1}}" > | |
42 | + <text data-index="{{index}}" class="btn" >已核销</text> | |
43 | + <text data-index="{{index}}" class="btn details" >详情</text> | |
44 | + </view> | |
45 | + | |
46 | + </view> | |
47 | + </block> | |
48 | + <!-- </scroll-view> --> | |
49 | + | |
46 | 50 | <view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view> |
47 | 51 | </view> |
48 | 52 | ... | ... |