From 680028df90e18299ea72d242a28a3ddcd9a0441c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 13:45:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/components/disProduct/index.wxss | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index e67a710..e06d6ca 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/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,24 +56,26 @@
.main_content .main_right {
flex: 1;
position: relative;
+ height: 100%;
}
.main_content .main_right .query_wrap {
display: flex;
+ width: 100%;
}
.main_content .main_right .query_wrap .item {
+ width: 50%;
height: 100rpx;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
- flex: 1;
}
.main_content .main_right .query_wrap .item .name {
margin-right: 12rpx;
}
.main_content .main_right .query_form {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
}
.main_content .main_right .query_form .list {
@@ -72,6 +83,8 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
+ max-height: 400rpx;
+ overflow: auto;
}
.main_content .main_right .query_form .list .item {
width: 154rpx;
@@ -111,11 +124,18 @@
background: var(--themeColor);
color: #fff;
}
+.main_content .main_right .shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
.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,25 +147,28 @@
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: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
- height: 136rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
}
.main_content .main_right .goods_list .item .img_wrap .img {
- width: 100%;
- height: 100%;
+ width: 242rpx;
+ height: 216rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
@@ -156,6 +179,10 @@
}
.main_content .main_right .goods_list .item .name {
margin: 12rpx 0 8rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ overflow: hidden;
}
.main_content .main_right .goods_list .item .info {
display: flex;
@@ -167,7 +194,7 @@
margin-right: 8rpx;
}
.main_content .main_right .goods_list .item .info .num {
- margin-right: 16rpx;
+ margin-right: 28rpx;
}
.main_content .main_right .goods_list .item .info .primary {
color: var(--themeColor);
--
Gitblit v1.9.3