Merge branch 'main' of https://github.com/uni-helper/galanga

uni-helper · Jun 5, 2023 · 495820c · 495820c
2 parents d35840f + cac78b1
commit 495820c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/esm/index.js b/esm/index.js
@@ -14,6 +14,6 @@ export { formatNumber } from 'galanga';
 export { afterTime } from 'galanga';
 //导出自己的子模块
 export { localCookie } from './cookie';
-export { url } from './url';
+export { url, getPreURL } from './url';
 export { checkDeviceType, clipboard } from './device';
 export { notificationPermission, clipboardPermission, locationPermission } from './permission';
diff --git a/esm/url.js b/esm/url.js
@@ -29,3 +29,9 @@ export const url = {
         currentRoute.$page.options[key] = value;
     }
 };
+//获取上一页的url
+export function getPreURL() {
+    const uniRouter = getCurrentPages();
+    const prevRoute = uniRouter[uniRouter.length - 2];
+    return '/' + prevRoute.route;
+}
diff --git a/src/index.ts b/src/index.ts
@@ -17,6 +17,6 @@ export { afterTime } from 'galanga';
 
 //导出自己的子模块
 export { localCookie } from './cookie';
-export { url } from './url';
+export { url, getPreURL } from './url';
 export { checkDeviceType, clipboard } from './device';
 export { notificationPermission, clipboardPermission, locationPermission } from './permission';
diff --git a/src/url.ts b/src/url.ts
@@ -31,4 +31,11 @@ export const url = {
     const currentRoute = uniRouter[uniRouter.length - 1];
     currentRoute.$page.options[key] = value;
   }
+}
+
+//获取上一页的url
+export function getPreURL() {
+  const uniRouter = getCurrentPages();
+  const prevRoute = uniRouter[uniRouter.length - 2];
+  return '/' + prevRoute.route;
 }
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -9,6 +9,6 @@ export { filterUniqueByProperty } from 'galanga';
 export { formatNumber } from 'galanga';
 export { afterTime } from 'galanga';
 export { localCookie } from './cookie';
-export { url } from './url';
+export { url, getPreURL } from './url';
 export { checkDeviceType, clipboard } from './device';
 export { notificationPermission, clipboardPermission, locationPermission } from './permission';
diff --git a/types/url.d.ts b/types/url.d.ts
@@ -6,3 +6,4 @@ export declare const url: {
     setPath: (value: string) => void;
     setQuery: (key: string, value: string) => void;
 };
+export declare function getPreURL(): string;