Commit d162c8e7 authored by jt's avatar jt

调整多商品时的间距

parent 3b6e209a
......@@ -331,10 +331,18 @@
width: 220rpx; // 固定宽度220rpx
height: 380rpx; // 固定高度380rpx
border-radius: 16rpx;
padding: 15rpx 15rpx 39rpx 15rpx;
padding: 15rpx 0 39rpx 0rpx;
display: flex;
flex-direction: column;
&:first-child {
margin-left: 24rpx;
}
&:last-child {
margin-right: 24rpx;
}
.good_info_container {
display: flex;
flex-direction: column;
......
......@@ -769,171 +769,155 @@ const generateTestSeckillData = () => {
"sessionKey": "session_1_ongoing",
"start": session1Start
},
// {
// "end": session2End,
// "goods": [
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 200,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 201,
// "goodsName": "限时秒杀商品A - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/FF6B35/FFFFFF?text=SeckillA"],
// "credits": "200",
// "priceSale": "400.00",
// "stock": 15
// },
// "priceSale": "400.00",
// "stock": 15
// },
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 300,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 202,
// "goodsName": "限时秒杀商品B - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=SeckillB"],
// "credits": "300",
// "priceSale": "600.00",
// "stock": 8
// },
// "priceSale": "600.00",
// "stock": 8
// },
// {
// "button": {"key": 1, "text": "立即抢购"},
// "credits": 150,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 203,
// "goodsName": "限时秒杀商品C - 正在进行中",
// "goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=SeckillC"],
// "credits": "150",
// "priceSale": "300.00",
// "stock": 12
// },
// "priceSale": "300.00",
// "stock": 12
// }
// ],
// "sessionKey": "session_2_ongoing",
// "start": session2Start
// },
// {
// "end": session3End,
// "goods": [
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 300,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 301,
// "goodsName": "测试商品D - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=GoodD"],
// "credits": "300",
// "priceSale": "600.00",
// "stock": 3
// },
// "priceSale": "600.00",
// "stock": 3
// },
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 250,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 302,
// "goodsName": "测试商品E - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/FF9800/FFFFFF?text=GoodE"],
// "credits": "250",
// "priceSale": "500.00",
// "stock": 6
// },
// "priceSale": "500.00",
// "stock": 6
// },
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 180,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 303,
// "goodsName": "测试商品F - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/795548/FFFFFF?text=GoodF"],
// "credits": "180",
// "priceSale": "360.00",
// "stock": 12
// },
// "priceSale": "360.00",
// "stock": 12
// }
// ],
// "sessionKey": "session_3_upcoming",
// "start": session3Start
// },
// {
// "end": session4End,
// "goods": [
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 300,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 301,
// "goodsName": "测试商品D - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=GoodD"],
// "credits": "300",
// "priceSale": "600.00",
// "stock": 3
// },
// "priceSale": "600.00",
// "stock": 3
// },
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 250,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 302,
// "goodsName": "测试商品E - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/FF9800/FFFFFF?text=GoodE"],
// "credits": "250",
// "priceSale": "500.00",
// "stock": 6
// },
// "priceSale": "500.00",
// "stock": 6
// },
// {
// "button": {"key": 2, "text": "即将开始"},
// "credits": 180,
// "creditsType": "CREDITS",
// "creditsTypeName": "积分",
// "goods": {
// "id": 303,
// "goodsName": "测试商品F - 即将开始",
// "goodsImage": ["https://via.placeholder.com/150/795548/FFFFFF?text=GoodF"],
// "credits": "180",
// "priceSale": "360.00",
// "stock": 12
// },
// "priceSale": "360.00",
// "stock": 12
// }
// ],
// "sessionKey": "session_3_upcoming",
// "start": session4Start
// }
{
"end": session2End,
"goods": [
{
"button": {"key": 1, "text": "立即抢购"},
"credits": 200,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 201,
"goodsName": "限时秒杀商品A - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/FF6B35/FFFFFF?text=SeckillA"],
"credits": "200",
"priceSale": "400.00",
"stock": 15
},
"priceSale": "400.00",
"stock": 15
},
{
"button": {"key": 1, "text": "立即抢购"},
"credits": 300,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 202,
"goodsName": "限时秒杀商品B - 正在进行中",
"goodsImage": ["https://via.placeholder.com/150/4CAF50/FFFFFF?text=SeckillB"],
"credits": "300",
"priceSale": "600.00",
"stock": 8
},
"priceSale": "600.00",
"stock": 8
},
],
"sessionKey": "session_2_ongoing",
"start": session2Start
},
{
"end": session3End,
"goods": [
{
"button": {"key": 2, "text": "即将开始"},
"credits": 300,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 301,
"goodsName": "测试商品D - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=GoodD"],
"credits": "300",
"priceSale": "600.00",
"stock": 3
},
"priceSale": "600.00",
"stock": 3
},
{
"button": {"key": 2, "text": "即将开始"},
"credits": 250,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 302,
"goodsName": "测试商品E - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/FF9800/FFFFFF?text=GoodE"],
"credits": "250",
"priceSale": "500.00",
"stock": 6
},
"priceSale": "500.00",
"stock": 6
},
{
"button": {"key": 2, "text": "即将开始"},
"credits": 180,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 303,
"goodsName": "测试商品F - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/795548/FFFFFF?text=GoodF"],
"credits": "180",
"priceSale": "360.00",
"stock": 12
},
"priceSale": "360.00",
"stock": 12
}
],
"sessionKey": "session_3_upcoming",
"start": session3Start
},
{
"end": session4End,
"goods": [
{
"button": {"key": 2, "text": "即将开始"},
"credits": 300,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 301,
"goodsName": "测试商品D - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/9C27B0/FFFFFF?text=GoodD"],
"credits": "300",
"priceSale": "600.00",
"stock": 3
},
"priceSale": "600.00",
"stock": 3
},
{
"button": {"key": 2, "text": "即将开始"},
"credits": 250,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 302,
"goodsName": "测试商品E - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/FF9800/FFFFFF?text=GoodE"],
"credits": "250",
"priceSale": "500.00",
"stock": 6
},
"priceSale": "500.00",
"stock": 6
},
{
"button": {"key": 2, "text": "即将开始"},
"credits": 180,
"creditsType": "CREDITS",
"creditsTypeName": "积分",
"goods": {
"id": 303,
"goodsName": "测试商品F - 即将开始",
"goodsImage": ["https://via.placeholder.com/150/795548/FFFFFF?text=GoodF"],
"credits": "180",
"priceSale": "360.00",
"stock": 12
},
"priceSale": "360.00",
"stock": 12
}
],
"sessionKey": "session_3_upcoming",
"start": session4Start
}
],
"id": 1141,
"name": "测试秒杀",
......@@ -957,7 +941,7 @@ const loadSeckillData = async () => {
const seckillData = await integralStore.getSeckillData(props.isdebug);
if (seckillData) {
mapSeckillDataToCreditsSale(seckillData);
初始化倒计时
//初始化倒计时
initCountdowns();
}
} catch (error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment