@pisell/private-materials 6.3.32 → 6.3.34

package/lib/plus/walletPassGallery/serve.d.ts

@@ -0,0 +1,218 @@
+/**
+ * 钱包列表查询参数接口
+ */
+export interface IWalletListParmsProps {
+    tags?: string[];
+    sales_status?: 1 | 0 | -1;
+    machine_search?: string;
+    createdDate?: string;
+    limit_status?: string;
+    relation_id?: string;
+    relation_type?: string;
+    customer_id?: number;
+    sort?: 'desc' | 'asc';
+    order_by?: string;
+    used_status?: string;
+    num?: number;
+    skip?: number;
+    filter_wallet_id?: string;
+    available: 0 | 1;
+}
+/**
+ * 钱包列表项属性接口
+ */
+export interface IWalletListItemProps {
+    id?: number | string;
+    encoded?: string;
+    code?: string;
+    limit_status?: string;
+    customer_id?: number;
+    generate_method?: 'not_settable' | 'before_order' | 'after_order';
+    created_at?: string;
+    product_id?: number;
+    sales_status?: 1 | 0;
+    tag?: string;
+    status?: string;
+    redeemed_at?: string;
+    collection_time?: string;
+    order_id?: number;
+    par_value?: string;
+    write_status?: number;
+    expire_date?: string;
+    balance?: string;
+    extension_id?: string;
+    product_title?: string;
+    product_cover?: string;
+    product?: IProductProps;
+    unified_available_status?: 0 | 1;
+    unified_error_code?: number;
+    shop: IShop;
+    unified_messages: any;
+    machinecode_config?: {
+        hide_recharge?: number;
+    };
+}
+/**
+ * 商店信息接口
+ */
+export interface IShop {
+    name: string;
+    id: number;
+}
+/**
+ * 商品属性接口
+ */
+export interface IProductProps {
+    id?: number;
+    title?: string;
+    description?: string;
+}
+/**
+ * API响应接口
+ */
+export interface ApiResponse<T> {
+    data: T;
+    code?: number;
+    message?: string;
+}
+/**
+ * 错误处理函数类型
+ */
+export declare type ErrorCallback = () => void;
+/**
+ * 获取钱包列表
+ * @param params 查询参数
+ * @returns Promise<{list: IWalletListItemProps[], count: number}> 钱包列表和总数
+ * @throws 请求失败时抛出错误
+ */
+export declare const getWalletList: (params?: IWalletListParmsProps) => Promise<{
+    list: IWalletListItemProps[];
+    count: number;
+}>;
+/**
+ * 通过code绑定客户
+ * @param params 请求参数，包含code
+ * @param errCallback 错误回调
+ * @returns Promise<any> 绑定结果
+ */
+export declare const bindCodeToCustomer: (params: {
+    code: string;
+}) => Promise<any>;
+/**
+ * 用户根据code查询待绑定识别码列表
+ * @param params 请求参数，包含code和tag
+ * @param errCallback 错误回调函数
+ * @returns Promise<IWalletListItemProps[] | null> 未绑定的钱包卡列表
+ */
+export declare const getUnbindList: (params: {
+    code: string;
+    tag?: string;
+}) => Promise<IWalletListItemProps[] | null>;
+/**
+ * 下单请求参数接口
+ */
+export interface IOrderParams {
+    voucher_id: string;
+    product_id: string;
+    product_variant_id: string;
+    quantity: number;
+    type: string;
+    platform: string;
+    currency_code: {
+        currency_code: string;
+        currency_symbol: string;
+        currency_format: string;
+    };
+}
+/**
+ * 下单
+ * @param params 下单参数
+ * @returns Promise<any> 下单结果
+ * @throws 请求失败时抛出错误
+ */
+export declare const goOrder: (params: IOrderParams) => Promise<any>;
+/**
+ * 设置请求对象
+ * @param req 请求对象
+ */
+export declare const setRequest: (req: any) => void;
+interface IAssetListProps {
+    skip?: string;
+    num?: string;
+    card_id?: string;
+    sourceType?: string;
+    business_object?: string;
+    tag?: string;
+}
+export interface IAssetItem {
+    id?: string;
+    tag?: 'gift_card' | 'product_voucher' | 'point_card' | 'product_discount_card';
+    shop_id?: string;
+    transaction_id?: string;
+    title?: string;
+    created_at?: string;
+    amount?: string;
+    balance?: string;
+    currency_symbol?: string;
+    action?: 'recharge' | 'order_expend' | 'order_refund' | 'expire';
+}
+/**
+ * 资产明细列表
+ * @param params 接口请求参数
+ * @returns 资产明细列表
+ */
+export declare const getAssetList: (params: IAssetListProps) => Promise<{
+    list: IAssetItem[];
+}>;
+/**
+ * 获取资产详情
+ * @param params 接口请求参数
+ * @returns 资产详情
+ */
+export declare const getDetailApi: (params: {
+    id: string;
+}) => Promise<IDetailResponse>;
+/**
+ * 详情响应数据结构，供组件消费
+ */
+export interface IDetailResponse {
+    detailId?: string;
+    productId?: string;
+    gift_option?: Array<{
+        id: string;
+        name: string;
+        gift_price: number;
+        price: number;
+        variant_id?: string;
+    }>;
+    [key: string]: any;
+}
+interface OrderParams {
+    voucher_id: string;
+    product_id: string;
+    product_variant_id: string;
+    quantity: number;
+    type: string;
+    platform: string;
+    currency_code: {
+        currency_code: string;
+        currency_symbol: string;
+        currency_format: string;
+    };
+}
+interface OrderResponse {
+    order_id: string;
+}
+/**
+ * 下单接口
+ * @param params - 订单参数
+ * @returns 订单响应数据
+ */
+export declare const orderRechargeProduct: (params: OrderParams) => Promise<OrderResponse>;
+/**
+ * @desc: 获取钱包信息
+ * @author: Arthur
+ * @date: 2025-11-03 15:30
+ */
+export declare const getWalletDetail: (id: string | number) => Promise<any>;
+export {};

package/lib/plus/walletPassGallery/serve.js

@@ -0,0 +1,98 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plus/walletPassGallery/serve.ts
+var serve_exports = {};
+__export(serve_exports, {
+  bindCodeToCustomer: () => bindCodeToCustomer,
+  getAssetList: () => getAssetList,
+  getDetailApi: () => getDetailApi,
+  getUnbindList: () => getUnbindList,
+  getWalletDetail: () => getWalletDetail,
+  getWalletList: () => getWalletList,
+  goOrder: () => goOrder,
+  orderRechargeProduct: () => orderRechargeProduct,
+  setRequest: () => setRequest
+});
+module.exports = __toCommonJS(serve_exports);
+var import_utils = require("../../utils");
+var import_utils2 = require("@pisell/utils");
+var getWalletList = async (params) => {
+  try {
+    const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/list`, params);
+    return data || { list: [], count: 0 };
+  } catch (error) {
+    console.error(
+      import_utils2.locales.getText("wallet-pass-gallery.log.getWalletListFailed"),
+      error
+    );
+    return { list: [], count: 0 };
+  }
+};
+var bindCodeToCustomer = async (params) => {
+  const { data } = await import_utils.request.getRequest().put(`/h5/voucher/bind/customer`, params);
+  return data;
+};
+var getUnbindList = async (params) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/unbind/list`, params);
+  return data;
+};
+var goOrder = async (params) => {
+  try {
+    const { data } = await import_utils.request.getRequest().post(`/h5/store/order/add`, params);
+    return data;
+  } catch (error) {
+    console.error(import_utils2.locales.getText("wallet-pass-gallery.log.orderFailed"), error);
+    throw error;
+  }
+};
+var setRequest = (req) => {
+  import_utils.request.setRequest(req);
+};
+var getAssetList = async (params) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/pay/asset/lowcode/list`, params);
+  return data;
+};
+var getDetailApi = async (params) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${params.id}`, {
+    order_behavior_count: 1,
+    // 订单行为次数
+    order_behavior_count_customer: 1
+    // 客户订单行为次数
+  });
+  return data;
+};
+var orderRechargeProduct = async (params) => {
+  const { data } = await import_utils.request.getRequest().post(`/h5/order/order`, params);
+  return data;
+};
+var getWalletDetail = async (id) => {
+  return import_utils.request.getRequest().get(`/h5/wallet/${id}`, {});
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  bindCodeToCustomer,
+  getAssetList,
+  getDetailApi,
+  getUnbindList,
+  getWalletDetail,
+  getWalletList,
+  goOrder,
+  orderRechargeProduct,
+  setRequest
+});

package/lib/pro/Login2.0/AuthModal.js

@@ -153,26 +153,31 @@ var AuthModal = () => {
     }
     enabledMethods.sort((a, b) => a.sort - b.sort);
     enabledMethods.forEach(({ type, config: methodConfig }) => {
-      var _a3, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
+      var _a3, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2;
       if (type === "email") {
         const verificationMethods = [];
-        const loginMethod = ((_a3 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _a3.login_method) || {};
+        const loginMethod = ((_a3 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _a3.login_method) || {
+          "password": {
+            enabled: true,
+            sort: 1
+          }
+        };
         const enabledVerificationMethods = [];
-        if ((_b2 = loginMethod.password) == null ? void 0 : _b2.enabled) {
+        if ((_b2 = loginMethod == null ? void 0 : loginMethod.password) == null ? void 0 : _b2.enabled) {
           enabledVerificationMethods.push({
             type: "password",
-            sort: loginMethod.password.sort || 0
+            sort: ((_c2 = loginMethod.password) == null ? void 0 : _c2.sort) || 0
             // 添加默认值保护
           });
         }
-        if ((_c2 = loginMethod.code) == null ? void 0 : _c2.enabled) {
+        if ((_d2 = loginMethod == null ? void 0 : loginMethod.code) == null ? void 0 : _d2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             sort: loginMethod.code.sort || 0
             // 添加默认值保护
           });
         }
-        if ((_d2 = loginMethod.link) == null ? void 0 : _d2.enabled) {
+        if ((_e2 = loginMethod == null ? void 0 : loginMethod.link) == null ? void 0 : _e2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             // link 映射为 verification_code
@@ -191,16 +196,16 @@ var AuthModal = () => {
         }
       } else if (type === "phone") {
         const verificationMethods = [];
-        const loginMethod = ((_e2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _e2.login_method) || {};
+        const loginMethod = ((_f2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _f2.login_method) || {};
         const enabledVerificationMethods = [];
-        if ((_f2 = loginMethod.password) == null ? void 0 : _f2.enabled) {
+        if ((_g2 = loginMethod == null ? void 0 : loginMethod.password) == null ? void 0 : _g2.enabled) {
           enabledVerificationMethods.push({
             type: "password",
             sort: loginMethod.password.sort || 0
             // 添加默认值保护
           });
         }
-        if ((_g2 = loginMethod.code) == null ? void 0 : _g2.enabled) {
+        if ((_h2 = loginMethod == null ? void 0 : loginMethod.code) == null ? void 0 : _h2.enabled) {
           enabledVerificationMethods.push({
             type: "verification_code",
             sort: loginMethod.code.sort || 0
@@ -223,12 +228,12 @@ var AuthModal = () => {
       } else if (type === "facebook") {
         loginMethods.push({
           type: "facebook",
-          appId: ((_h2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _h2.appid) || ""
+          appId: ((_i2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _i2.appid) || ""
         });
       } else if (type === "apple") {
         loginMethods.push({
           type: "apple",
-          clientId: ((_i2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _i2.identifier) || ""
+          clientId: ((_j2 = methodConfig == null ? void 0 : methodConfig.setting) == null ? void 0 : _j2.identifier) || ""
         });
       } else if (type === "guest") {
         loginMethods.push({

package/lib/pro/Login2.0/Login2.js

@@ -114,6 +114,9 @@ var Login2 = ({
         );
       }
     }
+    if (loginMethods.length === 1 && loginMethods[0].type === "guest") {
+      handleGuestLogin();
+    }
   }, [loginMethods, currentLoginMethod]);
   (0, import_react.useEffect)(() => {
     if (((currentLoginMethod == null ? void 0 : currentLoginMethod.type) === "email" || (currentLoginMethod == null ? void 0 : currentLoginMethod.type) === "phone") && currentVerificationMethod === "password") {
@@ -842,7 +845,10 @@ var Login2 = ({
         const fbConfig = (_a2 = config == null ? void 0 : config.loginMethods) == null ? void 0 : _a2.find((n) => n.type === "facebook");
         const token = fbConfig == null ? void 0 : fbConfig.appId;
         if (token) {
-          await registerAndLogin.loginWithFacebook(token);
+          const res = await registerAndLogin.loginWithFacebook(token);
+          if (res.status) {
+            onLogin == null ? void 0 : onLogin(res.data, "facebook", { account: "", password: "" }, config.channel);
+          }
         } else {
           throw new Error("Facebook app_id not configured");
         }
@@ -850,7 +856,8 @@ var Login2 = ({
         const appleConfig = (_b2 = config == null ? void 0 : config.loginMethods) == null ? void 0 : _b2.find((n) => n.type === "apple");
         const token = appleConfig == null ? void 0 : appleConfig.clientId;
         if (token) {
-          await registerAndLogin.loginWithApple(token);
+          const res = await registerAndLogin.loginWithApple(token);
+          onLogin == null ? void 0 : onLogin(res.data, "apple", { account: "", password: "" }, config.channel);
         } else {
           throw new Error("Apple client_id not configured");
         }
@@ -858,6 +865,9 @@ var Login2 = ({
         await (onOAuthLogin == null ? void 0 : onOAuthLogin(provider, config.channel));
       }
     } catch (error) {
+      if (error.message === "facebook_login_cancel") {
+        return import_antd.message.error(import_utils.locales.getText("pisell-register2-facebook-login-canceled"));
+      }
       import_antd.message.error(
         (error == null ? void 0 : error.message) || import_utils.locales.getText("pisell-login2-login-failed")
       );
@@ -1281,7 +1291,7 @@ var Login2 = ({
     if (!nonOauthButtons.length && !oauthProviders.length) {
       return registerPrompt;
     }
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showDivider && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-divider" }, import_utils.locales.getText("pisell-login2-or")), nonOauthButtons.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, nonOauthButtons), oauthProviders.length > 0 && /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showDivider && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-divider" }, import_utils.locales.getText("pisell-login2-or")), (nonOauthButtons.length > 0 || oauthProviders.length > 0) && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-groups" }, nonOauthButtons.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "login2-switch-options" }, nonOauthButtons), oauthProviders.length > 0 && /* @__PURE__ */ import_react.default.createElement(
       import_OAuthButtonGroup.default,
       {
         providers: oauthProviders,
@@ -1289,7 +1299,7 @@ var Login2 = ({
         buttonClassName: "login2-oauth-button",
         gap: 12
       }
-    ), registerPrompt);
+    )), registerPrompt);
   };
   if (!visible) {
     return null;

package/lib/pro/Login2.0/Register2.js

@@ -454,7 +454,7 @@ var Register2 = ({
       }
       await (onOAuthLogin == null ? void 0 : onOAuthLogin(provider, config.channel));
     } catch (error) {
-      if (error.messager === "facebook_login_cancel") {
+      if (error.message === "facebook_login_cancel") {
         return import_antd.message.error(import_utils.locales.getText("pisell-register2-facebook-login-canceled"));
       }
       console.error(`${provider} login error:`, error);

package/lib/pro/Login2.0/components/phoneValidation.js

@@ -78,7 +78,7 @@ var validatePhoneNumber = async (value, getText) => {
       }
       break;
     case "61":
-      if (!/^4\d{8,9}$/.test(phone)) {
+      if (!/^(\+?0)?4\d{8}$/.test(phone)) {
         throw new Error(getText("pisell-phone-validation-australia"));
       }
       break;

package/lib/pro/Login2.0/index.less

@@ -547,7 +547,10 @@
   align-items: center;
   justify-content: center;
   gap: 12px;
-
+  .pisell-lowcode-btn-icon {
+    margin-right: 0!important;
+    font-size: 24px;
+  }
   svg {
     flex-shrink: 0;
   }
@@ -685,6 +688,12 @@
 }
 
 // 切换选项区域
+.login2-container .login2-switch-groups {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
 .login2-container .login2-switch-options {
   display: flex;
   flex-direction: column;
@@ -778,7 +787,7 @@
   position: relative; // 为角标定位提供基准
 
   .oauth-icon {
-    font-size: 18px;
+    font-size: 24px;
     font-weight: 700;
     flex-shrink: 0;
   }