Commit c39a4157a75d0e149e75cc75aa9f0562f0d918a1
1 parent
3313d867
礼包优化
Showing
3 changed files
with
22 additions
and
15 deletions
components/my_confirm/my_confirm.wxss
| @@ -22,24 +22,21 @@ | @@ -22,24 +22,21 @@ | ||
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | .shut{ | 24 | .shut{ |
| 25 | - /* display: block; | ||
| 26 | - width: 40rpx; | ||
| 27 | - height: 40rpx; | ||
| 28 | - | ||
| 29 | - line-height:35rpx; | 25 | + display: block; |
| 26 | + width: 45rpx; | ||
| 27 | + height: 45rpx; | ||
| 28 | + line-height:36rpx; | ||
| 30 | border-radius: 50%; | 29 | border-radius: 50%; |
| 31 | -moz-border-radius: 50%; | 30 | -moz-border-radius: 50%; |
| 32 | - -webkit-border-radius: 50%; */ | 31 | + -webkit-border-radius: 50%; |
| 33 | font-size: 40rpx; | 32 | font-size: 40rpx; |
| 34 | - color: #9F9F9F; | 33 | + color: #fff; |
| 35 | text-align: center; | 34 | text-align: center; |
| 36 | position: fixed; | 35 | position: fixed; |
| 37 | z-index: 66666; | 36 | z-index: 66666; |
| 38 | - right: 105rpx; | ||
| 39 | - /* background: #c8162c; */ | ||
| 40 | -} | ||
| 41 | -.icon-close:before { | ||
| 42 | - content: "\e62e"; | 37 | + right: 75rpx; |
| 38 | + top: 465rpx; | ||
| 39 | + background: #c8162c; | ||
| 43 | } | 40 | } |
| 44 | .xc-qr-frame{ | 41 | .xc-qr-frame{ |
| 45 | width:560rpx; | 42 | width:560rpx; |
packageA/pages/myGift/myGift.js
| @@ -144,7 +144,7 @@ Page({ | @@ -144,7 +144,7 @@ Page({ | ||
| 144 | isShowLoading: true, | 144 | isShowLoading: true, |
| 145 | }) | 145 | }) |
| 146 | .then(function(res) { | 146 | .then(function(res) { |
| 147 | - | 147 | + console.log(res); |
| 148 | if(res.data.code == 0) { | 148 | if(res.data.code == 0) { |
| 149 | 149 | ||
| 150 | self.setData({ | 150 | self.setData({ |
packageA/pages/myGiftDetails/myGiftDetails.wxml
| @@ -3,7 +3,17 @@ | @@ -3,7 +3,17 @@ | ||
| 3 | <!-- 图片 --> | 3 | <!-- 图片 --> |
| 4 | <view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view> | 4 | <view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view> |
| 5 | 5 | ||
| 6 | - <view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view> | 6 | + <!-- 未买 --> |
| 7 | + <block wx:if="{{index==0}}"> | ||
| 8 | + <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view> | ||
| 9 | + </block> | ||
| 10 | + <!-- 已买 --> | ||
| 11 | + <block wx:else> | ||
| 12 | + <view wx:if="{{details.lbtype==1}}"class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view> | ||
| 13 | + </block> | ||
| 14 | + | ||
| 15 | + | ||
| 16 | + | ||
| 7 | <!-- 描述--> | 17 | <!-- 描述--> |
| 8 | <view class="desc-container"> | 18 | <view class="desc-container"> |
| 9 | <!-- 标题 --> | 19 | <!-- 标题 --> |
| @@ -30,7 +40,7 @@ | @@ -30,7 +40,7 @@ | ||
| 30 | <view class="fs24 c-a4">已售{{details.salenum}}件</view> | 40 | <view class="fs24 c-a4">已售{{details.salenum}}件</view> |
| 31 | </view> | 41 | </view> |
| 32 | <!-- 时间 --> | 42 | <!-- 时间 --> |
| 33 | - <view class="date" wx:if="{{details.lbtype==1}}">活动结束日期 {{filter.format_time(details.endtime)}}</view> | 43 | + <!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> --> |
| 34 | </view> | 44 | </view> |
| 35 | 45 | ||
| 36 | 46 |