@pisell/private-materials 6.6.5 → 6.6.6

package/es/plus/walletPassGallery/components/passList/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages"];
+var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages", "holder", "metadata"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -15,7 +15,8 @@ var PassList = function PassList(props) {
     valuePropName = _props$valuePropName === void 0 ? 'id' : _props$valuePropName,
     hasMore = props.hasMore,
     onLoadMore = props.onLoadMore,
-    loading = props.loading;
+    loading = props.loading,
+    onEditHolder = props.onEditHolder;
   var _loadMore = /*#__PURE__*/React.createElement("div", {
     style: {
       textAlign: 'center',
@@ -31,7 +32,7 @@ var PassList = function PassList(props) {
       color: '#999'
     }
   }, locales.getText('wallet-pass-gallery.allLoaded')));
-  return /*#__PURE__*/React.createElement(List, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(List, {
     className: "pisell-wallet-pass-gallery_list",
     itemLayout: "horizontal",
     dataSource: dataSource,
@@ -62,6 +63,8 @@ var PassList = function PassList(props) {
         par_value = _item$par_value === void 0 ? '' : _item$par_value,
         _item$unified_message = item.unified_messages,
         unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message,
+        holder = item.holder,
+        metadata = item.metadata,
         rest = _objectWithoutProperties(item, _excluded);
       // 用于选中状态和变更回调的值（支持自定义属性名）
       var itemValue = item === null || item === void 0 ? void 0 : item[valuePropName];
@@ -107,9 +110,18 @@ var PassList = function PassList(props) {
         discount: isDiscountCard ? Number(par_value) : undefined,
         showDiscount: isDiscountCard,
         code: encoded,
-        validDate: expire_date
+        validDate: expire_date,
+        holder: holder,
+        onSetHolder: function onSetHolder() {
+          var _holder$metadata;
+          onEditHolder === null || onEditHolder === void 0 || onEditHolder({
+            wallet_pass_detail_id: id,
+            customer_id: holder === null || holder === void 0 ? void 0 : holder.customer_id,
+            form_id: holder === null || holder === void 0 || (_holder$metadata = holder.metadata) === null || _holder$metadata === void 0 ? void 0 : _holder$metadata.custom_id
+          });
+        }
       }))));
     }
-  });
+  }));
 };
 export default PassList;

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

@@ -32,6 +32,10 @@ var Recharge = function Recharge(_ref) {
     storage = _ref2.storage;
   var dvaStore = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getStore) === null || _context$appHelper2$g === void 0 || (_context$appHelper2$g = _context$appHelper2$g.call(_context$appHelper2)) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.getState();
   var shop = (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.shop) || {};
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   useEffect(function () {
     if (detailData) {
       setChargeItem(((detailData === null || detailData === void 0 ? void 0 : detailData.gift_option) || [])[0]);
@@ -44,6 +48,7 @@ var Recharge = function Recharge(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
+            setLoading(true);
             params = {
               voucher_id: (detailData === null || detailData === void 0 ? void 0 : detailData.id) || '',
               product_id: (detailData === null || detailData === void 0 ? void 0 : detailData.product_id) || '',
@@ -57,9 +62,9 @@ var Recharge = function Recharge(_ref) {
                 currency_format: (shop === null || shop === void 0 ? void 0 : shop.currency_format) || ''
               }
             };
-            _context.next = 4;
+            _context.next = 5;
             return orderRechargeProduct(params);
-          case 4:
+          case 5:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.order_id) {
               storage === null || storage === void 0 || (_storage$set = storage.set) === null || _storage$set === void 0 || _storage$set.call(storage, 'orderId', data.order_id);
@@ -69,23 +74,28 @@ var Recharge = function Recharge(_ref) {
                 callback: function callback() {}
               });
             }
-            _context.next = 11;
+            _context.next = 12;
             break;
-          case 8:
-            _context.prev = 8;
+          case 9:
+            _context.prev = 9;
             _context.t0 = _context["catch"](0);
             console.error(locales.getText('wallet-pass-gallery.log.rechargeOrderFailed'), _context.t0);
-          case 11:
+          case 12:
+            _context.prev = 12;
+            setLoading(false);
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee, null, [[0, 9, 12, 15]]);
     }));
     return function handleRecharge() {
       return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement(Drawer, {
+    destroyOnClose: true,
     title: locales.getText('wallet-pass-gallery.rechargeOptions'),
     open: open,
     zIndex: 999,
@@ -97,7 +107,8 @@ var Recharge = function Recharge(_ref) {
       block: true,
       size: "large",
       onClick: handleRecharge,
-      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id)
+      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id),
+      loading: loading
     }, locales.getText('wallet-pass-gallery.recharge'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_recharge"

package/es/plus/walletPassGallery/index.js

@@ -3,6 +3,15 @@ var _excluded = ["id", "product_name", "balance", "code", "encoded", "expire_dat
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -18,12 +27,13 @@ import { useRequest, useInfiniteScroll } from 'ahooks';
 import { Button, Col, Row, Typography } from 'antd';
 import { Icon, PisellModal, PisellInformationEntry, PisellToast, Tabs, PisellWalletPassCard } from '@pisell/materials';
 import { locales } from '@pisell/utils';
-import { getWalletList, getUnbindList, bindCodeToCustomer, getWalletDetail } from "./serve";
+import { getWalletPassList, getUnbindList, bindCodeToCustomer, getWalletDetail, getWalletPassDetail, updateWalletPassHolder } from "./serve";
 import localeTexts from "./locales";
 import { request } from "../../utils";
 import useEngineContext from "../../hooks/useEngineContext";
 import PassList from "./components/passList";
 import PassDetail from "./components/passDetail";
+import TempHolderSelector from "../../components/walletList/tempHolderSelector";
 import "./index.less";
 var Title = Typography.Title;
 var KEYS = {
@@ -53,6 +63,16 @@ var WalletPassGallery = function WalletPassGallery(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     currentUnbindItem = _useState8[0],
     setCurrentUnbindItem = _useState8[1];
+
+  // holder 绑定相关
+  var _useState9 = useState(null),
+    _useState10 = _slicedToArray(_useState9, 2),
+    editHolderData = _useState10[0],
+    setEditHolderData = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    updateHolderLoading = _useState12[0],
+    setUpdateHolderLoading = _useState12[1];
   var context = useEngineContext();
   var utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
   var platform = useMemo(function () {
@@ -71,28 +91,31 @@ var WalletPassGallery = function WalletPassGallery(props) {
   });
   var _getAvailableList = useInfiniteScroll( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(d) {
-      var walletId, res;
+      var _searchParams, walletId, holderId, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            walletId = new URLSearchParams(window.location.search).get('id');
-            _context.next = 3;
-            return getWalletList({
+            _searchParams = new URLSearchParams(window.location.search);
+            walletId = _searchParams.get('id');
+            holderId = _searchParams.get('holder_id');
+            _context.next = 5;
+            return getWalletPassList({
               available: 1,
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
               filter_wallet_id: walletId || undefined,
-              "with": ['customScheduleSnapshot']
+              filter_holder_id: holderId || undefined,
+              with: ['holder.detail']
             });
-          case 3:
+          case 5:
             res = _context.sent;
             return _context.abrupt("return", {
               list: (res === null || res === void 0 ? void 0 : res.list) || [],
               count: (res === null || res === void 0 ? void 0 : res.count) || 0,
               nextId: (res === null || res === void 0 ? void 0 : res.skip) || 1
             });
-          case 5:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -111,28 +134,31 @@ var WalletPassGallery = function WalletPassGallery(props) {
   });
   var _getUnavailableList = useInfiniteScroll( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(d) {
-      var walletId, res;
+      var _searchParams, walletId, holderId, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            walletId = new URLSearchParams(window.location.search).get('id');
-            _context2.next = 3;
-            return getWalletList({
+            _searchParams = new URLSearchParams(window.location.search);
+            walletId = _searchParams.get('id');
+            holderId = _searchParams.get('holder_id');
+            _context2.next = 5;
+            return getWalletPassList({
               available: 0,
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
               filter_wallet_id: walletId || undefined,
-              "with": ['customScheduleSnapshot']
+              filter_holder_id: holderId || undefined,
+              with: ['holder.detail']
             });
-          case 3:
+          case 5:
             res = _context2.sent;
             return _context2.abrupt("return", {
               list: (res === null || res === void 0 ? void 0 : res.list) || [],
               count: (res === null || res === void 0 ? void 0 : res.count) || 0,
               nextId: (res === null || res === void 0 ? void 0 : res.skip) || 1
             });
-          case 5:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -150,28 +176,99 @@ var WalletPassGallery = function WalletPassGallery(props) {
   });
   useEffect(function () {
     var walletId = new URLSearchParams(window.location.search).get('id');
+    var passId = new URLSearchParams(window.location.search).get('wallet_pass_detail_id');
     if (walletId) {
       _getWalletDetail.runAsync(walletId);
     }
     var req1 = _getAvailableList.loadMoreAsync();
     var req2 = _getUnavailableList.loadMoreAsync();
-    Promise.all([req1, req2]).then(function (_ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
+    var req3 = passId ? getWalletPassDetail(passId, {
+      with: ['holder.detail']
+    }) : Promise.resolve();
+    Promise.all([req1, req2, req3]).then(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 3),
         data1 = _ref4[0],
-        data2 = _ref4[1];
-      if (platform === 'h5') return;
-      // 当 currentItemId 为空或不在当前列表中时，设置默认选中项
-      var list = (data1 === null || data1 === void 0 ? void 0 : data1.list) || [];
-      var firstAvailable = list[0];
-      if (firstAvailable) {
-        setCurrentItemId(firstAvailable.id);
-        return;
-      }
-      var list2 = (data2 === null || data2 === void 0 ? void 0 : data2.list) || [];
-      var firstUnavailable = list2[0];
-      if (firstUnavailable) {
-        setCurrentItemId(firstUnavailable.id);
-        setActiveKey('unavailable');
+        data2 = _ref4[1],
+        data3 = _ref4[2];
+      if (platform !== 'h5') {
+        var list1 = (data1 === null || data1 === void 0 ? void 0 : data1.list) || [];
+        var list2 = (data2 === null || data2 === void 0 ? void 0 : data2.list) || [];
+
+        // 如果 passId 不为空，按照 passId 逻辑处理
+        if (passId) {
+          var _data3$holder, _data3$holder2;
+          // 检查是否在列表中匹配到
+          var matchedInList1 = list1.find(function (item) {
+            return String(item.id) === passId;
+          });
+          var matchedInList2 = list2.find(function (item) {
+            return String(item.id) === passId;
+          });
+          if (matchedInList1 || matchedInList2) {
+            // 匹配到了，设置 currentItemId 为 passId
+            setCurrentItemId(Number(passId));
+            if (matchedInList2) {
+              setActiveKey('unavailable');
+            }
+          } else {
+            // 没有匹配到
+            // 如果 data3 存在，根据 unified_available_status 将其加入列表首位
+            if (data3) {
+              if (data3.unified_available_status === 1) {
+                // 加入 data1.list 首位
+                _getAvailableList.mutate(function (data) {
+                  return _objectSpread(_objectSpread({}, data), {}, {
+                    list: [data3].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : data.list) || []))
+                  });
+                });
+                setCurrentItemId(data3.id);
+              } else {
+                // 加入 data2.list 首位
+                _getUnavailableList.mutate(function (data) {
+                  return _objectSpread(_objectSpread({}, data), {}, {
+                    list: [data3].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : data.list) || []))
+                  });
+                });
+                setCurrentItemId(data3.id);
+                setActiveKey('unavailable');
+              }
+            } else {
+              // data3 不存在，按原有逻辑取下标为0的item
+              var firstAvailable = list1[0];
+              if (firstAvailable) {
+                setCurrentItemId(firstAvailable.id);
+              } else {
+                var firstUnavailable = list2[0];
+                if (firstUnavailable) {
+                  setCurrentItemId(firstUnavailable.id);
+                  setActiveKey('unavailable');
+                }
+              }
+            }
+          }
+
+          // setEditHolderData 逻辑是独立的，不管是否匹配到，只要满足条件就执行
+          if (data3 && ((_data3$holder = data3.holder) === null || _data3$holder === void 0 ? void 0 : _data3$holder.holder_type) === 'form' && !((_data3$holder2 = data3.holder) !== null && _data3$holder2 !== void 0 && _data3$holder2.holder_id)) {
+            var _data3$holder3, _data3$holder4;
+            setEditHolderData({
+              wallet_pass_detail_id: passId,
+              customer_id: (_data3$holder3 = data3.holder) === null || _data3$holder3 === void 0 ? void 0 : _data3$holder3.customer_id,
+              form_id: (_data3$holder4 = data3.holder) === null || _data3$holder4 === void 0 || (_data3$holder4 = _data3$holder4.metadata) === null || _data3$holder4 === void 0 ? void 0 : _data3$holder4.custom_id
+            });
+          }
+        } else {
+          // passId 为空时，设置默认选中项
+          var _firstAvailable = list1[0];
+          if (_firstAvailable) {
+            setCurrentItemId(_firstAvailable.id);
+          } else {
+            var _firstUnavailable = list2[0];
+            if (_firstUnavailable) {
+              setCurrentItemId(_firstUnavailable.id);
+              setActiveKey('unavailable');
+            }
+          }
+        }
       }
     });
   }, []);
@@ -219,11 +316,6 @@ var WalletPassGallery = function WalletPassGallery(props) {
     var newId = key === KEYS.unavailable ? (_unavailable$ = _unavailable[0]) === null || _unavailable$ === void 0 ? void 0 : _unavailable$.id : (_avaliable$ = _avaliable[0]) === null || _avaliable$ === void 0 ? void 0 : _avaliable$.id;
     setCurrentItemId(newId);
   };
-  var _handleMenuChange = function _handleMenuChange(key) {
-    // H5 Menu 切换逻辑
-    setActiveKey(key);
-    setCurrentItemId(undefined);
-  };
   var _resetSearchState = function _resetSearchState() {
     setCurrentUnbindItem(null);
     _getUnbindList.mutate([]);
@@ -326,6 +418,82 @@ var WalletPassGallery = function WalletPassGallery(props) {
       return _ref6.apply(this, arguments);
     };
   }();
+  var _handleHolderChange = function _handleHolderChange(passId, holder) {
+    // 查找所属列表，手动精准更新
+    if (_avaliable.find(function (item) {
+      return item.id === passId;
+    })) {
+      _getAvailableList.mutate(function (data) {
+        var newList = data.list.map(function (item) {
+          return item.id === passId ? _objectSpread(_objectSpread({}, item), {}, {
+            holder: holder
+          }) : item;
+        });
+        return _objectSpread(_objectSpread({}, data), {}, {
+          list: newList
+        });
+      });
+    } else if (_unavailable.find(function (item) {
+      return item.id === passId;
+    })) {
+      _getUnavailableList.mutate(function (data) {
+        var newList = data.list.map(function (item) {
+          return item.id === passId ? _objectSpread(_objectSpread({}, item), {}, {
+            holder: holder
+          }) : item;
+        });
+        return _objectSpread(_objectSpread({}, data), {}, {
+          list: newList
+        });
+      });
+    } else {
+      console.log('pass not found', passId);
+    }
+  };
+  var _handleBindHolder = /*#__PURE__*/function () {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(holderId) {
+      var passId, res;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            setUpdateHolderLoading(true);
+            passId = editHolderData.wallet_pass_detail_id;
+            _context5.prev = 2;
+            _context5.next = 5;
+            return updateWalletPassHolder(passId, {
+              holder_type: 'form',
+              holder_id: holderId
+            });
+          case 5:
+            res = _context5.sent;
+            setEditHolderData(null);
+            if (holderId) {
+              if (res) {
+                _handleHolderChange === null || _handleHolderChange === void 0 || _handleHolderChange(Number(passId), res);
+              }
+            } else {
+              _handleHolderChange === null || _handleHolderChange === void 0 || _handleHolderChange(Number(passId), null);
+            }
+            _context5.next = 13;
+            break;
+          case 10:
+            _context5.prev = 10;
+            _context5.t0 = _context5["catch"](2);
+            console.error('Error updating wallet pass holder:', _context5.t0);
+          case 13:
+            _context5.prev = 13;
+            setUpdateHolderLoading(false);
+            return _context5.finish(13);
+          case 16:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[2, 10, 13, 16]]);
+    }));
+    return function _handleBindHolder(_x4) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
   var _currentItem = useMemo(function () {
     if (!currentItemId) return null;
     var found1 = _avaliable.find(function (item) {
@@ -358,7 +526,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
         hasMore: !_getAvailableList.noMore,
         dataSource: _avaliable,
         value: currentItemId,
-        onChange: _handleCardClick
+        onChange: _handleCardClick,
+        onEditHolder: setEditHolderData
       });
     }
     return /*#__PURE__*/React.createElement(ARow, {
@@ -374,7 +543,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
       hasMore: !_getAvailableList.noMore,
       dataSource: _avaliable,
       value: currentItemId,
-      onChange: _handleCardClick
+      onChange: _handleCardClick,
+      onEditHolder: setEditHolderData
     })), /*#__PURE__*/React.createElement(ACol, {
       flex: "auto"
     }, /*#__PURE__*/React.createElement(PassDetail, {
@@ -392,7 +562,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
         loading: _getUnavailableList.loadingMore,
         dataSource: _unavailable,
         value: currentItemId,
-        onChange: _handleCardClick
+        onChange: _handleCardClick,
+        onEditHolder: setEditHolderData
       });
     }
     return /*#__PURE__*/React.createElement(ARow, {
@@ -408,7 +579,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
       loading: _getUnavailableList.loadingMore,
       dataSource: _unavailable,
       value: currentItemId,
-      onChange: _handleCardClick
+      onChange: _handleCardClick,
+      onEditHolder: setEditHolderData
     })), /*#__PURE__*/React.createElement(ACol, {
       flex: "auto"
     }, /*#__PURE__*/React.createElement(PassDetail, {
@@ -554,7 +726,9 @@ var WalletPassGallery = function WalletPassGallery(props) {
       },
       block: true
     }, locales.getText('wallet-pass-gallery.button.add'))), /*#__PURE__*/React.createElement(PisellModal, {
-      platform: 'h5',
+      zIndex: 997,
+      destroyOnClose: true,
+      platform: platform,
       visible: !!_currentItem,
       onCancel: function onCancel() {
         return setCurrentItemId('');
@@ -599,6 +773,16 @@ var WalletPassGallery = function WalletPassGallery(props) {
     searchDescribe: locales.getText('wallet-pass-gallery.searchDescribe'),
     onChange: _handleSearchByCode,
     onChangeType: _resetSearchState
-  }), (_getUnbindList.data || []).map(renderSearchCard))));
+  }), (_getUnbindList.data || []).map(renderSearchCard))), !!editHolderData && /*#__PURE__*/React.createElement(TempHolderSelector, {
+    visible: true,
+    onCancel: function onCancel() {
+      setEditHolderData(null);
+    },
+    onConfirm: _handleBindHolder,
+    confirmLoading: updateHolderLoading,
+    formId: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.form_id,
+    customerId: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.customer_id,
+    value: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.holder_id
+  }));
 };
 export default WalletPassGallery;

package/es/plus/walletPassGallery/locales.d.ts

@@ -87,6 +87,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
     'zh-CN': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -176,6 +181,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
     'zh-HK': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -265,6 +275,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
 };
 export default _default;

package/es/plus/walletPassGallery/locales.js

@@ -92,7 +92,15 @@ export default {
     'wallet-pass-gallery.monthlyReset': 'Counter resets on 1st of each month at midnight',
     'wallet-pass-gallery.voucherExpireNote': 'Voucher will automatically expire when limit is reached',
     'wallet-pass-gallery.viewMore': 'View More',
-    'wallet-pass-gallery.allLoaded': 'All loaded'
+    'wallet-pass-gallery.allLoaded': 'All loaded',
+    // TempHolderSelector
+    'page.wallet.tempHolderSelector.title': 'Edit Holder',
+    'page.wallet.tempHolderSelector.create': 'Create New',
+    'page.wallet.tempHolderSelector.confirm': 'Confirm',
+    // temp
+    'page.wallet.notValidDate': 'Not valid on',
+    // 不可用日期
+    'page.wallet.includedDate': 'Included dates' // 包含日期
   },
   'zh-CN': {
     'wallet-pass-gallery.rechargeableCard': '充值卡',
@@ -167,7 +175,7 @@ export default {
     'wallet-pass-gallery.loading': '正在加载钱包...',
     'wallet-pass-gallery.usageRules': '使用规则',
     'wallet-pass-gallery.usageRulesSubtitle': '请仔细阅读以下使用条件',
-    'wallet-pass-gallery.timeUsageLimits': '时间使用限制',
+    'wallet-pass-gallery.timeUsageLimits': '使用频次限制',
     'wallet-pass-gallery.totalQuantityControl': '总量控制',
     'wallet-pass-gallery.dailyLimit': '每日限制:',
     'wallet-pass-gallery.weeklyLimit': '每周限制:',
@@ -183,7 +191,15 @@ export default {
     'wallet-pass-gallery.monthlyReset': '每月1号0点自动重置计数',
     'wallet-pass-gallery.voucherExpireNote': '用完后此券将自动失效',
     'wallet-pass-gallery.viewMore': '查看更多',
-    'wallet-pass-gallery.allLoaded': '已全部加载'
+    'wallet-pass-gallery.allLoaded': '已全部加载',
+    // TempHolderSelector
+    'page.wallet.tempHolderSelector.title': '编辑持有人',
+    'page.wallet.tempHolderSelector.create': '创建新持有人',
+    'page.wallet.tempHolderSelector.confirm': '确定',
+    // temp
+    'page.wallet.notValidDate': '不可用日期',
+    // 不可用日期
+    'page.wallet.includedDate': '包含日期' // 包含日期
   },
   'zh-HK': {
     'wallet-pass-gallery.rechargeableCard': '充值卡',
@@ -258,7 +274,7 @@ export default {
     'wallet-pass-gallery.loading': '正在加載錢包...',
     'wallet-pass-gallery.usageRules': '使用規則',
     'wallet-pass-gallery.usageRulesSubtitle': '請仔細閱讀以下使用條件',
-    'wallet-pass-gallery.timeUsageLimits': '時間使用限制',
+    'wallet-pass-gallery.timeUsageLimits': '使用頻次限制',
     'wallet-pass-gallery.totalQuantityControl': '總量控制',
     'wallet-pass-gallery.dailyLimit': '每日限制:',
     'wallet-pass-gallery.weeklyLimit': '每週限制:',
@@ -274,6 +290,14 @@ export default {
     'wallet-pass-gallery.monthlyReset': '每月1號0點自動重置計數',
     'wallet-pass-gallery.voucherExpireNote': '用完後此券將自動失效',
     'wallet-pass-gallery.viewMore': '查看更多',
-    'wallet-pass-gallery.allLoaded': '已全部加載'
+    'wallet-pass-gallery.allLoaded': '已全部加載',
+    // TempHolderSelector
+    'page.wallet.tempHolderSelector.title': '編輯持有人',
+    'page.wallet.tempHolderSelector.create': '創建新持有人',
+    'page.wallet.tempHolderSelector.confirm': '確定',
+    // temp
+    'page.wallet.notValidDate': '不可用日期',
+    // 不可用日期
+    'page.wallet.includedDate': '包含日期' // 包含日期
   }
 };