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"-->
@@ -323,6 +332,12 @@
      selectDate: null,
      columns: [
        {
          title: "会员id",
          key: "memberId",
          minWidth: 240,
          tooltip: true
        },
        {
          title: "订单号",
          key: "sn",
          minWidth: 240,