diff --git a/assets/images/merchantImgCover.png b/assets/images/merchantImgCover.png index ac6476d..63a50ae 100644 Binary files a/assets/images/merchantImgCover.png and b/assets/images/merchantImgCover.png differ diff --git a/components/shop/shop.wxml b/components/shop/shop.wxml index 0247f52..37e1127 100644 --- a/components/shop/shop.wxml +++ b/components/shop/shop.wxml @@ -1,31 +1,35 @@ - 适用门店 + {{"适用门店("+mallNum+"家)"}} - {{'共'+mallNum+'家门店适用'}} + - - - {{item.mallName}} + + + + {{item.mallName}} + - - - - - {{item.merchantVoList.length+'家门店适用'}} - - - + + + + {{item.merchantVoList.length+'家门店适用'}} + + + + + + - + + \ No newline at end of file diff --git a/components/shop/shop.wxss b/components/shop/shop.wxss index 2ff71cf..ce9ed90 100644 --- a/components/shop/shop.wxss +++ b/components/shop/shop.wxss @@ -2,6 +2,7 @@ display: block; height: auto; margin-top: 15rpx; + margin-bottom: 15rpx; background-color: #fff; } @@ -20,7 +21,7 @@ } .components .header .goShop { - float: right; + float: left; font-size: 22rpx; height: 70rpx; line-height: 70rpx; @@ -53,40 +54,44 @@ } .components .body .mall .img { - width: 120rpx; - height: 120rpx; + display: inline-block; + width: 75rpx; + height: 75rpx; } .components .body .mall .mallItem { - display: flex; - justify-content: space-between; - align-items: center; + position: relative; + top: -26rpx; + display: inline-block; + margin-left: 25rpx; } .components .body .mall .mallItem .title { - font-size: 35rpx; + font-size: 28rpx; } -.components .body .goExpand { - text-align: center; +.components .body .mall .goExpand { font-size: 25rpx; color: #a6a6a6; } -.components .body .goExpand .rightArrowDown { +.components .body .mall .goExpand .text { + display: inline-block; + margin-right: 20rpx; +} + +.components .body .mall .goExpand .rightArrowDown { + display: inline-block; position: relative; - left: 50%; - transform: translate(-50%); - display: block; + top: 5rpx; width: 14rpx; transform: rotate(90deg); } -.components .body .goExpand .rightArrowUp { +.components .body .mall .goExpand .rightArrowUp { + display: inline-block; position: relative; - left: 50%; - transform: translate(-50%); - display: block; + top: 5rpx; width: 14rpx; transform: rotate(-90deg); } @@ -129,7 +134,7 @@ .components .body .shop .posi .posi_logo .shopVoList { white-space: nowrap !important; overflow-y: scroll; - height: 90rpx !important; + height: 60rpx !important; width: 360rpx; font-size: 16px; color: #333; @@ -202,4 +207,16 @@ float: right; width: 40rpx; height: 40rpx; +} + +.components .body .shop .posi .dividerInside { + width: 100%; + height: 5rpx; + background-color: #DCDFE6; +} + +.components .body .divider { + width: 100%; + height: 12rpx; + background-color: #f4f5f9; } \ No newline at end of file