From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/detailDis/product.less | 142 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 14 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index c088474..a0f2291 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -7,7 +7,6 @@
padding: 0 30rpx;
display: flex;
align-items: center;
-
.content {
flex: 1;
@@ -24,6 +23,7 @@
.avatar {
width: 80rpx;
+ height: 80rpx;
border-radius: 50%;
margin-right: 24rpx;
}
@@ -40,35 +40,89 @@
color: #fff;
}
}
-
+.container{
+ padding-bottom: 200rpx;
+}
page {
background-color: #f7f7f7;
}
-
+.swiper_wrap{
+ position: relative;
+ .indicator{
+ position: absolute;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 80rpx;
+ height: 40rpx;
+ text-align: center;
+ line-height: 40rpx;
+ background: rgba(0,0,0,0.4);
+ border-radius: 21rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 999;
+ z-index: 99;
+ }
+}
+.banner_swiper{
+ image{
+ width: 100%;
+ }
+}
+.share_btn{
+ position: fixed;
+ bottom: 16rpx;
+ left: 40rpx;
+ width: 670rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+
+}
.main_content {
padding: 52rpx 40rpx 40rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
margin-bottom: 20rpx;
-
.title {
font-weight: 500;
font-size: 36rpx;
+ margin-bottom: 16rpx;
}
-
.desc {
+
font-size: 26rpx;
color: #555555;
- margin: 16rpx 0 26rpx;
+ margin-bottom: 26rpx;
}
- .text {
+ .text {
+ line-height: 48rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
}
}
-
+.spaceList{
+ .item{
+ .name{
+ font-weight: 600;
+ font-size: 36rpx;
+ color: #111111;
+ }
+ .img{
+ width: 100%;
+ }
+ }
+}
.counselor {
width: 670rpx;
padding: 0 0 0 30rpx;
@@ -121,11 +175,36 @@
font-size: 36rpx;
margin-bottom: 32rpx;
}
-
- video {
+ .img_wrap{
width: 100%;
- border: 1px solid;
border-radius: 8rpx;
+ position: relative;
+ .img{
+ width: 100%;
+ height: 376rpx;
+ }
+ .play{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 136rpx;
+ height: 58rpx;
+ line-height: 56rpx;
+ text-align: center;
+ background: rgba(0,0,0,0.54);
+ border-radius: 30rpx;
+ font-size: 26rpx;
+ color: rgba(255,255,255,0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .icon{
+ width: 14rpx;
+ height: 16rpx;
+ margin-left: 14rpx;
+ }
+ }
}
}
@@ -141,15 +220,16 @@
.line {
display: flex;
- height: 62rpx;
- margin-bottom: 24rpx;
-
+ margin-bottom: 20rpx;
.label {
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.val {
+ flex: 1;
font-size: 24rpx;
color: #333333;
}
@@ -167,6 +247,10 @@
display: flex;
align-items: center;
height: 100rpx;
+ .btn{
+ padding: 0;
+ margin-top: 16rpx;
+ }
}
.sub_btn {
display: flex;
@@ -197,4 +281,34 @@
width: 44rpx;
}
}
+}
+.share_modal{
+ .btns{
+ display: flex;
+ min-height: 320rpx;
+ display: flex;
+ align-items: center;
+ .item{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ flex: 1;
+ font-size: 26rpx;
+ background-color: #fff;
+ image{
+ width: 80rpx;
+ height: 80rpx;
+ margin-bottom: 10rpx;
+ }
+ }
+ }
+ .cancel{
+ height: 80rpx;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border: 1rpx solid #e5e5e5;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3