整体测试及优化，部分细节功能待完善

2023-03-24 02:15:07 +08:00
parent 3f94ece6d4
commit 37402b0ea4
18 changed files with 273 additions and 139 deletions
--- a/src/view/dealDetailManage/auctionDetail.vue
+++ b/src/view/dealDetailManage/auctionDetail.vue
@@ -21,7 +21,8 @@ const queryParams = ref({
  pageSize:10,
  user_id:0,
  type:'', // 是否中奖
-  time:'', // 抽经时间
+  time:'', // 抽经时间,
+  current_page:1
 })
 const tableData = ref([])
 const total = ref(0)
@@ -37,6 +38,7 @@ const typeList = ref([
 ])
 // 生命周期
 onMounted(() => {
+  queryParams.value.id = parseInt(route.params.user_id)
  // getAuctionDetailList()
 })
 // 方法
@@ -57,7 +59,9 @@ const onReset = () => {
    user_id:0,
    type:'', // 是否中奖
    time:'', // 抽经时间
+    current_page:1
  }
+  queryParams.value.id = parseInt(route.params.user_id)
 }
 function handleCurrentChange(val) {
  queryParams.value.page = val
--- a/src/view/dealDetailManage/dealDetailMoney.vue
+++ b/src/view/dealDetailManage/dealDetailMoney.vue
@@ -59,6 +59,7 @@ const onReset = () => {
    type:'',
    deal_time:''
  }
+  queryParams.value.id = parseInt(route.params.user_id)
 }
 function handleCurrentChange(val) {
  queryParams.value.page = val
@@ -90,15 +91,15 @@ function getTypeName(type) {
          </el-select>
        </el-form-item>

-<!--        <el-form-item label="交易时间">-->
-<!--           <el-date-picker class="oi-item" style="margin-left:5px"-->
-<!--            v-model="queryParams.deal_time"-->
-<!--            type="date"-->
-<!--            placeholder="交易时间"-->
-<!--            format="YYYY-MM-DD"-->
-<!--            value-format="x"-->
-<!--           />-->
-<!--        </el-form-item>-->
+        <el-form-item label="交易时间">
+           <el-date-picker class="oi-item" style="margin-left:5px"
+            v-model="queryParams.deal_time"
+            type="date"
+            placeholder="交易时间"
+            format="YYYY-MM-DD"
+            value-format="x"
+           />
+        </el-form-item>

        <el-form-item>
          <el-button size="small" type="primary" icon="search" @click="onSubmit">查询</el-button>
--- a/src/view/dealDetailManage/dealDetailPoint.vue
+++ b/src/view/dealDetailManage/dealDetailPoint.vue
@@ -57,6 +57,7 @@ const onReset = () => {
    type:'',
    deal_time:''
  }
+  queryParams.value.id = parseInt(route.params.user_id)
 }
 function handleCurrentChange(val) {
  queryParams.value.page = val
@@ -67,6 +68,7 @@ function handleSizeChange(val) {
  getDealPointList()
 }
 function getTypeName(type) {
+  console.log(deal_types.value,type)
  return deal_types.value.filter((item,i) => {
    return item.value == type
  })[0].name
@@ -78,12 +80,12 @@ function getTypeName(type) {
    <div class="gva-search-box">
      <el-form ref="searchForm" :inline="true" :model="queryParams">
        <el-form-item label="交易类别">
-          <el-select v-model="queryParams.subject" clearable placeholder="请选择">
+          <el-select v-model="queryParams.type" clearable placeholder="请选择">
            <el-option
              v-for="item in deal_types"
              :key="item.value"
              :label="item.name"
-              :value="item.name"
+              :value="item.value"
            />
          </el-select>
        </el-form-item>
@@ -108,10 +110,10 @@ function getTypeName(type) {
    <div class="gva-table-box">
      <!--      数据列表-->
      <el-table :data="tableData">
-        <el-table-column align="left" label="交易单号" min-width="150" prop="wallet_log_id" />
+        <el-table-column align="left" label="交易单号" min-width="150" prop="consume_id" />
        <el-table-column align="left" label="交易类型" min-width="150">
          <template #default="scope">
-            {{getTypeName(scope.row.wallet_log_type)}}
+            {{getTypeName(scope.row.point_type)}}
          </template>
        </el-table-column>
        <el-table-column align="left" label="交易时间" min-width="150" >
--- a/src/view/dealDetailManage/learningDetail.vue
+++ b/src/view/dealDetailManage/learningDetail.vue
@@ -83,7 +83,8 @@ function initChart() { // echart
 async function getSubject(){ // 获取课程分类
  const res = await capi.getSubjectList(subjectParams.value)
  if(res.code === 0) {
-    subjectList.value = custom.getStdSubject(res.data.records)
+    // subjectList.value = custom.getStdSubject(res.data.records)
+    subjectList.value = custom.addTreeFormatSubject(res.data.records,'id')
    // console.log(subjectList.value)
  }
 }
@@ -106,6 +107,7 @@ const onReset = () => {
    last_time:'',
    subject:''
  }
+  queryParams.value.id = parseInt(route.params.user_id)
 }
 // const handleSelectionChange = (val) => {
 //   question_ids.value = val
@@ -126,14 +128,15 @@ function handleSizeChange(val) {
      <el-form ref="searchForm" :inline="true" :model="queryParams">

        <el-form-item label="课程分类">
-          <el-select v-model="queryParams.subject" clearable placeholder="请选择">
-            <el-option
-              v-for="item in subjectList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
+<!--          <el-select v-model="queryParams.subject" clearable placeholder="请选择">-->
+<!--            <el-option-->
+<!--              v-for="item in subjectList"-->
+<!--              :key="item.id"-->
+<!--              :label="item.name"-->
+<!--              :value="item.id"-->
+<!--            />-->
+<!--          </el-select>-->
+          <el-tree-select v-model="queryParams.subject" :data="subjectList" :render-after-expand="false" />
        </el-form-item>

        <el-form-item label="最后学习时间">
@@ -163,7 +166,7 @@ function handleSizeChange(val) {
          </template>
        </el-table-column>
        <el-table-column align="left" label="科目" min-width="150" prop="subject"></el-table-column>
-        <el-table-column align="left" label="课程" min-width="150" prop="subject" />
+        <el-table-column align="left" label="课程" min-width="150" prop="name" />
        <el-table-column align="left" label="学习时长(分钟)" min-width="150" prop="duration" />

      </el-table>
--- a/src/view/dealDetailManage/raffleDetail.vue
+++ b/src/view/dealDetailManage/raffleDetail.vue
@@ -37,7 +37,7 @@ const typeList = ref([
 ])
 // 生命周期
 onMounted(() => {
-  // getRaffleDetailList()
+  getRaffleDetailList()
 })
 // 方法
 async function getRaffleDetailList() {
--- a/src/view/dealDetailManage/testDetail.vue
+++ b/src/view/dealDetailManage/testDetail.vue
@@ -36,8 +36,9 @@ onMounted(() => {
 async function getSubject(){ // 获取课程分类
  const res = await capi.getSubjectList(subjectParams.value)
  if(res.code === 0) {
-    subjectList.value = custom.getStdSubject(res.data.records)
+    // subjectList.value = custom.getStdSubject(res.data.records)
    // console.log(subjectList.value)
+     subjectList.value = custom.addTreeFormatSubject(res.data.records,'id')
  }
 }
 async function getTestDetailList() {
@@ -58,6 +59,7 @@ const onReset = () => {
    last_time:'',
    subject:''
  }
+  queryParams.value.id = parseInt(route.params.user_id)
 }
 function handleCurrentChange(val) {
  queryParams.value.page = val
@@ -82,14 +84,15 @@ async function getCourseName(course_id) {
      <el-form ref="searchForm" :inline="true" :model="queryParams">

        <el-form-item label="课程分类">
-          <el-select v-model="queryParams.subject" clearable placeholder="请选择">
-            <el-option
-              v-for="item in subjectList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
+<!--          <el-select v-model="queryParams.subject" clearable placeholder="请选择">-->
+<!--            <el-option-->
+<!--              v-for="item in subjectList"-->
+<!--              :key="item.id"-->
+<!--              :label="item.name"-->
+<!--              :value="item.id"-->
+<!--            />-->
+<!--          </el-select>-->
+          <el-tree-select v-model="queryParams.subject" :data="subjectList" :render-after-expand="false" />
        </el-form-item>

        <el-form-item label="测试时间">