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/pages/store/info.less | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index c5208fa..42ed794 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -18,11 +18,18 @@
font-size: 26rpx;
color: #666666;
margin-bottom: 24rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
}
.addr {
font-size: 26rpx;
color: #888888;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
.navback{
@@ -43,8 +50,8 @@
.main_content {
position: relative;
bottom: 80rpx;
- padding: 0 40rpx 40rpx;
- height: 100%;
+ padding: 0 40rpx 0rpx;
+ height: calc( 100% - 480rpx );
overflow: hidden;
background-color: #fff;
padding-top: 80rpx;
@@ -54,19 +61,21 @@
margin-bottom: 38rpx;
}
.list {
- height: calc( 100% - 420rpx );
- padding-bottom: 160rpx;
+ height: calc( 100% - 92rpx );
+ padding: 20rpx;
+ margin: 0 -40rpx;
+ padding-bottom: 12rpx;
+ width: 750rpx;
.item {
width: 670rpx;
+ margin: 10rpx auto 30rpx;
height: 148rpx;
background: rgba(176, 135, 113, 0.05) #FFFFFF;
- box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
+ box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12);
border-radius: 8rpx;
padding: 0 30rpx;
display: flex;
align-items: center;
- margin-bottom: 30rpx;
-
.content {
flex: 1;
@@ -101,6 +110,9 @@
border: 1rpx solid var(--themeColor);
}
}
+ .empty{
+ height: 80rpx;
+ }
}
}
.empty_wrap{
@@ -117,7 +129,6 @@
.footer{
display: flex;
align-items: center;
- height: 100rpx;
position: fixed;
background-color: #fff;
z-index: 999;
--
Gitblit v1.9.3