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_staff/components/disProduct/index.wxss |   69 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index e67a710..b1e47c1 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -11,11 +11,16 @@
 }
 .search_wrap image {
   width: 28rpx;
+  height: 28rpx;
   margin-right: 16rpx;
 }
 .app {
   height: 100%;
   width: 100%;
+  overflow-y: hidden;
+}
+.app .home_content {
+  height: 100%;
 }
 .main_content {
   display: flex;
@@ -24,7 +29,6 @@
 .main_content .main_left {
   width: 160rpx;
   height: 100%;
-  overflow-y: auto;
   border-radius: 0rpx 16rpx 16rpx 0rpx;
 }
 .main_content .main_left .item {
@@ -47,24 +51,31 @@
 .main_content .main_right {
   flex: 1;
   position: relative;
+  height: 100%;
+}
+.main_content .main_right .query_wrap_scroll {
+  width: 540rpx;
+  padding-left: 40rpx;
 }
 .main_content .main_right .query_wrap {
   display: flex;
+  flex-wrap: nowrap;
 }
 .main_content .main_right .query_wrap .item {
+  flex-shrink: 0;
+  margin-right: 48rpx;
   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: 680rpx;
+  overflow: auto;
 }
 .main_content .main_right .query_form .list .item {
   width: 154rpx;
@@ -111,11 +124,22 @@
   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 {
+  position: absolute;
+  background-color: #fff;
+  z-index: 99;
+  width: 100%;
   display: flex;
   padding: 0rpx 40rpx;
-  margin: 20rpx 0;
   align-items: center;
+  height: 92rpx;
 }
 .main_content .main_right .status .active {
   color: var(--themeColor);
@@ -127,25 +151,31 @@
   background-color: #333333;
 }
 .main_content .main_right .goods_list {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
+  height: calc(100% - 100rpx);
+  width: 590rpx;
+  box-sizing: border-box;
   padding: 12rpx 40rpx;
 }
+.main_content .main_right .goods_list .empty {
+  height: 92rpx;
+}
 .main_content .main_right .goods_list .item {
-  flex-shrink: 0;
+  width: 240rpx;
+  float: left;
   margin-bottom: 32rpx;
+}
+.main_content .main_right .goods_list .item:nth-of-type(2n) {
+  margin-right: 26rpx;
 }
 .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: 136rpx;
 }
 .main_content .main_right .goods_list .item .img_wrap .new {
   width: 72rpx;
@@ -156,6 +186,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;
@@ -164,11 +198,22 @@
 }
 .main_content .main_right .goods_list .item .info .icon {
   width: 28rpx;
+  height: 28rpx;
   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);
 }
+.main_content .main_right .empty_wrap {
+  width: 100%;
+  display: flex;
+  padding-top: 200rpx;
+  justify-content: center;
+}
+.main_content .main_right .default_empty {
+  width: 300rpx;
+  height: 300rpx;
+}

--
Gitblit v1.9.3