From b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 22 七月 2024 15:34:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disProduct/index.wxss | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 3a5d0b9..01a09dd 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -17,14 +17,23 @@
height: 100%;
width: 100%;
}
+.app .home_content {
+ height: 100%;
+}
+.home_top {
+ position: fixed;
+ z-index: 9999;
+ width: 100%;
+ background-color: #fff;
+}
.main_content {
display: flex;
- height: calc(100% - 120rpx);
+ padding-top: 120rpx;
+ height: 100%;
}
.main_content .main_left {
width: 160rpx;
height: 100%;
- overflow-y: auto;
border-radius: 0rpx 16rpx 16rpx 0rpx;
}
.main_content .main_left .item {
@@ -47,6 +56,7 @@
.main_content .main_right {
flex: 1;
position: relative;
+ height: 100%;
}
.main_content .main_right .query_wrap {
display: flex;
@@ -114,8 +124,8 @@
.main_content .main_right .status {
display: flex;
padding: 0rpx 40rpx;
- margin: 20rpx 0;
align-items: center;
+ height: 92rpx;
}
.main_content .main_right .status .active {
color: var(--themeColor);
@@ -127,13 +137,16 @@
background-color: #333333;
}
.main_content .main_right .goods_list {
+ height: calc(100% - 182rpx);
+ width: 590rpx;
display: flex;
flex-wrap: wrap;
+ box-sizing: border-box;
justify-content: space-between;
padding: 12rpx 40rpx;
}
.main_content .main_right .goods_list .item {
- width: 50%;
+ width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
}
--
Gitblit v1.9.3