diff --git a/pages/user/labels/labels.wxml b/pages/user/labels/labels.wxml index 1e6c800..53c8f38 100644 --- a/pages/user/labels/labels.wxml +++ b/pages/user/labels/labels.wxml @@ -21,7 +21,7 @@ - + 已选中 diff --git a/pages/user/labels/labels.wxss b/pages/user/labels/labels.wxss index 06711c5..bfb58e7 100644 --- a/pages/user/labels/labels.wxss +++ b/pages/user/labels/labels.wxss @@ -1,13 +1,20 @@ +page{ + height: 100%; +} .padding { padding: 0rpx 65rpx; } .container { border-top: 6rpx solid rgb(238, 238, 238); + height: 100%; + display: block; +} +.lables{ + height: 50%; } - .labels_head { - padding-top: 60rpx; + padding-top: 45rpx; padding-bottom: 25rpx; border-bottom: 3rpx solid rgb(238, 238, 238); } @@ -22,7 +29,7 @@ } .label_aggregate { - height: 520rpx; + height: 80%; padding-top: 30rpx; overflow-y: scroll; } @@ -31,12 +38,12 @@ display: inline-block; max-width: 200rpx; height: 46rpx; - line-height: 46rpx; + line-height: 46rpx; border: 2rpx solid rgb(204, 204, 204); border-radius: 30rpx; padding: 0rpx 30rpx; margin-right: 25rpx; - margin-bottom: 45rpx; + margin-bottom: 3%; } .click{ color: rgb(255,255,255); @@ -44,7 +51,7 @@ background-color: rgb(255, 138, 160); } .check_head { - padding-top: 50rpx; + padding-top: 10rpx; padding-bottom: 25rpx; border-bottom: 3rpx solid rgb(238, 238, 238); margin-bottom: 30rpx; @@ -57,7 +64,7 @@ border: 2rpx solid rgb(255, 138, 160); line-height: 46rpx; margin-right: 25rpx; - margin-bottom: 30rpx; + margin-bottom: 3%; padding: 0rpx 30rpx; border-radius: 30rpx; color: rgb(255, 255, 255); @@ -75,6 +82,9 @@ border-radius: 40rpx; } .check_labels{ - height: 120rpx; + height: 80%; overflow-y: scroll; +} +.check_item{ + height: 30%; } \ No newline at end of file diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 4303681..fa7ee13 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -637,7 +637,8 @@ Page({ consumption: a.paypwd, identity_card: a.idcard, address: a.address, - isGender: a.sex + isGender: a.sex, + isstcsp: a.isLock }); } }) @@ -829,6 +830,7 @@ Page({ is_zy: 1 }); getApp().goto(url); - } + }, + }); \ No newline at end of file diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss index a75baab..6b6da66 100644 --- a/pages/user/userinfo/userinfo.wxss +++ b/pages/user/userinfo/userinfo.wxss @@ -625,8 +625,6 @@ input { .lables { display: inline-block; - max-height: 120rpx; - overflow-y: scroll; padding-top: 25rpx; }