From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 wechat_jiaxuan/components/disProduct/index.wxss |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 12a0f9c..7d5106f 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -24,7 +24,7 @@
 }
 .main_content {
   display: flex;
-  height: 100%;
+  height: calc(100% - 120rpx);
 }
 .main_content .main_left {
   width: 160rpx;
@@ -85,7 +85,7 @@
   display: flex;
   flex-wrap: wrap;
   padding: 30rpx 40rpx;
-  max-height: 680rpx;
+  max-height: 480rpx;
   overflow: auto;
 }
 .main_content .main_right .query_form .list .item {
@@ -153,7 +153,7 @@
   background-color: #333333;
 }
 .main_content .main_right .goods_list {
-  height: calc(100% - 222rpx);
+  height: calc(100% - 100rpx);
   width: 590rpx;
   box-sizing: border-box;
   padding: 12rpx 40rpx;

--
Gitblit v1.9.3