@foundbyte/uni-libs 0.0.9 → 0.0.10-alpha.2

package/es/constants/routes/index.d.ts

@@ -42,6 +42,8 @@ declare const routePrefix: Readonly<{
   scene: "/sub/scene";
   /** 路线 */
   road: "/sub/road/pages";
+  /** 出行 */
+  travel: "/sub/travel/pages";
   /** 酒店 */
   hotel: "/sub/hotel/pages";
   /** 美食 */

package/es/constants/routes/index.js

@@ -23,6 +23,7 @@ const routePrefix = Object.freeze({
 	ticket: "/sub/ticket/pages",
 	scene: "/sub/scene",
 	road: "/sub/road/pages",
+	travel: "/sub/travel/pages",
 	hotel: "/sub/hotel/pages",
 	food: "/sub/food/pages",
 	enjoy: "/sub/enjoy/pages",

package/es/entry.d.ts

@@ -1,5 +1,5 @@
 import { IOneTravelSDKConfig } from "./types/one-travel-service/index.js";
-import { IJumpGoodsDetailItem } from "./services/goods/type.js";
+import { IJumpGoodsDetailItem, IJumpProductDetailItem } from "./services/goods/type.js";
 import { IAppConfig } from "./configs/app/app.type.js";
 
 //#region src/entry.d.ts
@@ -16,10 +16,15 @@ declare class OneTravelSDK {
    */
   getAppConfig(): IAppConfig;
   /**
-   * 跳转商品详情页
+   * 跳转商品详情页（老）
    * @param goodsItem 商品数据
    */
   jumpToGoodsDetailPage(goodsItem: IJumpGoodsDetailItem): void;
+  /**
+   * 跳转商品详情页
+   * @param item
+   */
+  jumpToProductDetailPage(item: IJumpProductDetailItem): void;
 }
 //#endregion
 export { OneTravelSDK };

package/es/entry.js

@@ -26,12 +26,19 @@ var OneTravelSDK = class {
 		return getAppConfig(this.sdkConfig.appEnv);
 	}
 	/**
-	* 跳转商品详情页
+	* 跳转商品详情页（老）
 	* @param goodsItem 商品数据
 	*/
 	jumpToGoodsDetailPage(goodsItem) {
 		this.goodsService.jumpToGoodsDetailPage(goodsItem);
 	}
+	/**
+	* 跳转商品详情页
+	* @param item
+	*/
+	jumpToProductDetailPage(item) {
+		this.goodsService.jumpToProductDetailPage(item);
+	}
 };
 
 //#endregion

package/es/enums/sub/foods/index.d.ts

@@ -4,5 +4,11 @@ declare enum EFoodsModuleType {
   /** 搜藏 */
   store = "store",
 }
+declare enum EFoodPackageType {
+  /** 特色美食 */
+  Normal = 1,
+  /** 休闲娱乐套餐 */
+  Enjoy = 2,
+}
 //#endregion
-export { EFoodsModuleType };
+export { EFoodPackageType, EFoodsModuleType };

package/es/enums/sub/foods/index.js

@@ -5,6 +5,13 @@ let EFoodsModuleType = /* @__PURE__ */ function(EFoodsModuleType$1) {
 	EFoodsModuleType$1["store"] = "store";
 	return EFoodsModuleType$1;
 }({});
+let EFoodPackageType = /* @__PURE__ */ function(EFoodPackageType$1) {
+	/** 特色美食 */
+	EFoodPackageType$1[EFoodPackageType$1["Normal"] = 1] = "Normal";
+	/** 休闲娱乐套餐 */
+	EFoodPackageType$1[EFoodPackageType$1["Enjoy"] = 2] = "Enjoy";
+	return EFoodPackageType$1;
+}({});
 
 //#endregion
-export { EFoodsModuleType };
+export { EFoodPackageType, EFoodsModuleType };

package/es/index.d.ts

@@ -3,13 +3,13 @@ import { BusinessLineDict, EBusinessLine, ESubBizType } from "./enums/business-l
 import { EAppEnv } from "./enums/environment/index.js";
 import { ECaller } from "./enums/sdk/index.js";
 import { EVenueTypes, EVenueTypesDes } from "./enums/sub/enjoy/index.js";
-import { EFoodsModuleType } from "./enums/sub/foods/index.js";
+import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/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 { EMessagesType, getWebViewEnv, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
+import { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
 import { OneTravelSDK } from "./entry.js";
-export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueTypes, EVenueTypesDes, IOneTravelSDKConfig, OneTravelSDK, WebviewPageParams, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getQueryParameters, getWebViewEnv, getWebviewPage, isEmpty, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+export { ActivityCalendarDetailPageParams, BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueTypes, EVenueTypesDes, IOneTravelSDKConfig, OneTravelSDK, WebviewPageParams, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getQueryParameters, getWebviewPage, isEmpty, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };

package/es/index.js

@@ -3,13 +3,13 @@ import { BusinessLineDict, EBusinessLine, ESubBizType } from "./enums/business-l
 import { EAppEnv } from "./enums/environment/index.js";
 import { ECaller } from "./enums/sdk/index.js";
 import { EVenueTypes, EVenueTypesDes } from "./enums/sub/enjoy/index.js";
-import { EFoodsModuleType } from "./enums/sub/foods/index.js";
+import { EFoodPackageType, EFoodsModuleType } from "./enums/sub/foods/index.js";
 import { EHotelType } from "./enums/sub/hotel/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 { EMessagesType, getWebViewEnv, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
+import { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo } from "./utils/web-view/index.js";
 import { OneTravelSDK } from "./entry.js";
 
-export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueTypes, EVenueTypesDes, OneTravelSDK, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getQueryParameters, getWebViewEnv, getWebviewPage, isEmpty, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };
+export { BusinessLineDict, EAppEnv, EBusinessLine, ECaller, EFoodPackageType, EFoodsModuleType, EHotelType, EMessagesType, ESubBizType, EVenueTypes, EVenueTypesDes, OneTravelSDK, getActivityCalendarDetailPage, getFoodPackagePage, getFoodStorePage, getQueryParameters, getWebviewPage, isEmpty, navigateBack, navigateTo, postMessage, query2url, redirectTo, routePrefix, routes };

package/es/services/goods/service.js

@@ -122,6 +122,102 @@ var GoodsService = class {
 			item: obj
 		}).then().catch();
 	};
+	/**
+	* 跳转商品详情页面
+	* @param item 商品数据
+	*/
+	jumpToProductDetailPage = (item) => {
+		const configOptions = this.goodsServiceConfig.sdkConfig;
+		const appConfig = getAppConfig(configOptions.appEnv);
+		let page = "";
+		const businessLine = item?.businessLine || item?.common?.bizType || item?.common?.linkBusinessLine || item?.common?.businessType;
+		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 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;
+				page = `${routePrefix.hotel}/home/details/index?id=${hotelId}`;
+				break;
+			case EBusinessLine.Homestay:
+				const homestayType = item?.homestay?.type || extInfo?.type || item?.common?.type;
+				if (homestayType === EHotelType.hotel) {
+					/** 酒店 (天下房仓酒店详情页)*/
+					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;
+					/** 民宿 */
+					if (`${subBizType}` === `${ESubBizType.HomestayHotel}`) page = `${routePrefix.hotel}/home/details/index?id=${id}`;
+					else page = `${routePrefix.hotel}/home/hot-sale-details/index?id=${id}`;
+				}
+				break;
+			case EBusinessLine.Route:
+				const routeId = item?.route?.id || item?.common?.spuId || item?.common?.id;
+				page = `${routePrefix.road}/product-detail/index?id=${routeId}`;
+				break;
+			case EBusinessLine.Travel:
+				const travelId = item?.travel?.id || item?.common?.spuId || item?.common?.id;
+				page = `${routePrefix.travel}/charter/detail?routeId=${travelId}`;
+				break;
+			case EBusinessLine.Buy:
+				const buySpuId = item?.buy?.spuId || item?.common?.spuId || item?.common?.id;
+				page = getWebviewPage({ url: appConfig.domain.shopping + `goods?itemId=${buySpuId}` });
+				break;
+			case EBusinessLine.Onebuygz:
+				const onebuySpuId = item?.onebuygz?.spuId || item?.common?.spuId || item?.common?.id;
+				const onebuySkuId = item?.onebuygz?.skuId || item?.common?.skuId;
+				page = getWebviewPage({ url: appConfig.domain.onebuygz + `pages/commodity-detail/index?itemId=${onebuySpuId}&skuId=${onebuySkuId}` });
+				break;
+			case EBusinessLine.Foods:
+				const moduleType = item?.food?.moduleType || extInfo?.moduleType;
+				const storeId = item?.food?.storeId || extInfo?.storeId || item?.common?.storeId || "";
+				const spuId = item?.food?.spuId || item?.common?.spuId || item?.common?.id || "";
+				const storePrecedentType = item?.food?.storePrecedentType || extInfo?.storePrecedentType || void 0;
+				if (moduleType === EFoodsModuleType.store)
+ /** 收藏跳店铺 */
+				page = getWebviewPage({ url: getFoodStorePage(appConfig.domain.food, storeId) });
+				else
+ /** 跳转套餐 */
+				page = getWebviewPage({ url: getFoodPackagePage(appConfig.domain.food, storeId, spuId, storePrecedentType) });
+				break;
+			case EBusinessLine.Entertainment:
+				const entertainmentId = item?.entertainment?.id || item?.common?.spuId || item?.common?.id;
+				const entertainmentStoreId = item?.entertainment?.storeId || extInfo?.storeId || item?.common?.storeId || "";
+				const entertainmentSubBizType = item?.entertainment?.subBizType || extInfo?.subBizType;
+				const entertainmentType = item?.entertainment?.type || extInfo?.type || item?.common?.type;
+				const entertainmentReservationId = item?.entertainment?.reservationId || extInfo?.reservationId || item?.common?.reservationId;
+				if (`${entertainmentType}` === EVenueTypesDes[EVenueTypes.Activity] || `${entertainmentSubBizType}` === `${ESubBizType.EntertainmentPerform}`) page = `${routePrefix.enjoy}/g-activity/detail?id=` + entertainmentId + "&mchId=" + entertainmentStoreId;
+				else page = `${routePrefix.enjoy}/g-venue/detail?id=${entertainmentId}&reservationId=${entertainmentReservationId}`;
+				break;
+			case EBusinessLine.Strategy:
+				const strategyId = item?.strategy?.id || item?.common?.spuId || item?.common?.id;
+				page = `${routePrefix.strategy}/strategy-detail/index?id=` + strategyId;
+				break;
+			case EBusinessLine.Recommend:
+				const recommendId = item?.recommend?.id || item?.common?.spuId || item?.common?.id;
+				const recommendMoreParameter = item?.recommend?.moreParameter || extInfo?.moreParameter || "";
+				page = `${routePrefix.show}/details/index?id=${recommendId}${recommendMoreParameter}`;
+				break;
+			case EBusinessLine.SoundGuizhou:
+				const soundGuizhouId = item?.soundGuizhou?.id || item?.common?.spuId || item?.common?.id;
+				page = `${routePrefix.soundGuizhou}/detail?audioLibId=${soundGuizhouId}`;
+				break;
+			case EBusinessLine.ExcitingVideo:
+				const excitingVideoId = item?.excitingVideo?.id || item?.common?.spuId || item?.common?.id;
+				page = `${routePrefix.living}/wonderful-video/index?vid=${excitingVideoId}`;
+				break;
+			default: break;
+		}
+		if (!page) return;
+		if (configOptions.caller === ECaller.web) navigateTo({ src: page });
+		else if (configOptions.caller === ECaller.host) uni.navigateTo({ url: page });
+	};
 };
 
 //#endregion

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

@@ -1,4 +1,5 @@
-import { EBusinessLine } from "../../enums/business-line/index.js";
+import { EBusinessLine, ESubBizType } from "../../enums/business-line/index.js";
+import { EFoodPackageType, EFoodsModuleType } from "../../enums/sub/foods/index.js";
 import { EHotelType } from "../../enums/sub/hotel/index.js";
 
 //#region src/services/goods/type.d.ts
@@ -22,5 +23,113 @@ type IJumpGoodsDetailItem = {
   bizType?: EBusinessLine;
   businessType?: EBusinessLine;
 };
+type IJumpProductDetailItemCommonExtInfo = {
+  reservationId?: string;
+  type?: 'hotel' | '1' | '3';
+  storeId?: string;
+  subBizType?: ESubBizType;
+  /************ 景区相关字段 ************/
+  isOld?: number;
+  /************ 景区相关字段 ************/
+  /************ 美食相关字段 ************/
+  storePrecedentType?: EFoodPackageType;
+  moduleType?: EFoodsModuleType;
+  /************ 美食相关字段 ************/
+  /************ 种草相关字段 ************/
+  moreParameter?: string;
+};
+/**
+ * 商品数据
+ */
+type IJumpProductDetailItem = {
+  /** 业务线(如果是common字段，则不用传，没有common必传) */
+  businessLine?: EBusinessLine;
+  /** 通用数据-(包含装修数据文本导航、商品组件) */
+  common?: {
+    /** 业务线字段（可能是三个中的一个） */
+    bizType?: EBusinessLine;
+    linkBusinessLine?: EBusinessLine;
+    businessType?: EBusinessLine;
+    /** skuId 字段 */
+    skuId: string;
+    /** spuId */
+    spuId: string;
+    /******** 收藏、搜索等(优先取扩展字段里面的) ********/
+    id?: string;
+    storeId?: string;
+    type?: 'hotel' | '1' | '3';
+    reservationId?: string;
+    /******** 收藏、搜索等 ********/
+    /** 扩展字段 */
+    extInfo?: IJumpProductDetailItemCommonExtInfo;
+    /** 扩展字段 */
+    extInfoMap?: IJumpProductDetailItemCommonExtInfo;
+  };
+  /** 景区门票 */
+  scenic?: {
+    id: string;
+    reservationId?: string;
+    isOld?: number;
+  };
+  /** 酒店 */
+  hotel?: {
+    id: string;
+  };
+  /** 名宿 */
+  homestay?: {
+    id: string;
+    type?: 'hotel';
+    subBizType?: ESubBizType;
+  };
+  /** 路线/定制 */
+  route?: {
+    id: string;
+  };
+  /** 出行 */
+  travel?: {
+    id: string;
+  };
+  /** 购物 */
+  buy?: {
+    spuId: string;
+  };
+  /** 购物（新）*/
+  onebuygz?: {
+    spuId: string;
+    skuId: string;
+  };
+  /** 美食 */
+  food?: {
+    storeId: string;
+    spuId?: string;
+    moduleType?: EFoodsModuleType;
+    storePrecedentType?: EFoodPackageType;
+  };
+  /** 文娱 */
+  entertainment?: {
+    id: string;
+    type?: string;
+    subBizType?: ESubBizType;
+    storeId?: string;
+    reservationId?: string;
+  };
+  /** 攻略 */
+  strategy?: {
+    id: string;
+  };
+  /** 种草 */
+  recommend?: {
+    id: string;
+    moreParameter?: string;
+  };
+  /** 声入贵州 */
+  soundGuizhou?: {
+    id: string;
+  };
+  /** 精彩视频 */
+  excitingVideo?: {
+    id: string;
+  };
+};
 //#endregion
-export { IJumpGoodsDetailItem };
+export { IJumpGoodsDetailItem, IJumpProductDetailItem };

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

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

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

@@ -1,3 +1,4 @@
+import { EFoodPackageType } from "../../../enums/sub/foods/index.js";
 import { query2url } from "../../common/index.js";
 
 //#region src/utils/pages/food/index.ts
@@ -16,12 +17,17 @@ const getFoodStorePage = (domain, storeId, isDiamondLevel) => {
 };
 /**
 * 套餐
-* @param domain
-* @param storeId
-* @param packageId
+* @param domain 域名
+* @param storeId 店铺ID
+* @param packageId 套餐ID
+* @param storePrecedentType 套餐类型 （1、特色美食，2、休闲娱乐套餐）
 * @returns
 */
-const getFoodPackagePage = (domain, storeId, packageId) => {
+const getFoodPackagePage = (domain, storeId, packageId, storePrecedentType) => {
+	if (storePrecedentType === EFoodPackageType.Enjoy) return `${domain}store/arrive/package-detail-enjoy/index${query2url({
+		storeId,
+		packageId
+	}, { encode: false })}`;
 	return `${domain}store/arrive/package-detail/index${query2url({
 		storeId,
 		packageId

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

@@ -1,14 +1,7 @@
-import "../../assets/js/webview/uni.webview.1.5.5.js";
-
 //#region src/utils/web-view/index.d.ts
 declare enum EMessagesType {
   pay = "pay",
 }
-/**
- * 当前环境
- * @returns
- */
-declare const getWebViewEnv: () => {};
 /**
  * 原生路由跳转
  * @param parameters
@@ -45,4 +38,4 @@ declare const postMessage: (data: {
   params: Record<string, any>;
 }) => void;
 //#endregion
-export { EMessagesType, getWebViewEnv, navigateBack, navigateTo, postMessage, redirectTo };
+export { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo };

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

@@ -1,25 +1,26 @@
-import "../../assets/js/webview/uni.webview.1.5.5.js";
 import wx from "weixin-js-sdk";
 
 //#region src/utils/web-view/index.ts
-let env = {};
+const userAgent = navigator.userAgent.toLowerCase();
+const isIOSOrAndroid = !userAgent.includes("miniprogram") && (userAgent.includes("android") || userAgent.includes("iphone") || userAgent.includes("ipad"));
+async function loadWebview() {
+	if (isIOSOrAndroid) {
+		console.log("webview.1.5.6");
+		await import("../../assets/js/webview/uni.webview.1.5.6.js");
+	} else {
+		console.log("webview.1.5.5");
+		await import("../../assets/js/webview/uni.webview.1.5.5.js");
+	}
+}
+loadWebview();
 document.addEventListener("UniAppJSBridgeReady", function() {
-	uni.webView.getEnv(function(res) {
-		env = res;
-	});
+	uni.webView.getEnv(function(res) {});
 });
 let EMessagesType = /* @__PURE__ */ function(EMessagesType$1) {
 	EMessagesType$1["pay"] = "pay";
 	return EMessagesType$1;
 }({});
 /**
-* 当前环境
-* @returns
-*/
-const getWebViewEnv = () => {
-	return env;
-};
-/**
 * 原生路由跳转
 * @param parameters
 */
@@ -85,4 +86,4 @@ function objectToQueryString(obj) {
 }
 
 //#endregion
-export { EMessagesType, getWebViewEnv, navigateBack, navigateTo, postMessage, redirectTo };
+export { EMessagesType, navigateBack, navigateTo, postMessage, redirectTo };

package/package.json

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