Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/locales/zh-CN.js

@@ -218,8 +218,8 @@ export default {
   },
   publicRecruitment: {
     publicRecruitment: '众聘',
-    myPR: '我的众聘',
+    myPR: '赏金与积分', // 我的众聘
     myRecommendation: '我的推荐',
-    myRegistration: '我的报名',
+    myRegistration: '我的积分',
   }
 }

src/router/modules/personal.js

@@ -107,14 +107,14 @@ const personal = [
     component: Layout,
     name: 'myPublicRecruitment',
     meta: {
-      title: '我的众聘'
+      title: '赏金与积分' // 我的众聘
     },
     children: [
       {
         path: '/myPublicRecruitment',
         component: () => import('@/views/personal/myPublicRecruitment/index'),
         meta: {
-          title: '我的众聘'
+          title: '赏金与积分'
         },
       }
     ]

src/views/personal/myPublicRecruitment/components/bountyDisplay.vue

@@ -1,5 +1,6 @@
 <!-- 滚动展示 -->
 <template>
+  <!-- height从外部传入 -->
   <div style="height: 100%; width: 100%;">
     <div class="mb-3" style="font-size: 13px; color: #666;">最近30天已有<span class="red">68人</span>提现成功，累计提现<span class="red">￥9450</span></div>
     <!-- 滚动 -->
@@ -19,7 +20,6 @@
         <div class="d-flex align-center">
           <v-avatar size="30" :image="item.avatar || 'https://minio.citupro.com/dev/menduner/7.png'"></v-avatar>
           <div class="ml-2">{{ formatName(item.name) }}</div>
-          <!-- <div class="ml-2">{{ item.name }}</div> -->
         </div>
         <div class="d-flex" style="width: calc(100% - 65px);">
           <!-- 内容 -->
@@ -32,8 +32,6 @@
           <div>提现￥<span class="red">{{ item.money }}</span></div>
         </div>
       </div>
-       <!-- <div class="scrollBox" id="scrollBox">
-       </div> -->
     </div>
   </div>
 </template>
@@ -62,7 +60,6 @@ for (let index = 0; index < 68; index++) {
   const obj = {
     id: 'id' + (index+1),
     name: '用户' + (index+1),
-    // name: (index+1),
     avatar: avatarList[index % 7],
     company: '某某公司' + (index+1),
     job: '某某职位' + (index+1),
@@ -89,7 +86,6 @@ const dataItemHeight = 40
 // 容器的 dom 节点
 const scrollRef = ref()
 // // 模拟列表数据
-// const listSource = new Array(10).fill(0).map((_, index) => ({ title: `这是一条信息${index}`}))
 const list = ref([...listSource])
 
 // 记录原始数据的长度
@@ -137,7 +133,6 @@ onMounted(() => {
     }
     scroll()
   }
-  // if (len*dataItemHeight > clientHeight) scroll()
 })
 </script>
 <style lang="scss" scoped>

src/views/personal/myPublicRecruitment/index.vue

@@ -1,4 +1,4 @@
-<!-- 我的众聘 -->
+<!-- 赏金与积分  // 我的众聘 -->
 <template>
   <div class="default-width py-3">
     <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList">
@@ -10,7 +10,7 @@
       <div v-if="tab === 1">
         <myRecommendation></myRecommendation>
       </div>
-      <!-- 我的报名 -->
+      <!-- 我的积分 -->
       <div v-if="tab === 2" class="pa-3 white-bgc" style="min-height: 500px; border-radius: 5px;">
         <myRegistration></myRegistration>
       </div>

src/views/personal/myPublicRecruitment/myRecommendation.vue

@@ -64,7 +64,7 @@ const statisticsClick = (item, index) => {
     dataList.value.push({ ...dataItem, avatar: avatarList[i], name: dataItem.name+(i+1) })
   }
 }
-statisticsClick(statisticsList.value[0])
+statisticsClick(statisticsList.value[0], 0)
 </script>
 <style lang="scss" scoped>
 .topTip {

src/views/personal/myPublicRecruitment/myRegistration.vue

@@ -1,6 +1,6 @@
-<!-- 我的报名 -->
+<!-- 我的积分 -->
 <template>
-  <div>我的报名</div>
+  <div>我的积分</div>
 </template>
 
 <script setup>