Merge branch 'feature/distribution' of...

Merge branch 'feature/distribution' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/distribution

src/pages/Groupmeal/orderManagement/index.vue

@@ -158,13 +158,11 @@
                   v-show="
                     scope.row.order_status == '2' ||
                     scope.row.order_status == '6' ||
-                    scope.row.order_status == '8' 
+                    scope.row.order_status == '8'
                   "
                   >退款</el-button
                 >
-                <el-button-group
-                  v-show="scope.row.order_status == '3'"
-                >
+                <el-button-group v-show="scope.row.order_status == '3'">
                   <el-button type="text" size="small" @click="agree(scope.row)"
                     >同意</el-button
                   >
@@ -516,7 +514,9 @@ export default {
         marketing_id: val,
       };
       const res = await getGoodsList(params);
+      const res = await getSubShopList(params);
       this.tradeNameArr = res.result;
+      this.selLiftPoinArr = res.result;
     },
 
     // 获取自提点

src/service/Groupmeal/groupmeal.js

@@ -50,8 +50,10 @@ export async function getGoodsList(params) {
 }
 
 // 获取自提点
-export async function getSubShopList() {
-  const res = await axios.get("/api/v1/order/background/sub_shop_list");
+export async function getSubShopList(params) {
+  const res = await axios.get("/api/v1/order/background/sub_shop_list",{
+    params
+  });
   return res;
 }