diff --git a/app.wxss b/app.wxss
index 23e7802..0247af3 100644
--- a/app.wxss
+++ b/app.wxss
@@ -125,6 +125,10 @@
color: #c7c7c7;
}
+.c-7b {
+ color: #7b7b7b;
+}
+
.c-d {
color: #ddd;
}
@@ -137,7 +141,7 @@
color: #555;
}
-.c7b {
+.c-7b {
color: #7b7b7b;
}
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index bee627d..1f78148 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -13,7 +13,7 @@
{{item.goods_name}}
-
+
{{item.prom_integral}}积分
+
@@ -122,7 +122,7 @@
-
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index e9a300c..f247ae6 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -122,7 +122,7 @@
-
+
@@ -131,9 +131,10 @@
{{data.goods_name}}
-
-
- 分享
+
+
+
+ 分享
@@ -155,25 +156,29 @@
-
+
- 以下小伙伴正在拼单，可直接参与
- 查看详细
+
+ 以下小伙伴正在拼单，可直接参与
+ 查看详细
-
+
-
-
-
-
-
- {{item.user.nickname}}
+
+
+
+
+
+
+ {{item.user.nickname}}
+
+
-
+
还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠您已经享最低优惠
还差{{prom_act.ct_num - item.open_num}}人成团
@@ -189,7 +194,7 @@
去参团
-
+
@@ -1096,7 +1101,7 @@
- 商品属性
+ 商品规格
{{item.gg}}
@@ -1108,7 +1113,7 @@
购买数量
- -
+ -
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 04863e9..8c99fe0 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -1,5 +1,5 @@
@import "../../../utils/wxParse/wxParse.wxss";
-.container { margin-bottom: 100rpx; overflow: hidden;}
+.container { margin-bottom: 100rpx; overflow: hidden;padding-top: 40rpx;}
image {
vertical-align: top;
}
@@ -9,6 +9,9 @@ image {
display: flex;
justify-content: center;
width: 100%;
+ position: fixed;
+ top: 0;
+ z-index: 999;
/* height: 80rpx; */
/* margin-bottom: 20rpx; */
background-color: #fff;
@@ -30,12 +33,14 @@ image {
display: flex;
justify-content: center;
width: 100%;
+ font-size: 26rpx;
}
.type-item-on {
color: #F95D74;
font-weight: bold;
/* border-bottom: 4rpx solid #F95D74; */
position: relative;
+ font-size: 30rpx;
}
.type-item-on:after {
content: '';
@@ -555,11 +560,11 @@ border-radius: 0 56rpx 55rpx 0;
/* padding: 0 30rpx; */
font-size: 32rpx;
box-sizing: border-box;
- border-radius: 20rpx;
- height: 72%;
+ border-radius: 20rpx 20rpx 0 0;
+ /* height: 72%; */
}
-.spec-model .pding{padding: 0 30rpx;}
+.spec-model .pding{padding: 0 20rpx;}
.spec-goods {
padding: 30rpx 0 20rpx;
@@ -612,10 +617,13 @@ border-radius: 0 56rpx 55rpx 0;
.quhuo{font-size: 30rpx; color: #000}
.b_num{
display: flex;font-size: 30rpx; color: #333;
+ justify-content: space-between;
+ align-items: center;
+ padding: 20rpx 0;
}
.count {
- position: fixed;
+ /* position: fixed; */
display: flex;
height: 50rpx;
border: 1rpx solid #000;
@@ -638,6 +646,10 @@ border-radius: 0 56rpx 55rpx 0;
.sub {
border-right: 1px solid #000;
}
+.sub.active {
+ /* background-color: #ddd; */
+ color: #ccc;
+}
.add {
border-left: 1px solid #000;
@@ -662,14 +674,15 @@ border-radius: 0 56rpx 55rpx 0;
}
.spec-cart-btns {
- width: 92%;
+ /* width: 92%; */
line-height: 70rpx;
- margin: 0rpx auto;
- margin-top: 160rpx;
- border-radius: 20rpx;
-position: fixed;
-bottom: 50rpx;
-left: 4%;
+ /* margin: 0rpx auto;
+ margin-top: 160rpx; */
+ /* border-radius: 20rpx; */
+/* position: fixed; */
+/* bottom: 50rpx; */
+/* left: 4%; */
+ padding: 20rpx;
}
.spec-cart-btn {
@@ -763,8 +776,8 @@ left:31rpx;}
/*------拼单------*/
.pt_view{ text-align: center; width: 100%; height: 100rpx; line-height: 100rpx; font-size: 26rpx}
.pt_view .secondkill-img{width: 100%;height: 100%;}
-.pt_fir{ background: #fff;margin-bottom: 10rpx; }
-.pt_fir .pt_fir_title{display: flex; align-items: center; margin-left: 10rpx; margin-top: 20rpx; font-size: 28rpx; position: relative;}
+.pt_fir{ background: #fff;/* margin-bottom: 10rpx; */}
+.pt_fir .pt_fir_title{display: flex; align-items: center; /* margin-left: 10rpx; margin-top: 20rpx; */ font-size: 28rpx; position: relative;}
.pt_fir .pt_fir_title .kt_type{ color: #fff;background:#e9030d; width: 100rpx; line-height: 40rpx; border-radius: 6rpx; margin: 0 10rpx;
height: 40rpx; font-size: 24rpx; text-align: center;}
.pt_fir .pt_fir_title .price{color: #e9030d;font-size: 26rpx;}
@@ -786,7 +799,7 @@ left:31rpx;}
.t_gz{padding: 10rpx 20rpx; font-size:28rpx }
.pt_fir.se1{height: auto; margin: 0}
-.pt_fir.se2{height: auto; margin: 0;border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee;}
+.pt_fir.se2{height: auto; margin: 0;/* border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee; */}
.pt_hb{height:78rpx; line-height: 75rpx; position: relative; font-size: 32rpx;overflow: hidden;width:695rpx;margin-left:28rpx;
border-bottom: 1rpx solid #E5E5E5 }
@@ -808,14 +821,14 @@ left:31rpx;}
.pt_fir .pt_fir_title.no-mar-b{margin-bottom: 0;padding-bottom: 10rpx; margin-left: 20rpx}
.pt_fir .pt_fir_title.boder-1{border-bottom: 1rpx #e7e7e7 solid}
-.jie_price{padding: 10rpx 30rpx;}
+.jie_price{/* padding: 10rpx 30rpx; */}
.jie_price_title{font-size: 30rpx; color: #a26270; margin-bottom: 10rpx}
.price_list{display: flex; width: 100%;}
.price_item{width: 25%;font-size: 28rpx; color: #4c336c}
-.pt_fir.se2 .zzk-1{margin-top: 23rpx; font-size: 30rpx;position: relative; margin-bottom: 30rpx; border-left:4rpx solid red;margin-left:14rpx;height:30rpx;line-height:30rpx;padding-left:5rpx;}
-.ckgd{position: absolute;top:0;right:57rpx; color:#d70025; font-size: 32rpx;}
-.ckgd .arrow-one{width:18rpx;height:18rpx;border-color:#da0b31;margin-top:5rpx;}
+.pt_fir.se2 .zzk-1{/* margin-top: 23rpx; */ font-size: 30rpx;position: relative; /* margin-bottom: 30rpx; */ border-left:4rpx solid red;/* margin-left:14rpx; */height:30rpx;line-height:30rpx;/* padding-left:5rpx; */}
+.ckgd{/* position: absolute;top:0;right:57rpx; */ color:#d70025; font-size: 26rpx;}
+.ckgd .arrow-one{width:14rpx;height:14rpx;border-color:#da0b31;/* margin-top:5rpx; */ margin:auto;}
.bview{
position: fixed; top:0; left:0; width: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.5);
@@ -842,65 +855,71 @@ left:31rpx;}
/*---多少人参加团--*/
.group {
- padding-top:25rpx;
- width: 91%;
- min-height: 92rpx;
- border-bottom:2rpx solid #eee;
- padding-bottom:25rpx;
+ padding-top:20rpx;
+ padding-bottom:20rpx;
+ width: 100%;
+ /* min-height: 92rpx; */
+ border-bottom: 2rpx solid #ebedf0;
}
.group .group-list {
-
- height: 90rpx;
- padding: 0 130rpx 0 100rpx;
- width: 470rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ /* height: 90rpx; */
+ /* padding: 0 130rpx 0 100rpx; */
+ /* width: 470rpx;
- position: absolute;
+ position: absolute; */
}
.group .group-list .gtou {
- width: 80rpx;
- height: 80rpx;
- float: left;
+ width: 70rpx;
+ height: 70rpx;
+ /* float: left;
position: relative;
top: 6rpx;
- left: -96rpx;
+ left: -96rpx; */
}
.group .group-list .gtou image {
- width: 80rpx;
- height: 80rpx;
- border-radius: 200rpx;
- background-color: green;
+ display: block;
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ background-color: #f0f0f0;
}
.group .group-list .gdn {
- float: left;
+ width: 140rpx;
+ text-align: center;
+ /* float: left; */
font-size: 26rpx;
- line-height: 48rpx;
+ /* padding-left: 20rpx; */
+ /* line-height: 48rpx;
height: 48rpx;
width: 168rpx;
position: relative;
left: -80rpx;
- top:20rpx;
- font-weight:600;
+ top:20rpx; */
+ font-weight:bold;
}
.group .group-list .ghaicha {
- width:300rpx;
+ /* width:300rpx; */
font-size: 27rpx;
- margin-left:180rpx;
+ /* margin-left:180rpx;
top:13rpx;
- left:-3rpx;
- font-weight:600;
+ left:-3rpx; */
+ font-weight: bold;
}
.group .group-list .ghaicha .gred {
- height: 48rpx;
- width: 300rpx;
+ /* height: 48rpx;
+ width: 300rpx; */
}
.gsj {
@@ -911,9 +930,9 @@ left:31rpx;}
.group .group-list .cjt {
height:42rpx;
width: 137rpx;
- position: absolute;
+ /* position: absolute;
right: 4rpx;
- top:25rpx;
+ top:25rpx; */
line-height: 42rpx;
font-size: 24rpx;
color: #fff;
@@ -926,7 +945,7 @@ left:31rpx;}
.gbody {
background-color: white;
}
-.t_show{overflow: hidden; display: flex; width: 300rpx; color: #292929; line-height: 36rpx;font-size:26rpx;
+.t_show{/* overflow: hidden; */ display: flex; /* width: 300rpx; */ color: #292929; /* line-height: 36rpx; */font-size:26rpx;
}
.join-cart>view.set_width {
width:58%;
@@ -984,7 +1003,7 @@ left:31rpx;}
.bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx;
/* border-bottom: 3rpx solid #eee; */
/* border-top: 3rpx solid #eee; */}
- .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;}
+ .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ overflow: hidden;}
.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333;
font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ }
@@ -1997,11 +2016,11 @@ xc-ensure-div{
}
.xc-video{
- width:100rpx;
- height: 50rpx;
- line-height: 50rpx;
+ /* width:100rpx; */
+ /* height: 50rpx;
+ line-height: 50rpx; */
text-align: center;
- margin-left:-30rpx;
+ /* margin-left:-30rpx; */
}
@@ -2324,8 +2343,9 @@ margin-top:5rpx;
.xc-partner-frame{
border-bottom:2rpx solid #eee;
width:100%;
-padding:0 20rpx;
-height:56rpx;
+padding:20rpx;
+/* height:56rpx; */
+box-sizing: border-box;
}
.xc-person-number{
width:120rpx;
@@ -2569,8 +2589,8 @@ margin-top: 10rpx;
}
.xc-goods-attribute{
border-bottom: 1px solid #eee;
-padding-bottom: 15px;
-margin-bottom:40rpx;
+padding-bottom: 20rpx;
+/* margin-bottom:40rpx; */
}
.xc-val-fream{
width: 105rpx;
@@ -2597,11 +2617,11 @@ border-radius: 55rpx;
.s_btn{ margin-top: 25rpx; }
/* 美妆价的样式 */
.beauty-makeup-frame{
- width: 101.5%;
- margin: auto;
+ /* width: 101.5%;
+ margin: auto; */
height: 120rpx;
border-radius: 15rpx;
- margin-top: 18px;
+ margin-top: 10px;
}
.beauty-makeup-frame .left{
@@ -2609,7 +2629,7 @@ border-radius: 55rpx;
height: 100%;
background:#f7f7f7;
border-radius: 20rpx 0rpx 0rpx 20rpx;
- padding-left: 20rpx;
+ padding: 0 10rpx;
}
.card-frame{
margin-top: 0rpx; padding-right: 23rpx;
@@ -2627,13 +2647,13 @@ border-radius: 55rpx;
}
.grade-card-frame{
- height:45rpx ;
+ /* height:45rpx ; */
background: #3c300a;
border-radius: 20rpx;
- margin-top: 10px;
- margin-left: 7rpx;
+ /* margin-top: 10px;
+ margin-left: 7rpx; */
justify-content: center;
- padding: 0 15rpx;
+ padding: 4rpx 12rpx;
}
.grade-card-frame .img{
width: 24rpx;