cmx #21

Merged
cmx merged 4 commits from cmx into master 2020-08-05 12:11:37 +00:00
4 changed files with 177 additions and 199 deletions
Showing only changes of commit 80e3a721a1 - Show all commits

View File

@ -182,49 +182,45 @@ export default {
if (this.cur == 0) {
// 退
return;
this.$u.api
.refund({
refund_id: this.orderid,
seller_state:2,
seller_message:""
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
this.$u.api.refund({
refund_id: this.orderid,
seller_state:2,
seller_message:""
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
} else {
// 退
return;
this.$u.api
.refund({
refund_id: this.orderid,
seller_state:3,
seller_message:""
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
this.$u.api.refund({
refund_id: this.orderid,
seller_state:3,
seller_message:""
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
}
},
// 退
@ -239,24 +235,22 @@ export default {
},
//
getcarinfo() {
this.$u.api
.getpushinfo({
order_id: this.orderid
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
this.$u.api.getpushinfo({
order_id: this.orderid
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
console.log(res);
}
});
},
//
getselectcompany(e) {
@ -268,48 +262,44 @@ export default {
confirmpushstyle() {
if (this.cur == 0) {
console.log(this.pushid);
this.$u.api
.bindpushid({
order_id: this.orderid,
shipping_code: this.pushid,
shipping_express_id: this.companyidA
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
uni.navigateBack({
delta: 1
});
}
});
this.$u.api.bindpushid({
order_id: this.orderid,
shipping_code: this.pushid,
shipping_express_id: this.companyidA
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
uni.navigateBack({
delta: 1
});
}
});
} else {
this.$u.api
.bindcarer({
order_id: this.orderid,
takeawayer_id: this.selctcar.takeawayer_id
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
this.$u.api.bindcarer({
order_id: this.orderid,
takeawayer_id: this.selctcar.takeawayer_id
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
}
},
//
@ -318,21 +308,19 @@ export default {
},
//
resetinfo() {
this.$u.api
.orderdetail({
order_id: this.orderid
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data;
}
});
this.$u.api.orderdetail({
order_id: this.orderid
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data;
}
});
this.$u.api.takeawayerlist({}).then(res => {
console.log(res);
if (res.errCode != 0) {

View File

@ -123,39 +123,35 @@ export default {
//
confirmpushstyle() {
if (this.cur == 0) {
this.$u.api
.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: 0
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
this.$u.api.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: 0
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
} else {
this.$u.api
.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: this.selctcar.takeawayer_id
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
this.$u.api.agreetest({
goods_try_id: this.orderid,
type: 1,
takeawayer_id: this.selctcar.takeawayer_id
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
}
});
}
},
//
@ -164,21 +160,19 @@ export default {
},
//
resetinfo() {
this.$u.api
.testorderdetail({
goods_try_id: this.orderid
})
.then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.info;
}
});
this.$u.api.testorderdetail({
goods_try_id: this.orderid
}).then(res => {
console.log(res);
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.info = res.data.info;
}
});
//
this.$u.api.takeawayerlist({}).then(res => {
console.log(res);

View File

@ -207,25 +207,23 @@ export default {
},
//
addLiveSpec() {
this.$u.api
.createLivesp({
spec_name: this.tagcontent
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.tagcontent = '';
this.show = false;
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
this.$u.api.createLivesp({
spec_name: this.tagcontent
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.tagcontent = '';
this.show = false;
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
},
//
uploadcover(data) {

View File

@ -184,25 +184,23 @@ export default {
},
//
addLiveSpec() {
this.$u.api
.createLivesp({
spec_name: this.tagcontent
})
.then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.tagcontent = '';
this.show = false;
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
this.$u.api.createLivesp({
spec_name: this.tagcontent
}).then(res => {
if (res.errCode != 0) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
});
} else {
this.tagcontent = '';
this.show = false;
this.$refs.uToast.show({
title: res.message,
type: 'success'
});
}
});
},
//
getLiveSpec() {