@foundbyte/uni-libs 0.1.0 → 1.0.1

package/es/index.d.ts

@@ -13,8 +13,8 @@ import { ActivityCalendarDetailPageParams, getActivityCalendarDetailPage } from
 import { WebviewPageParams, getWebviewPage } from "./utils/pages/webview/index.js";
 import { getFoodPackagePage, getFoodStorePage } from "./utils/pages/food/index.js";
 import { getMoviePage } from "./utils/pages/movie/index.js";
-import { EMessagesType, IShareParam, isAlipay, isIOSOrAndroid, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay } from "./utils/web-view/index.js";
-import { getSystemInfoSync, isApp, isH5 } from "./utils/uni-env/index.js";
+import { EMessagesType, IShareParam, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay } from "./utils/web-view/index.js";
+import { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv } from "./utils/uni-env/index.js";
 import { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
-export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, IOneTravelSDKConfig, IShareParam, OneTravelSDK, WebviewPageParams, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAlipay, isApp, isEmpty, isH5, isIOSOrAndroid, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes, setShareParam, toPay };
+export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, IOneTravelSDKConfig, IShareParam, OneTravelSDK, WebviewPageParams, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAlipay, isAlipayEnv, isAndroid, isAndroidEnv, isAppEnv, isEmpty, isH5Env, isHarmony, isHarmonyEnv, isIOSOrAndroid, isWeixin, isWeixinEnv, isiOS, isiOSEnv, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes, setShareParam, toPay };

package/es/index.js

@@ -12,9 +12,9 @@ import { getActivityCalendarDetailPage } from "./utils/pages/activity-calendar/i
 import { getWebviewPage } from "./utils/pages/webview/index.js";
 import { getFoodPackagePage, getFoodStorePage } from "./utils/pages/food/index.js";
 import { getMoviePage } from "./utils/pages/movie/index.js";
-import { EMessagesType, isAlipay, isIOSOrAndroid, isWeixin, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay } from "./utils/web-view/index.js";
-import { getSystemInfoSync, isApp, isH5 } from "./utils/uni-env/index.js";
+import { EMessagesType, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay } from "./utils/web-view/index.js";
+import { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv } from "./utils/uni-env/index.js";
 import { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
 
-export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, OneTravelSDK, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAlipay, isApp, isEmpty, isH5, isIOSOrAndroid, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes, setShareParam, toPay };
+export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EUniPlatform, EVenueSimpleTypes, EVenueTypes, OneTravelSDK, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getSystemInfoSync, getWebviewPage, isAlipay, isAlipayEnv, isAndroid, isAndroidEnv, isAppEnv, isEmpty, isH5Env, isHarmony, isHarmonyEnv, isIOSOrAndroid, isWeixin, isWeixinEnv, isiOS, isiOSEnv, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes, setShareParam, toPay };

package/es/services/goods/service.js

@@ -28,27 +28,28 @@ var GoodsService = class {
 		const extInfo = item?.common?.extInfoMap || item?.common?.extInfo;
 		switch (businessLine) {
 			case EBusinessLine.Scenic:
-				const scenicId = item?.scenic?.id || item?.common?.spuId || item?.common?.id;
-				const scenicReservationId = item?.scenic?.reservationId || extInfo?.reservationId || item?.common?.reservationId;
+				const scenicId = item?.scenic?.id || item?.common?.spuId || item?.common?.id || "";
+				const scenicReservationId = item?.scenic?.reservationId || extInfo?.reservationId || item?.common?.reservationId || "";
 				const scenicIsOld = item?.scenic?.isOld || extInfo?.isOld;
 				page = `${routePrefix.ticket}/detail/index?scenicId=${scenicId}&reservationId=${scenicReservationId}&isOld=${scenicIsOld}`;
 				break;
 			case EBusinessLine.Hotel:
-				const hotelId = item?.hotel?.id || extInfo?.storeId || item?.common?.storeId;
+				const hotelId = item?.hotel?.id || extInfo?.storeId || item?.common?.storeId || "";
 				page = `${routePrefix.hotel}/home/details/index?id=${hotelId}`;
 				break;
 			case EBusinessLine.Homestay:
-				const homestayType = item?.homestay?.type || extInfo?.type || item?.common?.type;
+				const homestayType = item?.homestay?.type || extInfo?.type || item?.common?.type || "";
 				if (homestayType === EHotelType.hotel) {
-					/** 酒店 (天下房仓酒店详情页)*/
-					const id = item?.homestay?.id || extInfo?.storeId || item?.common?.storeId;
+					/** 酒店 (天下房仓酒店详情页) */
+					const id = item?.homestay?.id || extInfo?.storeId || item?.common?.storeId || "";
 					page = `${routePrefix.hotel}/home/details/index?id=${id}`;
 				} else {
 					const subBizType = item?.homestay?.subBizType || extInfo?.subBizType;
-					const id = item?.homestay?.id || item?.common?.spuId || item?.common?.id;
+					const id = item?.homestay?.id || item?.common?.spuId || item?.common?.id || "";
 					/** 民宿 */
 					if (`${subBizType}` === `${ESubBizType.HomestayHotel}`) page = `${routePrefix.hotel}/home/details/index?id=${id}`;
-					else page = `${routePrefix.hotel}/home/hot-sale-details/index?id=${id}`;
+					else if (`${subBizType}` === `${ESubBizType.HomestayHot}`) page = `${routePrefix.hotel}/home/hot-sale-details/index?id=${id}`;
+					else page = `${routePrefix.hotel}/home/pms-details/index?id=${id}`;
 				}
 				break;
 			case EBusinessLine.Route:
@@ -93,7 +94,7 @@ var GoodsService = class {
 				let movieId = item?.movie?.id || "";
 				try {
 					movieId = JSON.parse(extInfo?.extInfo || "{}")?.thirdMovieId || "";
-				} catch (e) {}
+				} catch {}
 				page = getMoviePage(appConfig.domain.movie, movieId);
 				break;
 			case EBusinessLine.Strategy:

package/es/services/goods/type.d.ts

@@ -75,7 +75,7 @@ type IJumpProductDetailItem = {
   buy?: {
     spuId: string;
   };
-  /** 购物（新）*/
+  /** 购物（新） */
   onebuygz?: {
     spuId: string;
     skuId: string;

package/es/utils/common/index.js

@@ -13,7 +13,7 @@ function isEmpty(value) {
 */
 function query2url(query, options) {
 	const { encode = true } = options || {};
-	const url = Object.entries(query || {}).filter(([key, val]) => val !== void 0 && val !== null).map(([key, val]) => {
+	const url = Object.entries(query || {}).filter(([_, val]) => val !== void 0 && val !== null).map(([key, val]) => {
 		return encode ? `${encodeURIComponent(key)}=${encodeURIComponent(val)}` : `${key}=${val}`;
 	}).join("&");
 	return url ? `?${url}` : "";
@@ -33,7 +33,7 @@ function getQueryParameters(url) {
 			let value = decodeURIComponent(pair[1] || "");
 			try {
 				value = JSON.parse(value);
-			} catch (error) {}
+			} catch {}
 			params[key] = value;
 		}
 	}

package/es/utils/native-app/index.js

@@ -1,5 +1,5 @@
 import { app_permission } from "../../constants/permission/index.js";
-import { isH5, isHarmony, isWeixin, isiOS } from "../uni-env/index.js";
+import { isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv } from "../uni-env/index.js";
 
 //#region src/utils/native-app/index.ts
 let plusNativeObjView;
@@ -61,7 +61,7 @@ const showAndroidTip = (options) => {
 */
 const checkAndRequestNativeAppPermission = (options) => {
 	const { type, success, fail } = options || {};
-	if (isWeixin() || isH5() || isHarmony() || isiOS()) {
+	if (isWeixinEnv() || isH5Env() || isHarmonyEnv() || isiOSEnv()) {
 		success?.();
 		return;
 	}

package/es/utils/uni-env/index.d.ts

@@ -1,24 +1,39 @@
 //#region src/utils/uni-env/index.d.ts
+/**
+ * 是否是支付宝小程序
+ * @returns
+ */
+declare const isAlipayEnv: () => boolean;
 /**
  * 是否是web环境
  * @returns
  */
-declare const isH5: () => boolean;
+declare const isH5Env: () => boolean;
 /**
  * 是否是微信小程序
  * @returns
  */
-
+declare const isWeixinEnv: () => boolean;
+/**
+ * 是否是鸿蒙
+ * @returns
+ */
+declare const isHarmonyEnv: () => boolean;
 /**
  * 是否是app
  * @returns
  */
-declare const isApp: () => boolean;
+declare const isAppEnv: () => boolean;
 /**
  * 是否是安卓
  * @returns
  */
-
+declare const isAndroidEnv: () => boolean;
+/**
+ * 是否是iOS
+ * @returns
+ */
+declare const isiOSEnv: () => boolean;
 declare function getSystemInfoSync(): UniApp.GetSystemInfoResult | {
   pixelRatio: number;
   screenWidth: number;
@@ -43,4 +58,4 @@ declare function getSystemInfoSync(): UniApp.GetSystemInfoResult | {
   platform: string;
 };
 //#endregion
-export { getSystemInfoSync, isApp, isH5 };
+export { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv };

package/es/utils/uni-env/index.js

@@ -2,40 +2,55 @@ import { EUniPlatform } from "../../enums/platform/index.js";
 
 //#region src/utils/uni-env/index.ts
 /**
+* 是否是支付宝小程序
+* @returns
+*/
+const isAlipayEnv = () => {
+	return true;
+};
+/**
 * 是否是web环境
 * @returns
 */
-const isH5 = () => {
+const isH5Env = () => {
 	return true;
 };
 /**
 * 是否是微信小程序
 * @returns
 */
-const isWeixin = () => {
+const isWeixinEnv = () => {
 	return true;
 };
 /**
 * 是否是鸿蒙
 * @returns
 */
-const isHarmony = () => {
+const isHarmonyEnv = () => {
 	return true;
 };
 /**
 * 是否是app
 * @returns
 */
-const isApp = () => {
-	if (isHarmony()) return true;
+const isAppEnv = () => {
+	if (isHarmonyEnv()) return true;
 	return true;
 };
 /**
+* 是否是安卓
+* @returns
+*/
+const isAndroidEnv = () => {
+	if (isAppEnv() && getSystemInfoSync().platform === EUniPlatform.android) return true;
+	return false;
+};
+/**
 * 是否是iOS
 * @returns
 */
-const isiOS = () => {
-	if (isApp() && getSystemInfoSync().platform === EUniPlatform.ios) return true;
+const isiOSEnv = () => {
+	if (isAppEnv() && getSystemInfoSync().platform === EUniPlatform.ios) return true;
 	return false;
 };
 function getSystemInfoSync() {
@@ -46,4 +61,4 @@ function getSystemInfoSync() {
 }
 
 //#endregion
-export { getSystemInfoSync, isApp, isH5, isHarmony, isWeixin, isiOS };
+export { getSystemInfoSync, isAlipayEnv, isAndroidEnv, isAppEnv, isH5Env, isHarmonyEnv, isWeixinEnv, isiOSEnv };

package/es/utils/web-view/index.d.ts

@@ -6,7 +6,13 @@ declare const isIOSOrAndroid: boolean;
 /** 判断是否支付宝小程序 */
 declare const isAlipay: boolean;
 /** 判断是否微信小程序 */
-
+declare const isWeixin: boolean;
+/** 判断是否鸿蒙APP */
+declare const isHarmony: boolean;
+/** 判断是否安卓APP */
+declare const isAndroid: boolean;
+/** 判断是否苹果APP */
+declare const isiOS: boolean;
 declare enum EMessagesType {
   /** app直接调用分享 */
   share = "share",
@@ -72,4 +78,4 @@ declare const toPay: (data: {
   orderNo: string;
 }) => void;
 //#endregion
-export { EMessagesType, IShareParam, isAlipay, isIOSOrAndroid, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };
+export { EMessagesType, IShareParam, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };

package/es/utils/web-view/index.js

@@ -14,9 +14,15 @@ const isHarmony = !userAgent.includes("miniprogram") && !userAgent.includes("and
 const isAndroid = !userAgent.includes("miniprogram") && userAgent.includes("android");
 /** 判断是否苹果APP */
 const isiOS = !userAgent.includes("miniprogram") && (userAgent.includes("iphone") || userAgent.includes("ipad"));
+let uni = {};
 async function loadWebview() {
-	if (isIOSOrAndroid) await import("../../assets/js/webview/uni.webview.1.5.6.js");
-	else await import("../../assets/js/webview/uni.webview.1.5.5.js");
+	if (isIOSOrAndroid) {
+		const res = await import("../../assets/js/webview/uni.webview.1.5.6.js");
+		uni = res.default;
+	} else {
+		const res = await import("../../assets/js/webview/uni.webview.1.5.5.js");
+		uni = res.default;
+	}
 	if (isAlipay) {
 		const scriptTag = document.createElement("script");
 		scriptTag.src = "https://appx/web-view.min.js";
@@ -47,7 +53,7 @@ const navigateTo = (parameters) => {
 		uni?.webView?.navigateTo?.({ url });
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.navigateTo({ url });
-		my.navigateTo({ url });
+		my?.navigateTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -63,7 +69,7 @@ const redirectTo = (parameters) => {
 		uni?.webView?.redirectTo?.({ url });
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.redirectTo({ url });
-		my.redirectTo({ url });
+		my?.redirectTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -77,7 +83,7 @@ const navigateBack = (parameters) => {
 		uni?.webView?.navigateBack?.(parameters);
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.navigateBack(parameters);
-		my.navigateBack(parameters);
+		my?.navigateBack(parameters);
 	} catch (error) {
 		console.error(error);
 	}
@@ -98,7 +104,7 @@ const postMessage = (data) => {
 	}
 	uni?.webView?.postMessage({ data });
 	wx.miniProgram.postMessage({ data });
-	my.postMessage({ data });
+	my?.postMessage({ data });
 };
 /**
 * 设置页面分享信息
@@ -138,4 +144,4 @@ function objectToQueryString(obj) {
 }
 
 //#endregion
-export { EMessagesType, isAlipay, isIOSOrAndroid, isWeixin, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };
+export { EMessagesType, isAlipay, isAndroid, isHarmony, isIOSOrAndroid, isWeixin, isiOS, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@foundbyte/uni-libs",
   "description": "FoundByte Uni Libs",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "0.1.0",
+  "version": "1.0.1",
   "private": false,
   "type": "module",
   "main": "es/index.js",