diff --git a/src/components/order/action.vue b/src/components/order/action.vue
index 4d438fd..2071bbc 100644
--- a/src/components/order/action.vue
+++ b/src/components/order/action.vue
@@ -6,14 +6,27 @@
- 尾款确认
+ 确认完成
待用户支付尾款
+
+ 待用户确认
+
+
+ 已完成
+
+
+
+
+ 待用户确认
+
+
+ 已完成
+
-
diff --git a/src/components/order/confirm-price.vue b/src/components/order/confirm-price.vue
index 9479f40..f4c84e8 100644
--- a/src/components/order/confirm-price.vue
+++ b/src/components/order/confirm-price.vue
@@ -14,7 +14,7 @@
1)添加后，请客户在小程序订单中支付尾款
2)没有尾款的话，请直接点击确认提交
- 确认添加
+ 确认
diff --git a/src/components/order/item.vue b/src/components/order/item.vue
index b5d55ec..8e17442 100644
--- a/src/components/order/item.vue
+++ b/src/components/order/item.vue
@@ -20,14 +20,16 @@
订单编号：
{{ order.orderId }}
-
- 服务分类：
- {{ order.cate }}
-
-
- 需求内容：
- {{ order.content }}
-
+
+
+ 服务分类：
+ {{ order.cate }}
+
+
+ 需求内容：
+ {{ order.content }}
+
+
下单时间：
{{ order.createTime }}
diff --git a/src/core/models/get.js b/src/core/models/get.js
index fec070a..950dc70 100644
--- a/src/core/models/get.js
+++ b/src/core/models/get.js
@@ -10,21 +10,40 @@ export default {
prototype.$request(options.request).then(response => {
if (response.code == 1) {
let list = [];
- response.data.forEach(item => {
- list.push({
- listType: options.listType,
- id: item.id,
- orderId: item.order,
- username: "用户名称",
- cate: "待返数据",
- content: item.desc,
- createTime: item.time,
- serviceTime: item.times,
- orderType: item.types,
- state: item.status,
- price: item.money,
+ if (options.listType == "t1" || options.listType == "t2") {
+ response.data.forEach(item => {
+ list.push({
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ username: "用户名称",
+ cate: "待返数据",
+ content: item.desc,
+ createTime: item.time,
+ serviceTime: item.times,
+ orderType: item.types,
+ state: item.status,
+ price: item.money,
+ });
});
- });
+ } else if (options.listType == "t3") {
+ response.data.forEach(item => {
+ list.push({
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ username: "用户名称",
+ cate: "待返数据",
+ content: "",
+ createTime: item.times,
+ serviceTime: item.starttime,
+ orderType: 1,
+ state: item.status,
+ price: item.money,
+ });
+ });
+ }
+
return resolve(list);
}
return reject(response.msg);
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 2134c10..1323cc6 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -21,21 +21,40 @@ export default {
prototype.$request(options.request).then(response => {
if (response.code == 1) {
let list = [];
- response.data.forEach(item => {
- list.push({
- listType: options.listType,
- id: item.id,
- orderId: item.order,
- username: "用户名称",
- cate: "待返数据",
- content: item.desc,
- createTime: item.time,
- serviceTime: item.times,
- orderType: item.types,
- state: item.status,
- price: item.money,
+
+ if (options.listType == "t1" || options.listType == "t2") {
+ response.data.forEach(item => {
+ list.push({
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ username: "用户名称",
+ cate: "待返数据",
+ content: item.desc,
+ createTime: item.time,
+ serviceTime: item.times,
+ orderType: item.types,
+ state: item.status,
+ price: item.money,
+ });
});
- });
+ } else if (options.listType == "t3") {
+ response.data.forEach(item => {
+ list.push({
+ listType: options.listType,
+ id: item.id,
+ orderId: item.order,
+ username: "用户名称",
+ cate: "待返数据",
+ content: "",
+ createTime: item.times,
+ serviceTime: item.starttime,
+ orderType: 1,
+ state: item.status,
+ price: item.money,
+ });
+ });
+ }
return resolve(list);
}
return reject(response.msg);
@@ -62,7 +81,7 @@ export default {
return new Promise((resolve, reject) => {
prototype.$request(options.request).then(response => {
if (response.code == 1) {
- return resolve(response.data);
+ return resolve(response);
}
return reject(response.msg);
}).catch(e => { });