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_staff/components/disProduct/index.less |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index b531431..4c50090 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -29,12 +29,11 @@
 
 .main_content {
   display: flex;
-  height: 100%;
+  height: calc( 100% - 120rpx );
   .main_left {
     width: 160rpx;
     height: 100%;
     border-radius: 0rpx 16rpx 16rpx 0rpx;
-
     .item {
       width: 160rpx;
       height: 100rpx;
@@ -90,7 +89,7 @@
         display: flex;
         flex-wrap: wrap;
         padding: 30rpx 40rpx;
-        max-height: 400rpx;
+        max-height: 680rpx;
         overflow: auto;
         .item {
           width: 154rpx;
@@ -146,6 +145,10 @@
     }
 
     .status {
+      position: absolute;
+      background-color: #fff;
+      z-index: 99;
+      width: 100%;
       display: flex;
       padding: 0rpx 40rpx;
       align-items: center;
@@ -163,17 +166,20 @@
     }
 
     .goods_list {
-      height: calc( 100% -  182rpx);
+      height: calc( 100% - 100rpx );
       width: 590rpx;
       box-sizing: border-box;
       padding: 12rpx 40rpx;
+      .empty{
+        height: 92rpx;
+      }
       .item {
-        width: 242rpx;
+        width: 240rpx;
         float: left;
         margin-bottom: 32rpx;
-        margin-right: 26rpx;
+        // margin-right: 26rpx;
         &:nth-of-type(2n){
-          margin-right: 0;
+          margin-right: 26rpx;
         }
         .img_wrap {
           width: 242rpx;
@@ -183,7 +189,7 @@
 
           .img {
             width: 242rpx;
-            max-height: 216rpx;
+            height: 136rpx;
           }
 
           .new {

--
Gitblit v1.9.3