@pisell/private-materials 6.3.116 → 6.3.118

package/lib/components/eventBooking/locales.js

@@ -265,5 +265,167 @@ var locales_default = {
     "pisell2.appointment.deposit.amount.tip2": " 定金。",
     "pisell2.appointment.deposit.close": "关闭",
     "pisell2.appointment.booking.empty.data": "暫無數據"
+  },
+  ja: {
+    "pisell2.event.calendar.limit.unavailable": "利用不可",
+    "pisell2.event.calendar.limit.sold.out": "売り切れ",
+    "pisell2.event.calendar.limit.call.to.book": "電話で予約",
+    "pisell2.event.calendar.limit.filling.up.fast": "残りわずか",
+    "pisell2.event.calendar.limit.lots.of.space": "空きあり",
+    "pisell2.event.calendar.booking-closed": "予約終了",
+    "pisell2.event.calendar.call-to-book": "電話で予約",
+    "pisell2.event.calendar.email-to-book": "メールで予約",
+    "pisell2.event.close.title": "終了を確認しますか？",
+    "pisell2.event.close.tip": "入力した情報はすべて失われます。終了してもよろしいですか？",
+    "pisell2.event.close.continue": "続ける",
+    "pisell2.event.close.exit": "終了",
+    "pisell2.event.step": (step) => `ステップ ${step}`,
+    "pisell2.event.select.category": (val) => `${val || "イベント"}を選択`,
+    "pisell2.event.select.campus": (val) => `${val || "イベント"}を選択`,
+    "pisell2.event.select.event": "サービスを選択",
+    "pisell2.event.cart": "カート",
+    "pisell2.event.total": "合計",
+    "pisell2.event.total.gst": (val, amount) => `${val} ${amount}を含む`,
+    "pisell2.event.continue": "続ける",
+    "pisell2.event.details": "詳細",
+    "pisell2.event.introduction": "イベント詳細",
+    "pisell2.event.schedule": "日付",
+    "pisell2.event.teacher": "講師",
+    "pisell2.event.campus": "キャンパス",
+    "pisell2.event.resource": "場所",
+    "pisell2.event.booking.options": "予約オプション",
+    "pisell2.event.add.to.cart": "カートに追加",
+    "pisell2.event.description": "説明",
+    "pisell2.event.view.more": "もっと見る",
+    "pisell2.event.view.less": "少なく表示",
+    "pisell2.event.holder.modal.title": "このイベントを誰が予約しますか？",
+    "pisell2.event.confirm": "確認",
+    "pisell2.event.confirm.information": "情報を確認",
+    "pisell2.event.confirm.information.tip": "チェックアウト前に情報を確認してください",
+    "pisell2.event.confirm.information.other": "または他の人とイベントを追加",
+    "pisell2.event.add.others": "他の人を追加",
+    "pisell2.event.checkout": "チェックアウト",
+    "pisell2.event.edit.event": "イベントを編集",
+    "pisell2.event.remove": "削除",
+    "pisell2.event.option": "オプション",
+    "pisell2.event.order.items.error.title": "注文アイテムの更新",
+    "pisell2.event.order.items.error.tip": (val) => `カート内の一部のアイテムが利用できなくなりました（${val}${val > 1 ? "件" : "件"}）。次のことができます：`,
+    "pisell2.event.order.items.error.proceed": "利用可能なアイテムで続行",
+    "pisell2.event.order.items.error.return": "カートに戻って変更",
+    "pisell2.event.order.items.error.back": "カートに戻る",
+    "pisell2.event.order.items.error.continue": "チェックアウトを続行",
+    "pisell2.event.order.items.error.all.tip": "選択したアイテムは利用できなくなりました。別のアイテムを選択してください。",
+    "pisell2.event.remove.title": "削除してもよろしいですか？",
+    "pisell2.event.remove.tip": "これによりカートの内容が空になります",
+    "pisell2.event.remove.cancel": "キャンセル",
+    "pisell2.event.create": "作成",
+    "pisell2.event.search": "検索",
+    "pisell2.event.empty.service": "サービスが選択されていません",
+    "pisell2.event.title": (val) => `${val}${val > 1 ? "個のイベント" : "個のイベント"}`,
+    "pisell2.event.create.form": "フォームを作成",
+    "pisell2.event.empty.event": "イベントなし",
+    "pisell2.event.error.holder": "まず所有者を作成する必要があります",
+    "pisell2.event.price.from": "から ",
+    "pisell2.event.empty.holder.title": "空の所有者が見つかりました",
+    "pisell2.event.empty.holder.tip": "次の所有者にはサービスが追加されていません：",
+    "pisell2.event.empty.holder.continue.tip": "続行できますが、サービスを追加するかどうか確認してください。",
+    "pisell2.event.empty.holder.go.back": "戻る",
+    "pisell2.event.empty.holder.continue.anyway": "とにかく続行",
+    "pisell2.event.event.full.title": "イベント満員",
+    "pisell2.event.event.full.tip": "申し訳ございませんが、このイベントは定員に達しました。別のイベントを選択してください。",
+    "pisell2.event.event.full.ok": "OK",
+    "pisell2.event.capacity.limit.reached.title": "定員に達しました",
+    "pisell2.event.capacity.limit.reached.tip": "カート内の1つ以上のイベントが定員に達したため利用できなくなりました。チェックアウトを完了するには、カートから利用できないイベントを削除してください。",
+    "pisell2.event.schedule.item.expand": "もっと見る",
+    "pisell2.event.schedule.item.collapse": "少なく表示",
+    "pisell2.appointment.deposit": "デポジット",
+    "pisell2.appointment.deposit.agreed": "私は以下を読み、同意しました ",
+    "pisell2.appointment.deposit.agree.policy": "続行するにはポリシーに同意する必要があります",
+    "pisell2.appointment.deposit.and": " と ",
+    "pisell2.appointment.deposit.amount.tip1": " をデポジットとして支払う必要があります。",
+    "pisell2.appointment.deposit.amount.tip2": " ",
+    "pisell2.appointment.deposit.close": "閉じる",
+    "pisell2.appointment.booking.empty.data": "データなし"
+  },
+  pt: {
+    "pisell2.event.calendar.limit.unavailable": "Indisponível",
+    "pisell2.event.calendar.limit.sold.out": "Esgotado",
+    "pisell2.event.calendar.limit.call.to.book": "Ligar para reservar",
+    "pisell2.event.calendar.limit.filling.up.fast": "Enchendo rapidamente",
+    "pisell2.event.calendar.limit.lots.of.space": "Muito espaço",
+    "pisell2.event.calendar.booking-closed": "Reserva fechada",
+    "pisell2.event.calendar.call-to-book": "Ligar para reservar",
+    "pisell2.event.calendar.email-to-book": "E-mail para reservar",
+    "pisell2.event.close.title": "Confirmar saída?",
+    "pisell2.event.close.tip": "Todas as informações inseridas serão perdidas. Tem certeza de que deseja sair?",
+    "pisell2.event.close.continue": "Continuar",
+    "pisell2.event.close.exit": "Sair",
+    "pisell2.event.step": (step) => `Etapa ${step}`,
+    "pisell2.event.select.category": (val) => `Selecionar ${val || "Evento"}`,
+    "pisell2.event.select.campus": (val) => `Selecionar ${val || "Evento"}`,
+    "pisell2.event.select.event": "Selecionar serviço",
+    "pisell2.event.cart": "Carrinho",
+    "pisell2.event.total": "Total",
+    "pisell2.event.total.gst": (val, amount) => `Incluindo ${val} ${amount}`,
+    "pisell2.event.continue": "Continuar",
+    "pisell2.event.details": "Detalhes",
+    "pisell2.event.introduction": "Detalhes do Evento",
+    "pisell2.event.schedule": "Data",
+    "pisell2.event.teacher": "Professor",
+    "pisell2.event.campus": "Campus",
+    "pisell2.event.resource": "Localização",
+    "pisell2.event.booking.options": "Opções de reserva",
+    "pisell2.event.add.to.cart": "Adicionar ao Carrinho",
+    "pisell2.event.description": "Descrição",
+    "pisell2.event.view.more": "Ver mais",
+    "pisell2.event.view.less": "Ver menos",
+    "pisell2.event.holder.modal.title": "Quem gostaria de reservar este evento?",
+    "pisell2.event.confirm": "Confirmar",
+    "pisell2.event.confirm.information": "Confirmar informações",
+    "pisell2.event.confirm.information.tip": "Por favor, confirme as informações antes do checkout",
+    "pisell2.event.confirm.information.other": "Ou adicionar outras pessoas e evento",
+    "pisell2.event.add.others": "Adicionar outras pessoas",
+    "pisell2.event.checkout": "Checkout",
+    "pisell2.event.edit.event": "Editar evento",
+    "pisell2.event.remove": "Remover",
+    "pisell2.event.option": "Opção",
+    "pisell2.event.order.items.error.title": "Atualização de Itens do Pedido",
+    "pisell2.event.order.items.error.tip": (val) => `Alguns itens no seu carrinho ficaram indisponíveis (${val} ${val > 1 ? "itens" : "item"}). Você pode:`,
+    "pisell2.event.order.items.error.proceed": "Prosseguir com itens disponíveis",
+    "pisell2.event.order.items.error.return": "Voltar ao carrinho para modificar",
+    "pisell2.event.order.items.error.back": "Voltar ao Carrinho",
+    "pisell2.event.order.items.error.continue": "Continuar Checkout",
+    "pisell2.event.order.items.error.all.tip": "O item que você selecionou não está mais disponível. Por favor, selecione outro item.",
+    "pisell2.event.remove.title": "Tem certeza de que deseja remover?",
+    "pisell2.event.remove.tip": "Isso esvaziará o conteúdo do carrinho",
+    "pisell2.event.remove.cancel": "Cancelar",
+    "pisell2.event.create": "Criar",
+    "pisell2.event.search": "Pesquisar",
+    "pisell2.event.empty.service": "Nenhum serviço selecionado",
+    "pisell2.event.title": (val) => `${val} ${val > 1 ? "eventos" : "evento"}`,
+    "pisell2.event.create.form": "Criar formulário",
+    "pisell2.event.empty.event": "Sem evento",
+    "pisell2.event.error.holder": "Você precisa criar um titular primeiro",
+    "pisell2.event.price.from": "A partir de ",
+    "pisell2.event.empty.holder.title": "Titulares vazios encontrados",
+    "pisell2.event.empty.holder.tip": "Os seguintes titulares não têm serviços adicionados:",
+    "pisell2.event.empty.holder.continue.tip": "Você ainda pode prosseguir, mas verifique se deseja adicionar algum serviço.",
+    "pisell2.event.empty.holder.go.back": "Voltar",
+    "pisell2.event.empty.holder.continue.anyway": "Continuar mesmo assim",
+    "pisell2.event.event.full.title": "Evento lotado",
+    "pisell2.event.event.full.tip": "Desculpe, este evento atingiu sua capacidade máxima. Por favor, selecione outro evento.",
+    "pisell2.event.event.full.ok": "Ok",
+    "pisell2.event.capacity.limit.reached.title": "Limite de capacidade atingido",
+    "pisell2.event.capacity.limit.reached.tip": "Um ou mais eventos no seu carrinho não estão mais disponíveis devido à capacidade total. Por favor, remova eventos indisponíveis do seu carrinho para completar o checkout.",
+    "pisell2.event.schedule.item.expand": "Ver mais",
+    "pisell2.event.schedule.item.collapse": "Ver menos",
+    "pisell2.appointment.deposit": "Depósito",
+    "pisell2.appointment.deposit.agreed": "Li e concordo com ",
+    "pisell2.appointment.deposit.agree.policy": "Você precisa concordar com a política para prosseguir",
+    "pisell2.appointment.deposit.and": " & ",
+    "pisell2.appointment.deposit.amount.tip1": " precisa ser pago como depósito.",
+    "pisell2.appointment.deposit.amount.tip2": " ",
+    "pisell2.appointment.deposit.close": "Fechar",
+    "pisell2.appointment.booking.empty.data": "Sem dados"
   }
 };

package/lib/components/kioskSkuDetail/index.d.ts

@@ -7,7 +7,7 @@ import './index.less';
  * - 中间区域用 SKUOptionsSelection 做 SKU 选择
  * - 底部用 PisellNumberSelector 做数量编辑
  */
-declare function KioskSkuDetail(props: KioskSkuDetailProps): React.JSX.Element;
+declare function KioskSkuDetail(props: KioskSkuDetailProps): JSX.Element;
 export default KioskSkuDetail;
 /**
  * @description 从原生回调 payload 中提取 productId

package/lib/components/kioskSkuDetail/index.js

@@ -79,6 +79,7 @@ function KioskSkuDetail(props) {
   });
   const [isEdit, setIsEdit] = (0, import_react.useState)(false);
   const skuOptionsSelectionRef = (0, import_react.useRef)(null);
+  const [nativeInitData, setNativeInitData] = (0, import_react.useState)(null);
   const requestSeqRef = (0, import_react.useRef)(0);
   const resetForInit = (0, import_react.useCallback)(() => {
     setProductData(null);
@@ -96,6 +97,7 @@ function KioskSkuDetail(props) {
       bundle: [],
       option: []
     });
+    setNativeInitData(null);
   }, []);
   const loadByProductId = (0, import_react.useCallback)(async (productId, options = {}) => {
     var _a2, _b2;
@@ -154,7 +156,7 @@ function KioskSkuDetail(props) {
   const loadRef = (0, import_react.useRef)(loadByProductId);
   loadRef.current = loadByProductId;
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
       module: "wallet_pass",
       key: "page_load"
@@ -176,6 +178,22 @@ function KioskSkuDetail(props) {
     (_f2 = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.mountFunction) == null ? void 0 : _f2.call(
       _e2,
       "wallet_pass",
+      "restore_recharge_wallet_pass",
+      (_data) => {
+        const data = JSON.parse(_data || "{}");
+        console.log("重置状态", data == null ? void 0 : data.productId);
+        console.log("宽", window.innerWidth);
+        console.log("高", window.innerHeight);
+        console.log("设备像素比", window.devicePixelRatio);
+        resetForInit();
+        if ((data == null ? void 0 : data.productId) || (data == null ? void 0 : data.productId) === 0) loadRef.current(data == null ? void 0 : data.productId);
+        setIsEdit(false);
+        setNativeInitData(data);
+      }
+    );
+    (_h2 = (_g2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _g2.mountFunction) == null ? void 0 : _h2.call(
+      _g2,
+      "wallet_pass",
       "edit_buy_wallet_pass",
       (data) => {
         console.log("编辑状态", data);
@@ -197,6 +215,7 @@ function KioskSkuDetail(props) {
           option: []
         });
         setIsEdit(true);
+        setNativeInitData(productData2);
       }
     );
     if (initialProductId || initialProductId === 0) loadRef.current(initialProductId);
@@ -257,12 +276,17 @@ function KioskSkuDetail(props) {
       quantity,
       variantId: skuValue.product_variant_id,
       pricePerUnit: unitPrice,
-      isWebBuyWalletPass: true
+      isWebBuyWalletPass: true,
+      // 特定字段
+      balance: nativeInitData == null ? void 0 : nativeInitData.balance,
+      walletCodeId: nativeInitData == null ? void 0 : nativeInitData.walletCodeId,
+      walletPassCodeId: nativeInitData == null ? void 0 : nativeInitData.walletPassCodeId
     };
     interaction.utils.postMessageToApp({
       module: "wallet_pass",
       key: "buy_wallet_pass",
       data: {
+        ...nativeInitData || {},
         // 把洗好的数据放这里
         productData: obj,
         isEdit
@@ -304,7 +328,7 @@ function KioskSkuDetail(props) {
           __html: descriptionText
         }
       }
-    )), !!priceRangeText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__price-range" }, priceRangeText, " ", currency_code), !!errorText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__error" }, errorText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__options-card" }, productData && Array.isArray(productData == null ? void 0 : productData.variant) && productData.variant.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
+    )), (nativeInitData == null ? void 0 : nativeInitData.balance) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__price-range" }, import_utils.locales.getText("pisell2.text.kiosk.sku.detail.balance"), ": ", symbol, nativeInitData == null ? void 0 : nativeInitData.balance) : !!priceRangeText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__price-range" }, priceRangeText, " ", currency_code), !!errorText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__error" }, errorText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__options-card" }, productData && Array.isArray(productData == null ? void 0 : productData.variant) && productData.variant.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
       import_skuOptionsSelection.default,
       {
         ref: skuOptionsSelectionRef,

package/lib/components/kioskSkuDetail/locales.d.ts

@@ -0,0 +1,48 @@
+declare const _default: {
+    en: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    'zh-CN': {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    'zh-TW': {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    ja: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    pt: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+};
+export default _default;

package/lib/components/kioskSkuDetail/locales.js

@@ -29,7 +29,8 @@ var locales_default = {
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "Add to cart",
     "pisell2.text.kiosk.sku.detail.btn.update": "Update",
     "pisell2.text.kiosk.sku.detail.loading.options": "Loading options…",
-    "pisell2.text.kiosk.sku.detail.toast.select.variant": "Please select a top-up option"
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "Please select a top-up option",
+    "pisell2.text.kiosk.sku.detail.balance": "Balance"
   },
   "zh-CN": {
     "pisell2.text.kiosk.sku.detail.btn.back": "返回",
@@ -37,7 +38,8 @@ var locales_default = {
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "加入购物车",
     "pisell2.text.kiosk.sku.detail.btn.update": "更新",
     "pisell2.text.kiosk.sku.detail.loading.options": "正在加载选项…",
-    "pisell2.text.kiosk.sku.detail.toast.select.variant": "请选择充值选项"
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "请选择充值选项",
+    "pisell2.text.kiosk.sku.detail.balance": "余额"
   },
   "zh-TW": {
     "pisell2.text.kiosk.sku.detail.btn.back": "返回",
@@ -45,6 +47,25 @@ var locales_default = {
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "加入購物車",
     "pisell2.text.kiosk.sku.detail.btn.update": "更新",
     "pisell2.text.kiosk.sku.detail.loading.options": "正在載入選項…",
-    "pisell2.text.kiosk.sku.detail.toast.select.variant": "請選擇充值選項"
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "請選擇充值選項",
+    "pisell2.text.kiosk.sku.detail.balance": "餘額"
+  },
+  ja: {
+    "pisell2.text.kiosk.sku.detail.btn.back": "戻る",
+    "pisell2.text.kiosk.sku.detail.item.total": "小計",
+    "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "カートに追加",
+    "pisell2.text.kiosk.sku.detail.btn.update": "更新",
+    "pisell2.text.kiosk.sku.detail.loading.options": "オプションを読み込み中…",
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "チャージオプションを選択してください",
+    "pisell2.text.kiosk.sku.detail.balance": "残高"
+  },
+  pt: {
+    "pisell2.text.kiosk.sku.detail.btn.back": "Voltar",
+    "pisell2.text.kiosk.sku.detail.item.total": "Subtotal",
+    "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "Adicionar ao carrinho",
+    "pisell2.text.kiosk.sku.detail.btn.update": "Atualizar",
+    "pisell2.text.kiosk.sku.detail.loading.options": "Carregando opções…",
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "Por favor, selecione uma opção de recarga",
+    "pisell2.text.kiosk.sku.detail.balance": "Saldo"
   }
 };

package/lib/components/login/index.d.ts

@@ -1,9 +1,8 @@
-import React from "react";
 import "./index.less";
 export interface LoginProps {
     title: string;
     style: any;
     onLogin: (values: any, callback: (status: any) => void) => void;
 }
-declare const Login: (props: LoginProps) => React.JSX.Element;
+declare const Login: (props: LoginProps) => JSX.Element;
 export default Login;

package/lib/components/login/locales.d.ts

@@ -0,0 +1,38 @@
+declare const _default: {
+    en: {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+    'zh-CN': {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+    'zh-HK': {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+    ja: {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+    pt: {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+};
+export default _default;

package/lib/components/login/locales.js

@@ -43,5 +43,19 @@ var locales_default = {
     "pisell2.text.password-placeholder": "請輸入密碼",
     "pisell2.text.password-error": "請輸入正確的密碼",
     "pisell2.text.email-error": "請輸入正確的電子郵件"
+  },
+  ja: {
+    "pisell2.text.login": "ログイン",
+    "pisell2.text.email-placeholder": "メールアドレスを入力してください",
+    "pisell2.text.password-placeholder": "パスワードを入力してください",
+    "pisell2.text.password-error": "正しいパスワードを入力してください",
+    "pisell2.text.email-error": "正しいメールアドレスを入力してください"
+  },
+  pt: {
+    "pisell2.text.login": "Login",
+    "pisell2.text.email-placeholder": "Por favor, insira o e-mail",
+    "pisell2.text.password-placeholder": "Por favor, insira a senha",
+    "pisell2.text.password-error": "Por favor, insira a senha correta",
+    "pisell2.text.email-error": "Por favor, insira o e-mail correto"
   }
 };

package/lib/components/pay/toC/PaymentList/payment/google_pay.svg

@@ -1,9 +1,27 @@
-<svg width="46" height="32" viewBox="0 0 46 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" fill="white"/>
-<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" stroke="#F2F4F7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4108 20.7039V16.7911H23.4303C24.2579 16.7911 24.9563 16.5138 25.5257 15.9669L25.6624 15.8282C26.7025 14.696 26.6342 12.9321 25.5257 11.8846C24.9715 11.33 24.2123 11.0296 23.4303 11.045H20.1885V20.7039H21.4108ZM21.4109 15.6048V12.2311H23.4611C23.9016 12.2311 24.3192 12.4006 24.6305 12.7087C25.2911 13.3557 25.3063 14.434 24.6685 15.1041C24.3572 15.4353 23.9167 15.6202 23.4611 15.6048H21.4109ZM31.3639 14.6112C30.84 14.1259 30.1263 13.8795 29.2229 13.8795C28.0613 13.8795 27.1882 14.3108 26.6112 15.1658L27.6893 15.8513C28.0841 15.2659 28.6231 14.9732 29.3064 14.9732C29.7391 14.9732 30.1567 15.135 30.4832 15.4277C30.802 15.7049 30.9842 16.1055 30.9842 16.5291V16.8141C30.5135 16.5522 29.9214 16.4136 29.1925 16.4136C28.3422 16.4136 27.6589 16.6138 27.1502 17.0221C26.6416 17.4303 26.3834 17.9695 26.3834 18.655C26.3682 19.2789 26.634 19.872 27.1047 20.2725C27.583 20.7039 28.1904 20.9195 28.904 20.9195C29.7467 20.9195 30.4148 20.5421 30.9235 19.7873H30.9767V20.7039H32.1458V16.6292C32.1458 15.7743 31.8877 15.0964 31.3639 14.6112ZM28.046 19.4869C27.7954 19.3021 27.6436 19.0017 27.6436 18.6782C27.6436 18.3161 27.8106 18.0157 28.1371 17.777C28.4712 17.5382 28.8889 17.4149 29.3824 17.4149C30.0658 17.4072 30.5974 17.5613 30.977 17.8694C30.977 18.3932 30.772 18.8476 30.3696 19.2327C30.0051 19.6025 29.5115 19.8104 28.9952 19.8104C28.6535 19.8181 28.3194 19.7026 28.046 19.4869ZM34.7734 23.6077L38.858 14.0952H37.5294L35.6389 18.8399H35.6162L33.6802 14.0952H32.3516L35.0316 20.2803L33.5132 23.6077H34.7734Z" fill="#3C4043"/>
-<path d="M17.1905 15.9439C17.1905 15.5665 17.1601 15.1891 17.0994 14.8193H11.9443V16.9529H14.8977C14.7762 17.6384 14.3814 18.2546 13.8044 18.6398V20.0262H15.5658C16.5983 19.0634 17.1905 17.6385 17.1905 15.9439Z" fill="#4285F4"/>
-<path d="M11.9452 21.3662C13.4181 21.3662 14.6632 20.8732 15.5666 20.0259L13.8053 18.6395C13.3118 18.9784 12.6816 19.1709 11.9452 19.1709C10.5179 19.1709 9.31074 18.1927 8.87799 16.8833H7.06348V18.316C7.98971 20.1877 9.88015 21.3662 11.9452 21.3662Z" fill="#34A853"/>
-<path d="M8.87795 16.8834C8.65015 16.1978 8.65015 15.4507 8.87795 14.7575V13.3325H7.06315C6.28103 14.8961 6.28103 16.7447 7.06315 18.3083L8.87795 16.8834Z" fill="#FBBC04"/>
-<path d="M11.9452 12.47C12.7272 12.4546 13.4788 12.755 14.0406 13.3018L15.6046 11.7151C14.61 10.7754 13.3042 10.2593 11.9452 10.2747C9.88015 10.2747 7.98971 11.4609 7.06348 13.3326L8.87799 14.7653C9.31074 13.4482 10.5179 12.47 11.9452 12.47Z" fill="#EA4335"/>
+<svg width="46" height="32" viewBox="170 168 754 328" fill="none" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg">
+<path fill="#FFFFFF" d="M722.7,170h-352c-110,0-200,90-200,200l0,0c0,110,90,200,200,200h352c110,0,200-90,200-200l0,0
+	C922.7,260,832.7,170,722.7,170z"/>
+<path fill="#3C4043" d="M722.7,186.2c24.7,0,48.7,4.9,71.3,14.5c21.9,9.3,41.5,22.6,58.5,39.5
+	c16.9,16.9,30.2,36.6,39.5,58.5c9.6,22.6,14.5,46.6,14.5,71.3s-4.9,48.7-14.5,71.3c-9.3,21.9-22.6,41.5-39.5,58.5
+	c-16.9,16.9-36.6,30.2-58.5,39.5c-22.6,9.6-46.6,14.5-71.3,14.5h-352c-24.7,0-48.7-4.9-71.3-14.5c-21.9-9.3-41.5-22.6-58.5-39.5
+	c-16.9-16.9-30.2-36.6-39.5-58.5c-9.6-22.6-14.5-46.6-14.5-71.3s4.9-48.7,14.5-71.3c9.3-21.9,22.6-41.5,39.5-58.5
+	c16.9-16.9,36.6-30.2,58.5-39.5c22.6-9.6,46.6-14.5,71.3-14.5L722.7,186.2 M722.7,170h-352c-110,0-200,90-200,200l0,0
+	c0,110,90,200,200,200h352c110,0,200-90,200-200l0,0C922.7,260,832.7,170,722.7,170L722.7,170z"/>
+<path fill="#3C4043" d="M529.3,384.2v60.5h-19.2V295.3H561c12.9,0,23.9,4.3,32.9,12.9
+	c9.2,8.6,13.8,19.1,13.8,31.5c0,12.7-4.6,23.2-13.8,31.7c-8.9,8.5-19.9,12.7-32.9,12.7h-31.7V384.2z M529.3,313.7v52.1h32.1
+	c7.6,0,14-2.6,19-7.7c5.1-5.1,7.7-11.3,7.7-18.3c0-6.9-2.6-13-7.7-18.1c-5-5.3-11.3-7.9-19-7.9h-32.1V313.7z"/>
+<path fill="#3C4043" d="M657.9,339.1c14.2,0,25.4,3.8,33.6,11.4c8.2,7.6,12.3,18,12.3,31.2v63h-18.3v-14.2h-0.8
+	c-7.9,11.7-18.5,17.5-31.7,17.5c-11.3,0-20.7-3.3-28.3-10s-11.4-15-11.4-25c0-10.6,4-19,12-25.2c8-6.3,18.7-9.4,32-9.4
+	c11.4,0,20.8,2.1,28.1,6.3v-4.4c0-6.7-2.6-12.3-7.9-17c-5.3-4.7-11.5-7-18.6-7c-10.7,0-19.2,4.5-25.4,13.6l-16.9-10.6
+	C625.9,345.8,639.7,339.1,657.9,339.1z M633.1,413.3c0,5,2.1,9.2,6.4,12.5c4.2,3.3,9.2,5,14.9,5c8.1,0,15.3-3,21.6-9
+	s9.5-13,9.5-21.1c-6-4.7-14.3-7.1-25-7.1c-7.8,0-14.3,1.9-19.5,5.6C635.7,403.1,633.1,407.8,633.1,413.3z"/>
+<path fill="#3C4043" d="M808.2,342.4l-64,147.2h-19.8l23.8-51.5L706,342.4h20.9l30.4,73.4h0.4l29.6-73.4H808.2z"/>
+<path fill="#4285F4" d="M452.93,372c0-6.26-0.56-12.25-1.6-18.01h-80.48v33L417.2,387
+	c-1.88,10.98-7.93,20.34-17.2,26.58v21.41h27.59C443.7,420.08,452.93,398.04,452.93,372z"/>
+<path fill="#34A853" d="M400.01,413.58c-7.68,5.18-17.57,8.21-29.14,8.21c-22.35,0-41.31-15.06-48.1-35.36
+	h-28.46v22.08c14.1,27.98,43.08,47.18,76.56,47.18c23.14,0,42.58-7.61,56.73-20.71L400.01,413.58z"/>
+<path fill="#FABB05" d="M320.09,370.05c0-5.7,0.95-11.21,2.68-16.39v-22.08h-28.46
+	c-5.83,11.57-9.11,24.63-9.11,38.47s3.29,26.9,9.11,38.47l28.46-22.08C321.04,381.26,320.09,375.75,320.09,370.05z"/>
+<path fill="#E94235" d="M370.87,318.3c12.63,0,23.94,4.35,32.87,12.85l24.45-24.43
+	c-14.85-13.83-34.21-22.32-57.32-22.32c-33.47,0-62.46,19.2-76.56,47.18l28.46,22.08C329.56,333.36,348.52,318.3,370.87,318.3z"/>
 </svg>

package/lib/components/pay/toC/PaymentList/payment/google_pay2.svg

@@ -0,0 +1,9 @@
+<svg width="46" height="32" viewBox="0 0 46 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" fill="white"/>
+<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" stroke="#F2F4F7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4108 20.7039V16.7911H23.4303C24.2579 16.7911 24.9563 16.5138 25.5257 15.9669L25.6624 15.8282C26.7025 14.696 26.6342 12.9321 25.5257 11.8846C24.9715 11.33 24.2123 11.0296 23.4303 11.045H20.1885V20.7039H21.4108ZM21.4109 15.6048V12.2311H23.4611C23.9016 12.2311 24.3192 12.4006 24.6305 12.7087C25.2911 13.3557 25.3063 14.434 24.6685 15.1041C24.3572 15.4353 23.9167 15.6202 23.4611 15.6048H21.4109ZM31.3639 14.6112C30.84 14.1259 30.1263 13.8795 29.2229 13.8795C28.0613 13.8795 27.1882 14.3108 26.6112 15.1658L27.6893 15.8513C28.0841 15.2659 28.6231 14.9732 29.3064 14.9732C29.7391 14.9732 30.1567 15.135 30.4832 15.4277C30.802 15.7049 30.9842 16.1055 30.9842 16.5291V16.8141C30.5135 16.5522 29.9214 16.4136 29.1925 16.4136C28.3422 16.4136 27.6589 16.6138 27.1502 17.0221C26.6416 17.4303 26.3834 17.9695 26.3834 18.655C26.3682 19.2789 26.634 19.872 27.1047 20.2725C27.583 20.7039 28.1904 20.9195 28.904 20.9195C29.7467 20.9195 30.4148 20.5421 30.9235 19.7873H30.9767V20.7039H32.1458V16.6292C32.1458 15.7743 31.8877 15.0964 31.3639 14.6112ZM28.046 19.4869C27.7954 19.3021 27.6436 19.0017 27.6436 18.6782C27.6436 18.3161 27.8106 18.0157 28.1371 17.777C28.4712 17.5382 28.8889 17.4149 29.3824 17.4149C30.0658 17.4072 30.5974 17.5613 30.977 17.8694C30.977 18.3932 30.772 18.8476 30.3696 19.2327C30.0051 19.6025 29.5115 19.8104 28.9952 19.8104C28.6535 19.8181 28.3194 19.7026 28.046 19.4869ZM34.7734 23.6077L38.858 14.0952H37.5294L35.6389 18.8399H35.6162L33.6802 14.0952H32.3516L35.0316 20.2803L33.5132 23.6077H34.7734Z" fill="#3C4043"/>
+<path d="M17.1905 15.9439C17.1905 15.5665 17.1601 15.1891 17.0994 14.8193H11.9443V16.9529H14.8977C14.7762 17.6384 14.3814 18.2546 13.8044 18.6398V20.0262H15.5658C16.5983 19.0634 17.1905 17.6385 17.1905 15.9439Z" fill="#4285F4"/>
+<path d="M11.9452 21.3662C13.4181 21.3662 14.6632 20.8732 15.5666 20.0259L13.8053 18.6395C13.3118 18.9784 12.6816 19.1709 11.9452 19.1709C10.5179 19.1709 9.31074 18.1927 8.87799 16.8833H7.06348V18.316C7.98971 20.1877 9.88015 21.3662 11.9452 21.3662Z" fill="#34A853"/>
+<path d="M8.87795 16.8834C8.65015 16.1978 8.65015 15.4507 8.87795 14.7575V13.3325H7.06315C6.28103 14.8961 6.28103 16.7447 7.06315 18.3083L8.87795 16.8834Z" fill="#FBBC04"/>
+<path d="M11.9452 12.47C12.7272 12.4546 13.4788 12.755 14.0406 13.3018L15.6046 11.7151C14.61 10.7754 13.3042 10.2593 11.9452 10.2747C9.88015 10.2747 7.98971 11.4609 7.06348 13.3326L8.87799 14.7653C9.31074 13.4482 10.5179 12.47 11.9452 12.47Z" fill="#EA4335"/>
+</svg>

package/lib/components/pay/toC/PaymentList/serve.js

@@ -55,7 +55,7 @@ var filterPaymentList = (list, platform = "h5", isApp, amount) => {
   if (platform === "h5") {
     arr = arr.concat(["globepay.wechat.qrcode", "globepay.alipay.qrcode"]);
   }
-  if (!(0, import_utils2.isIOS)()) {
+  if (!(0, import_utils2.isIOS)() && !(0, import_utils2.isSafari)()) {
     arr = arr.concat(["mw.apple"]);
   }
   if ((0, import_utils2.isIOS)() && isApp) {

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/Add/index.d.ts

@@ -4,9 +4,15 @@ export interface AddMWCreditCardRef {
     init: () => void;
     onReset: () => void;
     onSubmit: () => void;
+    close: () => void;
 }
 export interface AddMWCreditCardProps {
+    /** 创建卡片回调 */
     onCreate?: (values: any) => void;
+    /** 店铺名称，用于授权说明文案 */
+    shopName?: string;
+    /** 按钮 loading */
+    btnLoading?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<AddMWCreditCardProps & React.RefAttributes<any>>;
 export default _default;

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/Add/index.js

@@ -71,7 +71,7 @@ var formatName = (card_name) => {
   }
 };
 var AddMWCreditCard = (props, ref) => {
-  const { onCreate } = props;
+  const { onCreate, shopName = "", btnLoading = false } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [form] = import_antd.Form.useForm();
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -147,12 +147,16 @@ var AddMWCreditCard = (props, ref) => {
   const onSubmit = () => {
     form.submit();
   };
+  const close = () => {
+    setOpen(false);
+  };
   (0, import_react.useImperativeHandle)(
     ref,
     () => ({
       init,
       onReset,
-      onSubmit
+      onSubmit,
+      close
     })
   );
   const okText = (0, import_react.useMemo)(() => {
@@ -167,15 +171,37 @@ var AddMWCreditCard = (props, ref) => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
-      title: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.addCard")),
+      title: /* @__PURE__ */ import_react.default.createElement("div", { className: "secure-card-payment-title" }, import_utils.locales.getText("tocPay.text.secureCardPayment"), /* @__PURE__ */ import_react.default.createElement(
+        import_materials.Iconfont,
+        {
+          type: "pisell2-shield-tick",
+          className: "secure-card-payment-title-icon"
+        }
+      )),
       open,
       onCancel,
       cancelVisible: false,
       onOk: onSubmit,
       okText,
-      bodyStyle: { padding: 24 }
+      bodyStyle: { padding: 24, display: "flex", flexDirection: "column" },
+      okButtonProps: {
+        loading: btnLoading,
+        style: {
+          display: "flex",
+          justifyContent: "center",
+          alignItems: "center"
+        }
+      }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "add-mw-credit-card-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellAlert,
+      {
+        className: "secure-card-tip-alert",
+        icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-tick" }),
+        showIcon: true,
+        message: import_utils.locales.getText("tocPay.text.secureBankInfo")
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form,
       {
         layout: "vertical",
@@ -246,24 +272,21 @@ var AddMWCreditCard = (props, ref) => {
             placeholder: import_utils.locales.getText("tocPay.text.incorrectName")
           }
         )
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
+      ))),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "merchant-authorization-text" }, import_utils.locales.getText("tocPay.text.merchantAuthorizationBefore"), /* @__PURE__ */ import_react.default.createElement("span", { className: "merchant-shop-name" }, shopName), import_utils.locales.getText("tocPay.text.merchantAuthorizationAfter")),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { className: "secure-card-divider" }),
+      /* @__PURE__ */ import_react.default.createElement(
         import_antd.Form.Item,
         {
           name: "is_save",
           valuePropName: "checked",
-          initialValue: true
+          initialValue: true,
+          className: "save-card-form-item"
         },
         /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, null, /* @__PURE__ */ import_react.default.createElement("span", { className: "save-card-checkbox-text" }, import_utils.locales.getText("tocPay.text.saveCardForNextTime")))
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellAlert,
-        {
-          className: "save-card-alert",
-          icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-tick" }),
-          showIcon: true,
-          message: import_utils.locales.getText("tocPay.text.secureBankInfo")
-        }
-      )))
-    ))
+      ),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "save-card-encryption-text" }, import_utils.locales.getText("tocPay.text.saveCardEncryption"))
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "three-d-secure-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "three-d-secure-badge" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-01", className: "three-d-secure-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "three-d-secure-badge-text" }, "3D")), /* @__PURE__ */ import_react.default.createElement("span", { className: "three-d-secure-text" }, import_utils.locales.getText("tocPay.text.threeDSecureProtection"))))
   );
 };
 var Add_default = (0, import_react.forwardRef)(AddMWCreditCard);