diff --git a/src/api/order/order.js b/src/api/order/order.js
index 8fb7409..bdbcfc6 100644
--- a/src/api/order/order.js
+++ b/src/api/order/order.js
@@ -11,3 +11,10 @@ export const getWuliuInfo = (param) => {
params: param,
});
};
+export const getOrderList = (query) => {
+ return request({
+ url: "/api/blade-desk/order/page",
+ method: "get",
+ params: query,
+ });
+};
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 6603b8a..8d10284 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -45,15 +45,17 @@
查看详情
- 发货
+ 发货
-
- 已发货
- 未发货
+
+ 待付款
+ 待发货
+ 待收货
+ 已完成
订单状态
{{
- checkaccept.orderStatus == 1
- ? "已发货"
- : checkaccept.orderStatus == 0
- ? "未发货"
+ checkaccept.status == 1
+ ? "待付款"
+ : checkaccept.status == 2
+ ? "待发货"
+ : checkaccept.status == 3
+ ? "待收货"
+ : checkaccept.status == 4
+ ? "已完成"
: ""
}}
@@ -154,7 +160,7 @@ import {
deleteList,
detailList,
} from "@/api/statistics/statistics";
-import {getWuliuInfo} from "@/api/order/order"
+import {getWuliuInfo,getOrderList} from "@/api/order/order"
// import { getToken } from "@/util/auth";
import md5 from "js-md5";
export default {
@@ -251,7 +257,7 @@ export default {
},
{
label: "姓名",
- prop: "username",
+ prop: "buyerName",
align: "center",
overHidden:true,
width:80,
@@ -260,7 +266,7 @@ export default {
label: "手机",
overHidden:true,
width:150,
- prop: "phone",
+ prop: "buyerPhone",
align: "center",
},
{
@@ -278,7 +284,7 @@ export default {
{
label: "订单状态",
slot:true,
- prop: "orderStatus",
+ prop: "status",
align: "center",
}
],
@@ -611,10 +617,10 @@ export default {
this.activities[0].status = this.activities[0].status == '在途' ? '运输中' : this.activities[0].status
this.activities[0].color = '#0bbd87'
console.log(this.activities)
- // getWuliuInfo(param).then(res =>{
- // console.log(res)
- // this.activities = res.data.data
- // })
+ getWuliuInfo(param).then(res =>{
+ console.log(res)
+ this.activities = res.data.data
+ })
},
selectionChange(data) {
this.selectionList = data;
@@ -688,33 +694,22 @@ export default {
},
onLoad() {
let params = {};
- // params = {
- // username:this.form.name ? this.form.name : '',
- // phone:this.form.phonenumber ? this.form.phonenumber : '',
- // pillowHardness:this.form.hardness ? this.form.hardness : '',
- // pillowMaterial:this.form.material ? this.form.material : ''
- // }
-
- if (!this.form.timeArr) {
- params = {
- username: this.form.username ? this.form.username : "",
- phone: this.form.phonenumber ? this.form.phonenumber : "",
- pillowHardness: this.form.hardness ? this.form.hardness : "",
- pillowMaterial: this.form.material ? this.form.material : "",
- ageRange: this.form.ageRange ? this.form.ageRange : "",
- };
- } else {
- params = {
- username: this.form.username ? this.form.username : "",
- phone: this.form.phonenumber ? this.form.phonenumber : "",
- pillowHardness: this.form.hardness ? this.form.hardness : "",
- pillowMaterial: this.form.material ? this.form.material : "",
- ageRange: this.form.ageRange ? this.form.ageRange : "",
- startTime: this.form.timeArr[0],
- endTime: this.form.timeArr[1],
- };
+ params = {
+ buyerName:this.form.name ? this.form.name : '',
+ buyerPhone:this.form.phonenumber ? this.form.phonenumber : '',
+ orderNo:this.form.orderNumber ? this.form.orderNumber : ''
}
console.log("par", params);
+ getOrderList({
+ current: this.page.currentPage,
+ size: this.page.pageSize,
+ ...params
+ }).then(res =>{
+ console.log(res)
+ this.loading = false;
+ this.data = res.data.data.records;
+ this.page.total = res.data.data.total;
+ })
// getList({
// current: this.page.currentPage,
@@ -726,14 +721,14 @@ export default {
// this.data = res.data.data.records;
// this.page.total = res.data.data.total;
// });
- this.data = [
- {username:'张大仙',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
- {username:'张伟',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'1'},
- {username:'王五',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
- {username:'张三',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
- {username:'李四',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
- ]
- this.loading = false;
+ // this.data = [
+ // {username:'张大仙',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
+ // {username:'张伟',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'1'},
+ // {username:'王五',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
+ // {username:'张三',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
+ // {username:'李四',phone:'13201241125',orderNo:'321456789520',position:'山东省青岛市市南区香港中路',orderStatus:'0'},
+ // ]
+ // this.loading = false;
},
addRegister() {
this.$router.push({ path: "/register/add", query: { type: "add" } });