From 8b6b9de9ea9fc235edfe591b374a5a114e245797 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 23 Aug 2023 13:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/order.js    |  7 +++
 src/views/order/index.vue | 93 ++++++++++++++++++---------------------
 2 files changed, 51 insertions(+), 49 deletions(-)

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 @@
       <template slot-scope="{ row }" slot="menu">
         <el-button size="small" @click="handleDetail(row)">查看详情</el-button>
         <!-- <el-button size="small" @click="handleDelete(row)">删除</el-button> -->
-        <el-button :disabled='row.orderStatus == 1' size="small" @click="handleSend(row)">发货</el-button>
+        <el-button :disabled='row.status == 1 || row.status == 2' size="small" @click="handleSend(row)">发货</el-button>
       </template>
       <!-- <template slot-scope="scope" slot="sleepingPosture">
         <div v-show="scope.row.sleepingPosture == 1">仰睡</div>
         <div v-show="scope.row.sleepingPosture == 2">侧睡</div>
       </template> -->
-      <template slot-scope="scope" slot="orderStatus">
-        <div v-show="scope.row.orderStatus == 1">已发货</div>
-        <div v-show="scope.row.orderStatus == 0">未发货</div>
+      <template slot-scope="scope" slot="status">
+        <div v-show="scope.row.status == 1">待付款</div>
+        <div v-show="scope.row.status == 2">待发货</div>
+        <div v-show="scope.row.status == 3">待收货</div>
+        <div v-show="scope.row.status == 4">已完成</div>
       </template>
       <template slot-scope="scope" slot="menuLeft">
         <el-button type="danger" size="small" @click="deleteItem"
@@ -96,10 +98,14 @@
             <template slot="label">订单状态</template>
             <div>
               {{
-                checkaccept.orderStatus == 1
-                  ? "已发货"
-                  : checkaccept.orderStatus == 0
-                  ? "未发货"
+                checkaccept.status == 1
+                  ? "待付款"
+                  : checkaccept.status == 2
+                  ? "待发货" 
+                  : checkaccept.status == 3
+                  ? "待收货"
+                  : checkaccept.status == 4
+                  ? "已完成"
                   : ""
               }}
             </div>
@@ -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" } });