@pisell/private-materials 6.3.33 → 6.3.34

package/es/pro/Login2.0/locales.js

@@ -100,38 +100,38 @@ export default {
     'pisell-phone-validation-required': 'Please enter your phone',
     'pisell-phone-validation-invalid': 'Please enter a valid phone',
     'pisell-phone-validation-invalid-format': 'Please enter a valid phone',
-    'pisell-phone-validation-china': 'Please enter a valid Chinese phone (11 digits starting with 1)',
-    'pisell-phone-validation-hongkong': 'Please enter a valid Hong Kong phone (8 digits)',
-    'pisell-phone-validation-macau': 'Please enter a valid Macau phone (8 digits)',
-    'pisell-phone-validation-taiwan': 'Please enter a valid Taiwan phone (9 digits starting with 9)',
-    'pisell-phone-validation-us-canada': 'Please enter a valid US/Canada phone (10 digits)',
-    'pisell-phone-validation-uk': 'Please enter a valid UK phone (10 digits starting with 7)',
+    'pisell-phone-validation-china': 'Please enter a valid Chinese phone',
+    'pisell-phone-validation-hongkong': 'Please enter a valid Hong Kong phone',
+    'pisell-phone-validation-macau': 'Please enter a valid Macau phone',
+    'pisell-phone-validation-taiwan': 'Please enter a valid Taiwan phone',
+    'pisell-phone-validation-us-canada': 'Please enter a valid US/Canada phone',
+    'pisell-phone-validation-uk': 'Please enter a valid UK phone',
     'pisell-phone-validation-australia': 'Please enter a valid Australian phone',
-    'pisell-phone-validation-japan': 'Please enter a valid Japanese phone (10 digits)',
-    'pisell-phone-validation-korea': 'Please enter a valid Korean phone (9-10 digits)',
-    'pisell-phone-validation-singapore': 'Please enter a valid Singapore phone (8 digits)',
-    'pisell-phone-validation-malaysia': 'Please enter a valid Malaysian phone (9-10 digits)',
-    'pisell-phone-validation-thailand': 'Please enter a valid Thai phone (9 digits)',
-    'pisell-phone-validation-vietnam': 'Please enter a valid Vietnamese phone (9 digits)',
-    'pisell-phone-validation-philippines': 'Please enter a valid Philippine phone (10 digits starting with 9)',
-    'pisell-phone-validation-indonesia': 'Please enter a valid Indonesian phone (9-12 digits starting with 8)',
-    'pisell-phone-validation-india': 'Please enter a valid Indian phone (10 digits)',
-    'pisell-phone-validation-invalid-china': 'Please enter a valid Chinese phone (11 digits starting with 1)',
-    'pisell-phone-validation-invalid-hongkong': 'Please enter a valid Hong Kong phone (8 digits)',
-    'pisell-phone-validation-invalid-macau': 'Please enter a valid Macau phone (8 digits)',
-    'pisell-phone-validation-invalid-taiwan': 'Please enter a valid Taiwan phone (9-10 digits starting with 09)',
-    'pisell-phone-validation-invalid-us-canada': 'Please enter a valid US/Canada phone (10 digits)',
-    'pisell-phone-validation-invalid-uk': 'Please enter a valid UK phone (10-11 digits)',
-    'pisell-phone-validation-invalid-australia': 'Please enter a valid Australian phone (9 digits starting with 4)',
-    'pisell-phone-validation-invalid-japan': 'Please enter a valid Japanese phone (10-11 digits)',
-    'pisell-phone-validation-invalid-korea': 'Please enter a valid Korean phone (10-11 digits)',
-    'pisell-phone-validation-invalid-singapore': 'Please enter a valid Singapore phone (8 digits)',
-    'pisell-phone-validation-invalid-malaysia': 'Please enter a valid Malaysian phone (9-10 digits)',
-    'pisell-phone-validation-invalid-thailand': 'Please enter a valid Thai phone (9 digits starting with 0)',
-    'pisell-phone-validation-invalid-vietnam': 'Please enter a valid Vietnamese phone (9-10 digits)',
-    'pisell-phone-validation-invalid-philippines': 'Please enter a valid Philippine phone (10 digits starting with 09)',
-    'pisell-phone-validation-invalid-indonesia': 'Please enter a valid Indonesian phone (10-13 digits)',
-    'pisell-phone-validation-invalid-india': 'Please enter a valid Indian phone (10 digits)',
+    'pisell-phone-validation-japan': 'Please enter a valid Japanese phone',
+    'pisell-phone-validation-korea': 'Please enter a valid Korean phone',
+    'pisell-phone-validation-singapore': 'Please enter a valid Singapore phone',
+    'pisell-phone-validation-malaysia': 'Please enter a valid Malaysian phone',
+    'pisell-phone-validation-thailand': 'Please enter a valid Thai phone',
+    'pisell-phone-validation-vietnam': 'Please enter a valid Vietnamese phone',
+    'pisell-phone-validation-philippines': 'Please enter a valid Philippine phone',
+    'pisell-phone-validation-indonesia': 'Please enter a valid Indonesian phone',
+    'pisell-phone-validation-india': 'Please enter a valid Indian phone',
+    'pisell-phone-validation-invalid-china': 'Please enter a valid Chinese phone',
+    'pisell-phone-validation-invalid-hongkong': 'Please enter a valid Hong Kong phone',
+    'pisell-phone-validation-invalid-macau': 'Please enter a valid Macau phone',
+    'pisell-phone-validation-invalid-taiwan': 'Please enter a valid Taiwan phone',
+    'pisell-phone-validation-invalid-us-canada': 'Please enter a valid US/Canada phone',
+    'pisell-phone-validation-invalid-uk': 'Please enter a valid UK phone',
+    'pisell-phone-validation-invalid-australia': 'Please enter a valid Australian phone',
+    'pisell-phone-validation-invalid-japan': 'Please enter a valid Japanese phone',
+    'pisell-phone-validation-invalid-korea': 'Please enter a valid Korean phone',
+    'pisell-phone-validation-invalid-singapore': 'Please enter a valid Singapore phone',
+    'pisell-phone-validation-invalid-malaysia': 'Please enter a valid Malaysian phone',
+    'pisell-phone-validation-invalid-thailand': 'Please enter a valid Thai phone',
+    'pisell-phone-validation-invalid-vietnam': 'Please enter a valid Vietnamese phone',
+    'pisell-phone-validation-invalid-philippines': 'Please enter a valid Philippine phone',
+    'pisell-phone-validation-invalid-indonesia': 'Please enter a valid Indonesian phone',
+    'pisell-phone-validation-invalid-india': 'Please enter a valid Indian phone',
     // OAuth buttons
     'pisell-register2-continue-with-google': 'Continue with Google',
     'pisell-register2-continue-with-facebook': 'Continue with Facebook',
@@ -306,38 +306,38 @@ export default {
     'pisell-phone-validation-required': '请输入手机号',
     'pisell-phone-validation-invalid': '请输入正确的手机号',
     'pisell-phone-validation-invalid-format': '请输入正确的手机号',
-    'pisell-phone-validation-china': '请输入正确的中国大陆手机号（11位数字，以1开头）',
-    'pisell-phone-validation-hongkong': '请输入正确的香港手机号（8位数字）',
-    'pisell-phone-validation-macau': '请输入正确的澳门手机号（8位数字）',
-    'pisell-phone-validation-taiwan': '请输入正确的台湾手机号（9位数字，以9开头）',
-    'pisell-phone-validation-us-canada': '请输入正确的美国/加拿大手机号（10位数字）',
-    'pisell-phone-validation-uk': '请输入正确的英国手机号（10位数字，以7开头）',
+    'pisell-phone-validation-china': '请输入正确的中国大陆手机号',
+    'pisell-phone-validation-hongkong': '请输入正确的香港手机号',
+    'pisell-phone-validation-macau': '请输入正确的澳门手机号',
+    'pisell-phone-validation-taiwan': '请输入正确的台湾手机号',
+    'pisell-phone-validation-us-canada': '请输入正确的美国/加拿大手机号',
+    'pisell-phone-validation-uk': '请输入正确的英国手机号',
     'pisell-phone-validation-australia': '请输入正确的澳大利亚手机号',
-    'pisell-phone-validation-japan': '请输入正确的日本手机号（10位数字）',
-    'pisell-phone-validation-korea': '请输入正确的韩国手机号（9-10位数字）',
-    'pisell-phone-validation-singapore': '请输入正确的新加坡手机号（8位数字）',
-    'pisell-phone-validation-malaysia': '请输入正确的马来西亚手机号（9-10位数字）',
-    'pisell-phone-validation-thailand': '请输入正确的泰国手机号（9位数字）',
-    'pisell-phone-validation-vietnam': '请输入正确的越南手机号（9位数字）',
-    'pisell-phone-validation-philippines': '请输入正确的菲律宾手机号（10位数字，以9开头）',
-    'pisell-phone-validation-indonesia': '请输入正确的印尼手机号（9-12位数字，以8开头）',
-    'pisell-phone-validation-india': '请输入正确的印度手机号（10位数字）',
-    'pisell-phone-validation-invalid-china': '请输入正确的中国大陆手机号（11位数字，以1开头）',
-    'pisell-phone-validation-invalid-hongkong': '请输入正确的香港手机号（8位数字）',
-    'pisell-phone-validation-invalid-macau': '请输入正确的澳门手机号（8位数字）',
-    'pisell-phone-validation-invalid-taiwan': '请输入正确的台湾手机号（9-10位数字，以09开头）',
-    'pisell-phone-validation-invalid-us-canada': '请输入正确的美国/加拿大手机号（10位数字）',
-    'pisell-phone-validation-invalid-uk': '请输入正确的英国手机号（10-11位数字）',
-    'pisell-phone-validation-invalid-australia': '请输入正确的澳大利亚手机号（9位数字，以4开头）',
-    'pisell-phone-validation-invalid-japan': '请输入正确的日本手机号（10-11位数字）',
-    'pisell-phone-validation-invalid-korea': '请输入正确的韩国手机号（10-11位数字）',
-    'pisell-phone-validation-invalid-singapore': '请输入正确的新加坡手机号（8位数字）',
-    'pisell-phone-validation-invalid-malaysia': '请输入正确的马来西亚手机号（9-10位数字）',
-    'pisell-phone-validation-invalid-thailand': '请输入正确的泰国手机号（9位数字，以0开头）',
-    'pisell-phone-validation-invalid-vietnam': '请输入正确的越南手机号（9-10位数字）',
-    'pisell-phone-validation-invalid-philippines': '请输入正确的菲律宾手机号（10位数字，以09开头）',
-    'pisell-phone-validation-invalid-indonesia': '请输入正确的印尼手机号（10-13位数字）',
-    'pisell-phone-validation-invalid-india': '请输入正确的印度手机号（10位数字）',
+    'pisell-phone-validation-japan': '请输入正确的日本手机号',
+    'pisell-phone-validation-korea': '请输入正确的韩国手机号',
+    'pisell-phone-validation-singapore': '请输入正确的新加坡手机号',
+    'pisell-phone-validation-malaysia': '请输入正确的马来西亚手机号',
+    'pisell-phone-validation-thailand': '请输入正确的泰国手机号',
+    'pisell-phone-validation-vietnam': '请输入正确的越南手机号',
+    'pisell-phone-validation-philippines': '请输入正确的菲律宾手机号',
+    'pisell-phone-validation-indonesia': '请输入正确的印尼手机号',
+    'pisell-phone-validation-india': '请输入正确的印度手机号',
+    'pisell-phone-validation-invalid-china': '请输入正确的中国大陆手机号',
+    'pisell-phone-validation-invalid-hongkong': '请输入正确的香港手机号',
+    'pisell-phone-validation-invalid-macau': '请输入正确的澳门手机号',
+    'pisell-phone-validation-invalid-taiwan': '请输入正确的台湾手机号',
+    'pisell-phone-validation-invalid-us-canada': '请输入正确的美国/加拿大手机号',
+    'pisell-phone-validation-invalid-uk': '请输入正确的英国手机号',
+    'pisell-phone-validation-invalid-australia': '请输入正确的澳大利亚手机号',
+    'pisell-phone-validation-invalid-japan': '请输入正确的日本手机号',
+    'pisell-phone-validation-invalid-korea': '请输入正确的韩国手机号',
+    'pisell-phone-validation-invalid-singapore': '请输入正确的新加坡手机号',
+    'pisell-phone-validation-invalid-malaysia': '请输入正确的马来西亚手机号',
+    'pisell-phone-validation-invalid-thailand': '请输入正确的泰国手机号',
+    'pisell-phone-validation-invalid-vietnam': '请输入正确的越南手机号',
+    'pisell-phone-validation-invalid-philippines': '请输入正确的菲律宾手机号',
+    'pisell-phone-validation-invalid-indonesia': '请输入正确的印尼手机号',
+    'pisell-phone-validation-invalid-india': '请输入正确的印度手机号',
     // OAuth buttons
     'pisell-register2-continue-with-google': '使用Google继续',
     'pisell-register2-continue-with-facebook': '使用Facebook继续',
@@ -552,38 +552,38 @@ export default {
     'pisell-phone-validation-required': '請輸入手機號碼',
     'pisell-phone-validation-invalid': '請輸入正確的手機號碼',
     'pisell-phone-validation-invalid-format': '請輸入正確的手機號碼',
-    'pisell-phone-validation-china': '請輸入正確的中國大陸手機號碼（11位數字，以1開頭）',
-    'pisell-phone-validation-hongkong': '請輸入正確的香港手機號碼（8位數字）',
-    'pisell-phone-validation-macau': '請輸入正確的澳門手機號碼（8位數字）',
-    'pisell-phone-validation-taiwan': '請輸入正確的台灣手機號碼（9位數字，以9開頭）',
-    'pisell-phone-validation-us-canada': '請輸入正確的美國/加拿大手機號碼（10位數字）',
-    'pisell-phone-validation-uk': '請輸入正確的英國手機號碼（10位數字，以7開頭）',
+    'pisell-phone-validation-china': '請輸入正確的中國大陸手機號碼',
+    'pisell-phone-validation-hongkong': '請輸入正確的香港手機號碼',
+    'pisell-phone-validation-macau': '請輸入正確的澳門手機號碼',
+    'pisell-phone-validation-taiwan': '請輸入正確的台灣手機號碼',
+    'pisell-phone-validation-us-canada': '請輸入正確的美國/加拿大手機號碼',
+    'pisell-phone-validation-uk': '請輸入正確的英國手機號碼',
     'pisell-phone-validation-australia': '請輸入正確的澳洲手機號碼',
-    'pisell-phone-validation-japan': '請輸入正確的日本手機號碼（10位數字）',
-    'pisell-phone-validation-korea': '請輸入正確的韓國手機號碼（9-10位數字）',
-    'pisell-phone-validation-singapore': '請輸入正確的新加坡手機號碼（8位數字）',
-    'pisell-phone-validation-malaysia': '請輸入正確的馬來西亞手機號碼（9-10位數字）',
-    'pisell-phone-validation-thailand': '請輸入正確的泰國手機號碼（9位數字）',
-    'pisell-phone-validation-vietnam': '請輸入正確的越南手機號碼（9位數字）',
-    'pisell-phone-validation-philippines': '請輸入正確的菲律賓手機號碼（10位數字，以9開頭）',
-    'pisell-phone-validation-indonesia': '請輸入正確的印尼手機號碼（9-12位數字，以8開頭）',
-    'pisell-phone-validation-india': '請輸入正確的印度手機號碼（10位數字）',
-    'pisell-phone-validation-invalid-china': '請輸入正確的中國大陸手機號碼（11位數字，以1開頭）',
-    'pisell-phone-validation-invalid-hongkong': '請輸入正確的香港手機號碼（8位數字）',
-    'pisell-phone-validation-invalid-macau': '請輸入正確的澳門手機號碼（8位數字）',
-    'pisell-phone-validation-invalid-taiwan': '請輸入正確的台灣手機號碼（9-10位數字，以09開頭）',
-    'pisell-phone-validation-invalid-us-canada': '請輸入正確的美國/加拿大手機號碼（10位數字）',
-    'pisell-phone-validation-invalid-uk': '請輸入正確的英國手機號碼（10-11位數字）',
-    'pisell-phone-validation-invalid-australia': '請輸入正確的澳洲手機號碼（9位數字，以4開頭）',
-    'pisell-phone-validation-invalid-japan': '請輸入正確的日本手機號碼（10-11位數字）',
-    'pisell-phone-validation-invalid-korea': '請輸入正確的韓國手機號碼（10-11位數字）',
-    'pisell-phone-validation-invalid-singapore': '請輸入正確的新加坡手機號碼（8位數字）',
-    'pisell-phone-validation-invalid-malaysia': '請輸入正確的馬來西亞手機號碼（9-10位數字）',
-    'pisell-phone-validation-invalid-thailand': '請輸入正確的泰國手機號碼（9位數字，以0開頭）',
-    'pisell-phone-validation-invalid-vietnam': '請輸入正確的越南手機號碼（9-10位數字）',
-    'pisell-phone-validation-invalid-philippines': '請輸入正確的菲律賓手機號碼（10位數字，以09開頭）',
-    'pisell-phone-validation-invalid-indonesia': '請輸入正確的印尼手機號碼（10-13位數字）',
-    'pisell-phone-validation-invalid-india': '請輸入正確的印度手機號碼（10位數字）',
+    'pisell-phone-validation-japan': '請輸入正確的日本手機號碼',
+    'pisell-phone-validation-korea': '請輸入正確的韓國手機號碼',
+    'pisell-phone-validation-singapore': '請輸入正確的新加坡手機號碼',
+    'pisell-phone-validation-malaysia': '請輸入正確的馬來西亞手機號碼',
+    'pisell-phone-validation-thailand': '請輸入正確的泰國手機號碼',
+    'pisell-phone-validation-vietnam': '請輸入正確的越南手機號碼',
+    'pisell-phone-validation-philippines': '請輸入正確的菲律賓手機號碼',
+    'pisell-phone-validation-indonesia': '請輸入正確的印尼手機號碼',
+    'pisell-phone-validation-india': '請輸入正確的印度手機號碼',
+    'pisell-phone-validation-invalid-china': '請輸入正確的中國大陸手機號碼',
+    'pisell-phone-validation-invalid-hongkong': '請輸入正確的香港手機號碼',
+    'pisell-phone-validation-invalid-macau': '請輸入正確的澳門手機號碼',
+    'pisell-phone-validation-invalid-taiwan': '請輸入正確的台灣手機號碼',
+    'pisell-phone-validation-invalid-us-canada': '請輸入正確的美國/加拿大手機號碼',
+    'pisell-phone-validation-invalid-uk': '請輸入正確的英國手機號碼',
+    'pisell-phone-validation-invalid-australia': '請輸入正確的澳洲手機號碼',
+    'pisell-phone-validation-invalid-japan': '請輸入正確的日本手機號碼',
+    'pisell-phone-validation-invalid-korea': '請輸入正確的韓國手機號碼',
+    'pisell-phone-validation-invalid-singapore': '請輸入正確的新加坡手機號碼',
+    'pisell-phone-validation-invalid-malaysia': '請輸入正確的馬來西亞手機號碼',
+    'pisell-phone-validation-invalid-thailand': '請輸入正確的泰國手機號碼',
+    'pisell-phone-validation-invalid-vietnam': '請輸入正確的越南手機號碼',
+    'pisell-phone-validation-invalid-philippines': '請輸入正確的菲律賓手機號碼',
+    'pisell-phone-validation-invalid-indonesia': '請輸入正確的印尼手機號碼',
+    'pisell-phone-validation-invalid-india': '請輸入正確的印度手機號碼',
     // Verification success
     'pisell-verification-success-title': '驗證成功',
     // Step-by-step login

package/lib/components/index.d.ts

@@ -9,7 +9,6 @@ import ProductExtension from './productExtension';
 import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
-import Wallet from './wallet';
 import WalletList from './walletList';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
@@ -19,4 +18,4 @@ import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };

package/lib/components/index.js

@@ -46,7 +46,6 @@ __export(components_exports, {
   SubTotal: () => import_subTotal.default,
   TaxSelect: () => import_taxSelect.default,
   ToCPay: () => import_toC.default,
-  Wallet: () => import_wallet.default,
   WalletList: () => import_walletList.default,
   WorkspaceList: () => import_workSpaceList.default,
   WorkspaceListDetail: () => import_workSpaceListDetail.default
@@ -63,7 +62,6 @@ var import_productExtension = __toESM(require("./productExtension"));
 var import_ruleSetting = __toESM(require("./ruleSetting"));
 var import_taxSelect = __toESM(require("./taxSelect"));
 var import_toC = __toESM(require("./pay/toC"));
-var import_wallet = __toESM(require("./wallet"));
 var import_walletList = __toESM(require("./walletList"));
 var import_workSpaceListDetail = __toESM(require("./workSpaceListDetail/"));
 var import_workSpaceList = __toESM(require("./workSpaceList"));
@@ -92,7 +90,6 @@ var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
   SubTotal,
   TaxSelect,
   ToCPay,
-  Wallet,
   WalletList,
   WorkspaceList,
   WorkspaceListDetail

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

@@ -1,28 +1,3 @@
-import React from 'react';
 import './index.less';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        role?: string;
-    }
-}
-declare global {
-    namespace JSX {
-        interface IntrinsicElements {
-            div: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> & {
-                children?: React.ReactNode;
-                onClick?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseDown?: React.MouseEventHandler<HTMLDivElement>;
-                onMouseUp?: React.MouseEventHandler<HTMLDivElement>;
-                onTouchStart?: React.TouchEventHandler<HTMLDivElement>;
-                onTouchEnd?: React.TouchEventHandler<HTMLDivElement>;
-                role?: string;
-            };
-            img: React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-            span: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> & {
-                children?: React.ReactNode;
-            };
-        }
-    }
-}
 declare const WalletList: (props: any) => JSX.Element;
 export default WalletList;

package/lib/components/walletList/index.js

@@ -104,8 +104,48 @@ var DEFAULT_WALLET_CARD = {
       en: "Level"
     },
     metadata: {
-      barcodetype: "barCode",
-      showcaseWalletPass: ["rechargeable", "piont", "voucher", "discount"],
+      showcaseWalletPassNew: [
+        {
+          type: "rechargeable",
+          display: 1,
+          custom_title: {
+            original: "Balance",
+            "zh-CN": "充值卡",
+            "zh-HK": "充值卡",
+            en: "Balance"
+          }
+        },
+        {
+          type: "point",
+          display: 1,
+          custom_title: {
+            original: "Points",
+            "zh-CN": "积分卡",
+            "zh-HK": "積分卡",
+            en: "Points"
+          }
+        },
+        {
+          type: "voucher",
+          display: 1,
+          custom_title: {
+            original: "Voucher",
+            "zh-CN": "代金券",
+            "zh-HK": "代金券",
+            en: "Voucher"
+          }
+        },
+        {
+          type: "discount",
+          display: 1,
+          custom_title: {
+            original: "Discount",
+            "zh-CN": "折扣卡",
+            "zh-HK": "折扣卡",
+            en: "Discount"
+          }
+        }
+      ],
       coverImage: "",
       icon: ""
     }
@@ -171,7 +211,7 @@ var WalletList = (0, import_model.Provider)((props) => {
       if (isMountedRef.current) {
         setState({
           list: [DEFAULT_WALLET_CARD],
-          balance: DEFAULT_BALANCE,
+          balance: [],
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -269,7 +309,7 @@ var WalletList = (0, import_model.Provider)((props) => {
     if (!isUserLoggedIn) {
       setState({
         list: [DEFAULT_WALLET_CARD],
-        balance: DEFAULT_BALANCE,
+        balance: [],
         hasAttempted: true,
         isLoggedIn: false
       });
@@ -281,6 +321,12 @@ var WalletList = (0, import_model.Provider)((props) => {
     try {
       cachedList = getFromLocalStorage(STORAGE_KEY);
       cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+      if (!Array.isArray(cachedBalance) || !cachedBalance.some(() => {
+        var _a3;
+        return (_a3 = items == null ? void 0 : items.hasOwnProperty) == null ? void 0 : _a3.call(items, "gift_card_balance");
+      })) {
+        cachedBalance = null;
+      }
     } catch (e) {
       console.error("Error fetching from localStorage:", e);
     }
@@ -293,10 +339,10 @@ var WalletList = (0, import_model.Provider)((props) => {
     }
     try {
       if (!isMountedRef.current) return;
-      const [walletListData, walletBalanceData] = await Promise.all([
-        (0, import_serve.getWalletList)(),
-        (0, import_serve.getWalletBalance)()
-      ]);
+      const walletListData = await (0, import_serve.getWalletList)();
+      const walletBalanceData = await (0, import_serve.batchGetWalletBalance)(
+        walletListData.map((item2) => item2.wallet_id)
+      );
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
       if (walletListData) {
         try {
@@ -319,8 +365,20 @@ var WalletList = (0, import_model.Provider)((props) => {
           try {
             let retryBalanceData = walletBalanceData;
             let retryListData = walletListData;
+            if (Array.isArray(walletListData) && walletListData.length === 0) {
+              retryListData = await (0, import_serve.getWalletList)();
+              if (retryListData && retryListData.length > 0) {
+                try {
+                  saveToLocalStorage(STORAGE_KEY, retryListData);
+                } catch (e) {
+                  console.error("Error saving retry list to localStorage:", e);
+                }
+              }
+            }
             if (!walletBalanceData) {
-              retryBalanceData = await (0, import_serve.getWalletBalance)();
+              retryBalanceData = await (0, import_serve.batchGetWalletBalance)(
+                retryListData.map((item2) => item2.wallet_id)
+              );
               if (retryBalanceData) {
                 try {
                   saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
@@ -332,16 +390,6 @@ var WalletList = (0, import_model.Provider)((props) => {
                 }
               }
             }
-            if (Array.isArray(walletListData) && walletListData.length === 0) {
-              retryListData = await (0, import_serve.getWalletList)({});
-              if (retryListData && retryListData.length > 0) {
-                try {
-                  saveToLocalStorage(STORAGE_KEY, retryListData);
-                } catch (e) {
-                  console.error("Error saving retry list to localStorage:", e);
-                }
-              }
-            }
             setState({
               list: retryListData || [],
               balance: retryBalanceData,
@@ -380,55 +428,46 @@ var WalletList = (0, import_model.Provider)((props) => {
       console.error("onViewPinClick方法需要传入wallet_detail_id");
     }
   };
-  const renderWalletCard = (item) => {
+  const renderWalletCard = (_walletItem) => {
     var _a2;
-    const { code, shop, wallet, id } = item;
+    const { code, shop, wallet, id } = _walletItem;
     const { metadata, name } = wallet || {};
     const {
-      barcodetype = "barCode",
-      showcaseWalletPass = [],
+      showcaseWalletPassNew = [],
       coverImage = "",
       icon = ""
     } = metadata || {};
     const { name: shopName } = shop;
-    const { balance } = state;
-    const balanceKeyMap = {
-      gift_card_balance: "rechargeable",
-      point_card_balance: "piont",
-      voucher_count: "voucher",
-      discount_card_count: "discount"
+    const { balance = [] } = state;
+    const balanceItem = balance.find((bi) => bi.wallet_id == _walletItem.wallet_id) || DEFAULT_BALANCE;
+    const _balanceKeyMap = {
+      rechargeable: "gift_card_balance",
+      point: "point_card_balance",
+      voucher: "voucher_count",
+      discount: "discount_card_count"
     };
-    const cardItems = (showcaseWalletPass || []).map(
-      (key) => {
-        var _a3;
-        const balanceKey = (_a3 = Object.entries(balanceKeyMap).find(
-          ([_, value2]) => value2 === key
-        )) == null ? void 0 : _a3[0];
-        let value = balanceKey ? balance[balanceKey] || 0 : 0;
-        if (balanceKey === "voucher_count") {
-          value += balance.good_pass_count;
-        }
-        return {
-          key,
-          label: key,
-          hidden: false,
-          value
-        };
-      }
-    );
+    const cardItems = showcaseWalletPassNew.map((item2) => {
+      const balanceKey = _balanceKeyMap[item2.type];
+      let value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      return {
+        ...item2,
+        value
+      };
+    });
     const cardProps = {
       // 先应用默认配置
       ...import_types.DEFAULT_CARD_CONFIG,
       // 再应用globalState作为兜底
       ...globalState,
       // 最后应用API返回的数据，这些拥有最高优先级
+      id: wallet.id,
       iconImg: icon,
       symbol,
       cardNo: code,
       walletName: getLocalizedName(name, (_a2 = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _a2.translateLocale),
       shopName,
-      codeType: barcodetype,
-      items: cardItems,
+      // codeType: barcodetype,
+      items: cardItems.slice(0, 4),
       customBackgroundImage: coverImage,
       isLogin: isUserLoggedIn
       // 添加登录状态
@@ -499,7 +538,7 @@ var WalletList = (0, import_model.Provider)((props) => {
     ]
   };
   const renderBalanceCard = (0, import_react.useCallback)((balance) => {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item.value)))));
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item2) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item2.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item2.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item2.value)))));
   }, []);
   const isShowGuide = (0, import_react.useMemo)(() => {
     var _a2;
@@ -518,7 +557,7 @@ var WalletList = (0, import_model.Provider)((props) => {
         ...globalState,
         walletGuideConfig: (globalState == null ? void 0 : globalState.walletGuideConfig) || (0, import_status.defaultWalletGuideConfig)()
       }
-    ) : /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item) => renderWalletCard(item)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
+    ) : /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item2) => renderWalletCard(item2)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: `wallet-nav-button wallet-prev ${currentIndex === 0 ? "disabled" : ""}`,

package/lib/components/walletList/serve.d.ts

@@ -10,6 +10,10 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * 批量获取钱包余额信息
+ */
+export declare const batchGetWalletBalance: (walletIds: string[]) => Promise<Record<string, WalletBalance> | null>;
 /**
  * @title: 获取钱包店铺列表
  * @description:

package/lib/components/walletList/serve.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/walletList/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
+  batchGetWalletBalance: () => batchGetWalletBalance,
   getWalletBalance: () => getWalletBalance,
   getWalletList: () => getWalletList,
   getWalletShopList: () => getWalletShopList
@@ -41,6 +42,16 @@ var getWalletBalance = async () => {
     return null;
   }
 };
+var batchGetWalletBalance = async (walletIds) => {
+  try {
+    const { data } = await import_utils.request.getRequest().get("/h5/wallet/wallet-pass/balance/batch", {
+      wallet_id: walletIds
+    });
+    return data || {};
+  } catch (error) {
+    return {};
+  }
+};
 var getWalletShopList = async (params) => {
   try {
     const { data } = await import_utils.request.getRequest().get("/h5/wallet/shop/list", params || {}, {
@@ -54,6 +65,7 @@ var getWalletShopList = async (params) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  batchGetWalletBalance,
   getWalletBalance,
   getWalletList,
   getWalletShopList

package/lib/components/walletList/types/index.d.ts

@@ -6,14 +6,18 @@ export interface MultiLanguageName {
     en: string;
     [key: string]: string;
 }
+declare type WalletPassType = 'rechargeable' | 'point' | 'voucher' | 'discount';
 export interface WalletMetadata {
     name: MultiLanguageName;
     welcomeText?: string | MultiLanguageName;
     customerName?: string;
     coverImage?: string;
     icon?: string;
-    barcodetype: 'barCode' | 'orCode';
-    showcaseWalletPass?: ('rechargeable' | 'piont' | 'voucher' | 'discount')[];
+    showcaseWalletPassNew?: Array<{
+        type: WalletPassType;
+        custom_title?: string | MultiLanguageName;
+        display?: 0 | 1;
+    }>;
 }
 export interface Shop {
     id: number;
@@ -56,15 +60,10 @@ export interface WalletBalance {
     voucher_count: number;
     discount_card_count: number;
 }
-export interface WalletBalanceItem {
-    key: string;
-    label: string;
-    value: number;
-}
 export interface WalletCardItem {
-    key: string;
-    label: string;
-    hidden: boolean;
+    type: WalletPassType;
+    custom_title?: string | MultiLanguageName;
+    display: 0 | 1;
     value?: number;
 }
 export interface State {
@@ -106,7 +105,7 @@ export interface WalletListProps {
         platform?: 'pc' | 'h5' | 'ipad';
         mode?: 'dark' | 'light';
         cardStyle?: 'normal' | 'full';
-        codeType?: 'barCode' | 'orCode';
+        codeType?: 'barCode' | 'qrCode';
         codeDirection?: 'bottom' | 'top';
         shopName?: boolean;
         showWalletName?: boolean;
@@ -131,7 +130,7 @@ export interface WalletCardProps {
     platform?: 'pc' | 'h5' | 'ipad';
     mode?: 'dark' | 'light';
     cardStyle?: 'normal' | 'full';
-    codeType?: 'barCode' | 'orCode';
+    codeType?: 'barCode' | 'qrCode';
     codeDirection?: 'bottom' | 'top';
     shopName?: boolean;
     showIcon?: boolean;
@@ -192,3 +191,4 @@ export interface CarouselSettings {
         };
     }>;
 }
+export {};