zhengyiming
2025-02-13 591a3742e98ad926c88059b8fe8eabd3a8630c25
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
24个文件已修改
5个文件已添加
164 ■■■■ 已修改文件
apps/bMiniApp/project.private.config.json 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/constants/router.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/pages/mine/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/setting/setting.config.ts 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/setting/setting.vue 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/assets/mine/icon-female.png 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/assets/mine/icon-male.png 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/assets/mine/icon-phone.png 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/mineAgreementSign.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/MineAgreementSignDetailCard.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/MineAgreementSignDetailItem.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineCancel/mineCancel.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineCollectTask/mineCollectTask.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/mine/mineSign/mineSign.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/project.private.config.json
@@ -3,12 +3,19 @@
  "projectname": "bMiniApp",
  "setting": {
    "compileHotReLoad": true,
    "bigPackageSizeSupport": true,
    "skylineRenderEnable": false
        "bigPackageSizeSupport": true
  },
  "condition": {
    "miniprogram": {
      "list": []
            "list": [
                {
                    "name": "",
                    "pathName": "pages/mine/index",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                }
            ]
    }
  },
  "libVersion": "3.7.3"
apps/bMiniApp/src/constants/router.ts
@@ -18,4 +18,6 @@
  authenticationFaRen = '/subpackages/authentication/authenticationFaRen/authenticationFaRen',
  authenticationJBR = '/subpackages/authentication/authenticationJBR/authenticationJBR',
  citySelect = '/subpackages/city/citySelect/citySelect',
  setting = '/subpackages/mine/setting/setting',
}
apps/bMiniApp/src/pages/mine/index.vue
@@ -11,7 +11,7 @@
      <img :src="OssAssets.mine.Bg" class="mine-page-bg" :style="{ height: `${bgHeight}px` }" />
    </template>
    <ContentView>
      <UserHomeTopView :showUserHomePageBtn="isLogin" :showOperation="isLogin">
      <UserHomeTopView :showUserHomePageBtn="false" :showOperation="isLogin">
        <template #avatar>
          <div class="mine-avatar-wrapper" @click="goLogin">
            <UserAvatar :size="60" class="mine-avatar" />
apps/bMiniApp/src/subpackages/mine/setting/setting.config.ts
New file
@@ -0,0 +1,3 @@
export default definePageConfig({
  disableScroll: true,
});
apps/bMiniApp/src/subpackages/mine/setting/setting.vue
New file
@@ -0,0 +1,66 @@
<template>
  <PageLayout title="设置" class="setting-page-wrapper" hasBorder>
    <List>
      <ListItem title="登录账号">
        <template #extra>
          <div class="user-account">
            {{ userAccount }}
          </div>
        </template>
      </ListItem>
      <ListItem title="用户协议" @click="goMineUserPolicy"></ListItem>
      <ListItem title="隐私政策" @click="goPrivacyPolicy"></ListItem>
      <ListItem title="退出登录" @click="handleLoginout"></ListItem>
    </List>
  </PageLayout>
</template>
<script setup lang="ts">
import { PageLayout } from '@/components';
import { List, ListItem } from '@12333/components';
import { addStarForString, Message } from '@12333/utils';
import { useUserStore } from '@/stores/modules/user';
import { useQueryClient } from '@tanstack/vue-query';
import Taro from '@tarojs/taro';
defineOptions({
  name: 'setting',
});
const userStore = useUserStore();
const queryClient = useQueryClient();
const userAccount = computed(() => {
  return addStarForString(userStore?.userDetail?.userName, 4, 8);
});
function goMineUserPolicy() {
  Taro.navigateTo({
    url: RouterPath.mineUserPolicy,
  });
}
function goPrivacyPolicy() {
  Taro.navigateTo({
    url: RouterPath.privacyPolicy,
  });
}
async function handleLoginout() {
  try {
    await Message.confirm({
      message: '确定要退出登录吗?',
    });
    userStore.logoutAndToHome();
    queryClient.removeQueries();
  } catch (error) {}
}
</script>
<style lang="scss">
@import '@/styles/common.scss';
.user-account {
  color: boleGetCssVar('text-color', 'regular');
  font-size: 24px;
}
</style>
apps/cMiniApp/src/assets/mine/icon-female.png
apps/cMiniApp/src/assets/mine/icon-male.png
apps/cMiniApp/src/assets/mine/icon-phone.png
apps/cMiniApp/src/subpackages/curriculum/editMineInfo/editMineInfo.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayout class="index-page-wrapper" :title="'编辑个人信息'" has-border>
  <PageLayout class="editMineInfo-page-wrapper" :title="'编辑个人信息'" has-border>
    <InnerPage></InnerPage>
  </PageLayout>
</template>
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue
@@ -96,6 +96,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineCertificateAddOrEdit-page-wrapper {
.nut-form .nut-cell.bole-form-item:not(.alignTop),
page .nut-form .nut-cell.bole-form-item:not(.alignTop) {
  align-items: flex-start !important;
@@ -117,4 +118,5 @@
    width: 98%;
  }
}
}
</style>
apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/mineCertificateAddOrEdit.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayout class="index-page-wrapper" :title="'资格证书'" has-border>
  <PageLayout class="mineCertificateAddOrEdit-page-wrapper" :title="'资格证书'" has-border>
    <InnerPage></InnerPage>
  </PageLayout>
</template>
apps/cMiniApp/src/subpackages/curriculum/mineCurriculumVitae/InnerPage.vue
@@ -17,14 +17,15 @@
            </div>
            <div class="mine-curriculum-info-item-gender">
              <div class="mine-curriculum-info-item-gender-dot">·</div>
              <img :src="IconAuth" class="mine-curriculum-info-item-gender-icon" />
              <img v-if="1" :src="IconMale" class="mine-curriculum-info-item-gender-icon" />
              <img v-else :src="IconFemale" class="mine-curriculum-info-item-gender-icon" />
            </div>
          </div>
          <IconFont name="rect-right" size="16" color="#6D6E6E" @click="goEditMineInfo"></IconFont>
        </div>
        <div class="mine-curriculum-info-item">
          <div class="mine-curriculum-info-item-left">
            <img :src="IconAuth" class="mine-curriculum-info-item-phone-icon" />
            <img :src="IconPhone" class="mine-curriculum-info-item-phone-icon" />
            <div class="mine-curriculum-info-item-phone">
              {{ userStore.userDetail?.phoneNumber ?? '' }}
            </div>
@@ -92,6 +93,9 @@
import { RouterPath } from '@/constants';
import IconArrow from '@/assets/setting/icon-arrow.png';
import IconAuth from '@/assets/mine/icon-auth.png';
import IconMale from '@/assets/mine/icon-male.png';
import IconFemale from '@/assets/mine/icon-female.png';
import IconPhone from '@/assets/mine/icon-phone.png';
import Taro from '@tarojs/taro';
defineOptions({
@@ -126,6 +130,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineCurriculumVitae-page-wrapper {
.mine-curriculum-noticebar {
  .nut-noticebar__page {
    padding: 0;
@@ -174,8 +179,8 @@
          }
          .mine-curriculum-info-item-gender-icon {
            width: 36px;
            height: 36px;
              width: 28px;
              height: 28px;
          }
        }
@@ -187,8 +192,8 @@
        }
        .mine-curriculum-info-item-phone-icon {
          width: 24px;
          height: 24px;
            width: 40px;
            height: 40px;
        }
      }
@@ -236,6 +241,24 @@
    .mine-curriculum-intention-job {
      align-items: flex-start;
        .mine-curriculum-intention-job-content {
          display: inline-flex;
          flex-wrap: wrap;
          .mine-curriculum-intention-job-item {
            font-size: 20px;
            color: boleGetCssVar('color', 'primary');
            padding: 6px 16px;
            background-color: #edf2ff;
            border-radius: 4px;
            display: inline-flex;
            align-items: center;
            justify-content: center;
            margin-right: 16px;
            margin-bottom: 14px;
          }
        }
    }
    .mine-curriculum-intention-bold {
@@ -256,4 +279,5 @@
    }
  }
}
}
</style>
apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/InnerPage.vue
@@ -48,6 +48,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineDetailedInfo-page-wrapper {
.person-photo {
  .nut-form-item__label {
    padding-right: 0;
@@ -58,4 +59,5 @@
page .nut-form .nut-cell.bole-form-item:not(.alignTop) {
  align-items: flex-start !important;
}
}
</style>
apps/cMiniApp/src/subpackages/curriculum/mineDetailedInfo/mineDetailedInfo.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayout class="index-page-wrapper" :title="'详细信息'" has-border>
  <PageLayout class="mineDetailedInfo-page-wrapper" :title="'详细信息'" has-border>
    <InnerPage></InnerPage>
  </PageLayout>
</template>
apps/cMiniApp/src/subpackages/curriculum/mineWorkExperience/mineWorkExperience.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayout class="index-page-wrapper" :title="'工作经验'" has-border>
  <PageLayout class="mineWorkExperience-page-wrapper" :title="'工作经验'" has-border>
    <InnerPage></InnerPage>
  </PageLayout>
</template>
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/InnerPage.vue
@@ -82,8 +82,10 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineAgreementSign-page-wrapper {
.task-card-actions-text {
  font-size: 24px;
  line-height: 42px;
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineAgreementSign/mineAgreementSign.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'协议签约'">
  <PageLayoutWithBg class="mineAgreementSign-page-wrapper" :title="'协议签约'">
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
@@ -99,6 +99,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineAgreementSignDetail-page-wrapper {
.mine-agreement-sign-detail {
  padding: 20px 28px 0;
@@ -110,4 +111,5 @@
.detail-card-btn {
  color: boleGetCssVar('color', 'primary');
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/MineAgreementSignDetailCard.vue
@@ -24,6 +24,8 @@
</script>
<style lang="scss">
@import '@/styles/common.scss';
.mine-agreement-sign-detail-card {
  background-color: #fff;
  border-radius: 12px;
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/MineAgreementSignDetailItem.vue
@@ -35,6 +35,8 @@
</script>
<style lang="scss">
@import '@/styles/common.scss';
.mine-agreement-sign-detail-item {
  margin-bottom: 24px;
  display: flex;
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'协议详情'">
  <PageLayoutWithBg class="mineAgreementSignDetail-page-wrapper" :title="'协议详情'">
    <InnerPage> </InnerPage>
  </PageLayoutWithBg>
</template>
@@ -8,7 +8,7 @@
import InnerPage from './InnerPage.vue';
defineOptions({
  name: 'mineAgreementSign',
  name: 'mineAgreementSignDetail',
});
</script>
apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue
@@ -49,9 +49,11 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineCancel-page-wrapper {
.task-card-actions-text {
  font-size: 24px;
  line-height: 42px;
  color: #9fa4ac;
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineCancel/mineCancel.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'已取消'">
  <PageLayoutWithBg class="mineCancel-page-wrapper" :title="'已取消'">
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/cMiniApp/src/subpackages/mine/mineCollectTask/InnerPage.vue
@@ -49,6 +49,7 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineCollectTask-page-wrapper {
.my-collect-task {
  display: flex;
  align-items: center;
@@ -67,4 +68,5 @@
    color: boleGetCssVar('text-color', 'regular');
  }
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineCollectTask/mineCollectTask.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'我收藏的任务'">
  <PageLayoutWithBg class="mineCollectTask-page-wrapper" :title="'我收藏的任务'">
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/cMiniApp/src/subpackages/mine/mineHire/InnerPage.vue
@@ -75,8 +75,10 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineHire-page-wrapper {
.task-card-actions-text {
  font-size: 24px;
  line-height: 42px;
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineHire/mineHire.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'已录用'">
  <PageLayoutWithBg class="mineHire-page-wrapper" :title="'已录用'">
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -74,8 +74,10 @@
<style lang="scss">
@import '@/styles/common.scss';
.mineSign-page-wrapper {
.task-card-actions-text {
  font-size: 24px;
  line-height: 42px;
}
}
</style>
apps/cMiniApp/src/subpackages/mine/mineSign/mineSign.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'我的报名'">
  <PageLayoutWithBg class="mineSign-page-wrapper" :title="'我的报名'">
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>