@foundbyte/uni-libs 0.0.14 → 0.1.0

package/README.md

@@ -74,17 +74,28 @@ navigateBack({
 })  
 ```
 
-### 4.postMessage
-网页向应用发送消息
+### 4.setShareParam
+设置页面分享内容
 ```typescript
-import { postMessage } from '@foundbyte/uni-libs'
-
-postMessage({
-  type: EMessagesType.pay,
-  params: {
-    url: encodeURIComponent('预下单返回的收银台地址')
-  }
-})  
+import { setShareParam, EBusinessLine } from '@foundbyte/uni-libs'
+
+setShareParam({
+  /** 标题 */
+  title: '',
+  /** 缩略图 */
+  imageUrl: '',
+  /** web完整链接，不需要encodeURIComponent */
+  shareUrl: ''
+},
+/** 业务线id, 没有可忽略 */
+businessType: EBusinessLine.Foods
+) 
 ```
 
+### 5.环境判断
+```typescript
+import { isAlipay, isWeixin, isHarmony, isAndroid, isiOS } from '@foundbyte/uni-libs'
 
+/** 支付宝小程序、微信、鸿蒙app、安卓app、苹果app */
+console.info(isAlipay, isWeixin, isHarmony, isAndroid, isiOS)
+```

package/es/enums/platform/index.d.ts

@@ -0,0 +1,8 @@
+//#region src/enums/platform/index.d.ts
+declare enum EUniPlatform {
+  android = "android",
+  ios = "ios",
+  harmony = "harmony",
+}
+//#endregion
+export { EUniPlatform };

package/es/enums/platform/index.js

@@ -0,0 +1,10 @@
+//#region src/enums/platform/index.ts
+let EUniPlatform = /* @__PURE__ */ function(EUniPlatform$1) {
+	EUniPlatform$1["android"] = "android";
+	EUniPlatform$1["ios"] = "ios";
+	EUniPlatform$1["harmony"] = "harmony";
+	return EUniPlatform$1;
+}({});
+
+//#endregion
+export { EUniPlatform };

package/es/index.d.ts

@@ -6,14 +6,15 @@ import { ECaller } from "./enums/sdk/index.js";
 import { EVenueSimpleTypes, EVenueTypes } from "./enums/sub/enjoy/index.js";
 import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/index.js";
+import { EUniPlatform } from "./enums/platform/index.js";
 import { IOneTravelSDKConfig } from "./types/one-travel-service/index.js";
 import { getQueryParameters, isEmpty, query2url } from "./utils/common/index.js";
 import { ActivityCalendarDetailPageParams, getActivityCalendarDetailPage } from "./utils/pages/activity-calendar/index.js";
 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, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
-import { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/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 { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
-export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueSimpleTypes, EVenueTypes, IOneTravelSDKConfig, OneTravelSDK, WebviewPageParams, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+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 };

package/es/index.js

@@ -6,14 +6,15 @@ import { ECaller } from "./enums/sdk/index.js";
 import { EVenueSimpleTypes, EVenueTypes } from "./enums/sub/enjoy/index.js";
 import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/index.js";
+import { EUniPlatform } from "./enums/platform/index.js";
 import { getQueryParameters, isEmpty, query2url } from "./utils/common/index.js";
 import { getActivityCalendarDetailPage } from "./utils/pages/activity-calendar/index.js";
 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, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
-import { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS } from "./utils/uni-env/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 { checkAndRequestNativeAppPermission } from "./utils/native-app/index.js";
 import { OneTravelSDK } from "./entry.js";
 
-export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueSimpleTypes, EVenueTypes, OneTravelSDK, app_permission, checkAndRequestNativeAppPermission, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getMoviePage, getQueryParameters, getWebviewPage, isAndroid, isApp, isEmpty, isH5, isHarmony, isWeixin, isiOS, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+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 };

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

@@ -7,17 +7,17 @@ type IJumpProductDetailItemCommonExtInfo = {
   type?: 'hotel' | '1' | '3';
   storeId?: string;
   subBizType?: ESubBizType;
-  /************ 景区相关字段 ************/
+  /** ********** 景区相关字段 ************/
   isOld?: number;
-  /************ 景区相关字段 ************/
-  /************ 美食相关字段 ************/
+  /** ********** 景区相关字段 ************/
+  /** ********** 美食相关字段 ************/
   storePrecedentType?: EFoodPackageType;
   moduleType?: EFoodsModuleType;
-  /************ 美食相关字段 ************/
-  /************ 种草相关字段 ************/
+  /** ********** 美食相关字段 ************/
+  /** ********** 种草相关字段 ************/
   moreParameter?: string;
-  /************ 种草相关字段 ************/
-  /************ 电影相关字段 ************/
+  /** ********** 种草相关字段 ************/
+  /** ********** 电影相关字段 ************/
   extInfo: string;
 };
 /**
@@ -36,12 +36,12 @@ type IJumpProductDetailItem = {
     skuId: string;
     /** spuId */
     spuId: string;
-    /******** 收藏、搜索等(优先取扩展字段里面的) ********/
+    /** ****** 收藏、搜索等(优先取扩展字段里面的) ********/
     id?: string;
     storeId?: string;
     type?: 'hotel' | '1' | '3';
     reservationId?: string;
-    /******** 收藏、搜索等 ********/
+    /** ****** 收藏、搜索等 ********/
     /** 扩展字段 */
     extInfo?: IJumpProductDetailItemCommonExtInfo;
     /** 扩展字段 */

package/es/utils/pages/food/index.d.ts

@@ -1,7 +1,4 @@
-import { EFoodPackageType } from "../../../enums/sub/foods/index.js";
-
 //#region src/utils/pages/food/index.d.ts
-
 /**
  * 店铺
  * @param domain 域名
@@ -18,6 +15,6 @@ declare const getFoodStorePage: (domain: string, storeId: string, isDiamondLevel
  * @param storePrecedentType 套餐类型 （1、特色美食，2、休闲娱乐套餐）
  * @returns
  */
-declare const getFoodPackagePage: (domain: string, storeId: string, packageId: string, storePrecedentType?: EFoodPackageType) => string;
+declare const getFoodPackagePage: (domain: string, storeId: string, packageId: string, storePrecedentType?: number) => string;
 //#endregion
 export { getFoodPackagePage, getFoodStorePage };

package/es/utils/pages/food/index.js

@@ -1,4 +1,3 @@
-import { EFoodPackageType } from "../../../enums/sub/foods/index.js";
 import { query2url } from "../../common/index.js";
 
 //#region src/utils/pages/food/index.ts
@@ -24,13 +23,10 @@ const getFoodStorePage = (domain, storeId, isDiamondLevel) => {
 * @returns
 */
 const getFoodPackagePage = (domain, storeId, packageId, storePrecedentType) => {
-	if (storePrecedentType === EFoodPackageType.Enjoy) return `${domain}store/arrive/package-detail-enjoy/index${query2url({
+	return `${domain}store/arrive/package-detail-middle/index${query2url({
 		storeId,
-		packageId
-	}, { encode: false })}`;
-	return `${domain}store/arrive/package-detail/index${query2url({
-		storeId,
-		packageId
+		packageId,
+		storePrecedentType
 	}, { encode: false })}`;
 };
 

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

@@ -8,12 +8,7 @@ declare const isH5: () => boolean;
  * 是否是微信小程序
  * @returns
  */
-declare const isWeixin: () => boolean;
-/**
- * 是否是鸿蒙
- * @returns
- */
-declare const isHarmony: () => boolean;
+
 /**
  * 是否是app
  * @returns
@@ -23,11 +18,29 @@ declare const isApp: () => boolean;
  * 是否是安卓
  * @returns
  */
-declare const isAndroid: () => boolean;
-/**
- * 是否是iOS
- * @returns
- */
-declare const isiOS: () => boolean;
+
+declare function getSystemInfoSync(): UniApp.GetSystemInfoResult | {
+  pixelRatio: number;
+  screenWidth: number;
+  screenHeight: number;
+  windowWidth: number;
+  windowHeight: number;
+  statusBarHeight: number;
+  windowTop: number;
+  windowBottom: number;
+  safeArea: UniApp.SafeArea;
+  safeAreaInsets: UniApp.SafeAreaInsets;
+  screenTop: number;
+  deviceBrand?: string;
+  deviceModel: string;
+  deviceId: string;
+  deviceType: string;
+  devicePixelRatio: number;
+  deviceOrientation: "portrait" | "landscape";
+  brand?: string;
+  model: string;
+  system: string;
+  platform: string;
+};
 //#endregion
-export { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };
+export { getSystemInfoSync, isApp, isH5 };

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

@@ -1,3 +1,5 @@
+import { EUniPlatform } from "../../enums/platform/index.js";
+
 //#region src/utils/uni-env/index.ts
 /**
 * 是否是web环境
@@ -29,19 +31,19 @@ const isApp = () => {
 	return true;
 };
 /**
-* 是否是安卓
-* @returns
-*/
-const isAndroid = () => {
-	return true;
-};
-/**
 * 是否是iOS
 * @returns
 */
 const isiOS = () => {
-	return true;
+	if (isApp() && getSystemInfoSync().platform === EUniPlatform.ios) return true;
+	return false;
 };
+function getSystemInfoSync() {
+	return {
+		...uni.getDeviceInfo(),
+		...uni.getWindowInfo()
+	};
+}
 
 //#endregion
-export { isAndroid, isApp, isH5, isHarmony, isWeixin, isiOS };
+export { getSystemInfoSync, isApp, isH5, isHarmony, isWeixin, isiOS };

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

@@ -1,5 +1,18 @@
+import { EBusinessLine } from "../../enums/business-line/index.js";
+
 //#region src/utils/web-view/index.d.ts
+/** 判断是否是iOS还是安卓 */
+declare const isIOSOrAndroid: boolean;
+/** 判断是否支付宝小程序 */
+declare const isAlipay: boolean;
+/** 判断是否微信小程序 */
+
 declare enum EMessagesType {
+  /** app直接调用分享 */
+  share = "share",
+  /** 设置分享参数 */
+  shareParam = "shareParam",
+  /** 去支付 */
   pay = "pay",
 }
 /**
@@ -37,5 +50,26 @@ declare const postMessage: (data: {
   type?: EMessagesType;
   params: Record<string, any>;
 }) => void;
+interface IShareParam {
+  /** 分享标题 */
+  title?: string;
+  /** 分享图片url */
+  imageUrl?: string;
+  /** 分享链接 */
+  shareUrl?: string;
+}
+/**
+ * 设置页面分享信息
+ * @param data
+ */
+declare const setShareParam: (data: IShareParam, businessType?: number | EBusinessLine) => void;
+/**
+ * 去支付
+ * @param data
+ */
+declare const toPay: (data: {
+  cashStageUrl: string;
+  orderNo: string;
+}) => void;
 //#endregion
-export { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo };
+export { EMessagesType, IShareParam, isAlipay, isIOSOrAndroid, navigateBack, navigateTo, postMessage, redirectTo, setShareParam, toPay };

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

@@ -2,16 +2,37 @@ import wx from "weixin-js-sdk";
 
 //#region src/utils/web-view/index.ts
 const userAgent = navigator.userAgent.toLowerCase();
+/** 判断是否是iOS还是安卓 */
 const isIOSOrAndroid = !userAgent.includes("miniprogram") && (userAgent.includes("android") || userAgent.includes("iphone") || userAgent.includes("ipad"));
+/** 判断是否支付宝小程序 */
+const isAlipay = userAgent.includes("miniprogram") && userAgent.includes("aliapp");
+/** 判断是否微信小程序 */
+const isWeixin = window.__wxjs_environment === "miniprogram";
+/** 判断是否鸿蒙APP */
+const isHarmony = !userAgent.includes("miniprogram") && !userAgent.includes("android") && userAgent.includes("openharmony");
+/** 判断是否安卓APP */
+const isAndroid = !userAgent.includes("miniprogram") && userAgent.includes("android");
+/** 判断是否苹果APP */
+const isiOS = !userAgent.includes("miniprogram") && (userAgent.includes("iphone") || userAgent.includes("ipad"));
 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 (isAlipay) {
+		const scriptTag = document.createElement("script");
+		scriptTag.src = "https://appx/web-view.min.js";
+		document.head.appendChild(scriptTag);
+	}
 }
 loadWebview();
 document.addEventListener("UniAppJSBridgeReady", function() {
-	uni.webView.getEnv(function(res) {});
+	uni.webView.getEnv(function(_) {});
 });
 let EMessagesType = /* @__PURE__ */ function(EMessagesType$1) {
+	/** app直接调用分享 */
+	EMessagesType$1["share"] = "share";
+	/** 设置分享参数 */
+	EMessagesType$1["shareParam"] = "shareParam";
+	/** 去支付 */
 	EMessagesType$1["pay"] = "pay";
 	return EMessagesType$1;
 }({});
@@ -26,6 +47,7 @@ const navigateTo = (parameters) => {
 		uni?.webView?.navigateTo?.({ url });
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.navigateTo({ url });
+		my.navigateTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -41,6 +63,7 @@ const redirectTo = (parameters) => {
 		uni?.webView?.redirectTo?.({ url });
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.redirectTo({ url });
+		my.redirectTo({ url });
 	} catch (error) {
 		console.error(error);
 	}
@@ -54,6 +77,7 @@ const navigateBack = (parameters) => {
 		uni?.webView?.navigateBack?.(parameters);
 		/** 不兼容上面的方法会自动往下执行 */
 		wx.miniProgram.navigateBack(parameters);
+		my.navigateBack(parameters);
 	} catch (error) {
 		console.error(error);
 	}
@@ -63,14 +87,47 @@ const navigateBack = (parameters) => {
 * @param data
 */
 const postMessage = (data) => {
-	if (window.__wxjs_environment === "miniprogram" && data.type === EMessagesType.pay) {
-		redirectTo({
-			src: "/pages/web-view/index",
-			params: data.params
-		});
-		return;
+	if (data.type === EMessagesType.pay) {
+		if (isWeixin || isAlipay) {
+			redirectTo({
+				src: "/pages/web-view/index",
+				params: data.params
+			});
+			return;
+		}
 	}
 	uni?.webView?.postMessage({ data });
+	wx.miniProgram.postMessage({ data });
+	my.postMessage({ data });
+};
+/**
+* 设置页面分享信息
+* @param data
+*/
+const setShareParam = (data, businessType) => {
+	const { shareUrl,...res } = data;
+	const params = { data: {
+		...res,
+		businessType,
+		shareUrl: encodeURIComponent(shareUrl || "")
+	} };
+	postMessage({
+		type: EMessagesType.shareParam,
+		params
+	});
+};
+/**
+* 去支付
+* @param data
+*/
+const toPay = (data) => {
+	postMessage({
+		type: EMessagesType.pay,
+		params: {
+			url: encodeURIComponent(data.cashStageUrl),
+			orderId: data.orderNo
+		}
+	});
 };
 function objectToQueryString(obj) {
 	const params = Object.entries(obj).map(([key, value]) => {
@@ -81,4 +138,4 @@ function objectToQueryString(obj) {
 }
 
 //#endregion
-export { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo };
+export { EMessagesType, isAlipay, isIOSOrAndroid, isWeixin, 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.0.14",
+  "version": "0.1.0",
   "private": false,
   "type": "module",
   "main": "es/index.js",