@pisell/private-materials 3.4.61 → 3.4.63

package/es/components/walletList/index.js

@@ -18,16 +18,18 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // app
 import React, { useEffect, useContext, useRef, useState, useCallback, useMemo } from 'react';
 import { Provider, Context } from "./model";
-import { WalletCard, Carousel } from '@pisell/materials';
+import { Carousel, WalletCard } from '@pisell/materials';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import useEngineContext from "./../../hooks/useEngineContext";
-import { getWalletList, batchGetWalletBalance, getWalletShopList } from "./serve";
+import { getWalletList, batchGetWalletBalance, getWalletShopList, updateWalletHolder } from "./serve";
 import { locales, getUniqueId } from '@pisell/utils';
 import { request } from "./../../utils";
 import { defaultWalletGuideConfig } from "./status";
 import localeTexts from "./locales";
 import "./index.less";
 import classNames from 'classnames';
+import TempHolderSelector from "./tempHolderSelector";
+
 // 导入所有类型
 import { DEFAULT_CARD_CONFIG } from "./types";
 import PinModal from "../pinModal";
@@ -170,7 +172,8 @@ var DEFAULT_BALANCE = {
   gift_card_balance: 0,
   point_card_balance: 0,
   voucher_count: 0,
-  discount_card_count: 0
+  discount_card_count: 0,
+  good_pass_count: 0
 };
 var WalletList = Provider(function (props) {
   var _utils$getStore, _context$engine, _store$getState;
@@ -204,6 +207,20 @@ var WalletList = Provider(function (props) {
     walletShopList = _useState4[0],
     setWalletShopList = _useState4[1];
 
+  // 新增持有人选择器状态
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    editHolderVisible = _useState6[0],
+    setEditHolderVisible = _useState6[1];
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    editHolderData = _useState8[0],
+    setEditHolderData = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    updateHolderLoading = _useState10[0],
+    setUpdateHolderLoading = _useState10[1];
+
   // 添加一个请求ID引用，用于去重
   var requestIdRef = useRef('');
   var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
@@ -423,7 +440,7 @@ var WalletList = Provider(function (props) {
   };
   var initData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(requestId) {
-      var cachedList, cachedBalance, walletListData, walletBalanceData, _message, _data, isAuthError;
+      var cachedList, cachedBalance, tempList, walletListData, walletBalanceData, _message, _data, isAuthError, walletDetailId, found, _carouselRef$current, _found$holder, _found$holder2, _found$holder3, _found$holder4;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -483,29 +500,30 @@ var WalletList = Provider(function (props) {
                 hasAttempted: false
               });
             }
-            _context3.prev = 13;
+            tempList = [];
+            _context3.prev = 14;
             if (isMountedRef.current) {
-              _context3.next = 16;
+              _context3.next = 17;
               break;
             }
             return _context3.abrupt("return");
-          case 16:
-            _context3.next = 18;
+          case 17:
+            _context3.next = 19;
             return getWalletList();
-          case 18:
+          case 19:
             walletListData = _context3.sent;
-            _context3.next = 21;
+            _context3.next = 22;
             return batchGetWalletBalance(walletListData.map(function (item) {
               return item.wallet_id;
             }));
-          case 21:
+          case 22:
             walletBalanceData = _context3.sent;
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
-              _context3.next = 24;
+              _context3.next = 25;
               break;
             }
             return _context3.abrupt("return");
-          case 24:
+          case 25:
             // 如果获取到有效数据，保存到 localStorage
             if (walletListData) {
               try {
@@ -580,10 +598,11 @@ var WalletList = Provider(function (props) {
                         balance: retryBalanceData,
                         hasAttempted: true
                       });
-                      _context2.next = 21;
+                      tempList = retryListData || [];
+                      _context2.next = 23;
                       break;
-                    case 18:
-                      _context2.prev = 18;
+                    case 19:
+                      _context2.prev = 19;
                       _context2.t0 = _context2["catch"](2);
                       // 重试出错也视为最终结果
                       setState({
@@ -591,11 +610,12 @@ var WalletList = Provider(function (props) {
                         balance: walletBalanceData,
                         hasAttempted: true
                       });
-                    case 21:
+                      tempList = walletListData || [];
+                    case 23:
                     case "end":
                       return _context2.stop();
                   }
-                }, _callee2, null, [[2, 18]]);
+                }, _callee2, null, [[2, 19]]);
               })), 2000);
             } else {
               // 如果两个请求都有数据，直接使用结果
@@ -604,18 +624,19 @@ var WalletList = Provider(function (props) {
                 balance: walletBalanceData,
                 hasAttempted: true
               });
+              tempList = walletListData || [];
             }
-            _context3.next = 35;
+            _context3.next = 36;
             break;
-          case 29:
-            _context3.prev = 29;
-            _context3.t0 = _context3["catch"](13);
+          case 30:
+            _context3.prev = 30;
+            _context3.t0 = _context3["catch"](14);
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
-              _context3.next = 33;
+              _context3.next = 34;
               break;
             }
             return _context3.abrupt("return");
-          case 33:
+          case 34:
             // 判断是否是登录超时错误
             isAuthError = (_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 4001 || (_context3.t0 === null || _context3.t0 === void 0 || (_message = _context3.t0.message) === null || _message === void 0 ? void 0 : _message.includes('login time out')) || (_context3.t0 === null || _context3.t0 === void 0 || (_data = _context3.t0.data) === null || _data === void 0 ? void 0 : _data.code) === 4001;
             setState({
@@ -623,16 +644,106 @@ var WalletList = Provider(function (props) {
               authError: isAuthError,
               hasAttempted: true
             });
-          case 35:
+          case 36:
+            // 自动定位
+            walletDetailId = new URLSearchParams(window.location.search).get('wallet_detail_id');
+            if (walletDetailId) {
+              found = tempList.find(function (item) {
+                return String(item.id) === walletDetailId;
+              });
+              if (found) {
+                setCurrentIndex(tempList.indexOf(found));
+                (_carouselRef$current = carouselRef.current) === null || _carouselRef$current === void 0 || _carouselRef$current.goTo(tempList.indexOf(found), true);
+                // 如果holder_type为form，且holder_id为空，则设置编辑持有人
+                if (((_found$holder = found.holder) === null || _found$holder === void 0 ? void 0 : _found$holder.holder_type) === 'form' && !((_found$holder2 = found.holder) !== null && _found$holder2 !== void 0 && _found$holder2.holder_id)) {
+                  setEditHolderData({
+                    wallet_record_id: found.id,
+                    customer_id: (_found$holder3 = found.holder) === null || _found$holder3 === void 0 ? void 0 : _found$holder3.customer_id,
+                    form_id: ((_found$holder4 = found.holder) === null || _found$holder4 === void 0 || (_found$holder4 = _found$holder4.metadata) === null || _found$holder4 === void 0 ? void 0 : _found$holder4.custom_id) || ''
+                  });
+                  setEditHolderVisible(true);
+                }
+              }
+            }
+          case 38:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[13, 29]]);
+      }, _callee3, null, [[14, 30]]);
     }));
     return function initData(_x) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var onBindHolder = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(holderId) {
+      var res, newList;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (editHolderData !== null && editHolderData !== void 0 && editHolderData.wallet_record_id) {
+              _context4.next = 3;
+              break;
+            }
+            console.error('wallet_record_id is required');
+            return _context4.abrupt("return");
+          case 3:
+            setUpdateHolderLoading(true);
+            _context4.prev = 4;
+            _context4.next = 7;
+            return updateWalletHolder(editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.wallet_record_id, {
+              holder_id: holderId,
+              holder_type: 'form'
+            });
+          case 7:
+            res = _context4.sent;
+            setEditHolderVisible(false);
+            setEditHolderData(null);
+            newList = list; // 有holderId, 但是没有返回结果，说明holder没有变化
+            if (holderId) {
+              if (res) {
+                newList = newList.map(function (item) {
+                  if (item.id === (editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.wallet_record_id)) {
+                    return _objectSpread(_objectSpread({}, item), {}, {
+                      holder: res
+                    });
+                  }
+                  return item;
+                });
+              }
+            } else {
+              newList = newList.map(function (item) {
+                if (item.id === (editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.wallet_record_id)) {
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    holder: null
+                  });
+                }
+                return item;
+              });
+            }
+            setState({
+              list: newList
+            });
+            _context4.next = 18;
+            break;
+          case 15:
+            _context4.prev = 15;
+            _context4.t0 = _context4["catch"](4);
+            console.error('Error updating wallet holder:', _context4.t0);
+          case 18:
+            _context4.prev = 18;
+            setUpdateHolderLoading(false);
+            return _context4.finish(18);
+          case 21:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[4, 15, 18, 21]]);
+    }));
+    return function onBindHolder(_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   var _onViewPinClick = function onViewPinClick(card) {
     if (card !== null && card !== void 0 && card.id) {
       var _pinModalRef$current;
@@ -646,17 +757,19 @@ var WalletList = Provider(function (props) {
     var code = item.code,
       shop = item.shop,
       wallet = item.wallet,
-      id = item.id;
-    var _ref5 = wallet || {},
-      metadata = _ref5.metadata,
-      name = _ref5.name;
-    var _ref6 = metadata || {},
-      _ref6$showcaseWalletP = _ref6.showcaseWalletPassNew,
-      showcaseWalletPassNew = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
-      _ref6$coverImage = _ref6.coverImage,
-      coverImage = _ref6$coverImage === void 0 ? '' : _ref6$coverImage,
-      _ref6$icon = _ref6.icon,
-      icon = _ref6$icon === void 0 ? '' : _ref6$icon;
+      id = item.id,
+      customer_id = item.customer_id,
+      holder = item.holder;
+    var _ref6 = wallet || {},
+      metadata = _ref6.metadata,
+      name = _ref6.name;
+    var _ref7 = metadata || {},
+      _ref7$showcaseWalletP = _ref7.showcaseWalletPassNew,
+      showcaseWalletPassNew = _ref7$showcaseWalletP === void 0 ? [] : _ref7$showcaseWalletP,
+      _ref7$coverImage = _ref7.coverImage,
+      coverImage = _ref7$coverImage === void 0 ? '' : _ref7$coverImage,
+      _ref7$icon = _ref7.icon,
+      icon = _ref7$icon === void 0 ? '' : _ref7$icon;
     var shopName = shop.name;
     var _state$balance = state.balance,
       balance = _state$balance === void 0 ? [] : _state$balance;
@@ -664,7 +777,7 @@ var WalletList = Provider(function (props) {
       return bi.wallet_id == item.wallet_id;
     }) || DEFAULT_BALANCE;
 
-    // 字段映射关系
+    // 字段映射关系 voucher 需要额外处理 good_pass_count(@date: 251229)
     var _balanceKeyMap = {
       rechargeable: 'gift_card_balance',
       point: 'point_card_balance',
@@ -674,6 +787,10 @@ var WalletList = Provider(function (props) {
     var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
       var balanceKey = _balanceKeyMap[showCaseItem.type];
       var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      // voucher 类型需要额外处理 good_pass_count
+      if (showCaseItem.type === 'voucher') {
+        value += balanceItem.good_pass_count || 0;
+      }
       return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
       });
@@ -692,7 +809,18 @@ var WalletList = Provider(function (props) {
       // codeType: barcodetype,
       items: cardItems.slice(0, 4),
       customBackgroundImage: coverImage,
-      isLogin: isUserLoggedIn // 添加登录状态
+      isLogin: isUserLoggedIn,
+      // 添加登录状态
+      holder: holder,
+      onSetHolder: function onSetHolder() {
+        var _holder$metadata;
+        setEditHolderData({
+          wallet_record_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
+        });
+        setEditHolderVisible(true);
+      }
     });
     return /*#__PURE__*/React.createElement(WalletCard, _extends({
       key: id
@@ -865,8 +993,19 @@ var WalletList = Provider(function (props) {
   };
 
   // 最终返回组件内容
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "wallet-list-wrapper"
-  }, renderContent());
+  }, renderContent()), editHolderVisible && /*#__PURE__*/React.createElement(TempHolderSelector, {
+    visible: true,
+    value: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.holder_id,
+    formId: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.form_id,
+    customerId: editHolderData === null || editHolderData === void 0 ? void 0 : editHolderData.customer_id,
+    onConfirm: onBindHolder,
+    onCancel: function onCancel() {
+      setEditHolderVisible(false);
+      setEditHolderData(null);
+    },
+    confirmLoading: updateHolderLoading
+  }));
 });
 export default WalletList;

package/es/components/walletList/locales.js

@@ -2,16 +2,25 @@ export default {
   "en": {
     'page.wallet.guide.title': 'Activate Now!',
     'page.wallet.guide.subtitle': 'Unlock membership benefits now',
-    'page.wallet.guide.button': 'Get Your Reward'
+    'page.wallet.guide.button': 'Get Your Reward',
+    'page.wallet.tempHolderSelector.title': 'Set Holder',
+    'page.wallet.tempHolderSelector.create': 'Create New',
+    'page.wallet.tempHolderSelector.confirm': 'Confirm'
   },
   'zh-CN': {
     'page.wallet.guide.title': '待解锁权益',
     'page.wallet.guide.subtitle': '成为专属会员，即可享受更多权益',
-    'page.wallet.guide.button': '点击获取'
+    'page.wallet.guide.button': '点击获取',
+    'page.wallet.tempHolderSelector.title': '添加持有人',
+    'page.wallet.tempHolderSelector.create': '创建新持有人',
+    'page.wallet.tempHolderSelector.confirm': '确定'
   },
   'zh-HK': {
     'page.wallet.guide.title': '待解鎖權益',
     'page.wallet.guide.subtitle': '成為專屬會員，即可享受更多權益',
-    'page.wallet.guide.button': '點擊獲取'
+    'page.wallet.guide.button': '點擊獲取',
+    'page.wallet.tempHolderSelector.title': '添加持有人',
+    'page.wallet.tempHolderSelector.create': '創建新持有人',
+    'page.wallet.tempHolderSelector.confirm': '確定'
   }
 };

package/es/components/walletList/model.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import { State, WalletListContextType } from './types';
 export declare const initialState: State;
 export declare const Context: React.Context<WalletListContextType>;
-export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => JSX.Element;
+export declare const Provider: (Component: React.ComponentType<any>) => (props: any) => React.JSX.Element;
 export * from './types';

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

@@ -22,3 +22,22 @@ export declare const batchGetWalletBalance: (walletIds: string[]) => Promise<Rec
  * @Date: 2025-06-09 11:12
  */
 export declare const getWalletShopList: (params: any) => Promise<any>;
+/**
+ * @title: 获取持有人列表
+ * @description: 获取持有人列表
+ * @param params 查询参数
+ * @returns 持有人列表
+ */
+export declare const getHolderList: (params: any) => Promise<any>;
+/**
+ * 更新持有人
+ * @param params 更新参数
+ * @returns 更新结果
+ */
+export declare const updateWalletHolder: (id: string, params: any) => Promise<any>;
+/**
+ * 获取表单配置
+ * @param formId 表单ID
+ * @returns 表单配置
+ */
+export declare const getFormConfig: (formId: string) => Promise<any>;

package/es/components/walletList/serve.js

@@ -5,8 +5,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { request } from "./../../utils";
 /**
  * 获取 wallet 列表
- * @param params 
- * @returns 
+ * @param params
+ * @returns
  */
 export var getWalletList = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -16,7 +16,9 @@ export var getWalletList = /*#__PURE__*/function () {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return request.getRequest().get('/h5/wallet', {});
+          return request.getRequest().get('/h5/wallet', {
+            with: ['holder.detail']
+          });
         case 3:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;
@@ -38,7 +40,7 @@ export var getWalletList = /*#__PURE__*/function () {
 
 /**
  * 获取钱包余额
- * @returns 
+ * @returns
  */
 export var getWalletBalance = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -103,7 +105,7 @@ export var batchGetWalletBalance = /*#__PURE__*/function () {
 
 /**
  * @title: 获取钱包店铺列表
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-06-09 11:12
@@ -137,4 +139,91 @@ export var getWalletShopList = /*#__PURE__*/function () {
   return function getWalletShopList(_x2) {
     return _ref4.apply(this, arguments);
   };
+}();
+
+/**
+ * @title: 获取持有人列表
+ * @description: 获取持有人列表
+ * @param params 查询参数
+ * @returns 持有人列表
+ */
+export var getHolderList = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.prev = 0;
+          _context5.next = 3;
+          return request.getRequest().get('/h5/form/data/v1', params || {});
+        case 3:
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
+          return _context5.abrupt("return", data || null);
+        case 8:
+          _context5.prev = 8;
+          _context5.t0 = _context5["catch"](0);
+        case 10:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5, null, [[0, 8]]);
+  }));
+  return function getHolderList(_x3) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
+/**
+ * 更新持有人
+ * @param params 更新参数
+ * @returns 更新结果
+ */
+export var updateWalletHolder = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id, params) {
+    var _yield$request$getReq6, data;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.prev = 0;
+          _context6.next = 3;
+          return request.getRequest().post("/h5/wallet/detail/".concat(id, "/bind-holder"), params || {});
+        case 3:
+          _yield$request$getReq6 = _context6.sent;
+          data = _yield$request$getReq6.data;
+          return _context6.abrupt("return", data || null);
+        case 8:
+          _context6.prev = 8;
+          _context6.t0 = _context6["catch"](0);
+        case 10:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6, null, [[0, 8]]);
+  }));
+  return function updateWalletHolder(_x4, _x5) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+/**
+ * 获取表单配置
+ * @param formId 表单ID
+ * @returns 表单配置
+ */
+export var getFormConfig = /*#__PURE__*/function () {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formId) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          return _context7.abrupt("return", request.getRequest().get("/h5/form/".concat(formId), {}));
+        case 1:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return function getFormConfig(_x6) {
+    return _ref7.apply(this, arguments);
+  };
 }();

package/es/components/walletList/tempHolderSelector/index.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+import './index.less';
+export declare const getAvatarText: (name: string) => string;
+interface ITempHolderSelectorProps {
+    visible: boolean;
+    value: any;
+    formId: string;
+    customerId: string;
+    onConfirm: (value: any) => void;
+    onCancel: () => void;
+    confirmLoading: boolean;
+}
+export default function TempHolderSelector(props: ITempHolderSelectorProps): React.JSX.Element;
+export {};