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

.env.development

@@ -3,13 +3,13 @@ NODE_ENV = 'development'
 VITE_APP_TITLE = 门墩儿
 
 # 访问路径
-VITE_ACCESS_BASE_URL = 'http://175.27.171.220/'
+VITE_ACCESS_BASE_URL = 'http://menduner.citupro.com:7878' #http://175.27.171.220/
 
 # 请求路径
-VITE_BASE_URL = 'http://175.27.171.220/'
+VITE_BASE_URL = 'http://menduner.citupro.com:7878' #http://175.27.171.220/
 
 # 预览路径
-VITE_PREVIEW_URL = 'https://kkfileview.menduner.com/'
+VITE_PREVIEW_URL = 'http://192.168.3.91:8012' #https://kkfileview.menduner.com/
 
 # 租户id
 VITE_TENANTCODE = '155'

src/views/about/index.vue

@@ -122,7 +122,7 @@ const introduce = [
 .banner {
   width: 100%;
   height: 390px;
-  background-image: url('https://minio.citupro.com/dev/menduner/home/about-bg.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/about-banner.png');
   background-position: center center;
   background-repeat: no-repeat;
   background-size: cover;

src/views/login/forgotPassword.vue

@@ -29,7 +29,7 @@ const router = useRouter()
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
 }
 .content {

src/views/login/forgotPasswordEnt.vue

@@ -53,7 +53,7 @@ const verifySuccess = (params) => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
 }
 .content {

src/views/login/index.vue

@@ -222,7 +222,7 @@ const verifySuccess = (params) => {
   position: relative;
   width: 100%;
   height: 100vh;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
   overflow: hidden;
   .navBar {

src/views/recruit/entRegister/inReview.vue

@@ -13,6 +13,13 @@
         <div v-if="!applyInfo || !(Object.keys(applyInfo).length)" class="d-flex flex-column align-center">
           <svg-icon name="submit" size="300"></svg-icon>
           <div><strong class="color-primary font-size-20">提交成功，</strong>已收到您的企业账号申请，审核时间预计在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收。</div>
+          <div style="width: 100%;">
+            <div class="mt-5 mb-1">如有疑问请扫码添加下方企业微信联系我们：</div>
+            <div style="width: 150px; height: 150px; margin: auto;">
+              <v-img src="https://minio.menduner.com/dev/menduner/contact.png" width="150" height="150"></v-img>
+            </div>
+            <div class="text-center ml-5">潘青海先生（Peter Pan）</div>
+          </div>
         </div>
 
         <!-- 等待审核 -->
@@ -26,6 +33,13 @@
           <div class="mt-5">
             <span>提交时间：{{ applyInfo.createTime }}</span>
           </div>
+          <div style="width: 100%;">
+            <div class="mt-5 mb-1">如有疑问请扫码添加下方企业微信联系我们：</div>
+            <div style="width: 150px; height: 150px; margin: auto;">
+              <v-img src="https://minio.menduner.com/dev/menduner/contact.png" width="150" height="150"></v-img>
+            </div>
+            <div class="text-center ml-5">潘青海先生（Peter Pan）</div>
+          </div>
         </div>
 
         <!-- 审核不通过 -->
@@ -41,6 +55,13 @@
           <div class="mt-5">
             <span>提交时间：{{ applyInfo.createTime }}</span>
           </div>
+          <div style="width: 100%;">
+            <div class="mt-5 mb-1">如有疑问请扫码添加下方企业微信联系我们：</div>
+            <div style="width: 150px; height: 150px; margin: auto;">
+              <v-img src="https://minio.menduner.com/dev/menduner/contact.png" width="150" height="150"></v-img>
+            </div>
+            <div class="text-center ml-5">潘青海先生（Peter Pan）</div>
+          </div>
         </div>
 
         <!-- 审核通过（审核通过不会进入此页面） -->

src/views/recruit/entRegister/register.vue

@@ -4,7 +4,7 @@
       <!-- 标题 -->
       <div class="mt-3" v-if="!isMobile">
         <v-btn v-if="pageType !== 'noLoginToRegister'" color="primary" variant="text" @click="router.push('/recruitHome')">{{ `<< 回到首页` }}</v-btn>
-        <div v-else style="height: 30px;"></div>
+        <v-btn v-else color="primary" variant="text" @click="router.push('/login')">{{ `<< 回到登录页` }}</v-btn>
       </div>
       <!-- 表单 -->
       <div class="CtFormClass" :style="{width: isMobile ? '' : '600px'}">
@@ -460,7 +460,7 @@ const passwordConfirmObj = {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
 }
 .file-box {

src/views/recruit/enterprise/systemManagement/groupAccount/components/record.vue

@@ -41,10 +41,14 @@ const query = ref({
 const headers = [
   { title: '企业名称', key: 'showInfo.currentAccountEnterpriseAnotherName', sortable: false },
   { title: '邀请人', key: 'showInfo.currentAccountUserName', sortable: false },
-  { title: 'invited', key: 'showInfo.invited', sortable: false },
+  { title: 'invited', key: 'showInfo.name', sortable: false },
   { title: t('enterprise.userManagement.invitationTime'), key: 'showInfo.time', sortable: false },
 ]
-headers.forEach(e => { if (e.title === 'invited') e.title = props.inviteType - 0 ? '受邀企业' : '受邀人' })
+headers.forEach(e => {
+  if (e.title === 'invited') {
+    e.title = props.inviteType - 0 ? '受邀企业' : '受邀人'
+  }
+})
 
 // 获取数据
 const getData = async () => {
@@ -52,37 +56,21 @@ const getData = async () => {
   try {
     const info = JSON.parse(localStorage.getItem('entBaseInfo')) || null
     const { list, total: number } = await enterpriseInviteRecordPage(query.value)
-    // const invitedNames = await Promise.all(list.map(async () => getInvited()))
     tableData.value = list.map(e => {
       const showInfo = {
         currentAccountEnterpriseAnotherName: info?.enterpriseAnotherName || '--',
         currentAccountUserName: info?.name || '--',
-        // invited: invitedNames[index] || '--', // 使用预先获取的invited名称
-        invited: e?.enterpriseUser?.enterpriseName || '--', // 使用预先获取的invited名称
+        name: props.inviteType - 0 ? e?.enterpriseUser?.enterpriseName : e?.enterpriseUser?.name,
         time: e.createTime ? timesTampChange(e.createTime) : '--',
       }
       return { showInfo, ...e }
     })
-    console.log('tableData.value', tableData.value)
     total.value = number
   } finally {
     loading.value = false
   }
 }
 
-// const getInvited = async (val) => {
-//   try {
-//     if (val) {
-//       const api = props.inviteType - 0 ? enterpriseInviteRecordPage: enterpriseInviteRecordPage
-//       const { data } = await api(query.value)
-//       return data.name
-//     } else {
-//       return '-占位-'
-//     }
-//   } catch (error) {
-//     console.log('error', error)
-//   }
-// }
 getData()
 
 const handleChangePage = (index) => {

src/views/recruit/enterprise/talentRecommendation/index.vue

@@ -191,7 +191,7 @@ const handleSearch = (val) => {
   position: relative;
   width: 100%;
   height: 100vh;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
   &-box {
     position: absolute;

src/views/recruit/personal/PersonalCenter/memberBenefits/taskCenter/index.vue

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

src/views/recruit/personal/position/components/details.vue

@@ -47,7 +47,6 @@
                   <div class="resume-title">{{ $t('position.jobResponsibilities') }}：</div>
                 </div>
                 <div v-if="info.content" class="requirement" v-html="cleanedHtml(info.content)"></div>
-                <!-- <div v-if="info.content" class="requirement" v-html="info.content.replace(/\n/g, '</br>')"></div> -->
                 <div v-else>暂无</div>
               </div>
               <div class="mt-3">

src/views/register/company.vue

@@ -44,7 +44,7 @@ const handleValidate = async () => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center center;

src/views/register/person.vue

@@ -75,7 +75,7 @@ const handleRegister = async () => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
 }
 .content {

src/views/register/select.vue

@@ -34,7 +34,7 @@ const handleToRegister = (path) => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://www.mendunerhr.com/images/userfiles/92d7e4a755e2428b94aab3636d5047f3/images/recruitment/adImages/2018/11/1920x940.jpg');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
   background-size: cover;
 }
 .register-content {