update:订单列表接口逻辑

server/controllers/groupmeal.js

-// const GROUPMEAL_URI = require("../config.js").GROUPMEAL_URI;
-// const req = require("../utils/request").httpReq;
+const GROUPMEAL_URI = require("../config.js").GROUPMEAL_URI;
+const req = require("../utils/request").httpReq;
+
+// 获取订单管理列表
+exports.getOrderList = async ctx => {
+    const url = `${GROUPMEAL_URI}/order/background/order_list`;
+    const opts = {
+      url,
+      method: "GET"
+    };
+    ctx.body = await req(ctx, opts);
+  };
+

server/router.js

@@ -6,6 +6,7 @@ const enterprise = require("./controllers/enterprise");
 const role = require('./controllers/role')
 const life = require('./controllers/life-no');
 const goods = require('./controllers/goods');
+const groupmeal = require('./controllers/groupmeal');
 
 const router = Router();
 const API_VERSION = "/api/v1";
@@ -62,4 +63,7 @@ router.get(`${API_VERSION}/merchant/lifeinner/life_list`, life.get_life_list)
 //用户
 router.post(`${API_VERSION}/merchant/authority/get_user_info`, user.getUser_detail)
 
+// 订单管理
+router.get(`${API_VERSION}/order/background/order_list`, groupmeal.getOrderList);
+
 module.exports = router;

src/pages/Groupmeal/orderManagement/tab/tabList.vue

@@ -2,32 +2,29 @@
   <div>
     <el-table :data="orderTableData" border stripe style="width: 100%">
       <el-table-column
-        prop="activity_name"
+        prop="marketing_name"
         label="活动名称"
         width
       ></el-table-column>
-      <el-table-column prop="order_no" label="订单号" width></el-table-column>
-      <el-table-column prop="order_status" label="订单状态"></el-table-column>
-      <el-table-column prop="commodity_info" label="商品信息"></el-table-column>
-      <el-table-column prop="consignee" label="收货人"></el-table-column>
+      <el-table-column prop="order_id" label="订单号" width></el-table-column>
       <el-table-column
-        prop="self_lifting_point"
-        label="自提点"
-      ></el-table-column>
-      <el-table-column prop="remarks" label="备注"></el-table-column>
-      <el-table-column prop="payment_time" label="支付时间"></el-table-column>
-      <el-table-column prop="payment_amount" label="支付金额"></el-table-column>
-      <el-table-column
-        prop="preferential_amount"
-        label="优惠金额"
+        prop="order_status_text"
+        label="订单状态"
       ></el-table-column>
+      <el-table-column prop="order_item" label="商品信息"></el-table-column>
+      <el-table-column prop="user_name" label="收货人"></el-table-column>
+      <el-table-column prop="sub_shop_name" label="自提点"></el-table-column>
+      <el-table-column prop="comment" label="备注"></el-table-column>
+      <el-table-column prop="pay_time" label="支付时间"></el-table-column>
+      <el-table-column prop="payment" label="支付金额"></el-table-column>
+      <el-table-column prop="discount_fee" label="优惠金额"></el-table-column>
       <el-table-column fixed="right" label="操作" width="100">
         <template #default="scope">
           <el-button
             type="text"
             size="small"
             @click="refund(scope.row)"
-            v-if="scope.row.order_status == '已支付'"
+            v-if="scope.row.order_status_text == '已支付'"
             >退款</el-button
           >
           <el-button-group v-else>
@@ -41,6 +38,11 @@
         </template>
       </el-table-column>
     </el-table>
+    <!-- <page
+      :totalNum="totalNum"
+      :pageSize="pageParams.size"
+      @update="updatePage"
+    /> -->
     <!-- 退款弹窗 -->
     <el-dialog title="退款" width="30%" top="10%" v-model="refundShow">
       <refundPopup />
@@ -56,43 +58,46 @@
 
 <script>
 import refundPopup from "../popup/refund.vue";
+// import page from "@/components/Pagination";
+// import { getOrderList } from "@/service/groupmeal";
 export default {
   components: {
     refundPopup,
+    // page,
   },
   data() {
     return {
       refundShow: false,
       // 表格数据
       orderTableData: [
-        {
-          activity_name: "生活圈7月20日午饭(232424)",
-          order_no: "232424",
-          order_status: "已支付",
-          commodity_info: "A套餐:红烧鸡块+地三鲜(含米饭)",
-          consignee: "丁丁",
-          self_lifting_point: "朝阳区",
-          remarks: "备注",
-          payment_time: "2021-01-01",
-          payment_amount: "20.00",
-          preferential_amount: "5.00",
-        },
-        {
-          activity_name: "",
-          order_no: "",
-          order_status: "代退款",
-          commodity_info: "",
-          consignee: "",
-          self_lifting_point: "",
-          remarks: "",
-          payment_time: "",
-          payment_amount: "",
-          preferential_amount: "5.00",
-        },
+        // {
+        //   marketing_name: "生活圈7月20日午饭(232424)",
+        //   order_id: "232424",
+        //   order_status_text: "已支付",
+        //   order_item: "A套餐:红烧鸡块+地三鲜(含米饭)",
+        //   user_name: "丁丁",
+        //   sub_shop_name: "朝阳区",
+        //   comment: "备注",
+        //   pay_time: "2021-01-01",
+        //   payment: "20.00",
+        //   discount_fee: "5.00",
+        // },
       ],
     };
   },
   methods: {
+    // 获取订单列表
+    async getOrderListMet() {
+    //   try {
+    //     const res = await getOrderList(params);
+    //     this.orderTableData = res.result;
+    //     console.log(res);
+    //   } catch (error) {
+    //     this.$message.error("发生未知错误,请稍后再试一下吧~~~");
+    //     console.error(error);
+    //   }
+    },
+
     // 退款
     refund(val) {
       console.log(val);
@@ -121,6 +126,9 @@ export default {
         });
     },
   },
+  created() {
+    this.getOrderListMet();
+  },
 };
 </script>