Commit 36be4393 by 赵雅纹

Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !172
parents 01abfa11 c1aea07c
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<view class="commodity_screen2" bindtap='closeCardModal' style='opacity: 0.5;' hidden="{{!show}}" catchtouchmove='true'></view> <view class="commodity_screen2" bindtap='closeCardModal' style='opacity: 0.5;' hidden="{{!show}}" catchtouchmove='true'></view>
<view class="card-modal" hidden="{{!show}}" catchtouchmove='true'> <view class="card-modal" hidden="{{!show}}" catchtouchmove='true'>
<view class="card-modal-content"> <view class="card-modal-content">
<view wx:if="{{!benefitData.receiveAwardJumpType}}"> <view wx:if="{{benefitData.receiveAwardJumpType}}">
<button class="positionAbs" bindgetuserinfo="_getUserInfo" data-jflag="false" open-type='getUserInfo'><image mode="widthFix" class="benefit-image" src="{{benefitData.inviteePage}}"></image></button> <button class="positionAbs" bindgetuserinfo="_getUserInfo" data-jflag="false" open-type='getUserInfo'></button><image mode="widthFix" class="benefit-image" src="{{benefitData.inviteePage}}"></image>
</view> </view>
<view wx:else> <view wx:else>
<image mode="widthFix" class="benefit-image" src="{{benefitData.inviteePage}}" bindtap="closeCardModal"></image> <image mode="widthFix" class="benefit-image" src="{{benefitData.inviteePage}}" bindtap="closeCardModal"></image>
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
transform:translate(-50%,-50%); transform:translate(-50%,-50%);
} }
.card-modal-content{ .card-modal-content{
background-color: rgba(255, 255, 255, 1); /* background-color: rgba(255, 255, 255, 1); */
box-shadow: 0px 4rpx 17rpx 0px rgba(0, 0, 0, 0.12); /* box-shadow: 0px 4rpx 17rpx 0px rgba(0, 0, 0, 0.12); */
} }
.benefit-image{ .benefit-image{
width: 600rpx; width: 600rpx;
......
...@@ -76,7 +76,6 @@ wxService.page({ ...@@ -76,7 +76,6 @@ wxService.page({
const { result, data } = res.data const { result, data } = res.data
if (result == 0) { if (result == 0) {
wx.hideLoading() wx.hideLoading()
let initiatorPage = JSON.parse(data.initiatorPage)
this.setData({ this.setData({
benefitData: data benefitData: data
}) })
......
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