Commit edb29a1e by 高淑倩

Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

parents 8200cc6f eee67ff5
...@@ -92,7 +92,7 @@ wxService.page({ ...@@ -92,7 +92,7 @@ wxService.page({
wxService.post(`/merchant/contentMobileTerminal/getReleasePermissions`, { wxService.post(`/merchant/contentMobileTerminal/getReleasePermissions`, {
userId: memberId, userId: memberId,
plus: this.data.plus, plus: this.data.plus,
level: member.level || 0 level: member.level ? member.level : 0
}).then(res => { }).then(res => {
if (!res) return false if (!res) return false
const { result, data } = res.data const { result, data } = res.data
......
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
<view class="page-my-invite"> <view class="page-my-invite">
<view class="release-num weui-flex df-j--bt"> <view class="release-num weui-flex df-j--bt">
<view class="num-invite df-1 border_box"> <view class="num-invite df-1 border_box">
<view class="share-number">{{currentInviteNum}}</view> <view class="share-number">{{currentInviteNum || 0}}</view>
<view class="share-title">当前邀请人数</view> <view class="share-title">当前邀请人数</view>
</view> </view>
<view class="extension-line"></view> <view class="extension-line"></view>
<view class="num-invite-yesterday df-1 border_box"> <view class="num-invite-yesterday df-1 border_box">
<view class="share-number">{{yesterdayInviteNum}}</view> <view class="share-number">{{yesterdayInviteNum || 0}}</view>
<view class="share-title">昨日邀请新增</view> <view class="share-title">昨日邀请新增</view>
</view> </view>
</view> </view>
<!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> --> <!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
<view class="invite-banner" bindtap="gotoInviteShare"> <view class="invite-banner" bindtap="gotoInviteShare">
<image src="{{isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image> <image src="{{!isGoToInvite ? inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}" mode="widthFix"></image>
</view> </view>
<!-- </navigator> --> <!-- </navigator> -->
<view class="order-benefit-wrap"> <view class="order-benefit-wrap">
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
} }
.invite-banner image{ .invite-banner image{
width: 712rpx; width: 712rpx;
height: 298rpx;
border-radius: 17rpx; border-radius: 17rpx;
/* background-color: rgba(216, 216, 216, 1); */ /* background-color: rgba(216, 216, 216, 1); */
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.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