diff --git a/components/button/index.wxss b/components/button/index.wxss index 9378f28..3625172 100644 --- a/components/button/index.wxss +++ b/components/button/index.wxss @@ -14,7 +14,7 @@ min-width: 104rpx; min-height: 88rpx!important; border: none; - border-radius: 8rpx; + border-radius: 12rpx; vertical-align: middle; text-align: center; text-overflow: ellipsis; @@ -344,7 +344,8 @@ .wux-button--stable.wux-button--outline { border-color: #b2b2b2!important; background-color: transparent!important; - color: #b2b2b2!important + color: #b2b2b2!important; + padding:2rpx 24rpx 0rpx 24rpx; } .wux-button--stable.wux-button--clear.wux-button--hover { background-color: rgba(0,0,0,0)!important; diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml index 1ea2a01..e1bb716 100644 --- a/pages/mall/order-info/index.wxml +++ b/pages/mall/order-info/index.wxml @@ -7,7 +7,7 @@ - + @@ -35,10 +35,13 @@ - - + + + + + 购买数量 - + @@ -46,7 +49,7 @@ {{orderInfo.summary}} - + 送货说明 diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js index e7ab9b5..af530bb 100644 --- a/pages/mall/search-list/index.js +++ b/pages/mall/search-list/index.js @@ -30,7 +30,7 @@ Page({ */ onLoad: function (options) { this.setData({ - height: app.globalData.fragmentHeight - 100, + height: app.globalData.fragmentHeight, CustomBar: app.globalData.CustomBar, }) var that = this diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml index 57bbade..39dde90 100644 --- a/pages/mall/search-list/index.wxml +++ b/pages/mall/search-list/index.wxml @@ -5,13 +5,14 @@ - + - + 搜索 + diff --git a/pages/mall/shops/index.wxml b/pages/mall/shops/index.wxml index 28d8f53..f5d3c86 100644 --- a/pages/mall/shops/index.wxml +++ b/pages/mall/shops/index.wxml @@ -14,7 +14,7 @@ - + @@ -29,10 +29,10 @@ 限时限量 售完即止 - - + + {{item.name}} @@ -57,10 +57,10 @@ - - + + {{item.name}} diff --git a/pages/mall/shops/index.wxss b/pages/mall/shops/index.wxss index 5fc1a13..ffcf4b6 100644 --- a/pages/mall/shops/index.wxss +++ b/pages/mall/shops/index.wxss @@ -76,6 +76,7 @@ } .content { + margin-top: 24rpx; background: rgba(255, 255, 255, 1); border-radius: 6px; }