Commit 372be683d5341f68368f67434a7570db004c893a
1 parent
a01151d6
会员标签界面兼容调整
Showing
4 changed files
with
23 additions
and
13 deletions
pages/user/labels/labels.wxml
| ... | ... | @@ -21,7 +21,7 @@ |
| 21 | 21 | </view> |
| 22 | 22 | |
| 23 | 23 | <!-- 选中的兴趣集合标签 --> |
| 24 | - <view class="padding"> | |
| 24 | + <view class="padding check_item"> | |
| 25 | 25 | <view class="fs32 check_head">已选中</view> |
| 26 | 26 | <view class="check_labels"> |
| 27 | 27 | <view class="check_label fs28" wx:for="{{check_label}}" wx:for-item="it" wx:for-index="key"> | ... | ... |
pages/user/labels/labels.wxss
| 1 | +page{ | |
| 2 | + height: 100%; | |
| 3 | +} | |
| 1 | 4 | .padding { |
| 2 | 5 | padding: 0rpx 65rpx; |
| 3 | 6 | } |
| 4 | 7 | |
| 5 | 8 | .container { |
| 6 | 9 | border-top: 6rpx solid rgb(238, 238, 238); |
| 10 | + height: 100%; | |
| 11 | + display: block; | |
| 12 | +} | |
| 13 | +.lables{ | |
| 14 | + height: 50%; | |
| 7 | 15 | } |
| 8 | - | |
| 9 | 16 | .labels_head { |
| 10 | - padding-top: 60rpx; | |
| 17 | + padding-top: 45rpx; | |
| 11 | 18 | padding-bottom: 25rpx; |
| 12 | 19 | border-bottom: 3rpx solid rgb(238, 238, 238); |
| 13 | 20 | } |
| ... | ... | @@ -22,7 +29,7 @@ |
| 22 | 29 | } |
| 23 | 30 | |
| 24 | 31 | .label_aggregate { |
| 25 | - height: 520rpx; | |
| 32 | + height: 80%; | |
| 26 | 33 | padding-top: 30rpx; |
| 27 | 34 | overflow-y: scroll; |
| 28 | 35 | } |
| ... | ... | @@ -31,12 +38,12 @@ |
| 31 | 38 | display: inline-block; |
| 32 | 39 | max-width: 200rpx; |
| 33 | 40 | height: 46rpx; |
| 34 | - line-height: 46rpx; | |
| 41 | + line-height: 46rpx; | |
| 35 | 42 | border: 2rpx solid rgb(204, 204, 204); |
| 36 | 43 | border-radius: 30rpx; |
| 37 | 44 | padding: 0rpx 30rpx; |
| 38 | 45 | margin-right: 25rpx; |
| 39 | - margin-bottom: 45rpx; | |
| 46 | + margin-bottom: 3%; | |
| 40 | 47 | } |
| 41 | 48 | .click{ |
| 42 | 49 | color: rgb(255,255,255); |
| ... | ... | @@ -44,7 +51,7 @@ |
| 44 | 51 | background-color: rgb(255, 138, 160); |
| 45 | 52 | } |
| 46 | 53 | .check_head { |
| 47 | - padding-top: 50rpx; | |
| 54 | + padding-top: 10rpx; | |
| 48 | 55 | padding-bottom: 25rpx; |
| 49 | 56 | border-bottom: 3rpx solid rgb(238, 238, 238); |
| 50 | 57 | margin-bottom: 30rpx; |
| ... | ... | @@ -57,7 +64,7 @@ |
| 57 | 64 | border: 2rpx solid rgb(255, 138, 160); |
| 58 | 65 | line-height: 46rpx; |
| 59 | 66 | margin-right: 25rpx; |
| 60 | - margin-bottom: 30rpx; | |
| 67 | + margin-bottom: 3%; | |
| 61 | 68 | padding: 0rpx 30rpx; |
| 62 | 69 | border-radius: 30rpx; |
| 63 | 70 | color: rgb(255, 255, 255); |
| ... | ... | @@ -75,6 +82,9 @@ |
| 75 | 82 | border-radius: 40rpx; |
| 76 | 83 | } |
| 77 | 84 | .check_labels{ |
| 78 | - height: 120rpx; | |
| 85 | + height: 80%; | |
| 79 | 86 | overflow-y: scroll; |
| 87 | +} | |
| 88 | +.check_item{ | |
| 89 | + height: 30%; | |
| 80 | 90 | } |
| 81 | 91 | \ No newline at end of file | ... | ... |
pages/user/userinfo/userinfo.js
| ... | ... | @@ -637,7 +637,8 @@ Page({ |
| 637 | 637 | consumption: a.paypwd, |
| 638 | 638 | identity_card: a.idcard, |
| 639 | 639 | address: a.address, |
| 640 | - isGender: a.sex | |
| 640 | + isGender: a.sex, | |
| 641 | + isstcsp: a.isLock | |
| 641 | 642 | }); |
| 642 | 643 | } |
| 643 | 644 | }) |
| ... | ... | @@ -829,6 +830,7 @@ Page({ |
| 829 | 830 | is_zy: 1 |
| 830 | 831 | }); |
| 831 | 832 | getApp().goto(url); |
| 832 | - } | |
| 833 | + }, | |
| 834 | + | |
| 833 | 835 | |
| 834 | 836 | }); |
| 835 | 837 | \ No newline at end of file | ... | ... |