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 | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ccb6a20..6321980 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -10,9 +10,9 @@
display: flex;
align-items: center;
background-color: #F7F7F7;
-
image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
}
}
@@ -20,27 +20,19 @@
.app {
height: 100%;
width: 100%;
+ overflow-y:hidden;
.home_content{
height: 100%;
}
}
-.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;
@@ -65,16 +57,21 @@
flex: 1;
position: relative;
height: 100%;
+ .query_wrap_scroll{
+ width: 540rpx;
+ padding-left: 40rpx;
+ }
.query_wrap {
display: flex;
+ flex-wrap: nowrap;
.item {
+ flex-shrink: 0;
+ margin-right: 48rpx;
height: 100rpx;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
- flex: 1;
-
.name {
margin-right: 12rpx;
}
@@ -83,15 +80,17 @@
.query_form {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
-
+ width: 590rpx;
+ overflow: hidden;
.list {
width: 100%;
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
-
+ max-height: 480rpx;
+ overflow: auto;
.item {
width: 154rpx;
height: 72rpx;
@@ -137,9 +136,20 @@
}
}
}
-
+ .shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ 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;
@@ -154,26 +164,31 @@
background-color: #333333;
}
}
-
.goods_list {
- height: calc( 100% - 182rpx);
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
+ height: calc( 100% - 100rpx );
+ width: 590rpx;
+ box-sizing: border-box;
padding: 12rpx 40rpx;
+ .empty{
+ width: 590rpx;
+ height: 92rpx;
+ }
.item {
- width: 50%;
+ float: left;
+ width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
-
+ &:nth-of-type(2n){
+ margin-right: 26rpx;
+ }
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
-
.img {
- width: 100%;
+ width: 242rpx;
+ height: 136rpx;
}
.new {
@@ -200,11 +215,12 @@
.icon {
width: 28rpx;
+ height: 26rpx;
margin-right: 8rpx;
}
.num {
- margin-right: 16rpx;
+ margin-right: 28rpx;
}
.primary {
@@ -214,4 +230,14 @@
}
}
}
+}
+.empty_wrap{
+ width: 100%;
+ display: flex;
+ padding-top: 200rpx;
+ justify-content: center;
+}
+.default_empty{
+ width: 300rpx;
+ height: 300rpx;
}
\ No newline at end of file
--
Gitblit v1.9.3