订单详情页接口联调

src/utils/shop/index.js

@@ -23,4 +23,14 @@ export const queryStore = (params) => {
     data: params,
     description: '查询店铺信息',
   })
+};
+
+export const queryOrderDetail = (orderId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`trade/order/admin/query/${orderId}`),
+    method: 'get',
+    // params: params,
+    description: '查询订单详情',
+  })
 };
\ No newline at end of file

src/views/goods/order-detail.vue

@@ -19,10 +19,10 @@
                 <i class="el-icon-truck" style="font-size: 18px"></i>
                 <span class="send-status">已发货</span>
               </p>
-              <p>收货地址：上海市浦东新区花木路世纪大厦22楼，张三，13273896478</p>
-              <p>物流公司：申通快递</p>
-              <p>快递单号：14792837492875</p>
-              <p>备注：是是是背部我of我那飞机我饿发窘</p>
+              <p>收货地址：{{orderDetailData.receiverAddr}}</p>
+              <p>物流公司：{{orderDetailData.expressName}}</p>
+              <p>快递单号：{{orderDetailData.expressNo}}</p>
+              <p>备注：{{orderDetailData.remark}}</p>
             </div>
           </el-card>
           <el-card class="right-card">
@@ -30,25 +30,25 @@
               <span>订单信息</span>
             </div>
             <div>
-              <p>订单编号：12579284048</p>
-              <p>下单时间：2020-03-20 13:36:28</p>
+              <p>订单编号：{{orderDetailData.orderNo}}</p>
+              <p>下单时间：{{orderDetailData.createdTime}}</p>
               <p>支付方式：微信支付</p>
-              <p>支付时间：2020-03-20 13:36:28</p>
-              <p>发货时间：2020-03-20 13:36:28</p>
-              <p>成交时间：2020-03-20 13:36:28</p>
+              <p>支付时间：{{orderDetailData.paymentTime}}</p>
+              <p>发货时间：{{orderDetailData.sendTime}}</p>
+              <p>成交时间：{{orderDetailData.finishTime}}</p>
             </div>
           </el-card>
         </div>
         <el-table :data="tableData" border class="item-table" style="width: 100%;margin-top: 30px;">
-          <el-table-column prop="name" label="商品名称" min-width="100" align="center"></el-table-column>
-          <el-table-column prop="guige" label="规格" min-width="100" align="center">
+          <el-table-column prop="goodsName" label="商品名称" min-width="100" align="center"></el-table-column>
+          <el-table-column prop="size" label="规格" min-width="100" align="center">
             <!--<template slot-scope="scope">-->
               <!--<span>{{ scope.row.type | dynamicFlagStatus }}</span>-->
             <!--</template>-->
           </el-table-column>
-          <el-table-column prop="num" label="数量" min-width="100" align="center">
+          <el-table-column prop="goodsQuantity" label="数量" min-width="100" align="center">
             <template slot-scope="scope">
-              <span>×{{ scope.row.num }}</span>
+              <span>×{{ scope.row.goodsQuantity }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="price" label="单价" min-width="100" align="center">
@@ -74,6 +74,7 @@
 <script>
   // import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
+  import { queryOrderDetail } from '@/utils/shop';
   export default {
     components: {
       BreadCrumb
@@ -84,23 +85,42 @@
         curmbSecond: '订单管理',
         jumPathThird: '/order-manage',
         curmbThird: '订单详情',
+        orderId: 1,
         orderStatus: 1,
-        tableData: [
-          {
-            name: '阿司匹林',
-            guige: '50mg*20粒*盒',
-            num: '2',
-            price: '27',
-            status: 1,
-          }
-        ],
+        orderDetailData: {
+          amount: '',//订单实付总金额
+          createdTime: '',//下单时间
+          expressId: '',//物流id
+          expressName: '',//物流公司名称
+          receiverAddr: '',//收货地址
+          expressNo: '',//快递单号
+          expressStatus: '',//物流状态
+          finishTime: '',//成交时间
+          orderNo: '',//订单编号
+          orderStatus: '',//订单状态：1待支付,2支付中,3支付失败,4订单超时,5支付成功,6交易完成,7交易关闭
+          paymentTime: '',//支付时间
+          totalCouponFee: '',//优惠券金额
+          totalPrice: '',//订单总金额
+          remark: '',//备注
+          sendTime: '',//发货时间
+        },
+        tableData: [],
       }
     },
     created() {
-
+      this.init();
     },
     methods: {
-
+      init() {
+        queryOrderDetail(this.orderId).then(res => {
+          console.log('获取订单详情',res);
+          if (res.code == '000000') {
+            const { goodsInfoDtoList } = res.data;
+            this.orderDetailData = {...res.data};
+            this.tableData = goodsInfoDtoList;
+          }
+        })
+      }
     },
   }
 </script>

src/views/shop/shop-list.vue

@@ -84,7 +84,7 @@
 <script>
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi";
+  // import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi";
   export default {
     components: {
       BreadCrumb
@@ -125,8 +125,8 @@
       }
     },
     created() {
-      this.initPrivilege();
-      this.searchList();
+      // this.initPrivilege();
+      // this.searchList();
     },
     methods: {
       initPrivilege(){