wxd / MShopWeApp

Commit 241345cd03dd0ee8718346e7c90a8a59ea1955b5

Authored by yvan.ni
1 parent 50ac1855

预存充值的优化

Inline Side-by-side
Showing 3 changed files with 22 additions and 11 deletions
packageA/pages/chongzhi/chongzhi.wxml
  View file @241345c
... ... @@ -29,9 +29,16 @@
29 29 </view>
30 30 </view>
31 31 <!-- 下 -->
32   - <view class="bottom" wx:if="{{currentIndex == 0 && g_filter.is_acting(item.EndDate) }}" >
33   - <text catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text>
  32 + <view class="bottom" wx:if="{{currentIndex == 0}}" >
  33 + <text wx:if="{{g_filter.is_acting(item.EndDate)}}"
  34 + catchtap="viewDetails" data-index="{{index}}" class="btn" >立即使用</text>
  35 + <text data-index="{{index}}" class="btn details" >详情</text>
34 36 </view>
  37 + <view class="bottom" wx:if="{{currentIndex == 1}}" >
  38 + <text data-index="{{index}}" class="btn" >已核销</text>
  39 + <text data-index="{{index}}" class="btn details" >详情</text>
  40 + </view>
  41 +
35 42 </view>
36 43 </block>
37 44  
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.js
  View file @241345c
... ... @@ -32,8 +32,7 @@ Page({
32 32 return false;
33 33 }
34 34  
35   -
36   -
  35 +
37 36 getApp().request.get("/api/wx/weappSendlist/page", {
38 37 data: {
39 38 store_id: os.stoid,
... ... @@ -76,7 +75,7 @@ Page({
76 75 var endtime = result.EndDate.replace(reg, '/');
77 76 var end=new Date(endtime);
78 77 result.is_acting=1;
79   - if(end<now) result.is_acting=0;
  78 + if(end<now) result.is_acting=0;
80 79  
81 80  
82 81 var givelist=result.givelist;
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
  View file @241345c
... ... @@ -37,13 +37,18 @@
37 37 </view>
38 38 </view>
39 39  
40   - <view class="btn-container" >
41   - <text wx:if="{{type==0}}" data-advance="{{result.Id}}" data-money="{{result.BeginSum}}"
42   - class="btn" bindtap="go_buy">立即充值</text>
43   - <block wx:else>
44   - <text wx:if="{{result.AddType==0 && result.is_acting}}" class="btn" bindtap="onUse">立即使用</text>
45   - <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
  40 + <view class="btn-container" >
  41 + <block wx:if="{{result.is_acting}}">
  42 + <text wx:if="{{type==0}}" data-advance="{{result.Id}}" data-money="{{result.BeginSum}}"
  43 + class="btn" bindtap="go_buy">立即充值</text>
  44 + <block wx:else>
  45 + <text wx:if="{{result.AddType==0}}" class="btn" bindtap="onUse">立即使用</text>
  46 + <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
  47 + </block>
46 48 </block>
  49 + <block wx:else>
  50 + <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
  51 + </block>
47 52 </view>
48 53  
49 54 <qrcode id="qrcode" ></qrcode>
... ...