diff --git a/api/activity.js b/api/activity.js index 49b3c08..76b9aa4 100644 --- a/api/activity.js +++ b/api/activity.js @@ -1,102 +1,90 @@ - import request from "@/utils/request.js"; /** * 拼团列表 - * + * */ export function getCombinationList(data) { - return request.get('store/product/group/lst', data, { - noAuth: true - }); + return request.get('store/product/group/lst', data, { + noAuth: true + }); } /** * 拼团参与人 - * + * */ export function getCombinationUser(data) { - return request.get('store/product/group/count', data, { - noAuth: true - }); + return request.get('store/product/group/count', data, { + noAuth: true + }); } /** * 活动分类 - * + * */ export function getActivitycategory(type) { - return request.get('product/spu/active/category/' + type, {}, { - noAuth: true - }); + return request.get('product/spu/active/category/' + type, {}, { + noAuth: true + }); } - /** * 拼团详情 - * + * */ export function getCombinationDetail(id) { - return request.get('store/product/group/detail/' + id, {}, { - noAuth: true - }); + return request.get('store/product/group/detail/' + id, {}, { + noAuth: true + }); } - /** * 拼团 开团 */ export function getCombinationPink(id) { - return request.get("store/product/group/get/" + id); + return request.get("store/product/group/get/" + id); } - - /** * 拼团 取消开团 */ export function postCombinationRemove(data) { - return request.post("store/product/group/cancel", data); + return request.post("store/product/group/cancel", data); } - /** * 秒杀产品详情 * @param int id */ export function getSeckillDetail(id) { - return request.get('store/product/seckill/detail/' + id, {}, { - noAuth: true - }); + return request.get('store/product/seckill/detail/' + id, {}, { + noAuth: true + }); } - - /** * 拼团海报 * @param object data - * + * */ export function getCombinationPoster(data) { - return request.post('combination/poster', data) + return request.post('combination/poster', data) } - - - /** * 获取秒杀小程序二维码 */ export function seckillCode(id, data) { - return request.get("seckill/code/" + id, data); + return request.get("seckill/code/" + id, data); } - /** * 获取拼团小程序二维码 */ export function scombinationCode(id) { - return request.get("combination/code/" + id); + return request.get("combination/code/" + id); } /** * 秒杀产品时间区间 - * + * */ export function getSeckillIndexTime() { - return request.get('store/product/seckill/select', {}, { - noAuth: true - }); + return request.get('store/product/seckill/select', {}, { + noAuth: true + }); } /** * 秒杀产品列表 @@ -104,147 +92,146 @@ export function getSeckillIndexTime() { * @param object data */ export function getSeckillList(data) { - return request.get('store/product/seckill/lst', data, { - noAuth: true - }); + return request.get('store/product/seckill/lst', data, { + noAuth: true + }); } /** * 预售列表 */ export function getPresellList(data) { - return request.get('store/product/presell/lst', data, { - noAuth: true - }); + return request.get('store/product/presell/lst', data, { + noAuth: true + }); } /** * 助力列表 */ export function getAssistList(data) { - return request.get('store/product/assist/lst', data, { - noAuth: true - }); + return request.get('store/product/assist/lst', data, { + noAuth: true + }); } - /** * 助力列表 -- 发起助力 */ export function initiateAssistApi(id) { - return request.post('store/product/assist/create/' + id); + return request.post('store/product/assist/create/' + id); } /** * 助力详情 */ -export function getAssistDetail(id,data) { - return request.get('store/product/assist/detail/' + id,data); +export function getAssistDetail(id, data) { + return request.get('store/product/assist/detail/' + id, data); } /** * 助力好友 */ export function assistHelpList(id, data) { - return request.get('store/product/assist/user/' + id, data); + return request.get('store/product/assist/user/' + id, data); } /** * 预售协议 */ export function presellAgreement() { - return request.get('store/product/presell/agree'); + return request.get('store/product/presell/agree'); } /** * 已助力成功数据 */ export function assistUserData(data) { - return request.get('store/product/assist/count', data, { - noAuth: true - }); + return request.get('store/product/assist/count', data, { + noAuth: true + }); } /** * 为好友助力 */ export function postAssistHelp(id) { - return request.post('store/product/assist/set/' + id); + return request.post('store/product/assist/set/' + id); } /** * 获取助力查看分享次数 */ export function getAssistUser(id) { - return request.get('store/product/assist/share/' + id); + return request.get('store/product/assist/share/' + id); } /** * 助力记录列表 */ export function getBargainUserList(data) { - return request.get('store/product/assist/set/lst', data); + return request.get('store/product/assist/set/lst', data); } /** * 助力记录列表 -- 取消 */ export function getBargainUserCancel(id) { - return request.post('store/product/assist/set/delete/' + id); + return request.post('store/product/assist/set/delete/' + id); } /** * 活动专题列表 */ export function getTopicList(id, data) { - return request.get(`activity/lst/${id}`, data, { - noAuth: true - }); + return request.get(`activity/lst/${id}`, data, { + noAuth: true + }); } /** * 活动专题详情 */ export function getTopicDetail(id) { - return request.get(`activity/info/${id}`,{}, { - noAuth: true - }); + return request.get(`activity/info/${id}`, {}, { + noAuth: true + }); } /** * 活动专题商品 */ export function getTopicProLst(data) { - return request.get(`product/spu/labels`,data, { - noAuth: true - }); + return request.get(`product/spu/labels`, data, { + noAuth: true + }); } /** * 获取本地服务商户列表 */ export function getMerchantServiceLst(data) { - return request.get(`store/merchant/local`,data, { - noAuth: true - }); + return request.get(`store/merchant/local`, data, { + noAuth: true + }); } /** * 获取优惠券列表 */ export function getCouponLst(data) { - return request.get(`coupon/getlst`,data, { - noAuth: true - }); + return request.get(`coupon/getlst`, data, { + noAuth: true + }); } /** * 获取优惠券列表 */ export function getNewPeopleCouponLst(data) { - return request.get(`coupon/new_people`,data, { - noAuth: true - }); + return request.get(`coupon/new_people`, data, { + noAuth: true + }); } /** * 获取热卖排行列表 */ export function hotRankingApi(data) { - return request.get(`product/spu/get_hot_ranking`,data, { - noAuth: true - }); + return request.get(`product/spu/get_hot_ranking`, data, { + noAuth: true + }); } /** * 热卖排行列表分类 */ export function spuTop(data) { - return request.get(`store/product/category/hotranking`, {}, { - noAuth: true - }); + return request.get(`store/product/category/hotranking`, {}, { + noAuth: true + }); } /** * 热卖排行列表 @@ -253,4 +240,29 @@ export function spuTopList(data) { return request.get(`product/spu/get_hot_ranking`, data, { noAuth: true }); -} \ No newline at end of file +} + + +// 活动 - 获取活动详情 +export function activityDetail(id) { + return request.get(`activity/detail/${id}`); +} +// 活动 - 加入活动 +export function activityJoin(data) { + return request.get(`activity/joinActivity`, data); +} + + + + + + + + + + + + + + + diff --git a/pages.json b/pages.json index 96e368a..c401c9d 100644 --- a/pages.json +++ b/pages.json @@ -1139,6 +1139,13 @@ "style": { "navigationBarTitleText": "热卖排行" } + }, + // 新 活动信息 + { + "path": "activity/details", + "style": { + "navigationBarTitleText": "活动详情" + } } ] }, diff --git a/pages/activity/activity/details.vue b/pages/activity/activity/details.vue new file mode 100644 index 0000000..207aa9e --- /dev/null +++ b/pages/activity/activity/details.vue @@ -0,0 +1,759 @@ + + + + + + 加入活动 + + + + + + + —— + 完善信息 + —— + + + + + {{ current_mer.mer_name }} + 距离:{{ current_mer.distance_text }} + {{ current_mer.mer_address }} + + + + {{ Object.values(current_mer).length > 0 ? '选择其他烟酒店' : '请选择烟酒店' }} + + + + 支付方式 + + + + + + + + + {{ item.name }} + + {{item.title}} + + {{now_money}} + + + + + + + + + + + + + + + + {{ Number(pay_money) > 0 ? '去支付 ¥' + pay_money : '立即加入' }} + + + + + + + + + + + + {{ item.mer_name }} + + + + + + + + + + + + + +