Commit 328d5c65 by 李嘉林

ui调整

parent 8564c70f
...@@ -113,7 +113,8 @@ export default { ...@@ -113,7 +113,8 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #333; font-size: 13px;
font-family: "PingFangSC-Medium, PingFang SC";
} }
} }
</style> </style>
<!--static/nativeComponents/CubeNav/index.wxml--> <!--static/nativeComponents/CubeNav/index.wxml-->
<view style="overflow: hidden;"> <view style="overflow: hidden;" class="cubeNav">
<view wx:if="{{datas.componentData.styleType == 0}}" class="cube-nav" style="margin-top:{{datas.componentData.verticalMargin * 2}}rpx;margin-bottom:{{datas.componentData.verticalMargin * 2}}rpx;margin-left:{{datas.componentData.levelMargin * 2}}rpx;margin-right:{{datas.componentData.levelMargin * 2}}rpx;border-radius:{{datas.componentData.moduleRadius * 2}}rpx"> <view wx:if="{{datas.componentData.styleType == 0}}" class="cube-nav" style="margin-top:{{datas.componentData.verticalMargin * 2}}rpx;margin-bottom:{{datas.componentData.verticalMargin * 2}}rpx;margin-left:{{datas.componentData.levelMargin * 2}}rpx;margin-right:{{datas.componentData.levelMargin * 2}}rpx;border-radius:{{datas.componentData.moduleRadius * 2}}rpx">
<view class="cube1 clearfix" wx:if="{{datas.componentData.layoutType == 0}}" style="margin-left:{{-datas.componentData.singleVerticalMargin*2}}rpx;background-color:{{datas.componentData.backgroundColor || ''}};"> <view class="cube1 clearfix" wx:if="{{datas.componentData.layoutType == 0}}" style="margin-left:{{-datas.componentData.singleVerticalMargin*2}}rpx;background-color:{{datas.componentData.backgroundColor || ''}};">
<view class="cube-bg" wx:for="{{imgList}}" data-item="{{item}}" bindtap="onclickHandle" style="padding-left:{{datas.componentData.singleVerticalMargin*2}}rpx;width:{{getColumnWidth}};"> <view class="cube-bg" wx:for="{{imgList}}" data-item="{{item}}" bindtap="onclickHandle" style="padding-left:{{datas.componentData.singleVerticalMargin*2}}rpx;width:{{getColumnWidth}};">
......
/* static/nativeComponents/CubeNav/index.wxss */ /* static/nativeComponents/CubeNav/index.wxss */
.cubeNav image{
height: auto;
}
.clearfix:after { .clearfix:after {
display: block; display: block;
clear: both; clear: both;
......
...@@ -58,7 +58,8 @@ const componentOptions = { ...@@ -58,7 +58,8 @@ const componentOptions = {
} else if (datas.componentData.style == 'waterfall' && datas.componentData.imgShowMode == "1") { } else if (datas.componentData.style == 'waterfall' && datas.componentData.imgShowMode == "1") {
imgFillType = "aspectFill" imgFillType = "aspectFill"
} else { } else {
imgFillType = "widthFix" // imgFillType = "widthFix"
imgFillType = "heightFix"
} }
this.setData({ this.setData({
datas, datas,
......
...@@ -78,22 +78,25 @@ ...@@ -78,22 +78,25 @@
<image mode="widthFix" src="{{datas.componentData['angleSignImg']}}" /> <image mode="widthFix" src="{{datas.componentData['angleSignImg']}}" />
</view> </view>
<!-- 商品主图 --> <!-- 商品主图 -->
<image <view class="contentImg">
lazy-load <image
mode="{{imgFillType}}" lazy-load
class="productImgUrl {{datas.componentData.imgShowMode == 1 && datas.componentData.style === 'waterfall'?'maxHeight':''}}" mode="{{imgFillType}}"
binderror="errorFunction" class="productImgUrl {{datas.componentData.imgShowMode == 1 && datas.componentData.style === 'waterfall'?'maxHeight':''}}"
wx:if="{{datas.componentData.goodsImgType == 1}}" binderror="errorFunction"
src="{{items.productImgUrl}}" wx:if="{{datas.componentData.goodsImgType == 1}}"
/> src="{{items.productImgUrl}}"
<image />
lazy-load <image
mode="{{imgFillType}}" lazy-load
class="productImgUrl {{datas.componentData.imgShowMode == 1 && datas.componentData.style === 'waterfall'?'maxHeight':''}}" mode="{{imgFillType}}"
binderror="errorFunction" class="productImgUrl {{datas.componentData.imgShowMode == 1 && datas.componentData.style === 'waterfall'?'maxHeight':''}}"
wx:else binderror="errorFunction"
src="{{items.coverImage}}" wx:else
/> src="{{items.coverImage}}"
/>
</view>
<!-- 售罄遮罩 --> <!-- 售罄遮罩 -->
<view class="whiteBg" wx:if="{{items&&items.oversoldFlag==0&&items.totalQty-0<=0}}"> <view class="whiteBg" wx:if="{{items&&items.oversoldFlag==0&&items.totalQty-0<=0}}">
<view class="cover"> <view class="cover">
......
...@@ -71,12 +71,24 @@ align-items: flex-start; ...@@ -71,12 +71,24 @@ align-items: flex-start;
.goodsPicture{ .goodsPicture{
width: 100%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box;
}
.contentImg{
width: 100%;
height: 0;
padding-bottom: 100%;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
} }
.goodsPicture .productImgUrl{ .contentImg .productImgUrl{
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute;
margin: auto;
top: -9999px;
left: -9999px;
bottom: -9999px;
right: -9999px;
} }
.maxHeight{ .maxHeight{
height: 48vw!important; height: 48vw!important;
...@@ -179,6 +191,7 @@ align-items: flex-start; ...@@ -179,6 +191,7 @@ align-items: flex-start;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
line-height: 1.4em; line-height: 1.4em;
position: relative; position: relative;
height: 2.8em;
} }
.info .follower-wrap{ .info .follower-wrap{
position: relative; position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment