Merge branch 'feature/distribution' into test

src/pages/Groupmeal/orderManagement/index.vue

@@ -13,6 +13,7 @@
             v-model="orderQueryObj.marketing_id"
             placeholder="请选择"
             @change="activityNameSel"
+            @focus="activityNameFocus"
             filterable
           >
             <el-option
@@ -24,7 +25,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="订单状态：" prop="order_status">
-          <el-select v-model="orderQueryObj.order_status" placeholder="请选择">
+          <el-select
+            v-model="orderQueryObj.order_status"
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in orderStatusArr"
               :key="item.value"
@@ -452,6 +456,10 @@ export default {
   },
 
   methods: {
+    activityNameFocus(){
+      this.getOrderListMet();
+    },
+
     // 获取活动名称
     async getMarketingListMet() {
       try {
@@ -540,7 +548,6 @@ export default {
       }
 
       let res = await this.printOrderMet(false);
-      console.log(res.code);
       if (res.code === 0) {
         this.$message({
           type: "success",
@@ -549,7 +556,7 @@ export default {
         return;
       }
 
-      if (res.code !== 10) {
+      if (res.code !== 5111040) {
         if (res.reason) {
           this.$message.error(res.reason);
         } else {

src/pages/Groupmeal/orderManagement/popup/refund.vue

-<template>
-  <div class="fefundGoods">
-    <el-checkbox
-      :indeterminate="isIndeterminate"
-      v-model="checkAll"
-      @change="handleCheckAllChange"
-      style="margin-bottom: 15px"
-    >
-      全选
-    </el-checkbox>
-    <div class="refundCon" v-for="(item, index) in refundGoods" :key="index">
-      <el-row>
-        <el-checkbox
-          v-model="refundGoods.refundedGoodsSel"
-          label="商品标题"
-          name="type"
-        ></el-checkbox>
-      </el-row>
-      <el-row>
-        <el-col :span="6">单价：{{ refundGoods.goodsUnitPrice }}</el-col>
-        <el-col :span="6">数量：{{ refundGoods.goodsQuantity }}</el-col>
-        <el-col :span="6">实付：{{ refundGoods.goodsActualPay }}</el-col>
-      </el-row>
-      <el-row>
-        可退数量：
-        <el-input-number
-          v-model="refundGoods.refundableQuantity"
-          @change="handleChange"
-          :min="1"
-          :max="10"
-          label="描述文字"
-        ></el-input-number>
-      </el-row>
-      <el-row>
-        退款金额(可退金额{{ refundGoods.refundAmount }}元)：
-        <el-input v-model="ipt" style="width: 150px"></el-input>
-      </el-row>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      //   退款
-      checkAll: false, // 全选
-      isIndeterminate: false,
-      refundGoods: [
-        {
-          refundedGoodsSel: false,
-          goodsUnitPrice: "", // 单价
-          goodsQuantity: "", // 数量
-          goodsActualPay: "", // 实付
-          refundableQuantity: "",
-          refundAmount: "",
-          ipt: "",
-        },
-      ],
-    };
-  },
-  methods: {
-    // 全选
-    handleCheckAllChange(val) {
-      console.log(val);
-      this.refundGoods.refundedGoodsSel = val;
-      this.isIndeterminate = false;
-    },
-  },
-};
-</script>
-
-<style scoped>
-.refundCon /deep/ .el-row {
-    margin-bottom: 15px;
-    display: flex;
-    align-items: center;
-}
-</style>
\ No newline at end of file

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

-<template>
-  <div>
-    <el-table :data="orderTableData" border stripe style="width: 100%">
-      <el-table-column
-        prop="marketing_name"
-        label="活动名称"
-        width
-      ></el-table-column>
-      <el-table-column prop="order_id" label="订单号" width></el-table-column>
-      <el-table-column
-        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_text == '已支付'"
-            >退款</el-button
-          >
-          <el-button-group v-else>
-            <el-button type="text" size="small" @click="agree(scope.row)"
-              >同意</el-button
-            >
-            <el-button type="text" size="small" @click="refuse(scope.row)"
-              >拒绝</el-button
-            >
-          </el-button-group>
-        </template>
-      </el-table-column>
-    </el-table>
-    <page :totalNum="totalNum" @update="update" style="float: right" />
-    <!-- 退款弹窗 -->
-    <el-dialog title="退款" width="30%" top="10%" v-model="refundShow">
-      <refundPopup />
-      <template #footer>
-        <span class="dialog-footer refundBtnGroup">
-          <el-button @click="refundShow = false">取 消</el-button>
-          <el-button type="primary" @click="refundConfirm">退款</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import refundPopup from "../popup/refund.vue";
-import { getOrderList} from "@/service/Groupmeal/groupmeal";
-import page from "../../../components/Pagination.vue";
-
-export default {
-  components: {
-    refundPopup,
-    page,
-  },
-  data() {
-    return {
-      refundShow: false,
-      // 表格数据
-      orderTableData: [],
-
-      params: {
-        page: 1,
-        page_size: 10,
-      },
-
-      totalNum: null, //总条数
-    };
-  },
-  methods: {
-    // 获取订单列表
-    async getOrderListMet() {
-      //   let { page, page_size } = this.params;
-      //   let params = {
-      //     page,
-      //     page_size,
-      //   };
-      try {
-        const res = await getOrderList(this.params);
-        console.log(res);
-        this.totalNum = res.count;
-        this.orderTableData = res.result;
-      } catch (error) {
-        this.$message.error("发生未知错误,请稍后再试一下吧~~~");
-        console.error(error);
-      }
-    },
-
-    //列表分页
-    update(obj) {
-      Object.assign(this.params, obj);
-      //   let { page, page_size } = this.parmas;
-      this.getOrderListMet(this.parmas);
-    },
-
-    // 退款
-    refund(val) {
-      console.log(val);
-      this.refundShow = true;
-    },
-    // 退款确认
-    refundConfirm() {},
-    // 拒绝
-    refuse(val) {
-      console.log(val);
-      this.$confirm("确定要拒绝退款么?", "拒绝", {
-        cancelButtonText: "取消",
-        confirmButtonText: "确定",
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "退款成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消",
-          });
-        });
-    },
-  },
-  created() {
-    this.getOrderListMet();
-  },
-};
-</script>
-
-<style scoped>
-.refundBtnGroup {
-  display: block;
-  text-align: center;
-}
-</style>
\ No newline at end of file

src/service/Groupmeal/groupmeal.js

@@ -102,5 +102,11 @@ export async function orderRefundReject(params) {
 
 // 导出订单
 export function getOrderExportURL(eventId, type) {
-  return `http://bp-dev.ini.yidian-inc.com/order/background/order_export?marketing_id=${eventId}&type=${type}`;
+  var ENV;
+  if(process.env.NODE_ENV == "development"){
+    ENV = "http://bp-dev.ini.yidian-inc.com/"
+  }else{
+    ENV = "http://bp-test.ini.yidian-inc.com/"
+  }
+  return `${ENV}order/background/order_export?marketing_id=${eventId}&type=${type}`;
 }