update:订单管理接口修改

server/controllers/groupmeal.js

@@ -150,7 +150,7 @@ exports.newGetOrderList = async ctx => {
 
 // 获取活动名称
 exports.newGetMarketingList = async ctx => {
-  const url = `${GROUPMEAL_URI}/order/background/marketing_list`;
+  const url = `${GROUPMEAL_URI}/order/background/order_condition_marketing_list`;
   const opts = {
     url,
     method: "GET"
@@ -160,7 +160,7 @@ exports.newGetMarketingList = async ctx => {
 
 // 获取商品名称
 exports.newGetGoodsList = async ctx => {
-  const url = `${GROUPMEAL_URI}/order/background/goods_list`;
+  const url = `${GROUPMEAL_URI}/order/background/order_condition_goods_list`;
   const opts = {
     url,
     method: "GET"
@@ -170,7 +170,7 @@ exports.newGetGoodsList = async ctx => {
 
 // 获取自提点
 exports.newGetSubShopList = async ctx => {
-  const url = `${GROUPMEAL_URI}/order/background/sub_shop_list`;
+  const url = `${GROUPMEAL_URI}/order/background/order_condition_take_place_list`;
   const opts = {
     url,
     method: "GET"

server/router.js

@@ -103,9 +103,9 @@ router.post(`${API_VERSION}/order/oldbackground/order_refund`, groupmeal.orderRe
 
 // 新订单管理
 router.get(`${API_VERSION}/order/background/op_order_list`, groupmeal.newGetOrderList);
-router.get(`${API_VERSION}/order/background/marketing_list`, groupmeal.newGetMarketingList);
-router.get(`${API_VERSION}/order/background/goods_list`, groupmeal.newGetGoodsList);
-router.get(`${API_VERSION}/order/background/sub_shop_list`, groupmeal.newGetSubShopList);
+router.get(`${API_VERSION}/order/background/order_condition_marketing_list`, groupmeal.newGetMarketingList);
+router.get(`${API_VERSION}/order/background/order_condition_goods_list`, groupmeal.newGetGoodsList);
+router.get(`${API_VERSION}/order/background/order_condition_take_place_list`, groupmeal.newGetSubShopList);
 router.get(`${API_VERSION}/order/background/order_export`, groupmeal.newOrderExport);
 router.get(`${API_VERSION}/order/background/order_print`, groupmeal.newOrderPrint);
 router.get(`${API_VERSION}/order/background/order_item_list`, groupmeal.newOrderItemList);

src/pages/Activity/Manage/index.vue

@@ -158,17 +158,20 @@
   </layout>
 </template>
 <script>
-import { layout } from "../../Groupmeal/layout/index.vue";
+import  layout  from "../../Groupmeal/layout/index.vue";
 import { ElMessage } from "element-plus";
 import ActivityService from "@/service/Activity/index";
 import dayJs from "dayjs";
 export default {
   name: "Manage",
+  components: {
+    layout,
+  },
   data() {
     return {
       activity: {
         activityName: "",
-        online_status: ""
+        online_status: "",
       },
       pageCount: 0, // 总条数
       currentPage: 1, //当前页码
@@ -180,8 +183,8 @@ export default {
         { value: "", label: "全部" },
         { value: "1", label: "未开始" },
         { value: "2", label: "进行中" },
-        { value: "3", label: "已结束" }
-      ]
+        { value: "3", label: "已结束" },
+      ],
     };
   },
   components: {
@@ -197,7 +200,7 @@ export default {
         marketing_type: 4, //1分销 2团购 3秒杀 4团餐 默认传4
         // marketing_id: "",
         page: this.currentPage,
-        page_size: this.pageSize
+        page_size: this.pageSize,
       };
       try {
         this.tableLoading = true;
@@ -235,7 +238,7 @@ export default {
 
     // 数据转换成tableData格式
     filterTableActiveList(tableData) {
-      this.tableActivityList = tableData.map(item => {
+      this.tableActivityList = tableData.map((item) => {
         let activityStatusText = "";
         let dateNow = dayJs();
         if (dateNow.diff(dayJs(item.start_time)) < 0) {
@@ -258,7 +261,7 @@ export default {
           status: item.online_status,
           minPrice: item.min_price,
           maxPrice: item.max_price,
-          marketing_type: 4
+          marketing_type: 4,
         };
       });
     },
@@ -275,8 +278,8 @@ export default {
         name: "ActivityDetail",
         query: {
           marketing_id: val.activiteId,
-          marketing_type: val.marketing_type
-        }
+          marketing_type: val.marketing_type,
+        },
       });
     },
     // 发布拼单
@@ -289,8 +292,8 @@ export default {
         path: "/op/activity/releaseProduc",
         query: {
           marketing_id: val.activiteId,
-          marketing_type: val.marketing_type
-        }
+          marketing_type: val.marketing_type,
+        },
       });
     },
     // 结束
@@ -305,7 +308,7 @@ export default {
     handleStart(val) {
       this.storeQuery = {
         marketing_id: val.activiteId,
-        online_status: 1 // 1 启用 2 关闭
+        online_status: 1, // 1 启用 2 关闭
       };
     },
     // 查看详情
@@ -314,14 +317,14 @@ export default {
         path: "/op/groupmeal/orderManagement",
         query: {
           marketing_id: row.activiteId,
-          marketing_type: row.marketing_type
-        }
+          marketing_type: row.marketing_type,
+        },
       });
-    }
+    },
   },
   created() {
     this.getActivityList();
-  }
+  },
 };
 </script>
 <style lang="less" src="./index.less" scope></style>

src/pages/Activity/releaseProduc/components/infoEditing.vue

 <template>
   <div class="infoEditing">
-    {{ picSubmitList.length }}
     <el-form ref="infoEditForm" :model="infoEditForm" label-width="80px">
       <el-form-item label="标题：">
         <el-input v-model="infoEditForm.title" maxlength="30"></el-input>

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -71,9 +71,9 @@
           >
             <el-option
               v-for="item in selLiftPoinArr"
-              :key="item.sub_shop_id"
-              :label="item.sub_shop_name"
-              :value="item.sub_shop_id"
+              :key="item.take_place_id"
+              :label="item.take_place_name"
+              :value="item.take_place_id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -491,6 +491,7 @@ export default {
         marketing_id: val,
       };
       const res = await newGetGoodsList(params); // 商品名称
+      console.log(res);
       this.getSubShopListMet(val); //自提点
       // const res = await getSubShopList(params);
       this.tradeNameArr = res.result;

src/service/Groupmeal/groupmeal.js

@@ -127,13 +127,13 @@ export async function newGetOrderList(params) {
 
 // 获取活动名称
 export async function newGetMarketingList() {
-  const res = await axios.get("/api/v1/order/background/marketing_list");
+  const res = await axios.get("/api/v1/order/background/order_condition_marketing_list");
   return res;
 }
 
 // 获取商品名称
 export async function newGetGoodsList(params) {
-  const res = await axios.get("/api/v1/order/background/goods_list", {
+  const res = await axios.get("/api/v1/order/background/order_condition_goods_list", {
     params
   });
   return res;
@@ -141,7 +141,7 @@ export async function newGetGoodsList(params) {
 
 // 获取自提点
 export async function newGetSubShopList(params) {
-  const res = await axios.get("/api/v1/order/background/sub_shop_list",{
+  const res = await axios.get("/api/v1/order/background/order_condition_take_place_list",{
     params
   });
   return res;