diff --git a/pages.json b/pages.json index 397f1bb..42cdd58 100644 --- a/pages.json +++ b/pages.json @@ -112,6 +112,11 @@ "iconPath": "static/tabbar/order.png", "selectedIconPath": "static/tabbar/order-active.png", "text": "推荐" + },{ + "pagePath": "pages/user/user", + "iconPath": "static/tabbar/my.png", + "selectedIconPath": "static/tabbar/my-active.png", + "text": "我的" }] } } diff --git a/pages/user/user.vue b/pages/user/user.vue index 56bd579..c322169 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -77,40 +77,7 @@ - - - - + @@ -247,81 +214,4 @@ border-bottom: none; } } - //waterfall - - .list-warter { - border-radius: 8px; - margin: 10px 5px; - margin-top: 0px; - background-color: #ffffff; - // padding: 8px; - position: relative; - overflow: hidden; - } - - .u-close { - position: absolute; - top: 32rpx; - right: 32rpx; - } - - .list-image { - width: 100%; - border-radius: 4px; - } - - .list-title { - font-size: 28rpx; - font-weight: bold; - color: $u-main-color; - } - - .list-label{ - position: absolute; - bottom: 0; - right: 0; - background-color: rgba(0,0,0,0.5); - width: 140rpx; - height: 48rpx; - border-radius: 20rpx 0rpx 0rpx 0rpx; - font-size: 22rpx; - color: #FFFFFF; - line-height: 48rpx; - text-align: center; - } - - .list-tag { - display: flex; - margin-top: 5px; - } - - .list-tag-owner { - background-color: $u-type-error; - color: #FFFFFF; - display: flex; - align-items: center; - padding: 4rpx 14rpx; - border-radius: 50rpx; - font-size: 20rpx; - line-height: 1; - } - - .list-tag-text { - border: 1px solid $u-type-primary; - color: $u-type-primary; - margin-left: 10px; - border-radius: 50rpx; - line-height: 1; - padding: 4rpx 14rpx; - display: flex; - align-items: center; - border-radius: 50rpx; - font-size: 20rpx; - } - - .list-price { - font-size: 30rpx; - color: $u-type-error; - margin-top: 5px; - }