Commit 5fbea9e0662e3a54bd30416cebe02b167d898636
1 parent
b9922539
各种有礼代码优化
Showing
9 changed files
with
190 additions
and
148 deletions
pages/giftpack/birthdaygift/birthdaygift.js
| @@ -84,8 +84,8 @@ Page({ | @@ -84,8 +84,8 @@ Page({ | ||
| 84 | } | 84 | } |
| 85 | } | 85 | } |
| 86 | th.setData({ | 86 | th.setData({ |
| 87 | - integralTitle: '领取' + res.data.data.lbIntegral + '积分', | ||
| 88 | - growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值' | 87 | + integralTitle: '价值' + res.data.data.lbIntegral + '积分', |
| 88 | + growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值' | ||
| 89 | }) | 89 | }) |
| 90 | if (res.data.data.receiveState == 0) { | 90 | if (res.data.data.receiveState == 0) { |
| 91 | th.setData({ | 91 | th.setData({ |
pages/giftpack/buygiftpack/giftpackbuy.wxml
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | <view class="flex-vertical"> | 50 | <view class="flex-vertical"> |
| 51 | <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}"> | 51 | <block wx:if="{{items.payMoney>0 && items.payIntegral>0}}"> |
| 52 | <block wx:if="{{items.payMoney>0}}"> | 52 | <block wx:if="{{items.payMoney>0}}"> |
| 53 | - <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}"> | 53 | + <view class="flex" bindtap="GetBuyPrice" data-id="{{items.lbId}}" data-money="{{items.payMoney}}"> |
| 54 | <button class="box_button_dui">立即购买</button> | 54 | <button class="box_button_dui">立即购买</button> |
| 55 | </view> | 55 | </view> |
| 56 | </block> | 56 | </block> |
pages/giftpack/evaluategift/evaluategift.js
| @@ -89,8 +89,8 @@ Page({ | @@ -89,8 +89,8 @@ Page({ | ||
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | th.setData({ | 91 | th.setData({ |
| 92 | - integralTitle: '领取' + res.data.data.lbIntegral + '积分', | ||
| 93 | - growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值' | 92 | + integralTitle: '价值' + res.data.data.lbIntegral + '积分', |
| 93 | + growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值' | ||
| 94 | }) | 94 | }) |
| 95 | if (res.data.data.receiveState == 0) { | 95 | if (res.data.data.receiveState == 0) { |
| 96 | th.setData({ | 96 | th.setData({ |
pages/giftpack/giftpacklist/giftpacklist.wxml
| 1 | <view class="box data-v-3a5b7e36"> | 1 | <view class="box data-v-3a5b7e36"> |
| 2 | <view class="box_top data-v-3a5b7e36"> | 2 | <view class="box_top data-v-3a5b7e36"> |
| 3 | - <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image> | 3 | + <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image> |
| 4 | </view> | 4 | </view> |
| 5 | <view class="box_title data-v-3a5b7e36"> | 5 | <view class="box_title data-v-3a5b7e36"> |
| 6 | <view class="top_title data-v-3a5b7e36"> | 6 | <view class="top_title data-v-3a5b7e36"> |
| @@ -40,19 +40,19 @@ | @@ -40,19 +40,19 @@ | ||
| 40 | <view class="box_ware_box data-v-3a5b7e36"> | 40 | <view class="box_ware_box data-v-3a5b7e36"> |
| 41 | <view class="box_ware_img data-v-3a5b7e36"> | 41 | <view class="box_ware_img data-v-3a5b7e36"> |
| 42 | <block wx:if="{{item.lbType==1}}"> | 42 | <block wx:if="{{item.lbType==1}}"> |
| 43 | - <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> | 43 | + <image src="{{item.wareImage==''?iurl+'/miniapp/images/giftbag/gift01.png':iurl+item.wareImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> |
| 44 | </block> | 44 | </block> |
| 45 | <block wx:if="{{item.lbType==2}}"> | 45 | <block wx:if="{{item.lbType==2}}"> |
| 46 | - <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> | 46 | + <image src="{{iurl+'/miniapp/images/giftbag/gift05.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> |
| 47 | </block> | 47 | </block> |
| 48 | <block wx:if="{{item.lbType==3}}"> | 48 | <block wx:if="{{item.lbType==3}}"> |
| 49 | - <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> | 49 | + <image src="{{iurl+'/miniapp/images/giftbag/gift02.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> |
| 50 | </block> | 50 | </block> |
| 51 | <block wx:if="{{item.lbType==4}}"> | 51 | <block wx:if="{{item.lbType==4}}"> |
| 52 | - <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> | 52 | + <image src="{{iurl+'/miniapp/images/giftbag/gift03.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> |
| 53 | </block> | 53 | </block> |
| 54 | <block wx:if="{{item.lbType==5}}"> | 54 | <block wx:if="{{item.lbType==5}}"> |
| 55 | - <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> | 55 | + <image src="{{iurl+'/miniapp/images/giftbag/gift04.png'}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].wareImage"></image> |
| 56 | </block> | 56 | </block> |
| 57 | </view> | 57 | </view> |
| 58 | <view class="box_ware_item data-v-3a5b7e36"> | 58 | <view class="box_ware_item data-v-3a5b7e36"> |
| @@ -70,8 +70,8 @@ | @@ -70,8 +70,8 @@ | ||
| 70 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image> | 70 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image> |
| 71 | </block> | 71 | </block> |
| 72 | <block wx:if="{{isBuy==0&item.lbType==2}}"> | 72 | <block wx:if="{{isBuy==0&item.lbType==2}}"> |
| 73 | - <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image> | ||
| 74 | - </block> | 73 | + <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image> |
| 74 | + </block> | ||
| 75 | <block wx:if="{{isBuy==0&item.lbType==3}}"> | 75 | <block wx:if="{{isBuy==0&item.lbType==3}}"> |
| 76 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image> | 76 | <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image> |
| 77 | </block> | 77 | </block> |
| @@ -118,9 +118,12 @@ | @@ -118,9 +118,12 @@ | ||
| 118 | </block> | 118 | </block> |
| 119 | <block wx:if="{{isBuy==0}}"> | 119 | <block wx:if="{{isBuy==0}}"> |
| 120 | <view class="foot_button data-v-3a5b7e36"> | 120 | <view class="foot_button data-v-3a5b7e36"> |
| 121 | - <view class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> | 121 | + <view wx:if="{{false}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode"> |
| 122 | <text class="data-v-3a5b7e36">立即使用</text> | 122 | <text class="data-v-3a5b7e36">立即使用</text> |
| 123 | </view> | 123 | </view> |
| 124 | + <view class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode"> | ||
| 125 | + <text class="data-v-3a5b7e36">商品已过期</text> | ||
| 126 | + </view> | ||
| 124 | </view> | 127 | </view> |
| 125 | </block> | 128 | </block> |
| 126 | </view> | 129 | </view> |
pages/giftpack/giftpacklist/giftpacklist.wxss
| 1 | - | ||
| 2 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
| 2 | + | ||
| 3 | /* Author XGQ | 3 | /* Author XGQ |
| 4 | * 2019-12-12 | 4 | * 2019-12-12 |
| 5 | */ | 5 | */ |
| 6 | + | ||
| 6 | .box.data-v-3a5b7e36 { | 7 | .box.data-v-3a5b7e36 { |
| 7 | - -webkit-align-content: center; | ||
| 8 | - align-content: center; | 8 | + -webkit-align-content: center; |
| 9 | + align-content: center; | ||
| 10 | + background-color: #e85f93; | ||
| 9 | } | 11 | } |
| 12 | + | ||
| 10 | .box_top.data-v-3a5b7e36 { | 13 | .box_top.data-v-3a5b7e36 { |
| 11 | - width: 100%; | 14 | + width: 100%; |
| 12 | } | 15 | } |
| 16 | + | ||
| 13 | .box_top image.data-v-3a5b7e36 { | 17 | .box_top image.data-v-3a5b7e36 { |
| 14 | - width: 100%; | ||
| 15 | - height: 540rpx; | 18 | + width: 100%; |
| 19 | + height: 540rpx; | ||
| 16 | } | 20 | } |
| 21 | + | ||
| 17 | .box_title.data-v-3a5b7e36 { | 22 | .box_title.data-v-3a5b7e36 { |
| 18 | - margin: 10rpx 20rpx 20rpx 20rpx; | ||
| 19 | - padding: 35rpx; | ||
| 20 | - background-color: #FFFFFF; | ||
| 21 | - border-radius: 40rpx; | 23 | + margin: 10rpx 20rpx 20rpx 20rpx; |
| 24 | + padding: 35rpx; | ||
| 25 | + background-color: #fff; | ||
| 26 | + border-radius: 40rpx; | ||
| 22 | } | 27 | } |
| 28 | + | ||
| 23 | .top_title.data-v-3a5b7e36 { | 29 | .top_title.data-v-3a5b7e36 { |
| 24 | - font-size: 30rpx; | ||
| 25 | - margin-bottom: 10rpx; | 30 | + font-size: 30rpx; |
| 31 | + margin-bottom: 10rpx; | ||
| 26 | } | 32 | } |
| 33 | + | ||
| 27 | .top_time.data-v-3a5b7e36 { | 34 | .top_time.data-v-3a5b7e36 { |
| 28 | - font-size: 27rpx; | ||
| 29 | - color: #B9B5B5; | 35 | + font-size: 27rpx; |
| 36 | + color: #b9b5b5; | ||
| 30 | } | 37 | } |
| 38 | + | ||
| 31 | .top_price.data-v-3a5b7e36 { | 39 | .top_price.data-v-3a5b7e36 { |
| 32 | - font-size: 35rpx; | ||
| 33 | - color: #D61B30; | ||
| 34 | - margin-top: 30rpx; | ||
| 35 | - margin-bottom: 5rpx; | 40 | + font-size: 35rpx; |
| 41 | + color: #d61b30; | ||
| 42 | + margin-top: 30rpx; | ||
| 43 | + margin-bottom: 5rpx; | ||
| 36 | } | 44 | } |
| 45 | + | ||
| 37 | .top_foot.data-v-3a5b7e36 { | 46 | .top_foot.data-v-3a5b7e36 { |
| 38 | - display: -webkit-box; | ||
| 39 | - display: -webkit-flex; | ||
| 40 | - display: flex; | 47 | + display: -webkit-box; |
| 48 | + display: -webkit-flex; | ||
| 49 | + display: flex; | ||
| 41 | } | 50 | } |
| 51 | + | ||
| 42 | .top_foot_price.data-v-3a5b7e36 { | 52 | .top_foot_price.data-v-3a5b7e36 { |
| 43 | - font-size: 22rpx; | ||
| 44 | - color: #B9B5B5; | ||
| 45 | - width: 50%; | ||
| 46 | - text-decoration: line-through; | 53 | + font-size: 22rpx; |
| 54 | + color: #b9b5b5; | ||
| 55 | + width: 50%; | ||
| 56 | + text-decoration: line-through; | ||
| 47 | } | 57 | } |
| 58 | + | ||
| 48 | .top_foot_qty.data-v-3a5b7e36 { | 59 | .top_foot_qty.data-v-3a5b7e36 { |
| 49 | - font-size: 22rpx; | ||
| 50 | - color: #B9B5B5; | ||
| 51 | - width: 50%; | ||
| 52 | - -webkit-align-content: flex-end; | ||
| 53 | - align-content: flex-end; | ||
| 54 | - text-align: right; | 60 | + font-size: 22rpx; |
| 61 | + color: #b9b5b5; | ||
| 62 | + width: 50%; | ||
| 63 | + -webkit-align-content: flex-end; | ||
| 64 | + align-content: flex-end; | ||
| 65 | + text-align: right; | ||
| 55 | } | 66 | } |
| 67 | + | ||
| 56 | .box_ware.data-v-3a5b7e36 { | 68 | .box_ware.data-v-3a5b7e36 { |
| 57 | - margin: 10rpx 20rpx 20rpx 20rpx; | ||
| 58 | - padding: 35rpx; | ||
| 59 | - background-color: #FFFFFF; | ||
| 60 | - border-radius: 40rpx; | 69 | + margin: 10rpx 20rpx 20rpx 20rpx; |
| 70 | + padding: 35rpx; | ||
| 71 | + background-color: #fff; | ||
| 72 | + border-radius: 40rpx; | ||
| 61 | } | 73 | } |
| 74 | + | ||
| 62 | .box_ware_title.data-v-3a5b7e36 { | 75 | .box_ware_title.data-v-3a5b7e36 { |
| 63 | - font-size: 35rpx; | ||
| 64 | - margin: 5rpx 0rpx 30rpx 0rpx; | 76 | + font-size: 35rpx; |
| 77 | + margin: 5rpx 0rpx 30rpx 0rpx; | ||
| 65 | } | 78 | } |
| 79 | + | ||
| 66 | .box_ware_box.data-v-3a5b7e36 { | 80 | .box_ware_box.data-v-3a5b7e36 { |
| 67 | - display: -webkit-box; | ||
| 68 | - display: -webkit-flex; | ||
| 69 | - display: flex; | ||
| 70 | - margin: 10rpx 0rpx 25rpx 0rpx; | 81 | + display: -webkit-box; |
| 82 | + display: -webkit-flex; | ||
| 83 | + display: flex; | ||
| 84 | + margin: 10rpx 0rpx 25rpx 0rpx; | ||
| 71 | } | 85 | } |
| 86 | + | ||
| 72 | /* .box_ware_img.data-v-3a5b7e36 { | 87 | /* .box_ware_img.data-v-3a5b7e36 { |
| 73 | width: 30%; | 88 | width: 30%; |
| 74 | height: 180rpx; | 89 | height: 180rpx; |
| 75 | border: #999999 solid 1rpx; | 90 | border: #999999 solid 1rpx; |
| 76 | } */ | 91 | } */ |
| 92 | + | ||
| 77 | .box_ware_img image.data-v-3a5b7e36 { | 93 | .box_ware_img image.data-v-3a5b7e36 { |
| 78 | - /* width: 185rpx; | ||
| 79 | - height: 190rpx; */ | ||
| 80 | - /* background-color: rgba(138, 138, 138, 0.63); */ | ||
| 81 | - border: 2rpx solid #999999; | 94 | + /* width: 185rpx; |
| 95 | + height: 190rpx; *//* background-color: rgba(138, 138, 138, 0.63); */ | ||
| 96 | + border: 2rpx solid #999; | ||
| 82 | width: 120rpx; | 97 | width: 120rpx; |
| 83 | - height: 120rpx; | 98 | + height: 120rpx; |
| 84 | } | 99 | } |
| 100 | + | ||
| 85 | .box_ware_item.data-v-3a5b7e36 { | 101 | .box_ware_item.data-v-3a5b7e36 { |
| 86 | - width: 70%; | ||
| 87 | - margin-left: 25rpx; | ||
| 88 | - position: relative; | 102 | + width: 70%; |
| 103 | + margin-left: 25rpx; | ||
| 104 | + position: relative; | ||
| 89 | } | 105 | } |
| 106 | + | ||
| 90 | .box_ware_item_title.data-v-3a5b7e36 { | 107 | .box_ware_item_title.data-v-3a5b7e36 { |
| 91 | - font-size: 24rpx; | ||
| 92 | - word-break: break-all; | ||
| 93 | - text-overflow: ellipsis; | ||
| 94 | - display: -webkit-box; | ||
| 95 | - -webkit-box-orient: vertical; | ||
| 96 | - -webkit-line-clamp: 2; | ||
| 97 | - overflow: hidden; | 108 | + font-size: 24rpx; |
| 109 | + word-break: break-all; | ||
| 110 | + text-overflow: ellipsis; | ||
| 111 | + display: -webkit-box; | ||
| 112 | + -webkit-box-orient: vertical; | ||
| 113 | + -webkit-line-clamp: 2; | ||
| 114 | + overflow: hidden; | ||
| 98 | } | 115 | } |
| 116 | + | ||
| 99 | .box_ware_count.data-v-3a5b7e36 { | 117 | .box_ware_count.data-v-3a5b7e36 { |
| 100 | - display: -webkit-box; | ||
| 101 | - display: -webkit-flex; | ||
| 102 | - display: flex; | 118 | + display: -webkit-box; |
| 119 | + display: -webkit-flex; | ||
| 120 | + display: flex; | ||
| 103 | } | 121 | } |
| 122 | + | ||
| 104 | .box_ware_item_price.data-v-3a5b7e36 { | 123 | .box_ware_item_price.data-v-3a5b7e36 { |
| 105 | - font-size: 25rpx; | ||
| 106 | - color: #B9B5B5; | ||
| 107 | - position: absolute; | ||
| 108 | - bottom: 60rpx; | ||
| 109 | - left: 0; | 124 | + font-size: 25rpx; |
| 125 | + color: #b9b5b5; | ||
| 126 | + position: absolute; | ||
| 127 | + bottom: 60rpx; | ||
| 128 | + left: 0; | ||
| 110 | } | 129 | } |
| 130 | + | ||
| 111 | .box_ware_item_qty.data-v-3a5b7e36 { | 131 | .box_ware_item_qty.data-v-3a5b7e36 { |
| 112 | - font-size: 22rpx; | ||
| 113 | - position: absolute; | ||
| 114 | - bottom: 15rpx; | ||
| 115 | - left: 0; | 132 | + font-size: 22rpx; |
| 133 | + position: absolute; | ||
| 134 | + bottom: 15rpx; | ||
| 135 | + left: 0; | ||
| 116 | } | 136 | } |
| 137 | + | ||
| 117 | .box_ware_code.data-v-3a5b7e36 { | 138 | .box_ware_code.data-v-3a5b7e36 { |
| 118 | - position: absolute; | ||
| 119 | - right: 10rpx; | ||
| 120 | - bottom:10rpx; | 139 | + position: absolute; |
| 140 | + right: 10rpx; | ||
| 141 | + bottom: 10rpx; | ||
| 121 | } | 142 | } |
| 143 | + | ||
| 122 | .box_ware_code image.data-v-3a5b7e36 { | 144 | .box_ware_code image.data-v-3a5b7e36 { |
| 123 | - width: 50rpx; | ||
| 124 | - height: 50rpx; | 145 | + width: 50rpx; |
| 146 | + height: 50rpx; | ||
| 125 | } | 147 | } |
| 148 | + | ||
| 126 | .box_ware_code text.data-v-3a5b7e36 { | 149 | .box_ware_code text.data-v-3a5b7e36 { |
| 127 | - font-size: 20rpx; | 150 | + font-size: 20rpx; |
| 128 | } | 151 | } |
| 152 | + | ||
| 129 | .foot_box.data-v-3a5b7e36 { | 153 | .foot_box.data-v-3a5b7e36 { |
| 130 | - margin: 10rpx 20rpx 50rpx 20rpx; | ||
| 131 | - padding: 35rpx; | ||
| 132 | - background-color: #FFFFFF; | ||
| 133 | - border-radius: 40rpx; | 154 | + margin: 10rpx 20rpx 50rpx 20rpx; |
| 155 | + padding: 35rpx; | ||
| 156 | + background-color: #fff; | ||
| 157 | + border-radius: 40rpx; | ||
| 134 | } | 158 | } |
| 159 | + | ||
| 135 | .foot_box_title.data-v-3a5b7e36 { | 160 | .foot_box_title.data-v-3a5b7e36 { |
| 136 | - font-size: 35rpx; | ||
| 137 | - margin-bottom: 30rpx; | 161 | + font-size: 35rpx; |
| 162 | + margin-bottom: 30rpx; | ||
| 138 | } | 163 | } |
| 164 | + | ||
| 139 | .foot_box_remark.data-v-3a5b7e36 { | 165 | .foot_box_remark.data-v-3a5b7e36 { |
| 140 | - font-size: 27rpx; | ||
| 141 | - line-height: 40rpx; | 166 | + font-size: 27rpx; |
| 167 | + line-height: 40rpx; | ||
| 142 | } | 168 | } |
| 169 | + | ||
| 143 | .foot_empty.data-v-3a5b7e36 { | 170 | .foot_empty.data-v-3a5b7e36 { |
| 144 | - height: 90rpx; | 171 | + height: 90rpx; |
| 145 | } | 172 | } |
| 173 | + | ||
| 146 | .foot_button.data-v-3a5b7e36 { | 174 | .foot_button.data-v-3a5b7e36 { |
| 147 | - display: -webkit-box; | ||
| 148 | - display: -webkit-flex; | ||
| 149 | - display: flex; | ||
| 150 | - margin: 20rpx 0rpx 0rpx 0rpx; | ||
| 151 | - padding: 25rpx 0rpx; | ||
| 152 | - background: #FFFFFF; | ||
| 153 | - text-align: center; | ||
| 154 | - -webkit-box-pack: center; | ||
| 155 | - -webkit-justify-content: center; | ||
| 156 | - justify-content: center; | ||
| 157 | - position: fixed; | ||
| 158 | - bottom: 0; | ||
| 159 | - left: 0; | ||
| 160 | - width: 100%; | 175 | + display: -webkit-box; |
| 176 | + display: -webkit-flex; | ||
| 177 | + display: flex; | ||
| 178 | + margin: 20rpx 0rpx 0rpx 0rpx; | ||
| 179 | + padding: 25rpx 0rpx; | ||
| 180 | + background: #fff; | ||
| 181 | + text-align: center; | ||
| 182 | + -webkit-box-pack: center; | ||
| 183 | + -webkit-justify-content: center; | ||
| 184 | + justify-content: center; | ||
| 185 | + position: fixed; | ||
| 186 | + bottom: 0; | ||
| 187 | + left: 0; | ||
| 188 | + width: 100%; | ||
| 161 | } | 189 | } |
| 190 | + | ||
| 162 | .foot_button_left.data-v-3a5b7e36 { | 191 | .foot_button_left.data-v-3a5b7e36 { |
| 163 | - background: #e4010c; | ||
| 164 | - color: #FFFFFF; | ||
| 165 | - width: 250rpx; | ||
| 166 | - height: 70rpx; | ||
| 167 | - font-size: 28rpx; | ||
| 168 | - line-height: 70rpx; | ||
| 169 | - border-radius: 40rpx; | 192 | + background: #e4010c; |
| 193 | + color: #fff; | ||
| 194 | + width: 250rpx; | ||
| 195 | + height: 70rpx; | ||
| 196 | + font-size: 28rpx; | ||
| 197 | + line-height: 70rpx; | ||
| 198 | + border-radius: 40rpx; | ||
| 170 | } | 199 | } |
| 200 | + | ||
| 171 | .foot_button_right.data-v-3a5b7e36 { | 201 | .foot_button_right.data-v-3a5b7e36 { |
| 172 | - background: #ffbb42; | ||
| 173 | - color: #FFFFFF; | ||
| 174 | - width: 250rpx; | ||
| 175 | - height: 70rpx; | ||
| 176 | - font-size: 28rpx; | ||
| 177 | - line-height: 70rpx; | ||
| 178 | - border-radius: 40rpx; | 202 | + background: #ffbb42; |
| 203 | + color: #fff; | ||
| 204 | + width: 250rpx; | ||
| 205 | + height: 70rpx; | ||
| 206 | + font-size: 28rpx; | ||
| 207 | + line-height: 70rpx; | ||
| 208 | + border-radius: 40rpx; | ||
| 179 | } | 209 | } |
| 210 | + | ||
| 180 | .foot_button_buy.data-v-3a5b7e36 { | 211 | .foot_button_buy.data-v-3a5b7e36 { |
| 181 | - background: #e4010c; | ||
| 182 | - color: #FFFFFF; | ||
| 183 | - width: 400rpx; | ||
| 184 | - height: 70rpx; | ||
| 185 | - font-size: 28rpx; | ||
| 186 | - line-height: 70rpx; | ||
| 187 | - border-radius: 40rpx; | 212 | + background: #e4010c; |
| 213 | + color: #fff; | ||
| 214 | + width: 400rpx; | ||
| 215 | + height: 70rpx; | ||
| 216 | + font-size: 28rpx; | ||
| 217 | + line-height: 70rpx; | ||
| 218 | + border-radius: 40rpx; | ||
| 188 | } | 219 | } |
| 220 | + | ||
| 189 | .foot_button_intalge.data-v-3a5b7e36 { | 221 | .foot_button_intalge.data-v-3a5b7e36 { |
| 190 | - background: #ffbb42; | ||
| 191 | - color: #FFFFFF; | ||
| 192 | - width: 400rpx; | ||
| 193 | - height: 70rpx; | ||
| 194 | - font-size: 28rpx; | ||
| 195 | - line-height: 70rpx; | ||
| 196 | - border-radius: 40rpx; | 222 | + background: #ffbb42; |
| 223 | + color: #fff; | ||
| 224 | + width: 400rpx; | ||
| 225 | + height: 70rpx; | ||
| 226 | + font-size: 28rpx; | ||
| 227 | + line-height: 70rpx; | ||
| 228 | + border-radius: 40rpx; | ||
| 197 | } | 229 | } |
| 230 | + | ||
| 198 | page.data-v-3a5b7e36 { | 231 | page.data-v-3a5b7e36 { |
| 199 | background-color: #e85f93; | 232 | background-color: #e85f93; |
| 200 | } | 233 | } |
| 234 | + | ||
| 201 | .foot_box_remark.data-v-3a5b7e36 ._img { | 235 | .foot_box_remark.data-v-3a5b7e36 ._img { |
| 202 | width: 100%; | 236 | width: 100%; |
| 203 | } | 237 | } |
| 238 | + | ||
| 204 | .foot_box_remark.data-v-3a5b7e36 .img { | 239 | .foot_box_remark.data-v-3a5b7e36 .img { |
| 205 | line-height: 0; | 240 | line-height: 0; |
| 206 | } | 241 | } |
| 207 | - | 242 | +.overdue.data-v-3a5b7e36{ |
| 243 | + background-color: rgb(153,153,153); | ||
| 244 | +} | ||
| 208 | \ No newline at end of file | 245 | \ No newline at end of file |
pages/giftpack/newvipgift/newvipgift.js
| @@ -84,8 +84,8 @@ Page({ | @@ -84,8 +84,8 @@ Page({ | ||
| 84 | } | 84 | } |
| 85 | } | 85 | } |
| 86 | th.setData({ | 86 | th.setData({ |
| 87 | - integralTitle: '领取' + res.data.data.lbIntegral + '积分', | ||
| 88 | - growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值' | 87 | + integralTitle: '价值' + res.data.data.lbIntegral + '积分', |
| 88 | + growUpTitle: '价值' + res.data.data.lbGrowthValue + '成长值' | ||
| 89 | }) | 89 | }) |
| 90 | if (res.data.data.receiveState == 0) { | 90 | if (res.data.data.receiveState == 0) { |
| 91 | th.setData({ | 91 | th.setData({ |
| @@ -120,7 +120,7 @@ Page({ | @@ -120,7 +120,7 @@ Page({ | ||
| 120 | }, | 120 | }, |
| 121 | onShow: function() { | 121 | onShow: function() { |
| 122 | var th = this; | 122 | var th = this; |
| 123 | - var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img"); | 123 | + var textTitle = th.data.textTitle.replace(/<img/gi, '<img style="max-width:100%;height:auto;float:left;display:block" '); |
| 124 | th.setData({ | 124 | th.setData({ |
| 125 | textTitle: textTitle | 125 | textTitle: textTitle |
| 126 | }) | 126 | }) |
pages/giftpack/newvipgift/newvipgift.json
| 1 | { | 1 | { |
| 2 | "navigationBarTitleText": "新人礼", | 2 | "navigationBarTitleText": "新人礼", |
| 3 | - "navigationStyle": "custom", | ||
| 4 | "usingComponents": { | 3 | "usingComponents": { |
| 5 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
| 6 | "my_confirm": "/components/my_confirm/my_confirm" | 5 | "my_confirm": "/components/my_confirm/my_confirm" |
pages/giftpack/newvipgift/newvipgift.wxss
| @@ -312,7 +312,7 @@ | @@ -312,7 +312,7 @@ | ||
| 312 | height: 70rpx; | 312 | height: 70rpx; |
| 313 | font-size: 28rpx; | 313 | font-size: 28rpx; |
| 314 | line-height: 70rpx; | 314 | line-height: 70rpx; |
| 315 | - border-radius: 30rpx; | 315 | + border-radius: 40rpx; |
| 316 | } | 316 | } |
| 317 | .foot_button_notbuy{ | 317 | .foot_button_notbuy{ |
| 318 | background: #999999; | 318 | background: #999999; |
| @@ -335,4 +335,7 @@ button::after { | @@ -335,4 +335,7 @@ button::after { | ||
| 335 | .foot_box_text .img { | 335 | .foot_box_text .img { |
| 336 | line-height: 0; | 336 | line-height: 0; |
| 337 | } | 337 | } |
| 338 | - | 338 | +.image{ |
| 339 | + width: 400rpx; | ||
| 340 | + height: 200rpx; | ||
| 341 | +} |