@pisell/private-materials 6.7.3 → 6.7.5

package/lib/plus/saasRegister/components/EntryEmail.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/lib/plus/saasRegister/components/EntryInfo.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

package/lib/plus/saasRegister/components/GoLogin.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 declare const GoLogin: (props: SRProps) => JSX.Element;

package/lib/plus/saasRegister/components/Header.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRProps } from '../types';
 import '../index.less';
 export declare const Header: (props: SRProps) => JSX.Element;

package/lib/plus/saasRegister/components/VerifyError.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRStepStatus } from '../types';
 import '../index.less';
 declare const VerifyError: (props: {

package/lib/plus/saasRegister/components/VerifyingLink.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VerifyingEmailLink: (props: {
     onVerifyLink: () => Promise<void>;

package/lib/plus/walletEditor/components/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const RelationProduct: ({ value, onChange, }: {
     value?: string[] | undefined;

package/lib/plus/walletPassGallery/components/footerButton/index.js

@@ -160,13 +160,13 @@ var FooterButtons = ({
         )
       );
     }
-    const buttonCount = buttons.length;
-    const className = `pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-${buttonCount}`;
+    const className = `pisell-wallet-pass-gallery_footer-buttons`;
     return buttons.length > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className }, buttons) : null;
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-pass-gallery_footer" }, renderButtons()), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
+      destroyOnClose: true,
       platform,
       mobileModalHeight: "auto",
       headerDivider: false,

package/lib/plus/walletPassGallery/components/footerButton/index.less

@@ -1,83 +1,38 @@
 .pisell-wallet-pass-gallery_footer {
   position: relative;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #fff;
   padding: 24px;
   z-index: 100;
   border-top: 1px solid #d0d5de;
-  margin-left: -20px;
-  margin-right: -20px;
+  margin-left: -24px;
+  margin-right: -24px;
   &-buttons {
     display: flex;
     gap: 12px;
     width: 100%;
 
-
-.pisell-wallet-pass-gallery_footer-buttons-item-secondary{
-    overflow: hidden;
-    display: flex;
-    >span{
-      display: block;
-      // width: 100%;
-      flex:1;
+    .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
+      overflow: hidden;
+      display: inline-block;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       text-wrap: nowrap;
-    }
-}
-
-
-    // 按钮数量样式
-    // 单个按钮占满宽度
-    &-count-1 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: 100%;
-      }
-    }
-    
-    // 两个按钮各占一半
-    &-count-2 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(50% - 6px);
+      > span {
+        display: inline;
       }
     }
-    
-    // 三个按钮各占三分之一
-    &-count-3 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(33.33% - 8px);
-      }
-    }
-    
-    // 四个按钮各占四分之一
-    &-count-4 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(25% - 9px);
-      }
-    }
-    
-    // Ant Design按钮覆盖样式
-    :global(.ant-btn) {
-      height: 48px;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      width: 100%;
+
+    .pisell-wallet-pass-gallery_footer-buttons-item {
+      flex-grow: 1;
     }
-    
+
     &-item {
       // 修饰符：主按钮
       &-primary {
-        background-color: var(--theme-color, #7F56D9);
+        background-color: var(--theme-color, #7f56d9);
       }
-      
+
       // 修饰符：次按钮
       &-secondary {
         background-color: #fff;
@@ -90,4 +45,4 @@
 
 .pisell-wallet-pass-gallery_footer:empty {
   display: none;
-}
+}

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -3,6 +3,7 @@ interface PassDetailProps {
     dataSource?: any | null;
     platform?: 'pc' | 'h5';
     buttonGroupList?: any[][];
+    showTimeLine?: boolean;
 }
 declare const PassDetail: (props: PassDetailProps) => JSX.Element | null;
 export default PassDetail;

package/lib/plus/walletPassGallery/components/passDetail/index.js

@@ -48,19 +48,26 @@ var import_recharge = __toESM(require("../recharge"));
 var import_footerButton = __toESM(require("../footerButton"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../../components/wallet/utils");
+var import_locales = __toESM(require("../../locales"));
+var import_utils4 = require("../../../../utils");
 var { Text } = import_antd.Typography;
 var PassDetail = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (!props.dataSource) return null;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
   const { symbol = "$" } = (0, import_materials.usePisellConfig)();
-  const { dataSource, platform = "pc" } = props;
+  const { dataSource, platform = "pc", showTimeLine = true } = props;
   const [activeKey, setActiveKey] = (0, import_react.useState)("detail");
   const [rechargeOpen, setRechargeOpen] = (0, import_react.useState)(false);
   const containerRef = (0, import_react.useRef)(null);
   const isIndicatorVisibleRef = (0, import_react.useRef)(false);
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
-  const timezone = ((_e = (_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) == null ? void 0 : _e.shop.timezone) || "Asia/Shanghai";
+  const { apiPrefix } = ((_b = context.appHelper) == null ? void 0 : _b.constants) || { apiPrefix: "/h5" };
+  const timezone = ((_g = (_f = (_e = (_d = (_c = store == null ? void 0 : store.getState) == null ? void 0 : _c.call(store)) == null ? void 0 : _d.global) == null ? void 0 : _e.symbol) == null ? void 0 : _f.shop) == null ? void 0 : _g.timezone) || "Asia/Shanghai";
+  import_utils.locales.init(import_locales.default, ((_i = (_h = context == null ? void 0 : context.engine) == null ? void 0 : _h.props) == null ? void 0 : _i.locale) || "en");
+  if ((_k = (_j = context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.request) {
+    import_utils4.request.setRequest((_m = (_l = context.appHelper) == null ? void 0 : _l.utils) == null ? void 0 : _m.request);
+  }
   const {
     id = "",
     code = "",
@@ -69,17 +76,22 @@ var PassDetail = (props) => {
     encoded = "",
     balance,
     expire_date = "",
-    product = {}
+    product = {},
+    custom_schedule_snapshot,
+    customer_id
   } = dataSource || {};
   const {
     description = "",
     extension_data = [],
     customer_order_behavior_count = 0
   } = product || {};
-  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id }), {
+  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id, apiPrefix, order_behavior_count_customer_id: customer_id }), {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  const scheduleList = (0, import_react.useMemo)(() => {
+    return (custom_schedule_snapshot == null ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   (0, import_react.useEffect)(() => {
     if (tag === "product_discount_card") {
       setActiveKey("detail");
@@ -111,7 +123,29 @@ var PassDetail = (props) => {
     return () => clearTimeout(timeoutId);
   }, []);
   const descs = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2, _c2;
+    const detail = (0, import_utils3.formatScheduleText)(scheduleList, (_b2 = (_a2 = context == null ? void 0 : context.engine) == null ? void 0 : _a2.props) == null ? void 0 : _b2.locale);
+    let expireText = expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate");
+    if (scheduleList.length > 0) {
+      let validityTexts = "";
+      let excludedText = "";
+      let includedText = "";
+      detail.forEach((item) => {
+        if (item.validityTexts.length > 0) {
+          validityTexts = `${validityTexts}${item.validityTexts.join("\n")}
+`;
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = `${excludedText}${item.excluded_date.join("\n")}
+`;
+        }
+        if (item.included_date.length > 0) {
+          includedText = `${includedText}${item.included_date.join("\n")}
+`;
+        }
+      });
+      expireText = /* @__PURE__ */ import_react.default.createElement("span", { className: "wallet-detail-expire-text" }, validityTexts, excludedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.notValidDate")), excludedText, includedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.includedDate")), includedText);
+    }
     let data = [
       {
         label: import_utils.locales.getText("wallet-pass-gallery.cardName"),
@@ -124,11 +158,11 @@ var PassDetail = (props) => {
       },
       {
         label: import_utils.locales.getText("wallet-pass-gallery.validDate"),
-        value: expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate")
+        value: expireText
       }
     ];
     if (tag === "product_discount_card") {
-      const isFixedAmount = ((_a2 = dataSource.metadata) == null ? void 0 : _a2.discount_card_type) === "fixed_amount";
+      const isFixedAmount = ((_c2 = dataSource.metadata) == null ? void 0 : _c2.discount_card_type) === "fixed_amount";
       data.splice(2, 0, {
         label: import_utils.locales.getText("wallet-pass-gallery.discount"),
         value: balance ? isFixedAmount ? `${symbol}${Number(balance)}` : `${Number(balance)}%` : ""
@@ -195,14 +229,19 @@ var PassDetail = (props) => {
   };
   const renderTimeLine = () => {
     if (tag === "product_discount_card") return null;
+    if (!showTimeLine) return null;
     return /* @__PURE__ */ import_react.default.createElement(import_timelineSection.default, { code, tag, timezone });
   };
+  if (!props.dataSource) return null;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: (0, import_classnames.default)(
         `pisell-wallet-pass-gallery_detail`,
-        `pisell-wallet-pass-gallery_detail-${platform}`
+        `pisell-wallet-pass-gallery_detail-${platform}`,
+        {
+          [`pisell-wallet-pass-gallery_detail-with-footer`]: platform === "h5" && tag === "gift_card"
+        }
       )
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -237,7 +276,7 @@ var PassDetail = (props) => {
           },
           /* @__PURE__ */ import_react.default.createElement("div", { "data-anchor": "detail" })
         ),
-        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_f = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _f.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_n = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _n.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
           import_antd.Button,
           {
             type: "primary",
@@ -269,9 +308,9 @@ var PassDetail = (props) => {
   ), platform === "h5" && tag === "gift_card" ? /* @__PURE__ */ import_react.default.createElement(
     import_footerButton.default,
     {
-      appleWalletUrl: (_g = _getDetail.data) == null ? void 0 : _g.apple_wallet_url,
-      googleWalletUrl: (_h = _getDetail.data) == null ? void 0 : _h.google_wallet_url,
-      onRechargeClick: ((_i = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _i.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
+      appleWalletUrl: (_o = _getDetail.data) == null ? void 0 : _o.apple_wallet_url,
+      googleWalletUrl: (_p = _getDetail.data) == null ? void 0 : _p.google_wallet_url,
+      onRechargeClick: ((_q = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _q.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
       platform
     }
   ) : null, /* @__PURE__ */ import_react.default.createElement(

package/lib/plus/walletPassGallery/components/passDetail/index.less

@@ -18,6 +18,10 @@
     padding: 20px 0px;
   }
 
+  &-with-footer {
+    height: calc(100% - 90px);
+  }
+
   .pisell-wallet-pass-gallery_detail-content {
     overflow-y: auto;
     height: 100%;

package/lib/plus/walletPassGallery/components/recharge/index.js

@@ -51,6 +51,7 @@ var Recharge = ({
   const { action, storage } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const dvaStore = (_e = (_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getStore) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getState();
   const shop = ((_g = (_f = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _f.core) == null ? void 0 : _g.shop) || {};
+  const [loading, setLoading] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (detailData) {
       setChargeItem(((detailData == null ? void 0 : detailData.gift_option) || [])[0]);
@@ -59,6 +60,7 @@ var Recharge = ({
   const handleRecharge = async () => {
     var _a2;
     try {
+      setLoading(true);
       const params = {
         voucher_id: (detailData == null ? void 0 : detailData.id) || "",
         product_id: (detailData == null ? void 0 : detailData.product_id) || "",
@@ -87,11 +89,14 @@ var Recharge = ({
         import_utils.locales.getText("wallet-pass-gallery.log.rechargeOrderFailed"),
         error
       );
+    } finally {
+      setLoading(false);
     }
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
+      destroyOnClose: true,
       title: import_utils.locales.getText("wallet-pass-gallery.rechargeOptions"),
       open,
       zIndex: 999,
@@ -105,7 +110,8 @@ var Recharge = ({
           block: true,
           size: "large",
           onClick: handleRecharge,
-          disabled: !(chargeItem == null ? void 0 : chargeItem.id)
+          disabled: !(chargeItem == null ? void 0 : chargeItem.id),
+          loading
         },
         import_utils.locales.getText("wallet-pass-gallery.recharge")
       )

package/lib/plus/walletPassGallery/index.js

@@ -89,7 +89,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -115,7 +116,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -440,7 +442,9 @@ var WalletPassGallery = (props) => {
     ), /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellModal,
       {
-        platform: "h5",
+        zIndex: 997,
+        destroyOnClose: true,
+        platform,
         visible: !!_currentItem,
         onCancel: () => setCurrentItemId(""),
         footer: null,

package/lib/plus/walletPassGallery/serve.js

@@ -69,11 +69,12 @@ var getAssetList = async (params) => {
   return data;
 };
 var getDetailApi = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${params.id}`, {
+  const { data } = await import_utils.request.getRequest().get(`${params.apiPrefix || "/h5"}/machinecode/lowcode/detail/${params.id}`, {
     order_behavior_count: 1,
     // 订单行为次数
-    order_behavior_count_customer: 1
+    order_behavior_count_customer: 1,
     // 客户订单行为次数
+    order_behavior_count_customer_id: params.apiPrefix === "/shop" ? params.order_behavior_count_customer_id : void 0
   });
   return data;
 };

package/lib/plus/webPosLogin/WebPosLogin.js

@@ -43,9 +43,10 @@ var useSearchParams = () => {
   return new URLSearchParams(window.location.search);
 };
 var WebPosLogin = (props) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { getApp = () => ({}), reloadAfterLogin } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { mediaConfig } = (_b = context.appHelper) == null ? void 0 : _b.constants;
   const { backgroundImage, step: propsStep = "login", config } = props;
   const [storeList, setStoreList] = (0, import_react.useState)(() => {
     var _a2;
@@ -102,7 +103,7 @@ var WebPosLogin = (props) => {
   const [isShowGoBack, setIsShowGoBack] = (0, import_react.useState)(true);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const onLoginSuccess = async (res) => {
-    var _a2, _b2, _c2, _d, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     const app = getApp();
     if (!res) {
       return;
@@ -114,10 +115,10 @@ var WebPosLogin = (props) => {
     );
     setUserInfo({
       name: ((_c2 = res == null ? void 0 : res.account) == null ? void 0 : _c2.name) || "",
-      avatar: ((_d = res == null ? void 0 : res.account) == null ? void 0 : _d.avatar) || ""
+      avatar: ((_d2 = res == null ? void 0 : res.account) == null ? void 0 : _d2.avatar) || ""
     });
     const tenant = await (0, import_service.getTenant)();
-    (_e = app == null ? void 0 : app.storage) == null ? void 0 : _e.setStorage("storeList", JSON.stringify(tenant || {}));
+    (_e2 = app == null ? void 0 : app.storage) == null ? void 0 : _e2.setStorage("storeList", JSON.stringify(tenant || {}));
     const lastUsedStore = tenant == null ? void 0 : tenant.find((item) => item.id == lastUsedStoreId);
     if ((tenant == null ? void 0 : tenant.length) === 1) {
       await handleStoreSelect(tenant[0], false);
@@ -136,7 +137,7 @@ var WebPosLogin = (props) => {
     }
   };
   const handleStoreSelect = async (shopInfo, isShowGoBack2 = true) => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h;
     const app = getApp();
     app.storage.setStorage("tenant_domain", (_a2 = shopInfo == null ? void 0 : shopInfo.tenant) == null ? void 0 : _a2.default_domain);
     app.storage.setStorage("selectedStore", JSON.stringify(shopInfo));
@@ -158,9 +159,9 @@ var WebPosLogin = (props) => {
         });
         return;
       }
-      (_e = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _e.set((_d = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _d.account_token, "pisellV1Token");
+      (_e2 = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _e2.set((_d2 = res == null ? void 0 : res.mypisell_data) == null ? void 0 : _d2.account_token, "pisellV1Token");
       if (res.nocobase_tenant_token) {
-        (_f = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _f.set(res.nocobase_tenant_token, "nocobaseToken");
+        (_f2 = app == null ? void 0 : app.getPlugin("token")) == null ? void 0 : _f2.set(res.nocobase_tenant_token, "nocobaseToken");
       }
       await getDeviceListFunction();
       setIsShowGoBack(isShowGoBack2);
@@ -208,7 +209,7 @@ var WebPosLogin = (props) => {
     }
   };
   const handleDissociateDevice = async () => {
-    var _a2, _b2, _c2, _d, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     const app = getApp();
     const boundCloudDevice = JSON.parse(
       ((_a2 = app == null ? void 0 : app.storage) == null ? void 0 : _a2.getStorage("boundCloudDevice")) || "{}"
@@ -219,13 +220,13 @@ var WebPosLogin = (props) => {
         dissociateDeviceNumber: boundCloudDevice == null ? void 0 : boundCloudDevice.number
       });
       if (!res) {
-        (_d = app == null ? void 0 : app.logger) == null ? void 0 : _d.addLog({
+        (_d2 = app == null ? void 0 : app.logger) == null ? void 0 : _d2.addLog({
           type: "error",
           title: "选择设备页-解除设备绑定失败"
         });
         return false;
       } else {
-        (_e = app == null ? void 0 : app.logger) == null ? void 0 : _e.addLog({
+        (_e2 = app == null ? void 0 : app.logger) == null ? void 0 : _e2.addLog({
           type: "info",
           title: "选择设备页-解除设备绑定成功",
           metadata: res || {}
@@ -236,7 +237,7 @@ var WebPosLogin = (props) => {
     return true;
   };
   const handleDeviceSelect = async (device) => {
-    var _a2, _b2, _c2, _d, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     const app = getApp();
     app.storage.setStorage("lastUsedDevice", JSON.stringify(device));
     setLastUsedDeviceId(device.id);
@@ -260,7 +261,7 @@ var WebPosLogin = (props) => {
       });
       return;
     } else {
-      (_d = app == null ? void 0 : app.logger) == null ? void 0 : _d.addLog({
+      (_d2 = app == null ? void 0 : app.logger) == null ? void 0 : _d2.addLog({
         type: "info",
         title: "选择设备页-绑定设备-本机设备信息获取成功",
         metadata: _device || {}
@@ -286,7 +287,7 @@ var WebPosLogin = (props) => {
       key: "DEVICE_NUMBER",
       metadata: { msg: "webpo主动推送" }
     });
-    (_e = app == null ? void 0 : app.logger) == null ? void 0 : _e.addLog({
+    (_e2 = app == null ? void 0 : app.logger) == null ? void 0 : _e2.addLog({
       type: "info",
       title: "选择设备页-绑定设备成功",
       metadata: res || {}
@@ -302,13 +303,8 @@ var WebPosLogin = (props) => {
     import_WebPosLoginCpt.default,
     {
       loginConfig: config,
-      backgroundImage,
-      brandConfig: {
-        carouselItems: [{
-          type: "image",
-          url: "https://static.pisellcdn.com/defaultLogo.png"
-        }]
-      },
+      backgroundImage: backgroundImage || ((_d = (_c = mediaConfig.loginBgMediaConfig) == null ? void 0 : _c[0]) == null ? void 0 : _d.url),
+      brandConfig: mediaConfig.loginMediaConfig,
       step,
       showBackButton: isShowGoBack,
       storeList,
@@ -317,7 +313,7 @@ var WebPosLogin = (props) => {
       selectedStore,
       lastUsedStoreId,
       lastUsedDeviceId,
-      locale: ((_c = (_b = context == null ? void 0 : context.engine) == null ? void 0 : _b.props) == null ? void 0 : _c.locale) || "en",
+      locale: ((_f = (_e = context == null ? void 0 : context.engine) == null ? void 0 : _e.props) == null ? void 0 : _f.locale) || "en",
       loading: false,
       onStoreSelect: handleStoreSelect,
       onDeviceSelect: handleDeviceSelect,

package/lib/plus/webPosLogin/WebPosLoginCpt.js

@@ -41,7 +41,7 @@ var import_SelectStore = __toESM(require("./components/SelectStore"));
 var import_SelectDevice = __toESM(require("./components/SelectDevice"));
 var import_UserFooter = __toESM(require("./components/UserFooter"));
 var import_WebPosLoginCpt = require("./WebPosLoginCpt.less");
-var DEFAULT_BACKGROUND = "http://static.pisellcdn.com/defaultBg.png";
+var DEFAULT_BACKGROUND = "http://static.pisellcdn.com/defaultBg1.jpg";
 var WebPosLoginCpt = (0, import_react.memo)((props) => {
   const {
     className = "",

package/lib/plus/webPosLogin/components/BrandPanel/index.js

@@ -33,31 +33,11 @@ __export(BrandPanel_exports, {
 });
 module.exports = __toCommonJS(BrandPanel_exports);
 var import_react = __toESM(require("react"));
-var import_materials = require("@pisell/materials");
 var import_index = require("./index.less");
+var import_MediaDisplay = __toESM(require("../MediaDisplay"));
 var BrandPanel = (0, import_react.memo)((props) => {
   const { config, className = "" } = props;
-  const displayImage = (0, import_react.useMemo)(() => {
-    var _a;
-    if ((_a = config == null ? void 0 : config.carouselItems) == null ? void 0 : _a.length) {
-      const firstImage = config.carouselItems.find((item) => item.type === "image");
-      if (firstImage == null ? void 0 : firstImage.url) {
-        return firstImage.url;
-      }
-    }
-    return config == null ? void 0 : config.logo;
-  }, [config == null ? void 0 : config.carouselItems, config == null ? void 0 : config.logo]);
-  const slogan = config == null ? void 0 : config.slogan;
-  console.log("displayImage", displayImage);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `webpos-login-brand-panel ${className}`.trim() }, /* @__PURE__ */ import_react.default.createElement("div", { className: "webpos-login-brand-panel__content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "webpos-login-brand-panel__logo-wrapper" }, /* @__PURE__ */ import_react.default.createElement(
-    import_materials.Image,
-    {
-      src: displayImage,
-      preview: false,
-      alt: "Brand Logo",
-      className: "webpos-login-brand-panel__logo"
-    }
-  )), slogan && /* @__PURE__ */ import_react.default.createElement("p", { className: "webpos-login-brand-panel__slogan" }, slogan)));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `webpos-login-brand-panel ${className}`.trim() }, /* @__PURE__ */ import_react.default.createElement(import_MediaDisplay.default, { config: { carouselItems: config } }));
 });
 BrandPanel.displayName = "BrandPanel";
 var BrandPanel_default = BrandPanel;

package/lib/plus/webPosLogin/components/MediaDisplay/index.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MediaDisplayProps } from "./type";
+import './index.less';
+/**
+ * MediaDisplay 媒体组件
+ * @description 通用媒体展示组件，支持图片/视频展示
+ * - 支持单个媒体或轮播（预留）
+ * - 支持全屏模式
+ * - 支持视频播放控制和状态回调
+ */
+declare const MediaDisplay: React.FC<MediaDisplayProps>;
+export default MediaDisplay;