Merge remote-tracking branch 'origin/send_coupon' into send_coupon

zxl

2025-10-23 5a80a60227011398c8fe306d4adcdd09297d21e2

 manager/src/views/order/order/orderList.vue

@@ -18,6 +18,15 @@
            style="width: 160px"
          />
        </Form-item>
        <Form-item label="会员id" prop="memberId">
          <Input
            type="text"
            v-model="searchForm.memberId"
            placeholder="请输入会员id"
            clearable
            style="width: 160px"
          />
        </Form-item>
<!--        <Form-item label="会员名称" prop="buyerName">-->
<!--          <Input-->
<!--            type="text"-->
@@ -36,7 +45,16 @@
            style="width: 160px"
          />
        </Form-item>

        <Form-item label="定制商品" prop="customizeFlag">
          <Select
            v-model="searchForm.customizeFlag"
            placeholder="请选择"
            clearable
            style="width: 160px"
          >
            <Option value="CUSTOMIZE">定制商品</Option>
          </Select>
        </Form-item>
        <Form-item label="订单类型" prop="orderType">
          <Select
            v-model="searchForm.orderPromotionType"
@@ -314,6 +332,12 @@
      selectDate: null,
      columns: [
        {
          title: "会员id",
          key: "memberId",
          minWidth: 240,
          tooltip: true
        },
        {
          title: "订单号",
          key: "sn",
          minWidth: 240,
@@ -385,7 +409,23 @@
          },

        },

        {
          title: "定制商品",
          key: "customizeFlag",
          minWidth: 120,
          tooltip: true,
          render: (h, params) => {
            if (params.row.customizeFlag == "CUSTOMIZE") {
              return h("div", [
                h("tag", { props: { color: "blue" } }, "定制商品"),
              ]);
            } else  {
              return h("div", [
                h("tag", { props: { color: "volcano" } }, "普通商品"),
              ]);
            }
          },
        },
        {
          title: "订单状态",
          key: "orderStatus",