This commit is contained in:
Gao xiaosong
2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions

View File

@ -75,13 +75,13 @@ export default {
methods: {
goDetail: function(id) {
this.$yrouter.push({
path: "/pages/activity/DargainDetails/main",
path: "/pages/activity/DargainDetails/index",
query: { id, partake: 0 }
});
},
goList: function() {
this.$yrouter.push({
path: "/pages/activity/GoodsBargain/main"
path: "/pages/activity/GoodsBargain/index"
});
},
getBargainUserList: function() {
@ -96,7 +96,7 @@ export default {
that.loadingList = false;
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -107,7 +107,7 @@ export default {
var that = this;
getBargainUserCancel({ bargainId: bargainId })
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "success",
duration: 2000
@ -119,7 +119,7 @@ export default {
that.getBargainUserList();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000

View File

@ -248,7 +248,7 @@ export default {
) {
that.bargainPartake = that.userInfo.uid;
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.bargainPartake }
// });
} else {
@ -274,7 +274,7 @@ export default {
postCartAdd(data)
.then(res => {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId }
});
})
@ -286,13 +286,13 @@ export default {
var that = this;
that.getBargainShare(that.bargainId);
this.$yrouter.push({
path: "/pages/activity/Poster/main",
path: "/pages/activity/Poster/index",
query: { id: that.bargainId, type: 2 }
});
},
goList: function() {
this.$yrouter.push({
path: "/pages/activity/GoodsBargain/main"
path: "/pages/activity/GoodsBargain/index"
});
},
//砍价分享
@ -317,7 +317,7 @@ export default {
that.getBargainHelpCount();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -333,7 +333,7 @@ export default {
that.getBargainHelp();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -347,7 +347,7 @@ export default {
that.surplusPrice === 0 &&
that.bargainPartake !== that.userInfo.uid
) {
return wx.showToast({
return uni.showToast({
title: "好友已经砍价成功",
icon: "success",
duration: 2000
@ -372,7 +372,7 @@ export default {
that.getBargainHelpPrice();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -399,7 +399,7 @@ export default {
}
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -425,7 +425,7 @@ export default {
that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -441,7 +441,7 @@ export default {
.then(() => {})
.catch(() => {
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.userInfo.uid }
// });
});
@ -463,7 +463,7 @@ export default {
.catch(() => {
that.bargainPartake = that.userInfo.uid;
// that.$yrouter.push({
// path: "/pages/activity/DargainDetails/main",
// path: "/pages/activity/DargainDetails/index",
// query: { id: that.bargainId, partake: that.userInfo.uid }
// });
});
@ -479,7 +479,7 @@ export default {
that.getBargainHelpList();
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -492,7 +492,7 @@ export default {
},
onShareAppMessage() {
return {
path: `/pages/activity/DargainDetails/main/?id=${
path: `/pages/activity/DargainDetails/index/?id=${
this.$yroute.query.id
}&partake=${this.userInfo.uid}`
};

View File

@ -69,7 +69,7 @@ export default {
},
goDetail: function(id) {
this.$yrouter.push({
path: "/pages/activity/DargainDetails/main",
path: "/pages/activity/DargainDetails/index",
query: { id, partake: 0 }
});
}

View File

@ -84,7 +84,7 @@ export default {
},
link: function(id) {
this.$yrouter.push({
path: "/pages/activity/GroupDetails/main",
path: "/pages/activity/GroupDetails/index",
query: { id }
});
}

View File

@ -115,7 +115,7 @@ export default {
methods: {
mountedStart: function() {
var that = this;
wx.showLoading();
uni.showLoading();
getSeckillConfig().then(res => {
that.$set(that, "headerImg", res.data.lovely);
that.$set(that, "timeList", res.data.seckillTime);
@ -161,7 +161,7 @@ export default {
that.getSeckillList();
that.$nextTick(function() {
that.sticky = true;
wx.hideLoading();
uni.hideLoading();
});
});
},
@ -180,14 +180,14 @@ export default {
that.status = res.data.length < that.limit;
that.seckillList.push.apply(that.seckillList, res.data);
that.page++;
wx.hideLoading();
uni.hideLoading();
});
},
goDetail: function(id) {
var that = this;
var time = that.timeList[that.active].stop;
this.$yrouter.push({
path: "/pages/activity/SeckillDetails/main",
path: "/pages/activity/SeckillDetails/index",
query: { id, time }
});
}

View File

@ -256,14 +256,14 @@ export default {
groupRule: function(id) {
var that = this;
that.$yrouter.push({
path: "/pages/activity/GroupRule/main",
path: "/pages/activity/GroupRule/index",
query: { id }
});
},
goReply: function() {
var that = this;
that.$yrouter.push({
path: "/pages/shop/EvaluateList/main",
path: "/pages/shop/EvaluateList/index",
query: { id: that.storeInfo.product_id }
});
},
@ -311,7 +311,7 @@ export default {
postCartAdd(data)
.then(res => {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId }
});
})

View File

@ -148,7 +148,7 @@ export default {
postCartAdd(data)
.then(res => {
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId, pinkid: that.pinkId }
});
})
@ -159,27 +159,27 @@ export default {
goPoster: function() {
var that = this;
this.$yrouter.push({
path: "/pages/activity/Poster/main",
path: "/pages/activity/Poster/index",
query: { id: that.pinkId, type: 1 }
});
},
goOrder: function() {
var that = this;
this.$yrouter.push({
path: "/pages/order/OrderDetails/main",
path: "/pages/order/OrderDetails/index",
query: { id: that.currentPinkOrder }
});
},
//拼团列表
goList: function() {
this.$yrouter.push({
path: "/pages/activity/GoodsGroup/main"
path: "/pages/activity/GoodsGroup/index"
});
},
//拼团详情
goDetail: function(id) {
this.$yrouter.push({
path: "/pages/activity/GroupDetails/main",
path: "/pages/activity/GroupDetails/index",
query: { id }
});
},
@ -202,14 +202,14 @@ export default {
var that = this;
getCombinationRemove({ id: that.pinkId, cid: that.storeCombination.id })
.then(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
});
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000

View File

@ -48,7 +48,7 @@ export default {
that.status = false;
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000
@ -64,7 +64,7 @@ export default {
that.status = false;
})
.catch(res => {
wx.showToast({
uni.showToast({
title: res.msg,
icon: "none",
duration: 2000

View File

@ -41,7 +41,7 @@
<div class="footerRush acea-row row-between-wrapper">
<div
class="customerSer acea-row row-center-wrapper row-column"
@click="$yrouter.push({ path: '/pages/user/CustomerList/index' })"
@click="routerGo()"
>
<div class="iconfont icon-kefu"></div>
<div>客服</div>
@ -123,6 +123,9 @@ export default {
this.mountedStart();
},
methods: {
routerGo(item) {
this.$yrouter.push({ path: '/pages/user/CustomerList/index' })
},
mountedStart: function() {
var that = this;
let id = that.$yroute.query.id;
@ -196,7 +199,7 @@ export default {
if (that.attr.cartAttr == false) {
that.attr.cartAttr = !this.attr.attrcartAttr;
} else {
console.log(that.storeInfo)
console.log(that.storeInfo);
var data = {};
data.productId = that.storeInfo.productId;
data.cartNum = that.attr.productSelect.cart_num;
@ -207,7 +210,7 @@ export default {
.then(res => {
console.log(res);
that.$yrouter.push({
path: "/pages/order/OrderSubmission/main",
path: "/pages/order/OrderSubmission/index",
query: { id: res.data.cartId }
});
})