Commit e1a90987 by 谢中龙

积分换物修改bug

parent 0ecea4fb
...@@ -15,7 +15,7 @@ wxService.page({ ...@@ -15,7 +15,7 @@ wxService.page({
exchangePoint: 0, exchangePoint: 0,
currentTab: 'coupon', currentTab: 'coupon',
memberPoint : { memberPoint : {
total : 0, total: '--',
expirePoint : 0, expirePoint : 0,
expireDate : '' expireDate : ''
} }
...@@ -55,6 +55,10 @@ wxService.page({ ...@@ -55,6 +55,10 @@ wxService.page({
// title: '数据请求中..', // title: '数据请求中..',
// }); // });
const { memberId } = wx.getStorageSync('_baseUserInfo') const { memberId } = wx.getStorageSync('_baseUserInfo')
if (!memberId){
return ;
}
wxService.get(`/member/memberPoint/getMemberPointInfo?memberId=${memberId}`).then(res => { wxService.get(`/member/memberPoint/getMemberPointInfo?memberId=${memberId}`).then(res => {
let data = res.data.data ? res.data.data : {}; let data = res.data.data ? res.data.data : {};
this.data.memberPoint.total = data.point ? data.point : 0; this.data.memberPoint.total = data.point ? data.point : 0;
......
<!--pages/userCenter.wxml--> <!--pages/userCenter.wxml-->
<view class='page-integral-mall' style="padding-bottom: 40rpx"> <view class='page-integral-mall' style="padding-bottom: {{currentTab =='goods' ? '70rpx' : '40rpx'}}">
<!-- title --> <!-- title -->
<view class='mall-title'> <view class='mall-title'>
<view class='title-num-point'> <view class='title-num-point'>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{{memberPoint.total}} {{memberPoint.total}}
</view> </view>
</view> </view>
<view class='integral-vip-rules' wx:if="{{integralCouponList. length}}" bindtap="handleGoMemberRulesRules">会员规则</view> <view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
</view> </view>
<view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}"> <view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}">
{{memberPoint.expirePoint}}积分将于{{memberPoint.expireDate}}清零 {{memberPoint.expirePoint}}积分将于{{memberPoint.expireDate}}清零
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.title}}</view> <view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-desc text-align-left fs-24'>查看详情 >>></view> <view class='coupon-desc text-align-left fs-24'>查看详情</view>
</view> </view>
</view> </view>
<view class='coupon-btn'> <view class='coupon-btn'>
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
</view> </view>
<!-- goods --> <!-- goods -->
<view wx:if="{{currentTab =='goods'}}"> <view wx:if="{{currentTab =='goods'}}">
<view class='point-exchange-goods-records' bindtap='onTapToExchangeRecords'>
查看兑换记录 >>
</view>
<view class='coupon-wrap' wx:if="{{integralGoodsList.length}}"> <view class='coupon-wrap' wx:if="{{integralGoodsList.length}}">
<view <view
class='coupon-list' class='coupon-list'
...@@ -90,7 +87,7 @@ ...@@ -90,7 +87,7 @@
</view> </view>
<view class='coupon-info'> <view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.title}}</view> <view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-desc text-align-left fs-24'>查看详情积分</view> <view class='coupon-desc text-align-left fs-24'>查看详情</view>
</view> </view>
</view> </view>
<view class='coupon-btn'> <view class='coupon-btn'>
...@@ -110,6 +107,10 @@ ...@@ -110,6 +107,10 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 悬浮兑换记录 -->
<view class='point-exchange-goods-records' wx:if="{{currentTab =='goods'}}" bindtap='onTapToExchangeRecords'>
查看兑换记录 >>
</view>
<exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}' /> <exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}' />
<!--<no-more wx:if="{{noMore}}"/>--> <!--<no-more wx:if="{{noMore}}"/>-->
......
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
@import "/base/base.wxss"; @import "/base/base.wxss";
page { page {
background-color: rgba(0, 0, 0, 0.05); /* background-color: rgba(0, 0, 0, 0.05); */
background: #ffffff;
} }
.page-integral-mall { .page-integral-mall {
border-top: 1px solid rgba(151, 151, 151, 1); border-top: 1px solid rgba(151, 151, 151, 0.1);
} }
.empty-wrap { .empty-wrap {
width: 300rpx; width: 300rpx;
...@@ -29,6 +30,7 @@ page { ...@@ -29,6 +30,7 @@ page {
} }
.coupon-list { .coupon-list {
margin-bottom: 10rpx; margin-bottom: 10rpx;
border-bottom: solid 1px #eeeeee;
} }
.coupon-img-title { .coupon-img-title {
display: flex; display: flex;
...@@ -140,12 +142,17 @@ page { ...@@ -140,12 +142,17 @@ page {
.point-exchange-goods-records{ .point-exchange-goods-records{
font-size: 28rpx; font-size: 28rpx;
color: #666666; color: #ffffff;
display: flex; display: flex;
justify-content: flex-end; justify-content: center;
align-items: center; align-items: center;
padding: 0 30rpx; height: 70rpx;
padding-top: 20rpx; position: fixed;
left: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.65);
z-index: 2;
width: 100%;
} }
.point-exchange-goods-records:active{ .point-exchange-goods-records:active{
...@@ -197,6 +204,7 @@ page { ...@@ -197,6 +204,7 @@ page {
padding: 5rpx 0; padding: 5rpx 0;
box-sizing: border-box; box-sizing: border-box;
margin-top: 10rpx; margin-top: 10rpx;
border-bottom: solid 1px #eeeeee;
} }
.tab-coupon, .tab-goods,.tab-coupon-goods { .tab-coupon, .tab-goods,.tab-coupon-goods {
flex: 1; flex: 1;
......
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