diff --git a/src/api/wishingStar/wishingStar.js b/src/api/wishingStar/wishingStar.js
index a089a96..a8a3b52 100644
--- a/src/api/wishingStar/wishingStar.js
+++ b/src/api/wishingStar/wishingStar.js
@@ -53,11 +53,17 @@ export const promiseStarUserRecordGetPromiseUsers = query => {
     }); 
 };
 
-export const promiseStarUserRecordSetUserWhite = query => {
+export const promiseStarUserRecordPage = query => {
     return request({
-        url: '/admin/promiseStarUserRecord/setUserWhite',
-        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
-        method: 'post',
+        url: '/admin/promiseStarUserRecord/page',
+        method: 'get',
+        data: query
+    });
+};
+export const promiseStarUserRecordExport = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/export',
+        method: 'get',
         data: query
     });
 };
diff --git a/src/views/wishingStar/userParticipationRecord.vue b/src/views/wishingStar/userParticipationRecord.vue
index 125221f..d7eb45e 100644
--- a/src/views/wishingStar/userParticipationRecord.vue
+++ b/src/views/wishingStar/userParticipationRecord.vue
@@ -27,7 +27,7 @@
       </div>
     </div>
     <!-- 查询按钮 -->
-    <el-button type="primary" @click="getDatas()">查询</el-button>
+    <el-button type="primary" @click="getData()">查询</el-button>
     <el-button type="primary" @click="derive()">导出</el-button>
 
     <!-- 表格 -->
@@ -37,19 +37,19 @@
       border
       style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="x" align="center" label="参与时间" />
-      <el-table-column prop="x" align="center" label="用户id" />
-      <el-table-column prop="x" align="center" label="用户昵称" />
+      <el-table-column prop="createTime" align="center" label="参与时间" />
+      <el-table-column prop="erbanNo" align="center" label="用户id" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
       <el-table-column align="center" label="轮次信息">
         <template v-slot="scope">
-          <div>轮次id: {{ scope.row.x }}</div>
-          <div>轮次礼物: {{ scope.row.x }}</div>
-          <div>需要魔法棒: {{ scope.row.x }}</div>
-          <div>{{ scope.row.x == 0 ? "轮次进行中" : "轮次已结束" }}</div>
+          <div>轮次id: {{ scope.row.roundId }}</div>
+          <div>轮次礼物: {{ scope.row.giftName }}</div>
+          <div>需要魔法棒: {{ scope.row.targetNum }}</div>
+          <div>{{ scope.row.roundStatus == 0 ? "轮次进行中" : "轮次已结束" }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="x" align="center" label="参与魔法棒数量" />
-      <el-table-column prop="x" align="center" label="该用户本轮是否中奖" />
+      <el-table-column prop="stickNum" align="center" label="参与魔法棒数量" />
+      <el-table-column prop="isWin" align="center" label="该用户本轮是否中奖" />
     </el-table>
 
     <!-- 分页 -->
@@ -70,6 +70,11 @@
   </div>
 </template>
 <script>
+import {
+  promiseStarUserRecordPage,
+  promiseStarUserRecordExport,
+} from "@/api/wishingStar/wishingStar";
+import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "userParticipationRecord",
@@ -83,7 +88,7 @@ export default {
         time: "",
       },
       // 表格
-      tableData: [{ x: 1 }],
+      tableData: [],
       // 分页
       total: 10, //总页数
       currentPage: 1, //页码
@@ -92,12 +97,57 @@ export default {
   },
   created() {},
   methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      promiseStarUserRecordPage({
+        roundId: this.inquire.turnId,
+        giftId: this.inquire.giftId,
+        erbanNo: this.inquire.userId,
+        startTime: startTime,
+        endTime: endTime,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        this.tableData = res.data.records;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
     // 导出按钮
-    derive() {},
+    derive() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      promiseStarUserRecordExport({
+        roundId: this.inquire.turnId,
+        giftId: this.inquire.giftId,
+        erbanNo: this.inquire.userId,
+        startTime: startTime,
+        endTime: endTime,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {});
+    },
 
     // 分页导航
-    handleSizeChange(val) {},
-    handleCurrentChange(val) {},
+    handleSizeChange(val) {
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.getData();
+    },
   },
 };
 </script>