diff --git a/pages.json b/pages.json
index 78d7c311..88ac0f4a 100644
--- a/pages.json
+++ b/pages.json
@@ -120,6 +120,17 @@
"group": "商品"
}
},
+ {
+ "path": "point",
+ "style": {
+ "navigationBarTitleText": "积分商品"
+ },
+ "meta": {
+ "sync": true,
+ "title": "积分商品",
+ "group": "商品"
+ }
+ },
{
"path": "list",
"style": {
diff --git a/pages/activity/point/list.vue b/pages/activity/point/list.vue
new file mode 100644
index 00000000..8b1e1bf9
--- /dev/null
+++ b/pages/activity/point/list.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/goods/point.vue b/pages/goods/point.vue
new file mode 100644
index 00000000..b49f7a21
--- /dev/null
+++ b/pages/goods/point.vue
@@ -0,0 +1,525 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getShowPriceText }}
+
+
+
+
+
+ 积分价
+
+
+
+
+
+ 原价
+
+ {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
+
+
+
+
+ {{ state.goodsInfo.name || '' }}
+ {{ state.goodsInfo.introduction }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index d090aecd..697f6b1d 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -294,6 +294,7 @@
combinationActivityId: state.orderPayload.combinationActivityId,
combinationHeadId: state.orderPayload.combinationHeadId,
seckillActivityId: state.orderPayload.seckillActivityId,
+ pointActivityId: state.orderPayload.pointActivityId,
});
if (code !== 0) {
return;
@@ -324,6 +325,7 @@
combinationActivityId: state.orderPayload.combinationActivityId,
combinationHeadId: state.orderPayload.combinationHeadId,
seckillActivityId: state.orderPayload.seckillActivityId,
+ pointActivityId: state.orderPayload.pointActivityId,
});
if (code !== 0) {
return;
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
index 1e8bb6e8..4b4db375 100644
--- a/pages/order/pickUpVerify.vue
+++ b/pages/order/pickUpVerify.vue
@@ -19,15 +19,15 @@
{{ orderInfo.pickUpVerifyCode }}
-
-
-
-
-
-
-
-
-
+
+
+ 核销时间
+
+
+ 每日:
+ 2020-2-+52
+
+
@@ -138,7 +138,6 @@
diff --git a/sheep/components/s-point-card/s-point-card.vue b/sheep/components/s-point-card/s-point-card.vue
new file mode 100644
index 00000000..c7380de5
--- /dev/null
+++ b/sheep/components/s-point-card/s-point-card.vue
@@ -0,0 +1,458 @@
+
+
+
+
+
+
+
+ {{ data.title }}
+
+
+ {{ data.subtitle }}
+
+
+
+ {{ Number(data.price[0]) > 0 ? '¥' + data.price[0] + '+' : '' }}
+
+ {{ data.score }}
+
+
+
+ {{ priceUnit }}
+ {{ data.original_price }}
+
+
+
+
+ {{ salesAndStock }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.title }}
+
+
+ {{ data.subtitle }}
+
+
+
+
+
+ {{ Number(data.price[0]) > 0 ? '¥' + data.price[0] + '+' : '' }}
+
+ {{ data.score }}
+
+
+ {{ priceUnit }}
+ {{ data.original_price }}
+
+
+
+ {{ salesAndStock }}
+
+
+
+
+ 去兑换
+
+
+
+
+
+
+
+
+ {{ data.title }}
+
+
+ {{ data.subtitle }}
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ {{ Number(data.price[0]) > 0 ? '¥' + data.price[0] + '+' : '' }}
+
+ {{ data.score ? data.score : '' }}
+
+
+ ¥
+ {{ data.original_price }}
+
+
+
+ {{ salesAndStock }}
+
+
+
+
+ 去兑换
+
+
+
+
+
+
diff --git a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
index 99b28a50..dfaf875e 100644
--- a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
+++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
@@ -19,8 +19,11 @@
{{ state.goodsInfo.name }}