-
mentioned in commit 199461b146085f9f730ec5f9e77eb8723160ac17
-
Status changed to merged
Showing
2 changed files
pages/user/cardinfo/cardinfo.wxml
@@ -131,11 +131,10 @@ | @@ -131,11 +131,10 @@ | ||
131 | <view> | 131 | <view> |
132 | <view class="xc-qr-frame"> | 132 | <view class="xc-qr-frame"> |
133 | <view class="shut" bindtap="close_yu_e">ⅹ</view> | 133 | <view class="shut" bindtap="close_yu_e">ⅹ</view> |
134 | - <view class="fs36 xc-black3 flex jc-center ai-center" style="width:100%;height:200rpx;">确定把所有奖励金转入余额</view> | 134 | + <view class="fs32 xc-black3 flex jc-center ai-center" style="width:100%;height:220rpx;">确定把所有奖励金转入余额</view> |
135 | <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;"> | 135 | <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;"> |
136 | - <view bindtap="go_yu_e" class="fs36 white flex jc-center ai-center" | ||
137 | - style="width:40%;height:60rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;margin-right: 20rpx;">是的</view> | ||
138 | - <view bindtap='close_yu_e' class="fs36 xc-ash flex jc-center ai-center"style="width:40%;height:60rpx;line-height:60rpx;border-radius:10rpx;background:#ececea;">再看看</view> | 136 | + <view bindtap="go_yu_e" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;">是的</view> |
137 | + <view bindtap='close_yu_e' class="fs30 xc-ash flex jc-center ai-center ck_btn"style="background:#ececea;">再看看</view> | ||
139 | </view> | 138 | </view> |
140 | </view> | 139 | </view> |
141 | </view> | 140 | </view> |
pages/user/cardinfo/cardinfo.wxss
@@ -190,9 +190,7 @@ align-items:center; | @@ -190,9 +190,7 @@ align-items:center; | ||
190 | display: block; | 190 | display: block; |
191 | width: 54rpx; | 191 | width: 54rpx; |
192 | height: 54rpx; | 192 | height: 54rpx; |
193 | - | ||
194 | font-size: 50rpx; | 193 | font-size: 50rpx; |
195 | - | ||
196 | line-height:47rpx; | 194 | line-height:47rpx; |
197 | border-radius: 50%; | 195 | border-radius: 50%; |
198 | -moz-border-radius: 50%; | 196 | -moz-border-radius: 50%; |
@@ -200,24 +198,25 @@ align-items:center; | @@ -200,24 +198,25 @@ align-items:center; | ||
200 | color: #fff; | 198 | color: #fff; |
201 | text-align: center; | 199 | text-align: center; |
202 | position: fixed; | 200 | position: fixed; |
203 | -margin-top: -23rpx; | ||
204 | -z-index: 66666; | ||
205 | - right: 20rpx; | ||
206 | - background: #c8162c; | 201 | + margin-top: -23rpx; |
202 | + z-index: 66666; | ||
203 | + right: 60rpx; | ||
204 | + background: #c8162c; | ||
207 | } | 205 | } |
208 | .xc-qr-frame{ | 206 | .xc-qr-frame{ |
209 | - width:90%; | ||
210 | -height: 260rpx; | 207 | + width:560rpx; |
208 | + height: 280rpx; | ||
211 | background: #fff; | 209 | background: #fff; |
212 | z-index: 55; | 210 | z-index: 55; |
213 | position: fixed; | 211 | position: fixed; |
214 | top:40%; | 212 | top:40%; |
215 | - | ||
216 | padding-bottom:20rpx; | 213 | padding-bottom:20rpx; |
217 | - right: 4.5%; | ||
218 | - overflow: hidden; | ||
219 | - | 214 | + left:50%; |
215 | + margin-left: -280rpx; border-radius:10rpx | ||
220 | } | 216 | } |
217 | + | ||
218 | +.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;} | ||
219 | + | ||
221 | .fs36{ | 220 | .fs36{ |
222 | font-size: 36rpx; | 221 | font-size: 36rpx; |
223 | } | 222 | } |