diff --git a/src/components/order/item.vue b/src/components/order/item.vue index ab34974..2cc7edd 100644 --- a/src/components/order/item.vue +++ b/src/components/order/item.vue @@ -81,8 +81,8 @@ export default { return { listType: this.$models.order.listType, state: this.$models.order.state, - title: "", - titleColor: "", + stateText: "", + stateDesc: "", previewWorkerList: [], }; }, @@ -95,13 +95,13 @@ export default { components: { WorkerItem, }, - created() { + async created() { for (let index = 0; index < 3; index++) { if (this.order.workerList[index]) { this.previewWorkerList.push(this.order.workerList[index]); } else break; } - let [stateText, stateDesc, stateTextColor] = this.$models.order.stateText( + let [stateText, stateDesc, stateTextColor] = await this.$models.order.stateText( this.order.listType, this.order.orderType, this.order.state diff --git a/src/core/models/order.js b/src/core/models/order.js index 080f04e..00cb4eb 100644 --- a/src/core/models/order.js +++ b/src/core/models/order.js @@ -109,7 +109,17 @@ export default { id: id } }).then(response => { - console.log(response); + if (response.code == 1) { + uni.requestPayment({ + ...response.data, + provider: "wxpay", + success(res) { + return resolve(); + } + }); + } else { + return reject(response.msg); + } }).catch(e => { throw e }); diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue index 908ec56..13724cb 100644 --- a/src/pages/order/order.vue +++ b/src/pages/order/order.vue @@ -31,7 +31,7 @@ > - + @@ -186,6 +186,14 @@ export default { } this.$utils.toPage("/pages/order/detail?list=" + listType + "&tab=" + tab + "&id=" + id); }, + /** + * 支付订单 + */ + payOrder(id) { + this.$models.order.payOrder(id).then(() => { + console.log("支付成功"); + }); + }, }, };