Commit 3313d8676ba748c2460b3ba50b80f13e07c880f9
1 parent
80b4ad92
我的礼包优化
Showing
5 changed files
with
30 additions
and
21 deletions
components/my_confirm/my_confirm.wxss
| 1 | - | |
| 1 | +@import '../../app.wxss'; | |
| 2 | 2 | /* 弹窗样式 */ |
| 3 | 3 | .xc-pop-up{ |
| 4 | 4 | width: 100%; |
| ... | ... | @@ -22,21 +22,24 @@ |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | .shut{ |
| 25 | - display: block; | |
| 26 | - width: 54rpx; | |
| 27 | - height: 54rpx; | |
| 28 | - font-size: 50rpx; | |
| 29 | - line-height:47rpx; | |
| 25 | + /* display: block; | |
| 26 | + width: 40rpx; | |
| 27 | + height: 40rpx; | |
| 28 | + | |
| 29 | + line-height:35rpx; | |
| 30 | 30 | border-radius: 50%; |
| 31 | 31 | -moz-border-radius: 50%; |
| 32 | - -webkit-border-radius: 50%; | |
| 33 | - color: #fff; | |
| 32 | + -webkit-border-radius: 50%; */ | |
| 33 | + font-size: 40rpx; | |
| 34 | + color: #9F9F9F; | |
| 34 | 35 | text-align: center; |
| 35 | 36 | position: fixed; |
| 36 | - margin-top: -25rpx; | |
| 37 | 37 | z-index: 66666; |
| 38 | - right: 65rpx; | |
| 39 | - background: #c8162c; | |
| 38 | + right: 105rpx; | |
| 39 | + /* background: #c8162c; */ | |
| 40 | +} | |
| 41 | +.icon-close:before { | |
| 42 | + content: "\e62e"; | |
| 40 | 43 | } |
| 41 | 44 | .xc-qr-frame{ |
| 42 | 45 | width:560rpx; |
| ... | ... | @@ -50,7 +53,7 @@ |
| 50 | 53 | margin-left: -280rpx; border-radius:10rpx |
| 51 | 54 | } |
| 52 | 55 | |
| 53 | -.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;} | |
| 56 | +.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;} | |
| 54 | 57 | |
| 55 | 58 | .fs36{ font-size: 36rpx; } |
| 56 | 59 | .fs30{ font-size: 30rpx; } | ... | ... |
components/qr_code/qr_code.wxml
components/qr_code/qr_code.wxss
| 1 | +@import '../../app.wxss'; | |
| 2 | + | |
| 1 | 3 | .xc-pop-up{ |
| 2 | 4 | width: 100%; |
| 3 | 5 | height: 100%; |
| ... | ... | @@ -102,17 +104,17 @@ top: 5rpx; |
| 102 | 104 | } |
| 103 | 105 | |
| 104 | 106 | .shut{ |
| 105 | - display: block; | |
| 107 | + /* display: block; | |
| 106 | 108 | width: 54rpx; |
| 107 | 109 | height: 54rpx; |
| 108 | 110 | border: 2rpx solid #fff; |
| 109 | 111 | font-size: 50rpx; |
| 110 | - z-index:55; | |
| 111 | - line-height:47rpx; | |
| 112 | + line-height:54rpx; | |
| 112 | 113 | margin-top: 45rpx; |
| 113 | 114 | border-radius: 50%; |
| 114 | 115 | -moz-border-radius: 50%; |
| 115 | - -webkit-border-radius: 50%; | |
| 116 | + -webkit-border-radius: 50%; */ | |
| 117 | + z-index:55; | |
| 116 | 118 | color: #fff; |
| 117 | 119 | text-align: center; |
| 118 | 120 | position: fixed; |
| ... | ... | @@ -120,6 +122,10 @@ top: 5rpx; |
| 120 | 122 | left:50%; |
| 121 | 123 | transform: translateX(-50%); |
| 122 | 124 | } |
| 125 | +.icon-close:before { | |
| 126 | + content: "\e62e"; | |
| 127 | + font-size: 50rpx; | |
| 128 | +} | |
| 123 | 129 | |
| 124 | 130 | .mt{ margin-top:130rpx} |
| 125 | 131 | .mts{ margin-top:70rpx} | ... | ... |
packageA/pages/myGift/myGift.wxml
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | <view class="fs24 c-a4">已售{{item.salenum}}件</view> |
| 37 | 37 | </view> |
| 38 | 38 | <!-- 时间 --> |
| 39 | - <view class="date">活动截止日期 {{filter.format_time(item.endtime)}}</view> | |
| 39 | + <view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view> | |
| 40 | 40 | <!-- 按钮 --> |
| 41 | 41 | </view> |
| 42 | 42 | </view> |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | <!-- 标题 --> |
| 56 | 56 | <view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view> |
| 57 | 57 | <!-- 时间 --> |
| 58 | - <view class="date pdb20">兑换截止日期 {{filter.format_time(item.endtime)}}</view> | |
| 58 | + <view class="date pdb20">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view> | |
| 59 | 59 | <view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view> |
| 60 | 60 | </view> |
| 61 | 61 | <!-- 说明 --> | ... | ... |
packageA/pages/myGiftDetails/myGiftDetails.wxml
| ... | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | <!-- 图片 --> |
| 4 | 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.endtime,1)}}</view> | |
| 6 | + <view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view> | |
| 7 | 7 | <!-- 描述--> |
| 8 | 8 | <view class="desc-container"> |
| 9 | 9 | <!-- 标题 --> |
| ... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 | <view class="fs24 c-a4">已售{{details.salenum}}件</view> |
| 31 | 31 | </view> |
| 32 | 32 | <!-- 时间 --> |
| 33 | - <view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view> | |
| 33 | + <view class="date" wx:if="{{details.lbtype==1}}">活动结束日期 {{filter.format_time(details.endtime)}}</view> | |
| 34 | 34 | </view> |
| 35 | 35 | |
| 36 | 36 | ... | ... |