diff --git a/src/components/order/action.vue b/src/components/order/action.vue
index db2e8ec..4d438fd 100644
--- a/src/components/order/action.vue
+++ b/src/components/order/action.vue
@@ -1,17 +1,19 @@
-
- 立即抢单
-
-
- 尾款确认
-
-
- 取消报价
-
-
- 已完成
-
+
+
+ 待用户支付
+
+
+
+ 尾款确认
+
+
+
+ 待用户支付尾款
+
+
+
@@ -23,12 +25,6 @@ export default {
models: this.$models,
};
},
- props: {
- date: {
- type: Object,
- default: () => {},
- },
- },
props: {
order: {
type: Object,
@@ -37,9 +33,14 @@ export default {
},
components: {},
created() {},
- mounted() {},
+ mounted() {
+ console.log(this.order);
+ },
destroyed() {},
methods: {
+ /**
+ * 确认价格
+ */
confirmPrice() {
this.$emit("confirmPrice");
},
@@ -73,6 +74,7 @@ export default {
color: #999999;
background-color: unset;
padding: 0;
+ border: 0;
}
}
\ No newline at end of file
diff --git a/src/components/order/confirm-price.vue b/src/components/order/confirm-price.vue
index 61c3995..9479f40 100644
--- a/src/components/order/confirm-price.vue
+++ b/src/components/order/confirm-price.vue
@@ -56,8 +56,10 @@ export default {
this.$emit("close");
},
confirmPrice() {
- console.log("当前id:" + this.confirmId + ",价格:" + this.price);
- this.$emit("confirm");
+ this.$emit("confirm", {
+ id: this.confirmId,
+ price: this.price,
+ });
},
},
};
diff --git a/src/core/apis.js b/src/core/apis.js
index 2910c00..1956a12 100644
--- a/src/core/apis.js
+++ b/src/core/apis.js
@@ -114,6 +114,23 @@ const apis = {
auth: true,
},
},
+ finish: {
+ t1: {
+ url: "/user/workerorderb/orderok",
+ showLoading: true,
+ auth: true,
+ },
+ t2: {
+ url: "/user/workerorderc/orderok",
+ showLoading: true,
+ auth: true,
+ },
+ t3: {
+ url: "",
+ showLoading: true,
+ auth: true,
+ }
+ }
},
}
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 0fdf8c9..2134c10 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -54,5 +54,18 @@ export default {
return reject(response.msg);
}).catch(e => { });
});
+ },
+ /**
+ * 完成订单
+ */
+ finishOrder(options) {
+ return new Promise((resolve, reject) => {
+ prototype.$request(options.request).then(response => {
+ if (response.code == 1) {
+ return resolve(response.data);
+ }
+ return reject(response.msg);
+ }).catch(e => { });
+ });
}
}
diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index cd4345b..81210d5 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -47,7 +47,7 @@
-
+
@@ -134,6 +134,31 @@ export default {
this.$store.commit("order/setConfirmId", id);
this.showConfirmModal = true;
},
+ /**
+ * 确认订单
+ */
+ finishOrder(e) {
+ this.showConfirmModal = false;
+ let currentTab = this.tabList[this.tabIndex];
+ this.$models.order
+ .finishOrder({
+ request: {
+ api: "order.finish." + currentTab.listType,
+ data: {
+ id: e.id,
+ money: e.price,
+ },
+ },
+ })
+ .then((response) => {
+ this.$utils.toast(response.msg).then(() => {
+ this.switchTab(this.tabIndex);
+ });
+ })
+ .catch((e) => {
+ this.$utils.toast(e);
+ });
+ },
/**
* 加载数据
*/