我的奖品移动到交易订单中

src/router/modules/components/recruit/personCenter.js

@@ -199,18 +199,7 @@ const personCenter = [
               enName: 'Shipping Address',
               icon: 'mdi-map-marker-outline'
             }
-          },
-          // 我的奖品
-          {
-            path: '/recruit/personal/personalCenter/myPrizes',
-            name: 'My Prizes',
-            component: () => import('@/views/recruit/personal/PersonalCenter/myPrizes/index.vue'),
-            meta: {
-              title: '我的奖品',
-              enName: 'My Prizes',
-              icon: 'mdi-star-four-points-outline'
-            }
-          },
+          }
         ]
       }
     ]

src/views/mall/components/GoodsItem/index.vue

@@ -11,7 +11,7 @@
           <span class="color-333">￥{{ fen2yuan(item.price) }}</span>
           <span v-if="item.count" class="color-999 font-size-13 ml-1">x {{ item.count }}</span>
         </p>
-        <p v-if="lottery && lottery.length" class="font-size-14 color-primary text-decoration-underline" @click.stop="router.push('/recruit/personal/personalCenter/myPrizes')">
+        <p v-if="lottery && lottery.length" class="font-size-14 color-primary text-decoration-underline" @click.stop="router.push('/recruit/personal/personalCenter/tradeOrder?key=3')">
           奖品：{{ lottery.map(e => e.prize.name).join('、') }}
         </p>
       </div>

src/views/recruit/personal/PersonalCenter/tradeOrder/components/detail.vue

@@ -23,7 +23,7 @@
           </template>
           <template #spuName="{ item }">
             <span class="color-primary cursor-pointer" @click="handleToGoodsDetail(item)">{{ item.spuName }}</span>
-            <p v-if="order.lottery && order.lottery.length" class="color-999 color-primary mt-1 cursor-pointer text-decoration-underline" @click.stop="router.push('/recruit/personal/personalCenter/myPrizes')">奖品：{{ order.lottery.map(e => e.prize.name).join('、') }}</p>
+            <p v-if="order.lottery && order.lottery.length" class="color-999 color-primary mt-1 cursor-pointer text-decoration-underline" @click.stop="router.push('/recruit/personal/personalCenter/tradeOrder?key=3')">奖品：{{ order.lottery.map(e => e.prize.name).join('、') }}</p>
           </template>
           <template #actions="{ item }">
             <div v-if="[10, 20, 30].includes(order.status) && item.extend && item.extend.fileUrls && item.extend.fileUrls.length > 0">

src/views/recruit/personal/PersonalCenter/myPrizes/index.vue → src/views/recruit/personal/PersonalCenter/tradeOrder/dynamic/myPrize.vue

@@ -8,9 +8,11 @@
     :isTools="false"
     :total="total"
     :showPage="true"
+		:itemsPerPage="5"
     :showSelect="false"
     :page-info="queryParams"
     itemKey="id"
+		@pageHandleChange="handleChangePage"
   >
     <template #prize="{ item }">
       <div class="d-flex align-center my-1">
@@ -54,13 +56,12 @@ import { timesTampChange } from '@/utils/date'
 
 const queryParams = ref({
 	pageNo: 1,
-	pageSize: 10,
+	pageSize: 5,
 })
 const total = ref(0)
 const items = ref([])
 
 const headers = [
-  // { title: '活动名称', key: 'lottery.name', sortable: false },
   { title: '奖品信息', key: 'prize', sortable: false },
   { title: '收货信息', key: 'receiveInfo', sortable: false },
   { title: '发货信息', key: 'deliverInfo', sortable: false },
@@ -83,6 +84,11 @@ const orderReceiveInfo = computed(() => (item) => {
   return `${info.name}，${info.mobile}，${info.areaName} ${info.detailAddress}`
 })
 
+const handleChangePage = (e) => {
+	queryParams.value.pageNo = e
+	getLuckLotteryRecordList()
+}
+
 // 领取
 const selectAddressRef = ref()
 const showDialog = ref(false)

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

@@ -13,13 +13,15 @@ import { ref, shallowRef } from 'vue'
 import RechargeVipOrder from './dynamic/rechargeVip.vue'
 import MallOrder from './dynamic/mallOrder.vue'
 import PointExchangeRecord from './dynamic/pointExchangeRecord.vue'
+import MyPrize from './dynamic/myPrize.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: 2, path: PointExchangeRecord }
+  { label: '积分兑换记录', value: 2, path: PointExchangeRecord },
+  { label: '我的奖品', value: 3, path: MyPrize }
 ])
 const route = useRoute()
 const { key } = route.query