mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-11-14 05:03:49 +08:00
This commit is contained in:
@@ -178,11 +178,15 @@ export function defShortcuts() {
|
||||
|
||||
export function defRangeShortcuts() {
|
||||
const nowDate = new Date();
|
||||
const dayBase = 86400 * 1000;
|
||||
return {
|
||||
今天: [startOfToday().getTime(), endOfToday().getTime()] as const,
|
||||
昨天: () => {
|
||||
return [startOfYesterday().getTime(), endOfYesterday().getTime()] as const;
|
||||
},
|
||||
近7天: [startOfToday().getTime() - dayBase * 6, endOfToday().getTime()] as const,
|
||||
近30天: [startOfToday().getTime() - dayBase * 29, endOfToday().getTime()] as const,
|
||||
近90天: [startOfToday().getTime() - dayBase * 89, endOfToday().getTime()] as const,
|
||||
本周: () => {
|
||||
return [
|
||||
startOfWeek(nowDate, { weekStartsOn: 1 }).getTime(),
|
||||
@@ -192,7 +196,7 @@ export function defRangeShortcuts() {
|
||||
本月: () => {
|
||||
return [startOfMonth(nowDate).getTime(), endOfMonth(nowDate).getTime()] as const;
|
||||
},
|
||||
上个月: () => {
|
||||
上月: () => {
|
||||
return [
|
||||
startOfMonth(subMonths(nowDate, 1)).getTime(),
|
||||
endOfMonth(subMonths(nowDate, 1)).getTime(),
|
||||
|
||||
@@ -19,6 +19,7 @@ import { useUserStoreWidthOut } from '@/store/modules/user';
|
||||
import router from '@/router';
|
||||
import { storage } from '@/utils/Storage';
|
||||
import { encodeParams } from '@/utils/urlUtils';
|
||||
import { delNullProperty } from '@/utils/array';
|
||||
|
||||
const globSetting = useGlobSetting();
|
||||
const urlPrefix = globSetting.urlPrefix || '';
|
||||
@@ -287,7 +288,22 @@ export const jumpExport = function (url, params) {
|
||||
urlPrefix +
|
||||
url +
|
||||
'?' +
|
||||
encodeParams({ ...params, ...{ authorization: useUserStoreWidthOut().token } });
|
||||
encodeParams({
|
||||
...delNullProperty(params),
|
||||
...{ authorization: useUserStoreWidthOut().token },
|
||||
});
|
||||
};
|
||||
|
||||
// 跳转
|
||||
export const jump = function (url, params) {
|
||||
window.location.href =
|
||||
urlPrefix +
|
||||
url +
|
||||
'?' +
|
||||
encodeParams({
|
||||
...delNullProperty(params),
|
||||
...{ authorization: useUserStoreWidthOut().token },
|
||||
});
|
||||
};
|
||||
|
||||
// 项目,多个不同 api 地址,直接在这里导出多个
|
||||
|
||||
@@ -142,3 +142,8 @@ export function isLetterBegin(str) {
|
||||
export function isUrl(url: string): boolean {
|
||||
return /(^http|https:\/\/)/g.test(url);
|
||||
}
|
||||
|
||||
// 判断是否为微信浏览器
|
||||
export function isWechatBrowser(): boolean {
|
||||
return /micromessenger/.test(navigator.userAgent.toLowerCase()) ? true : false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user