From 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 15 八月 2024 10:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disProduct/index.less | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 7de0910..6321980 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -10,7 +10,6 @@
display: flex;
align-items: center;
background-color: #F7F7F7;
-
image {
width: 28rpx;
height: 28rpx;
@@ -27,22 +26,13 @@
}
}
-.home_top {
- position: fixed;
- z-index: 9999;
- width: 100%;
- background-color: #fff;
-}
-
.main_content {
display: flex;
- padding-top: 120rpx;
- height: 100%;
+ height: calc( 100% - 120rpx );
.main_left {
width: 160rpx;
height: 100%;
border-radius: 0rpx 16rpx 16rpx 0rpx;
-
.item {
width: 160rpx;
height: 100rpx;
@@ -99,7 +89,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 520rpx;
+ max-height: 480rpx;
overflow: auto;
.item {
width: 154rpx;
@@ -153,9 +143,13 @@
background-color: rgba(0,0,0,.5);
z-index: 99;
}
-
+
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
display: flex;
+ width: 590rpx;
padding: 0rpx 40rpx;
align-items: center;
height: 92rpx;
@@ -170,30 +164,31 @@
background-color: #333333;
}
}
-
.goods_list {
- height: calc( 100% - 182rpx);
+ height: calc( 100% - 100rpx );
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
+ .empty{
+ width: 590rpx;
+ height: 92rpx;
+ }
.item {
float: left;
width: 242rpx;
flex-shrink: 0;
- margin-right: 26rpx;
margin-bottom: 32rpx;
&:nth-of-type(2n){
- margin-right: 0;
+ margin-right: 26rpx;
}
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
-
.img {
width: 242rpx;
- max-height: 216rpx;
+ height: 136rpx;
}
.new {
--
Gitblit v1.9.3