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

zxl

2025-10-23 5a80a60227011398c8fe306d4adcdd09297d21e2

 manager/src/views/userAction/userAction.vue

@@ -6,16 +6,19 @@
          <Form-item label="用户昵称" prop="userName">
            <Input type="text" v-model="searchForm.userName" placeholder="请输入用户昵称" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="用户id" prop="userId">
            <Input type="text" v-model="searchForm.userId" placeholder="请输入用户id" clearable style="width: 200px" />
          </Form-item>
          <Form-item label="页面类型" prop="pageCode">
            <Select 
              v-model="searchForm.pageCode" 
              clearable 
            <Select
              v-model="searchForm.pageCode"
              clearable
              filterable
              style="width: 200px"
              placeholder="请选择页面类型">
              <Option 
                v-for="item in pageTypeOptions" 
                :key="item.value" 
              <Option
                v-for="item in pageTypeOptions"
                :key="item.value"
                :value="item.value"
                :label="item.label">
                {{ item.label }}
@@ -108,6 +111,7 @@
        pageSize: 10,
        userName: "",
        pageCode: "",
        userId: "",
        beginDate: startTime,
        endDate: endTime
      },
@@ -141,7 +145,7 @@
      ],
      columns: [
        {
          title: "用户名称",
          title: "用户id",
          key: "userId",
          minWidth: 120
        },
@@ -149,11 +153,6 @@
          title: "用户昵称",
          key: "nickName",
          minWidth: 100
        },
        {
          title: "会话ID",
          key: "sessionId",
          minWidth: 150
        },
        {
          title: "页面类型",
@@ -189,11 +188,6 @@
            };
            return h('span', pageCodes[params.row.pageCode] || params.row.pageCode);
          }
        },
        {
          title: "页面名称",
          key: "pageNameCn",
          minWidth: 150
        },
        {
          title: "进入时间",
@@ -408,6 +402,7 @@
      this.searchForm.pageSize = 10;
      this.searchForm.userName = "";
      this.searchForm.pageCode = "";
      this.searchForm.userId = "";
      // 使用正确的参数名称和方法
      this.searchForm.beginDate = this.getDefaultBeginDate();
      this.searchForm.endDate = this.getDefaultEndDate();