diff --git a/App.vue b/App.vue
index eb78bd7..951d4e5 100644
--- a/App.vue
+++ b/App.vue
@@ -14,8 +14,10 @@ onLaunch((options) => {
useDictStore().getDictData();
try {
getUserInfo();
+ useUserStore().changMiniProgramAppStatus(false);
} catch {
console.log('不是爱山东平台,使用测试登陆');
+ useUserStore().changMiniProgramAppStatus(true);
useUserStore().initSeesionId(); //更新
let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
if (token) {
diff --git a/common/common.css b/common/common.css
index da7cc25..c558f2e 100644
--- a/common/common.css
+++ b/common/common.css
@@ -33,12 +33,17 @@ html {
overflow-x: hidden;
}
+li {
+ list-style: none;
+}
+
/* 布局调整 */
/* 点击动效 */
/* 缩小 */
.button-click {
- transition: transform 0.1s ease;
+ /* transition: transform 0.1s ease; */
+ transition: transform 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
}
.button-click:active {
@@ -67,7 +72,8 @@ html {
}
.btn-feel {
- transition: transform 0.15s ease;
+ transition: transform 0.5s ease;
+ /* transition: transform 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275); */
transform-style: preserve-3d;
}
@@ -84,7 +90,8 @@ html {
border: none;
border-radius: 6px;
cursor: pointer;
- transition: transform 0.1s ease, box-shadow 0.1s ease;
+ /* transition: transform 0.4s ease, box-shadow 0.1s ease; */
+ transition: transform 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
/* box-shadow: 0 4px 0 #2C3E50; */
}
@@ -472,4 +479,159 @@ html {
.height-100 {
height: 100%;
+}
+
+
+.pointEveNone {
+ pointer-events: none;
+}
+
+/*
+ *
+ * TransitionGroup 动画
+ * stagger 错峰
+ * fade-up-stagger --i 淡入上滑(经典错峰)
+ * pop-in-stagger --i 旋转缩放弹入(活泼)
+ * slide-left-stagger 从左侧滑入(消息流风格)
+ * blur-fade-stagger --i 渐显 + 模糊(毛玻璃感)
+ * bounce-up-stagger 从底部弹跳入场(物理感)
+ *
+ */
+/* 淡入上滑(经典错峰) */
+.fade-up-stagger-enter-active {
+ transition: all 0.4s cubic-bezier(0.18, 0.89, 0.32, 1.28);
+ transition-delay: calc(var(--i) * 0.1s);
+}
+
+.fade-up-stagger-enter-from {
+ opacity: 0;
+ transform: translateY(20px);
+}
+
+.fade-up-stagger-leave-active {
+ transition: opacity 0.25s ease;
+}
+
+.fade-up-stagger-leave-to {
+ opacity: 0;
+}
+
+/* */
+
+.pop-in-stagger-enter-active {
+ transition: all 0.45s cubic-bezier(0.68, -0.55, 0.27, 1.55);
+ transition-delay: calc(var(--i) * 0.08s);
+}
+
+.pop-in-stagger-enter-from {
+ opacity: 0;
+ transform: scale(0.7) rotate(-10deg);
+}
+
+.pop-in-stagger-leave-active {
+ transition: all 0.2s ease;
+}
+
+.pop-in-stagger-leave-to {
+ opacity: 0;
+ transform: scale(0.9) rotate(5deg);
+}
+
+.slide-left-stagger-enter-active {
+ transition: all 0.35s ease-out;
+ transition-delay: calc(var(--i) * 0.07s);
+}
+
+.slide-left-stagger-enter-from {
+ opacity: 0;
+ transform: translateX(-100%);
+}
+
+.slide-left-stagger-leave-active {
+ transition: all 0.25s ease;
+}
+
+.slide-left-stagger-leave-to {
+ opacity: 0;
+ transform: translateX(50%);
+}
+
+/* 错峰动画 */
+.stagger-enter-active {
+ transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+ transition-delay: calc(var(--i) * 0.42s);
+ /* 关键:120ms 间隔 */
+}
+
+.stagger-enter-from {
+ opacity: 0;
+ transform: translateY(30px) scale(0.95);
+ /* 更大位移 + 轻微缩放 */
+}
+
+.stagger-leave-active {
+ transition: all 0.25s ease;
+}
+
+.stagger-leave-to {
+ opacity: 0;
+ transform: translateX(20px);
+}
+
+.stagger-move {
+ transition: transform 0.4s ease;
+}
+
+.blur-fade-stagger-enter-active {
+ transition: all 0.5s ease;
+ transition-delay: calc(var(--i) * 0.09s);
+}
+
+.blur-fade-stagger-enter-from {
+ opacity: 0;
+ filter: blur(8px);
+ transform: scale(1.02);
+}
+
+.blur-fade-stagger-leave-active {
+ transition: all 0.2s ease;
+}
+
+.blur-fade-stagger-leave-to {
+ opacity: 0;
+ filter: blur(4px);
+}
+
+.bounce-up-stagger-enter-active {
+ animation: stagger-bounce 0.6s forwards;
+ animation-delay: calc(var(--i) * 0.12s);
+}
+
+.bounce-up-stagger-leave-active {
+ transition: all 0.25s ease;
+}
+
+.bounce-up-stagger-leave-to {
+ opacity: 0;
+ transform: translateY(30px);
+}
+
+@keyframes stagger-bounce {
+ 0% {
+ opacity: 0;
+ transform: translateY(100px) scale(0.8);
+ }
+
+ 60% {
+ transform: translateY(-10px) scale(1.05);
+ }
+
+ 80% {
+ transform: translateY(5px) scale(0.98);
+ }
+
+ 100% {
+ opacity: 1;
+ transform: translateY(0) scale(1);
+ }
}
\ No newline at end of file
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 2c3d63f..4ae779c 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -285,9 +285,9 @@ function deg2rad(deg) {
}
function vacanciesTo(vacancies) {
- if(!vacancies){
- return '不限人数'
- }else if (vacancies >= 0) {
+ if (vacancies === null) {
+ return '-人'
+ } else if (vacancies >= 0) {
return vacancies + "人"
} else {
return '不限人数'
diff --git a/components/renderCompanysOutData/renderCompanysOutData.vue b/components/renderCompanysOutData/renderCompanysOutData.vue
index 26b61c6..01c3243 100644
--- a/components/renderCompanysOutData/renderCompanysOutData.vue
+++ b/components/renderCompanysOutData/renderCompanysOutData.vue
@@ -1,48 +1,52 @@
-
-
-
- {{ job.gsmc }}
-
-
-
-
- {{job.gsxy}}
+ {{ job.gsxy }}
+
+
+
+ 在招职位·
+ {{ job.zzgwsl || '-' }}
+ 个
+
+
-
-
- 在招职位·
- {{ job.zzgwsl || '-' }}
- 个
-
-
-
-
-
-
-
-
-
- {{ vacanciesTo(job.vacancies) }}
-
-
- {{job.qyxz}}
+
+
+
+
+
+
+ {{ vacanciesTo(job.vacancies) }}
+
+
+ {{ job.qyxz }}
+
-
+
diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue
index b877e20..13c25f1 100644
--- a/components/renderJobs/renderJobs.vue
+++ b/components/renderJobs/renderJobs.vue
@@ -1,48 +1,54 @@
-
-
-
- {{ job.jobTitle }}
-
-
+
+
+
+
+ {{ job.jobTitle }}
+
+
+
+
+ {{ job.gwmc }}
+
+
+
+
+
+
+
+
+ {{ vacanciesTo(job.vacancies) }}
+
+
+
+ {{ job.postingDate }}
+
+
+
+
- {{ job.gwmc }}
-
-
-
-
-
-
-
-
- {{ vacanciesTo(job.vacancies) }}
-
-
-
- {{ job.postingDate }}
-
-
-
-
+
+ {{ job.title }}
-
- {{ job.title }}
-
-
+
-->
-
+
diff --git a/manifest.json b/manifest.json
index ecc65c8..e4373ed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -80,7 +80,7 @@
"locale": "zh-Hans",
"h5": {
"router": {
- "base": "/app/",
+ "base": "./",
"mode": "hash"
},
"title": "青岛智慧就业服务",
diff --git a/packageA/pages/Intendedposition/Intendedposition.vue b/packageA/pages/Intendedposition/Intendedposition.vue
index 404e8a5..0b5a1bb 100644
--- a/packageA/pages/Intendedposition/Intendedposition.vue
+++ b/packageA/pages/Intendedposition/Intendedposition.vue
@@ -21,6 +21,7 @@ import { storeToRefs } from 'pinia';
import useLocationStore from '@/stores/useLocationStore';
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
const userStore = useUserStore();
+const { isMiniProgram } = storeToRefs(useUserStore());
const state = reactive({});
const pageState = reactive({
page: 0,
@@ -37,6 +38,15 @@ onLoad(() => {
getJobList();
});
+onMounted(() => {
+ // #ifdef H5
+ if (!isMiniProgram.value) {
+ const a = document.getElementsByClassName('uni-page-head-hd')[0];
+ a.style.display = 'none';
+ }
+ // #endif
+});
+
onReachBottom(() => {
getJobList();
});
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index ee8ce79..ee65f63 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -1,6 +1,6 @@
-
+
@@ -75,6 +75,8 @@ import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
import { onLoad, onShow } from '@dcloudio/uni-app';
import dictLabel from '@/components/dict-Label/dict-Label.vue';
import { storeToRefs } from 'pinia';
+const { isMiniProgram } = storeToRefs(useUserStore());
+import useUserStore from '@/stores/useUserStore';
import useLocationStore from '@/stores/useLocationStore';
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
@@ -220,7 +222,8 @@ function handleJobsListResponse(type, rows, total, pageKey) {
const str = pageState.pageSize * (pageState[pageKey] - 1);
const end = pageState.list.length;
const reslist = rows;
- pageState.list.splice(str, end, ...reslist);
+ pageState.list = [...pageState.list, ...rows];
+ // pageState.list.splice(str, end, ...reslist);
} else {
pageState.list = rows;
}
diff --git a/packageA/pages/addPosition/addPosition.vue b/packageA/pages/addPosition/addPosition.vue
index 1545e26..d6ecd4c 100644
--- a/packageA/pages/addPosition/addPosition.vue
+++ b/packageA/pages/addPosition/addPosition.vue
@@ -1,6 +1,6 @@
-
+
@@ -74,7 +74,7 @@ const { $api, navBack } = inject('globalFunction');
import { storeToRefs } from 'pinia';
import useUserStore from '@/stores/useUserStore';
const { getUserResume } = useUserStore();
-const { userInfo } = storeToRefs(useUserStore());
+const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
const popup = ref(null);
const selectJobsModel = ref(null);
diff --git a/packageA/pages/browseJob/browseJob.vue b/packageA/pages/browseJob/browseJob.vue
index ae6a98a..edc6cf6 100644
--- a/packageA/pages/browseJob/browseJob.vue
+++ b/packageA/pages/browseJob/browseJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -46,7 +46,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
import useUserStore from '@/stores/useUserStore';
const { $api, navTo, navBack } = inject('globalFunction');
import useLocationStore from '@/stores/useLocationStore';
-const { userInfo } = storeToRefs(useUserStore());
+const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
const userStore = useUserStore();
const browseDate = ref('');
@@ -123,6 +123,7 @@ function getJobList(type = 'add', loading = true) {
reslist.shift();
}
}
+ // pageState.list = [...pageState.list, ...rows];
pageState.list.splice(str, end, ...reslist);
pageState.lastDate = lastDate;
} else {
diff --git a/packageA/pages/choiceness/choiceness.vue b/packageA/pages/choiceness/choiceness.vue
index 1abf65f..738080d 100644
--- a/packageA/pages/choiceness/choiceness.vue
+++ b/packageA/pages/choiceness/choiceness.vue
@@ -1,6 +1,6 @@
-
+
@@ -28,7 +28,7 @@ const { $api, navBack, navTo } = inject('globalFunction');
import { storeToRefs } from 'pinia';
import useUserStore from '@/stores/useUserStore';
const { getUserResume } = useUserStore();
-const { userInfo } = storeToRefs(useUserStore());
+const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
const list = ref([]);
onLoad(() => {
diff --git a/packageA/pages/choicenessList/choicenessList.vue b/packageA/pages/choicenessList/choicenessList.vue
index 357535b..27c2507 100644
--- a/packageA/pages/choicenessList/choicenessList.vue
+++ b/packageA/pages/choicenessList/choicenessList.vue
@@ -1,6 +1,6 @@
-
+
@@ -39,6 +39,8 @@ import { storeToRefs } from 'pinia';
const { $api, navTo, navBack } = inject('globalFunction');
import useLocationStore from '@/stores/useLocationStore';
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
// state
const title = ref('事业单位');
const cardInfo = ref({});
diff --git a/packageA/pages/collection/collection.vue b/packageA/pages/collection/collection.vue
index 51898ad..6ca19a3 100644
--- a/packageA/pages/collection/collection.vue
+++ b/packageA/pages/collection/collection.vue
@@ -1,6 +1,6 @@
-
+
@@ -61,6 +61,8 @@ import { storeToRefs } from 'pinia';
import useLocationStore from '@/stores/useLocationStore';
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
const { $api, navBack } = inject('globalFunction');
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
const type = ref(0);
const pageState = reactive({
diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index 88919c9..18136fe 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -1,6 +1,6 @@
-
+
@@ -83,7 +83,7 @@
:longitude="longitudeVal"
:latitude="latitudeVal"
>
-
+
@@ -110,6 +110,8 @@ import useLocationStore from '@/stores/useLocationStore';
const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
import { storeToRefs } from 'pinia';
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
const isExpanded = ref(false);
const fairInfo = ref({});
@@ -121,7 +123,7 @@ const pageState = reactive({
maxPage: 1,
pageSize: 10,
});
-const hasnext = ref(true);
+const hasnext = ref(false);
const zphId = ref('');
const pageOptions = ref({});
@@ -163,7 +165,8 @@ function getCompanyList(type = 'add') {
const str = pageState.pageSize * (pageState.current - 1);
const end = pageState.list.length;
const reslist = rows;
- pageState.list.splice(str, end, ...reslist);
+ pageState.list = [...pageState.list, ...rows];
+ // pageState.list.splice(str, end, ...reslist);
} else {
pageState.list = rows;
}
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 52bcf10..86b0084 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -1,6 +1,6 @@
-
+
@@ -42,7 +42,7 @@
- {{ userInfo.age }}岁
+ {{ userInfo.age || '-' }}岁
- {{ userInfo.phone }}
+ {{ userInfo.phone || '未知手机号' }}
@@ -137,7 +137,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
import { storeToRefs } from 'pinia';
import useUserStore from '@/stores/useUserStore';
import useDictStore from '@/stores/useDictStore';
-const { userInfo } = storeToRefs(useUserStore());
+const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
const { getUserResume } = useUserStore();
const { getDictData, oneDictData } = useDictStore();
import config from '@/config.js';
@@ -186,7 +186,8 @@ function uploadResume(tempFilePath, loading) {
header['Authorization'] = encodeURIComponent(Authorization);
return new Promise((resolve, reject) => {
uni.uploadFile({
- url: config.baseUrl + '/app/oss/uploadToObs',
+ url: config.baseUrl + '/app/user/resume/recognition',
+ // url: config.baseUrl + '/app/oss/uploadToObs',
filePath: tempFilePath,
name: 'file',
header,
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 042233c..952b2d6 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -1,267 +1,295 @@
-
-
- 取消
-
-
- 确认
-
-
-
- 编辑头像
-
-
-
-
+
+
+ 取消
+
+
+ 确认
+
+
+
+ 编辑头像
+
+
+
+
+
+
+
+ 姓名
+
+
+
+ 性别
+
+
+ 男
+
+
+ 女
+
+
+
+
+ 出生年月
+
+
+
+ 学历
+
+
+
+ 政治面貌
+
+
+
+ 手机号码
+
+
-
-
- 姓名
-
-
-
- 性别
-
- 男
- 女
-
-
-
- 出生年月
-
-
-
- 学历
-
-
-
- 政治面貌
-
-
-
- 手机号码
-
-
-
-
+
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index eb08b7c..308edba 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -1,6 +1,6 @@
-
+
@@ -183,6 +183,9 @@ import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
import dictLabel from '@/components/dict-Label/dict-Label.vue';
import RadarMap from './component/radarMap.vue';
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
const { $api, navTo, getLenPx, parseQueryParams, navBack, isEmptyObject } = inject('globalFunction');
import config from '@/config.js';
diff --git a/packageA/pages/reservation/reservation.vue b/packageA/pages/reservation/reservation.vue
index 7da1c99..ff8a71b 100644
--- a/packageA/pages/reservation/reservation.vue
+++ b/packageA/pages/reservation/reservation.vue
@@ -60,7 +60,7 @@ import Countdown from './component/countdown.vue';
import { storeToRefs } from 'pinia';
import useLocationStore from '@/stores/useLocationStore';
import useUserStore from '@/stores/useUserStore';
-const { userInfo } = storeToRefs(useUserStore());
+const { userInfo, isMiniProgram } = storeToRefs(useUserStore());
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
const pageState = reactive({
@@ -92,6 +92,15 @@ onLoad(() => {
getList();
});
+onMounted(() => {
+ // #ifdef H5
+ if (!isMiniProgram.value) {
+ const a = document.getElementsByClassName('uni-page-head-hd')[0];
+ a.style.display = 'none';
+ }
+ // #endif
+});
+
function chnageRanOption(item) {
ranItem.value = item;
getList();
diff --git a/packageA/pages/selectDate/selectDate.vue b/packageA/pages/selectDate/selectDate.vue
index cbf8bf2..5cda5d6 100644
--- a/packageA/pages/selectDate/selectDate.vue
+++ b/packageA/pages/selectDate/selectDate.vue
@@ -1,7 +1,7 @@
-
+
@@ -51,6 +51,9 @@ const { $api, navTo, navBack } = inject('globalFunction');
const weekMap = ['日', '一', '二', '三', '四', '五', '六'];
const calendarData = ref([]);
const current = ref({});
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
import { Solar, Lunar } from '@/lib/lunar-javascript@1.7.2.js';
const isRecord = ref(false);
@@ -62,7 +65,6 @@ const pages = reactive({
const hasZphDateArray = ref([]);
onLoad((options) => {
- updateDateArray();
if (options.date) {
current.value = {
date: options?.date || null,
diff --git a/packageA/pages/tiktok/tiktok.vue b/packageA/pages/tiktok/tiktok.vue
index 7430bee..2b52e7e 100644
--- a/packageA/pages/tiktok/tiktok.vue
+++ b/packageA/pages/tiktok/tiktok.vue
@@ -95,7 +95,7 @@ const change = (e) => {
position: absolute;
left: 24rpx;
right: 24rpx;
- bottom: 30rpx;
+ bottom: calc( var(--window-bottom));
color: #fff;
.title{
font-weight: 500;
diff --git a/packageA/pages/vCard/vCard.vue b/packageA/pages/vCard/vCard.vue
index 9782722..ed4fc22 100644
--- a/packageA/pages/vCard/vCard.vue
+++ b/packageA/pages/vCard/vCard.vue
@@ -1,267 +1,279 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ userInfo.name || "编辑用户名" }}
-
-
- |
- {{ userInfo.age }}岁
- |
-
-
+
+
+
+
+
+
+
+
+ {{ userInfo.name || '编辑用户名' }}
+
+
+ |
+ {{ userInfo.age || '-' }}岁
+ |
+
+
-
-
-
- {{ userInfo.phone }}
-
-
-
-
-
-
- 地点:青岛市-
-
-
-
- 求职意向岗位
- {{ userInfo.jobIntention || userInfo.jobTitle?.join(',') || '-' }}
-
-
- 毕业学校
- {{ userInfo.graduationSchool || "-" }}
-
-
+
+
+ 地点:青岛市-
+
+
+
+
+
+ 求职意向岗位
+
+ {{ userInfo.jobIntention || userInfo.jobTitle?.join(',') || '--' }}
+
+
+
+ 毕业学校
+ {{ userInfo.graduationSchool || '--' }}
+
+
-
-
+
+
-
-
-
- 个人技能
-
-
- {{ item.skill }}
-
-
-
- 暂无个人技能
-
-
-
-
-
- 关键经历
-
-
- {{ index + 1 + "." }}{{ item.duty }}
-
-
-
- 暂无关键经历
-
-
-
-
-
- 荣誉及证书情况
-
+
+
+
+ 个人技能
+
+
+ {{ item.skill }}
+
+
+
+ 暂无个人技能
+
+
+
+
+
+ 关键经历
+
+
+
+ {{ index + 1 + '.' }}{{ item.duty }}
+
+
+
+
+ 暂无关键经历
+
+
+
+
+
+ 荣誉及证书情况
+
-
-
-
- 暂无荣誉证书
+
+
+
+ 暂无荣誉证书
+
+
-
-
-
+
diff --git a/packageA/pages/workExp/workExp.vue b/packageA/pages/workExp/workExp.vue
index 05f8f9e..2f33e71 100644
--- a/packageA/pages/workExp/workExp.vue
+++ b/packageA/pages/workExp/workExp.vue
@@ -1,246 +1,250 @@
-
-
- 取消
-
-
- 确认
-
-
-
- 公司
-
-
-
- 岗位
-
-
-
- 时间
-
-
-
-
-
- -
-
-
-
-
+
+
+ 取消
+
+
+ 确认
+
+
+
+ 公司
+
+
+
+ 岗位
+
+
+
+ 时间
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ 工作内容
+
+
-
-
- 工作内容
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index 27f2305..30dffb4 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -45,56 +45,59 @@
-
- {{ item.zphmc }}
-
- {{ item.jbf }}
-
-
-
-
-
-
- {{ parseDateTime(item.zphjbsj).time }}
- {{ parseDateTime(item.zphjbsj).date }}
+
-
-
-
- {{ getTimeStatus(item.zphjbsj, item.zphjzsj).statusText }}
+
+
+ {{ parseDateTime(item.zphjbsj).time }}
+ {{ parseDateTime(item.zphjbsj).date }}
-
- {{ getHoursBetween(item.zphjbsj, item.zphjzsj) }}小时
+
+
+
+ {{ getTimeStatus(item.zphjbsj, item.zphjzsj).statusText }}
+
+
+ {{ getHoursBetween(item.zphjbsj, item.zphjzsj) }}小时
+
+
+
+
+ {{ parseDateTime(item.zphjzsj).time }}
+ {{ parseDateTime(item.zphjzsj).date }}
-
-
- {{ parseDateTime(item.zphjzsj).time }}
- {{ parseDateTime(item.zphjzsj).date }}
-
+
+
-
-
-
+
-
+
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index 569fa1e..8f38652 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -111,16 +111,16 @@ onHide(() => {
paging.value?.handleTouchCancel();
if (isDrawerOpen.value) {
isDrawerOpen.value = false;
- // uni.showTabBar();
+ uni.showTabBar();
}
});
const toggleDrawer = () => {
isDrawerOpen.value = !isDrawerOpen.value;
if (isDrawerOpen.value) {
- // uni.hideTabBar();
+ uni.hideTabBar();
} else {
- // uni.showTabBar();
+ uni.showTabBar();
}
};
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
index 5cbd0fa..8512466 100644
--- a/pages/chat/components/ai-paging.vue
+++ b/pages/chat/components/ai-paging.vue
@@ -240,7 +240,7 @@
-
+
@@ -268,9 +268,9 @@ import WaveDisplay from './WaveDisplay.vue';
import FileIcon from './fileIcon.vue';
import FileText from './fileText.vue';
// 系统功能hook和阿里云hook
-import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
+import { useAudioRecorder } from '@/hook/useRealtimeRecorder2.js';
// import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
-import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
+import { useTTSPlayer } from '@/hook/useTTSPlayer2.js';
// import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
// 全局
const { $api, navTo, throttle } = inject('globalFunction');
@@ -612,17 +612,23 @@ function userGoodFeedback(msg) {
// $api.msg('该功能正在开发中,敬请期待后续更新!');
feeback.value?.open();
feebackData.value = msg;
+ uni.hideTabBar()
}
function confirmFeeBack(value) {
useChatGroupDBStore()
.badFeedback(feebackData.value, value)
.then(() => {
+ uni.showTabBar()
feeback.value?.close();
feeBackTips.value?.open();
});
}
+function colseFeeBack() {
+ uni.showTabBar()
+}
+
function readMarkdown(value, index) {
speechIndex.value = index;
if (speechIndex.value !== index) {
diff --git a/pages/chat/components/popupbadFeeback.vue b/pages/chat/components/popupbadFeeback.vue
index ebdc864..1d99f01 100644
--- a/pages/chat/components/popupbadFeeback.vue
+++ b/pages/chat/components/popupbadFeeback.vue
@@ -1,5 +1,5 @@
-
+
反馈
针对问题
@@ -38,7 +38,7 @@