diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 195e696..e7a76fd 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -256,6 +256,11 @@ let arr = oaHomeData.filter(item => !item.captain); //过滤掉普通用户专属页面 this.oaHomeData = arr; } + if(this.$store.state.app.userInfo?.company?.company_type_name=='平台公司'){ + this.oaHomeData = this.oaHomeData.filter(item => { + return item.text=='人员管理'?false:true; + }) + } // 判断是否需要显示更多按钮 if (this.oaHomeData >= 8) { this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length - 1]; diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index 693191e..c51b522 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -79,7 +79,8 @@ - 更新时间:{{item.update_time}} + 更新时间:{{item.update_time}} + {{updateTo(item.update_time)}} @@ -112,6 +113,7 @@ import { Toast } from "../../libs/uniApi" import { informationAdd, informationDetails } from "@/api/information.js" import { comonentList } from '@/static/server/archives.js' + import { getTimeAgo } from "@/utils/time.js" import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器 import residents from "@/components/newArchives/residents.vue" // 常住人口 import breeding from "@/components/newArchives/breeding.vue" // 种养殖 @@ -214,6 +216,9 @@ }, changeCurrent(e) { this.current = e.index; + }, + updateTo(time){ + return getTimeAgo(time) } }, onPullDownRefresh() { @@ -247,8 +252,12 @@ } .update_time { - padding-left: 28rpx; - padding-top: 28rpx; + padding: 32rpx 28rpx 0 28rpx; + display: flex; + justify-content: space-between; + .right{ + color: $theme-oa-color; + } } .card { diff --git a/utils/time.js b/utils/time.js new file mode 100644 index 0000000..24d6f2e --- /dev/null +++ b/utils/time.js @@ -0,0 +1,34 @@ + +// 格式化:50分钟前,1小时前.20天前 +export const getTimeAgo = (timestamp) => { + const now = Date.now(); + const diff = now - new Date(timestamp); + + // 计算时间差的毫秒数 + const milliseconds = Math.abs(diff); + + // 定义时间单位与对应的毫秒数 + const timeUnits = [ + { unit: '年', ms: 1000 * 60 * 60 * 24 * 365 }, + { unit: '个月', ms: 1000 * 60 * 60 * 24 * 30 }, + { unit: '周', ms: 1000 * 60 * 60 * 24 * 7 }, + { unit: '天', ms: 1000 * 60 * 60 * 24 }, + { unit: '小时', ms: 1000 * 60 * 60 }, + { unit: '分钟', ms: 1000 * 60 }, + ]; + + let str = '' + + // 循环遍历时间单位,并计算时间差所对应的单位 + for (let i = 0; i < timeUnits.length; i++) { + const { unit, ms } = timeUnits[i]; + if (milliseconds >= ms) { + const count = Math.floor(milliseconds / ms); + str = `${count}${unit}前`; + break; + } + } + + // 如果时间差过小,可以自定义返回结果 + return str||'刚刚'; +}