Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesMy/order/index.vue

@@ -242,8 +242,8 @@
 					content: '确定取消订单吗?',
 					success: async function(res) {
 						if (res.confirm) {
-							const arr = await that.$api(`/order/${e._id}`, 'POST', {
-								status: '-1'
+							const arr = await that.$api(`/order/cancel`, 'POST', {
+								order_id: e._id
 							});
 							if (arr.errcode == '0') {
 								uni.showToast({
@@ -279,8 +279,12 @@
 								"provider": "wxpay",
 								...res.data,
 								success(res) {
-									console.log('in success');
-									console.log(res)
+									uni.showToast({
+										title: '支付成功',
+										icon: 'none'
+									})
+									that.clearPage();
+									that.search();
 								},
 								fail(e) {
 									console.log('in fail');