diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index dedff57..13a075c 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -23,7 +23,7 @@ {{filter.toFix(item[card_field],2)}} - {{card_name}} + {{card_name}} diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss index bc4c262..437a2a9 100644 --- a/components/goods_list/goods_list.wxss +++ b/components/goods_list/goods_list.wxss @@ -2,7 +2,7 @@ margin-top: 40rpx; } .ib{ - display: inline-block; + display: inline-block; } .fs20{ font-size: 20rpx; @@ -151,6 +151,11 @@ color: #b9b9b9; } .line_th{ text-decoration: line-through} -.card_bg {display: flex; padding: 0rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx; +.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx; background: #333; color: #fff; justify-content: center; margin-left: 2rpx;} -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;} \ No newline at end of file +.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}.card_bg .card_name{ + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space:nowrap; +} \ No newline at end of file diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 735d087..9d5260e 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -47,7 +47,8 @@ ¥{{item[card_field]}} - {{card_name}} + + {{card_name}} ¥{{item.market_price}} diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss index 2029a59..ea50eba 100644 --- a/pages/goods/goodsList/goodsList.wxss +++ b/pages/goods/goodsList/goodsList.wxss @@ -156,8 +156,17 @@ width: 300rpx; } -.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx; -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx;} +.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx; +background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx; +padding: 2rpx 10rpx;width: auto; + +} +.card_bg .card_name{ + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space:nowrap; +} .card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} .mk_price{margin-left: 10rpx; font-size: 25rpx;} .item-cont{ line-height: 38rpx} \ No newline at end of file diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 9f28aa8..39df1db 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -43,7 +43,9 @@ ¥{{item[card_field]}} - {{card_name}} + + {{card_name}} + ¥{{item.market_price}} diff --git a/pages/goods/search/search.wxss b/pages/goods/search/search.wxss index f1920c3..7cce065 100644 --- a/pages/goods/search/search.wxss +++ b/pages/goods/search/search.wxss @@ -227,8 +227,14 @@ margin-left: 15rpx; } -.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx; -background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx;} -.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} +.card_bg {display: flex; max-width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;padding: 2rpx 10rpx; +background: #333; color: #fff; justify-content: center; margin-left: 3rpx; margin-top:7rpx; line-height: 28rpx; width: auto} +.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle} +.card_bg .card_name{ + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space:nowrap; +} .mk_price{margin-left: 10rpx; font-size: 25rpx;} .item-cont{ line-height: 38rpx}