|
@@ -136,7 +136,7 @@ export default {
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
}).then(async () => {
|
|
}).then(async () => {
|
|
|
var loading = this.$loading();
|
|
var loading = this.$loading();
|
|
|
- var resp = await this.$API.order.end.post({"order":data.order_sn});
|
|
|
|
|
|
|
+ var resp = await this.$API.merOrder.end.post({"order":data.order_sn});
|
|
|
loading.close();
|
|
loading.close();
|
|
|
if (resp.code !== 1) {
|
|
if (resp.code !== 1) {
|
|
|
return this.$message.error(resp.msg);
|
|
return this.$message.error(resp.msg);
|
