|
@@ -991,13 +991,14 @@ const getSeckillData = (productSkn) => { |
|
@@ -991,13 +991,14 @@ const getSeckillData = (productSkn) => { |
|
991
|
}
|
991
|
}
|
|
992
|
|
992
|
|
|
993
|
data = {
|
993
|
data = {
|
|
994
|
- productSkn: 512581470,
|
|
|
|
995
|
activityId: 4,
|
994
|
activityId: 4,
|
|
996
|
- startTime: 1475192655,
|
|
|
|
997
|
- endTime: 1475558971,
|
|
|
|
998
|
- formatSecKillPrice: '¥50.00',
|
995
|
+ startTime: 1465194254,
|
|
|
|
996
|
+ endTime: 1475294254,
|
|
|
|
997
|
+ formatSecKillPrice: '¥123.00',
|
|
|
|
998
|
+ id: 4,
|
|
|
|
999
|
+ orderBy: 0,
|
|
|
|
1000
|
+ productSkn: 512581470,
|
|
999
|
secKillPrice: 50,
|
1001
|
secKillPrice: 50,
|
|
1000
|
- status: 1,
|
|
|
|
1001
|
secKillSku: [
|
1002
|
secKillSku: [
|
|
1002
|
{
|
1003
|
{
|
|
1003
|
activityId: 4,
|
1004
|
activityId: 4,
|
|
@@ -1013,7 +1014,10 @@ const getSeckillData = (productSkn) => { |
|
@@ -1013,7 +1014,10 @@ const getSeckillData = (productSkn) => { |
|
1013
|
productSku: 1384140,
|
1014
|
productSku: 1384140,
|
|
1014
|
storageNum: 5
|
1015
|
storageNum: 5
|
|
1015
|
}
|
1016
|
}
|
|
1016
|
- ]
|
1017
|
+ ],
|
|
|
|
1018
|
+ secKillStatus: 0,
|
|
|
|
1019
|
+ status: 2,
|
|
|
|
1020
|
+ storageSum: 0
|
|
1017
|
};
|
1021
|
};
|
|
1018
|
|
1022
|
|
|
1019
|
return data;
|
1023
|
return data;
|
|
@@ -1064,6 +1068,12 @@ let getProductData = (data) => { |
|
@@ -1064,6 +1068,12 @@ let getProductData = (data) => { |
|
1064
|
comment.getConsults(result.productId, 1, 2),
|
1068
|
comment.getConsults(result.productId, 1, 2),
|
|
1065
|
getSeckillData(result.productSkn)
|
1069
|
getSeckillData(result.productSkn)
|
|
1066
|
]).then((info) => {
|
1070
|
]).then((info) => {
|
|
|
|
1071
|
+
|
|
|
|
1072
|
+ // result.goodsList[0].sizeList[0].storageNumber = 1;
|
|
|
|
1073
|
+ // result.goodsList[0].sizeList[1].storageNumber = 0;
|
|
|
|
1074
|
+ // result.goodsList[0].sizeList[2].storageNumber = 0;
|
|
|
|
1075
|
+ // result.goodsList[0].sizeList[3].storageNumber = 0;
|
|
|
|
1076
|
+ // result.goodsList[0].sizeList[4].storageNumber = 0;
|
|
1067
|
result.promotionBoList = info[1];
|
1077
|
result.promotionBoList = info[1];
|
|
1068
|
finalResult = _detailDataPkg(result, data.uid, data.vipLevel, data.ua);
|
1078
|
finalResult = _detailDataPkg(result, data.uid, data.vipLevel, data.ua);
|
|
1069
|
finalResult.enterStore = info[0];
|
1079
|
finalResult.enterStore = info[0];
|
|
@@ -1084,9 +1094,11 @@ let getProductData = (data) => { |
|
@@ -1084,9 +1094,11 @@ let getProductData = (data) => { |
|
1084
|
|
1094
|
|
|
1085
|
if (!end) {
|
1095
|
if (!end) {
|
|
1086
|
|
1096
|
|
|
1087
|
- let notStart = nowDate < info[5].startTime ? true : false;
|
1097
|
+ let notStart = info[5].status === 1 ? true : false;
|
|
1088
|
|
1098
|
|
|
1089
|
- let startIng = info[5].startTime < nowDate && info[5].endTime > nowDate ? true : false;
|
1099
|
+ let startIng = info[5].status === 2 ? true : false;
|
|
|
|
1100
|
+
|
|
|
|
1101
|
+ let end = info[5].status === 3 ? true : false;
|
|
1090
|
|
1102
|
|
|
1091
|
let leftCount = 0;
|
1103
|
let leftCount = 0;
|
|
1092
|
|
1104
|
|
|
@@ -1098,9 +1110,7 @@ let getProductData = (data) => { |
|
@@ -1098,9 +1110,7 @@ let getProductData = (data) => { |
|
1098
|
isSecKill: {
|
1110
|
isSecKill: {
|
|
1099
|
notStart: notStart,
|
1111
|
notStart: notStart,
|
|
1100
|
startIng: startIng,
|
1112
|
startIng: startIng,
|
|
1101
|
-
|
|
|
|
1102
|
- // startTime: info[5].startTime,
|
|
|
|
1103
|
- // endTime: info[5].endTime,
|
1113
|
+ end: end,
|
|
1104
|
productSkn: data.productSkn,
|
1114
|
productSkn: data.productSkn,
|
|
1105
|
secKillPrice: info[5].formatSecKillPrice,
|
1115
|
secKillPrice: info[5].formatSecKillPrice,
|
|
1106
|
noneLeft: leftCount === 0 ? true : false
|
1116
|
noneLeft: leftCount === 0 ? true : false
|
