积分兑换记录

src/layout/index.vue

@@ -35,8 +35,7 @@ const footerWhiteList = [
   '/headhunting',
   '/headhunting/service',
   '/headhunting/service/details',
-  '/recruit/personal/resume/analysis',
-  '/mall/pointExchange/records'
+  '/recruit/personal/resume/analysis'
 ]
 const router = useRouter()
 const sharedState = useSharedState()

src/router/modules/recruit.js

@@ -67,14 +67,6 @@ const recruit = [
           title: '商品详情'
         }
       },
-      {
-        path: '/mall/pointExchange/records',
-        component: () => import('@/views/mall/home/pointExchange/records.vue'),
-        name: 'mallPointExchangeRecords',
-        meta: {
-          title: '积分兑换记录'
-        }
-      },
       {
         path: '/mall/user',
         redirect: '/mall/user/order',

src/views/mall/home/pointExchange/index.vue

@@ -5,7 +5,7 @@
       <div>
         <span class="cursor-pointer active" @click="handleTo('/recruit/personal/personalCenter/wallet')">当前账户积分：{{ point }}</span>
         <span class="septal-line"></span>
-        <span class="cursor-pointer active" @click="handleTo('/mall/pointExchange/records')">兑换记录</span>
+        <span class="cursor-pointer active" @click="handleTo('/recruit/personal/personalCenter/tradeOrder?key=2')">兑换记录</span>
       </div>
     </div>
     <div class="goods-box mt-5">

src/views/mall/home/pointExchange/records.vue

@@ -1,65 +0,0 @@
-<template>
-  <div class="pa-5 white-bgc" style="height: calc(100vh - 50px);">
-    <!-- <v-breadcrumbs color="primary" :items="breadcrumbs"></v-breadcrumbs> -->
-    <v-btn class="mb-3" size="large" color="primary" variant="text" prepend-icon="mdi-chevron-triple-left" @click="router.go(-1)">返回上一页</v-btn>
-    <v-card elevation="5">
-      <CtTable
-        :items="dataList"
-        :headers="headers"
-        :loading="false"
-        :elevation="0"
-        :isTools="false"
-        :showPage="true"
-        :total="total"
-        :page-info="queryParams"
-        itemKey="id"
-        @pageHandleChange="handleChangePage"
-      >
-      </CtTable>
-    </v-card>
-  </div>
-</template>
-
-<script setup>
-defineOptions({name: 'mall-point-exchange-records'})
-import { ref } from 'vue'
-import { getRedeemPage } from '@/api/mall/index.js'
-import { getToken } from '@/utils/auth'
-import { useRouter } from 'vue-router'
-
-const router = useRouter()
-const total = ref(0)
-const headers = [
-  { title: '商品名称', key: 'name', sortable: false },
-  { title: '消耗积分', key: 'point', sortable: false },
-  { title: '收货人姓名', key: 'contactName', sortable: false },
-  { title: '联系电话/收货人电话', key: 'contactPhone', sortable: false },
-  { title: '收货详细地址', key: 'contactAddress', sortable: false },
-  { title: '订单编号', key: 'orderNo', sortable: false }
-]
-const breadcrumbs = [
-  { title: '首页', href: '/mall' },
-  { title: '积分兑换记录', href: '/mall/pointExchange/records', disabled: true }
-]
-const queryParams = ref({
-  pageNo: 1,
-  pageSize: 10,
-})
-
-// 数据
-const dataList = ref([])
-const getData = async () => {
-  const res  = await getRedeemPage(queryParams.value)
-  dataList.value = res.list
-  total.value = res.total
-}
-if (getToken()) getData()
-
-const handleChangePage = (e) => {
-  queryParams.value.pageNo = e
-  getData()
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/recruit/personal/PersonalCenter/tradeOrder/dynamic/pointExchangeRecord.vue

@@ -0,0 +1,53 @@
+<template>
+  <CtTable
+    class="mt-3"
+    :items="dataList"
+    :headers="headers"
+    :loading="false"
+    :elevation="0"
+    :isTools="false"
+    :showPage="true"
+    :total="total"
+    :page-info="queryParams"
+    itemKey="id"
+    @pageHandleChange="handleChangePage"
+  >
+  </CtTable>
+</template>
+
+<script setup>
+defineOptions({name: 'personal-person-center-point-exchange-records'})
+import { ref } from 'vue'
+import { getRedeemPage } from '@/api/mall/index.js'
+
+const total = ref(0)
+const headers = [
+  { title: '商品名称', key: 'name', sortable: false },
+  { title: '消耗积分', key: 'point', sortable: false },
+  { title: '收货人姓名', key: 'contactName', sortable: false },
+  { title: '联系电话/收货人电话', key: 'contactPhone', sortable: false },
+  { title: '收货详细地址', key: 'contactAddress', sortable: false },
+  { title: '订单编号', key: 'orderNo', sortable: false }
+]
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+})
+
+// 数据
+const dataList = ref([])
+const getData = async () => {
+  const res  = await getRedeemPage(queryParams.value)
+  dataList.value = res.list
+  total.value = res.total
+}
+getData()
+
+const handleChangePage = (e) => {
+  queryParams.value.pageNo = e
+  getData()
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/recruit/personal/PersonalCenter/tradeOrder/index.vue

@@ -1,4 +1,3 @@
-<!--  -->
 <template>
   <div class="white-bgc pa-3">
     <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="handleChangeTab">
@@ -13,17 +12,23 @@ defineOptions({name: 'tradingOrder'})
 import { ref, shallowRef } from 'vue'
 import RechargeVipOrder from './dynamic/rechargeVip.vue'
 import MallOrder from './dynamic/mallOrder.vue'
+import PointExchangeRecord from './dynamic/pointExchangeRecord.vue'
+import { useRoute } from 'vue-router'
 
 const tab = ref(0)
 const items = shallowRef([
   { label: '余额充值、购买会员订单', value: 0, path: RechargeVipOrder },
-  { label: '商城交易订单', value: 1, path: MallOrder }
+  { label: '商城交易订单', value: 1, path: MallOrder },
+  { label: '积分兑换记录', value: 2, path: PointExchangeRecord }
 ])
+const route = useRoute()
+const { key } = route.query
+if (key) tab.value = Number(key)
 
 // 切换
 const handleChangeTab = () => {
 }
-
 </script>
+
 <style lang="scss" scoped>
 </style>