Commit b0e678cb by 谢中龙

Merge branch '711_dev_7.5.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into 711_dev_7.5.0

parents 676da08d d3b2bdab
......@@ -2,13 +2,13 @@
<!--<view wx:if='{{!memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{'background-image: url(../../assets/imgs/user-bg.png)'}}">
<button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
</view>-->
<view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<view wx:if='{{!memberActivateStatus}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<!-- <text class="un-active-btn">升级7-Eleven会员2.0版本</text>-->
<image wx:if="{{baseImgUrl}}" src="{{baseImgUrl}}{{personCenter.noactiveBackgroundImageUrl}}" class="no-active-img" mode="widthFix"></image>
</view>
<!--<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">-->
<view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ baseImgUrl +''+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}">
<view class='user-info' wx:if='{{currentMobile}}'>
<view wx:if='{{memberActivateStatus}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ baseImgUrl +''+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}">
<view class='user-info' wx:if='{{memberActivateStatus}}'>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
</view>
......@@ -27,7 +27,7 @@
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{currentMobile}}'>
<view class='df tc person-num' wx:if='{{memberActivateStatus}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
......
......@@ -116,6 +116,7 @@ wxService.page({
item.startTime = item.startTime.substring(0, 10);
item.endTime = item.endTime.substring(0,10);
item.useResidueDays = item.useResidueDays ? item.useResidueDays : 0;
item.validStatus = item.validStatus ? item.validStatus : 0;
});
this.data.myCardsList = this.data.myCardsList.concat(data);
......
......@@ -6,9 +6,9 @@
wx:for-index="idx"
wx:key="*this">
<!-- 失效的时候 -->
<view class='invalide' wx:if="{{item.useResidueDays <= 0}}">
<view class='invalide' wx:if="{{item.validStatus == 1}}">
<view class='status-bar'>
<view class='card-status'>已过期</view>
<view class='card-status'>已失效</view>
</view>
</view>
<view class='card-top-info' bindtap='onTapToInfoPage' data-item="{{item}}" data-index="{{idx}}">
......
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