积分明细接口更换

src/api/integral.js

@@ -22,8 +22,9 @@ export const getUserRewardPoint = async () => {
 }
 
 // 获取用户积分明细
-export const getUserRewardPointPage = async (pageNo, pageSize) => {
+export const getUserRewardPointPage = async (params) => {
   return await request.get({
-    url: `/app-api/menduner/reward/point/record/page?pageNo=${pageNo}&pageSize=${pageSize}`
+    url: `/app-api/menduner/reward/user/account/record/page`,
+    params
   })
 }

src/config/axios/service.js

@@ -88,12 +88,12 @@ service.interceptors.request.use(
       }
     }
     // 截取request url
-    const url = getSuffixAfterPrefix(config.url)
-    if (!url || !clickTrigger.length) return config
-    const _obj = clickTrigger.find(e => e.url === url)
-    if (_obj) {
-      rewardEventTrackClick(_obj.url)
-    }
+    // const url = getSuffixAfterPrefix(config.url)
+    // if (!url || !clickTrigger.length) return config
+    // const _obj = clickTrigger.find(e => e.url === url)
+    // if (_obj) {
+    //   rewardEventTrackClick(_obj.url)
+    // }
     return config
   },
   (error) => {
@@ -197,15 +197,15 @@ service.interceptors.response.use(
     }
     
     // 请求成功后触发获取积分
-    if (!requestCompletionTrigger.length) {
-      return data
-    }
-    const _list = requestCompletionTrigger.filter(_e => {
-      return response.config.url.includes(_e.url)
-    })
-    if (_list.length) {
-      rewardEventTrackClick(_list.pop().url)
-    }
+    // if (!requestCompletionTrigger.length) {
+    //   return data
+    // }
+    // const _list = requestCompletionTrigger.filter(_e => {
+    //   return response.config.url.includes(_e.url)
+    // })
+    // if (_list.length) {
+    //   rewardEventTrackClick(_list.pop().url)
+    // }
     return data
   },
   (error) => {

src/views/integral/pointsManagement/components/integralTable.vue

@@ -20,9 +20,9 @@ defineProps({
 })
 
 const headers = [
-  { title: '来源', key: 'description' },
-  { title: '积分数', key: 'point' },
-  { title: '总积分数', key: 'totalPoint' },
+  { title: '来源', key: 'description', sortable: false},
+  { title: '积分数', key: 'point', sortable: false },
+  { title: '总积分数', key: 'totalPoint', sortable: false },
   { title: '获得时间', key: 'createTime', value: item =>  timesTampChange(item.createTime), sortable: false }
 ]
 </script>

src/views/integral/pointsManagement/components/signInTable.vue

@@ -22,8 +22,8 @@ defineProps({
 
 const { t } = useI18n()
 const headers = [
-  { title: t('taskCenter.signInDays'), key: 'day' },
-  { title: t('taskCenter.points'), key: 'point' },
+  { title: t('taskCenter.signInDays'), key: 'day', sortable: false },
+  { title: t('taskCenter.points'), key: 'point', sortable: false },
   { title: t('taskCenter.createTime'), key: 'createTime', value: item => timesTampChange(item.createTime), sortable: false }
 ]
 </script>

src/views/integral/pointsManagement/pointsDetails.vue

@@ -3,15 +3,15 @@
   <div class="mt-3">
     <v-tabs v-model="tab" style="border-radius: 5px;" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
       <v-tab :value="1"> {{ $t('points.whole') }}</v-tab>
-      <v-tab :value="2">{{ $t('sys.signIn') }}</v-tab>
+      <!-- <v-tab :value="2">{{ $t('sys.signIn') }}</v-tab> -->
     </v-tabs>
     <TablePage v-if="tab === 1" :items="dataList"></TablePage>
-    <SignInTable v-if="tab === 2" :items="dataList"></SignInTable>
+    <!-- <SignInTable v-if="tab === 2" :items="dataList"></SignInTable> -->
     <CtPagination
       v-if="total > 0"
       :total="total"
-      :page="pageNo"
-      :limit="pageSize"
+      :page="query.pageNo"
+      :limit="query.pageSize"
       @handleChange="handleChangePage"
     ></CtPagination>
   </div>
@@ -21,35 +21,38 @@
 defineOptions({name: 'personal-pointsManagement-pointsDetails'})
 import { ref } from 'vue'
 import TablePage from './components/integralTable.vue'
-import SignInTable from './components/signInTable.vue'
+// import SignInTable from './components/signInTable.vue'
 import { getUserRewardPointPage } from '@/api/integral'
-import { getRewardSignInRecordPage } from '@/api/sign'
+// import { getRewardSignInRecordPage } from '@/api/sign'
 
 const tab = ref(1)
 
 // 数据
 const total = ref(0)
-const pageNo = ref(1)
-const pageSize = ref(10)
+const query = ref({
+  pageNo: 1,
+  pageSize: 10,
+  type: 0
+})
 const dataList = ref([])
 
 // 积分、签到明细
 const getData = async () => {
-  const api = tab.value === 1 ? getUserRewardPointPage : getRewardSignInRecordPage
-  const res = await api(pageNo.value, pageSize.value)
+  // const res = tab.value === 1 ? await getUserRewardPointPage({ pageNo: pageNo.value, pageSize: pageSize.value, type: 0 }) : await getRewardSignInRecordPage(pageNo.value, pageSize.value)
+  const res = await getUserRewardPointPage(query.value)
   dataList.value = res.list
   total.value = res.total
 }
 getData()
 
 const handleChangePage = (e) => {
-  pageNo.value = e
+  query.value.pageNo = e
   getData()
 }
 
 // 切换
 const handleChangeTab = () => {
-  pageNo.value = 1
+  query.value.pageNo = 1
   getData()
 }
 </script>

src/views/recruit/enterprise/memberCenter/myPoints/pointsDetails.vue

@@ -11,8 +11,8 @@
     <CtPagination
       v-if="total > 0"
       :total="total"
-      :page="pageNo"
-      :limit="pageSize"
+      :page="query.pageNo"
+      :limit="query.pageSize"
       @handleChange="handleChangePage"
     ></CtPagination>
   </div>
@@ -27,26 +27,29 @@ const tab = ref(0)
 
 // 数据
 const total = ref(0)
-const pageNo = ref(1)
-const pageSize = ref(10)
+const query = ref({
+  pageNo: 1,
+  pageSize: 10,
+  type: 0
+})
 const dataList = ref([])
 
 // 积分明细
 const getData = async () => {
-  const res = await getUserRewardPointPage(pageNo.value, pageSize.value)
+  const res = await getUserRewardPointPage(query.value)
   dataList.value = res.list
   total.value = res.total
 }
 getData()
 
 const handleChangePage = (e) => {
-  pageNo.value = e
+  query.value.pageNo = e
   getData()
 }
 
 // 切换
 const handleChangeTab = () => {
-  pageNo.value = 1
+  query.value.pageNo = 1
   // tab
   // getData()
 }