Commit c108048c authored by beisir's avatar beisir

feat:测试列表

parent 65690df2
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
const { const {
skuNo, skuNo,
goodsSpecialId, goodsSpecialId,
activityTemplateInfoId, activityTemplateId,
activityTemplateDetailId, activityTemplateDetailId,
activityInfoId activityInfoId
} = this.goodsItem; } = this.goodsItem;
...@@ -101,6 +101,12 @@ export default { ...@@ -101,6 +101,12 @@ export default {
return; return;
} }
if (s === 2) { if (s === 2) {
// skuNo=2305164578817
// goodsSpecialId=59
// activityId=47
// templateId=58
// templateDetailId=83
this.$router.push({ this.$router.push({
path: '/groupBuy/skuInfo', path: '/groupBuy/skuInfo',
query: { query: {
...@@ -108,7 +114,7 @@ export default { ...@@ -108,7 +114,7 @@ export default {
skuNo, skuNo,
goodsSpecialId, goodsSpecialId,
activityId: activityInfoId, activityId: activityInfoId,
templateId: activityTemplateInfoId, templateId: activityTemplateId,
templateDetailId: activityTemplateDetailId templateDetailId: activityTemplateDetailId
} }
}); });
...@@ -116,7 +122,7 @@ export default { ...@@ -116,7 +122,7 @@ export default {
return false; return false;
} }
this.$dialog({ this.$dialog({
message: '请在微信小程序中参与此活动哦~', message: '该活动已结束~',
confirmButtonText: s === 3 ? '重新选择' : '订阅消息', confirmButtonText: s === 3 ? '重新选择' : '订阅消息',
onConfirm: () => { onConfirm: () => {
// todo 跳转到小程序 // todo 跳转到小程序
......
...@@ -259,9 +259,7 @@ export default { ...@@ -259,9 +259,7 @@ export default {
if (res.size) { if (res.size) {
this.loading = false; this.loading = false;
this.showLoading = false; this.showLoading = false;
// res.items[5].goodsCount = 0;
this.goodsList = res.items || []; this.goodsList = res.items || [];
console.log(this.goodsList, 'this.goodsList');
if (!res.hasNext) { if (!res.hasNext) {
this.finished = true; this.finished = true;
} else { } else {
...@@ -298,7 +296,7 @@ async function getActivityList(urlQuery, next) { ...@@ -298,7 +296,7 @@ async function getActivityList(urlQuery, next) {
t.hasStart = handleRemainTime(startTime, '')[0] > 0; t.hasStart = handleRemainTime(startTime, '')[0] > 0;
t = { ...t, ...handleDateFormat(startTime, endTime) }; t = { ...t, ...handleDateFormat(startTime, endTime) };
t.stateTxt = !t.hasStart ? '即将开始' : t.hasStop ? '活动已结束' : '距结束'; t.stateTxt = !t.hasStart ? '即将开始' : t.hasStop ? '活动已结束' : '距结束';
t.groupBuyUserInfoList = t.groupBuyUserInfoList.reverse();
const { title } = t; const { title } = t;
store.commit('CHANGE_TITLE', title || '活动页'); store.commit('CHANGE_TITLE', title || '活动页');
nextFns(vm => { nextFns(vm => {
......
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
3: { 3: {
class: 'Ol__head-fail', class: 'Ol__head-fail',
message: '拼团失败', message: '拼团失败',
footTxt: '0元拿商品,退款将原路返还' footTxt: '退款将原路返还,请注意帐户变动'
} }
} }
}; };
......
...@@ -21,7 +21,7 @@ export const goUrlExtends = { ...@@ -21,7 +21,7 @@ export const goUrlExtends = {
}); });
} }
setTimeout(() => { setTimeout(() => {
this.$router.replace({ name: 'orderList', params: { state: 0 } }); this.$router.replace({ name: 'orderList', params: { status: 0 } });
}, 500); }, 500);
}, },
goOrderDetail() { goOrderDetail() {
......
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