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

src/layout/personal/navBar.vue

@@ -39,7 +39,7 @@
           <div class="d-flex align-center" v-if="getToken()">
             <a href="/purchasePackage" class="cursor-pointer mr-5" style="color: #FB8C00;">{{ $t('sys.purchasePackage') }}</a>
             <span class="cursor-pointer">{{ $t('sys.news') }}</span>
-            <span class="cursor-pointer ml-5" @click="router.push({ path: '/personalTaskCenter' })">{{ $t('sys.sign') }}</span>
+            <span class="cursor-pointer ml-5" @click="router.push({ path: '/personalTaskCenter' })">{{ $t('sys.signIn') }}</span>
             <v-menu open-on-hover>
               <template v-slot:activator="{ props }">
                 <div class="d-flex ml-5 pl-2 align-center cursor-pointer" v-bind="props" @click="handleToPersonalCenter">

src/locales/en.js

@@ -69,7 +69,7 @@ export default {
     tourist: 'Tourist',
     purchasePackage: 'Purchase Package',
     news: 'News',
-    sign: 'Sign in',
+    signIn: 'Sign in',
     lookingJob: 'Looking For Job',
     recruit: 'Recruit',
     switchCities: 'Switch Cities'

src/locales/zh-CN.js

@@ -69,7 +69,7 @@ export default {
     tourist: '游客',
     purchasePackage: '购买套餐',
     news: '消息',
-    sign: '签到',
+    signIn: '签到',
     lookingJob: '我要找工作',
     recruit: '我要招聘',
     switchCities: '切换城市'
@@ -228,7 +228,7 @@ export default {
     publicRecruitment: '众聘',
     myPR: '赏金与积分',
     myRecommendation: '我的推荐',
-    myRegistration: '我的积分',
+    myRegistration: '积分明细',
     // 积分
     whole: '全部',
     In: '收入',

src/views/personal/components/integralShow.vue

@@ -0,0 +1,30 @@
+<!--  -->
+<template>
+  <div class="statisticsBox">
+    <div class="mt-2">
+      <span style="font-size: 20px; color: #333; line-height: 28px; font-weight: bold;" class="ml-10">您当前赚取积分</span>
+      <span style="font-size: 14px; color: #777; line-height: 24px; cursor: pointer;" class="ml-2">积分规则</span>
+    </div>
+    <div class="d-flex justify-space-between align-end my-1">
+      <span style="font-size: 42px; color: #ff9300; line-height: 50px;" class="ml-10">{{ integral }}</span>
+      <span style="font-size: 16px; color: #787d82; line-height: 24px;" class="mr-8">
+        积分土豪的都喜欢来这里，
+        <span style="color: #ff7802; cursor: pointer;">积分商城</span>
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineOptions({name: 'myRegistration-integralShow'})
+const integral = '135'
+</script>
+<style lang="scss" scoped>
+.statisticsBox {
+  padding: 10px 0;
+  border-radius: 10px;
+  background-color: var(--default-bgc);
+  // background-color: #f3f3f3;
+  // font-family: 宋体, SimSun;
+}
+</style>

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

@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-defineOptions({ name: 'table-page'})
+defineOptions({ name: 'myPublicRecruitment-table-page'})
 import { ref } from 'vue'
 
 // const emit = defineEmits(['refresh'])

src/views/personal/myPublicRecruitment/index.vue

@@ -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: 600px; border-radius: 5px;">
         <myRegistration></myRegistration>
       </div>

src/views/personal/myPublicRecruitment/myRegistration.vue

@@ -1,23 +1,10 @@
-<!-- 我的积分 -->
+<!-- 积分明细 -->
 <template>
   <div>
-    <div class="statisticsBox">
-      <div class="mt-2">
-        <span style="font-size: 20px; color: #333; line-height: 28px; font-weight: bold;" class="ml-10">您当前赚取积分</span>
-        <span style="font-size: 14px; color: #777; line-height: 24px; cursor: pointer;" class="ml-2">积分规则</span>
-      </div>
-      <div class="d-flex justify-space-between align-end my-1">
-        <span style="font-size: 42px; color: #ff9300; line-height: 50px;" class="ml-10">{{ integral }}</span>
-        <span style="font-size: 16px; color: #787d82; line-height: 24px;" class="mr-8">
-          积分土豪的都喜欢来这里，
-          <span style="color: #ff7802; cursor: pointer;">积分商城</span>
-        </span>
-      </div>
-    </div>
+    <integralShow></integralShow>
     <!-- 任务中心 -->
     <div style="font-size: 14px; color: #777; text-align: right;" class="mr-5 mt-3 cursor-pointer" @click="router.push({ path: '/personalTaskCenter' })">《<span style=" color: var(--v-primary-base);">任务中心</span>》</div>
-    <!-- 数据 -->
-    <!-- <div class="d-flex mt-3"></div> -->
+    <!-- 积分明细 -->
     <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('publicRecruitment.whole') }}</v-tab>
@@ -32,10 +19,10 @@
 
 <script setup>
 import TablePage from './components/integralTable.vue'
+import integralShow from '@/views/personal/components/integralShow.vue'
 import { useRouter } from 'vue-router'; const router = useRouter()
 import { ref } from 'vue'
 defineOptions({name: 'personal-myPublicRecruitment-myRegistration'})
-const integral = '135'
 const tab = ref(0)
 const dataList = ref([])
 // 数据
@@ -55,11 +42,4 @@ const handleChangeTab = () => {
 }
 </script>
 <style lang="scss" scoped>
-.statisticsBox {
-  padding: 10px 0;
-  border-radius: 10px;
-  background-color: var(--default-bgc);
-  // background-color: #f3f3f3;
-  // font-family: 宋体, SimSun;
-}
 </style>

src/views/personal/purchasePackage/index.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup>
-import packagesDetail from './components/packagesDetail'
+import packagesDetail from './components/packagesDetail.vue'
 import { ref } from 'vue'
 defineOptions({name: 'personal-purchasePackage'})
 

src/views/personal/taskCenter/components/daily.vue

@@ -0,0 +1,10 @@
+<!-- 每日任务 -->
+<template>
+  <div>每日任务</div>
+</template>
+
+<script setup>
+defineOptions({name: 'personal-taskCenter-daily'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/personal/taskCenter/components/signIn.vue

@@ -0,0 +1,13 @@
+<!-- 签到 -->
+<template>
+  <div>
+    <integralShow></integralShow>
+  </div>
+</template>
+
+<script setup>
+import integralShow from '@/views/personal/components/integralShow.vue'
+defineOptions({name: 'personal-taskCenter-signIn'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/personal/taskCenter/components/suggest.vue

@@ -0,0 +1,10 @@
+<!-- 推荐任务 -->
+<template>
+  <div>推荐任务</div>
+</template>
+
+<script setup>
+defineOptions({name: 'personal-taskCenter-suggest'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/personal/taskCenter/index.vue

@@ -1,10 +1,24 @@
 <!-- 任务中心 -->
 <template>
-  <div>任务中心</div>
+  <div class="default-width py-3">
+    <!-- 签到 -->
+    <signIn class="white-bgc borderRadius5 pa-3"></signIn>
+    <!-- 任务 -->
+    <div class="white-bgc borderRadius5 mt-3 pa-3">
+      <!-- 推荐任务 -->
+      <suggest></suggest>
+      <!-- 每日任务 -->
+      <daily></daily>
+    </div>
+  </div>
 </template>
 
 <script setup>
+import signIn from './components/signIn.vue'
+import suggest from './components/suggest.vue'
+import daily from './components/daily.vue'
 defineOptions({name: 'personal-taskCenter-index'})
 </script>
 <style lang="scss" scoped>
+.borderRadius5 { border-radius: 5px; }
 </style>