@pisell/private-materials 3.3.53 → 3.3.56

package/es/components/pay/toC/utils.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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); }
 import { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
 /**
@@ -90,4 +96,19 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
+};
+export var clientPayment = function clientPayment(params) {
+  var _interaction$utils, _interaction$utils$po;
+  var interaction = params.interaction,
+    type = params.type,
+    order_id = params.order_id,
+    values = params.values;
+  interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+    module: 'global',
+    key: 'paymentClient',
+    data: _objectSpread({
+      type: type,
+      order_id: order_id
+    }, values)
+  });
 };

package/es/components/wallet/index.js

@@ -1,4 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }); }; }
@@ -297,6 +303,16 @@ var Wallet = Provider(function () {
       count: count
     })), /*#__PURE__*/React.createElement(RightOutlined, null));
   };
+  var mergeSearch = function mergeSearch(currentSearch, params) {
+    var searchParams = new URLSearchParams(currentSearch);
+    Object.entries(params).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+        key = _ref5[0],
+        value = _ref5[1];
+      searchParams.set(key, value);
+    });
+    return searchParams.toString();
+  };
 
   /**
    * 创建Menu组件的配置
@@ -304,6 +320,13 @@ var Wallet = Provider(function () {
   var MenuProps = {
     className: 'pisell-lowcode-wallet-menu',
     onClick: function onClick(e) {
+      var _context$appHelper$ut;
+      (_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.history) === null || _context$appHelper$ut === void 0 || _context$appHelper$ut.push({
+        hash: location.hash,
+        search: mergeSearch(location.search, {
+          type: 'list'
+        })
+      });
       dispatch({
         type: 'setState',
         payload: {
@@ -341,6 +364,27 @@ var Wallet = Provider(function () {
     }]
   };
 
+  // 监听路由 type变化 dispatch更新setup
+  useEffect(function () {
+    var searchParams = new URLSearchParams(location.search);
+    var type = searchParams.get('type');
+    if (type) {
+      dispatch({
+        type: 'setState',
+        payload: {
+          setup: type
+        }
+      });
+    } else {
+      dispatch({
+        type: 'setState',
+        payload: {
+          setup: 'menu'
+        }
+      });
+    }
+  }, [location.search]);
+
   /**
    * 处理返回按钮点击
    */
@@ -356,6 +400,7 @@ var Wallet = Provider(function () {
           setup: prevSetup
         }
       });
+      history.back(); // 后退到上一步
     }
   };
 
@@ -390,7 +435,7 @@ var Wallet = Provider(function () {
    * @param code 钱包代码
    */
   var addWallet = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(code) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(code) {
       var onError, data, tagMap, cardType, successMessage;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -452,7 +497,7 @@ var Wallet = Provider(function () {
       }, _callee2);
     }));
     return function addWallet(_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -460,7 +505,7 @@ var Wallet = Provider(function () {
    * 搜索钱包
    */
   var handleSearch = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var code,
         resetSearchState,
         onSearchFail,
@@ -528,7 +573,7 @@ var Wallet = Provider(function () {
       }, _callee3, null, [[6, 13]]);
     }));
     return function handleSearch() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -607,9 +652,10 @@ var Wallet = Provider(function () {
    * 渲染移动端布局
    */
   var renderMobileLayout = function renderMobileLayout() {
+    var _utils$interaction, _utils$interaction$is;
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode-wallet-mobile"
-    }, /*#__PURE__*/React.createElement(WalletBar, {
+    }, !(utils !== null && utils !== void 0 && (_utils$interaction = utils.interaction) !== null && _utils$interaction !== void 0 && (_utils$interaction = _utils$interaction.utils) !== null && _utils$interaction !== void 0 && (_utils$interaction$is = _utils$interaction.isAppEnv) !== null && _utils$interaction$is !== void 0 && _utils$interaction$is.call(_utils$interaction)) && /*#__PURE__*/React.createElement(WalletBar, {
       setup: setup,
       onBack: onBack
     }), /*#__PURE__*/React.createElement("div", {

package/lib/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/lib/components/appointmentBooking/components/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/lib/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/lib/components/booking/info/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/eventBooking/components/Provider/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/lib/components/eventBooking/components/progressBar/index.js

@@ -37,6 +37,7 @@ var import_materials = require("@pisell/materials");
 var import_Sales = require("../../../Sales");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var ProgressBar = ({
   title,
   description,
@@ -48,8 +49,11 @@ var ProgressBar = ({
   onBack,
   onClose
 }) => {
+  var _a;
   const [open, setOpen] = (0, import_react.useState)(false);
   const { removeSessionStorage } = (0, import_Sales.useSales)();
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const handleClose = () => {
     if (isConfirmClose) {
       setOpen(true);
@@ -58,6 +62,17 @@ var ProgressBar = ({
     }
   };
   const handleOk = () => {
+    var _a2, _b;
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      interaction.utils.postMessageToApp({
+        module: "global",
+        key: "paymentResultAction",
+        data: {
+          actionType: "backHome"
+        }
+      });
+      return;
+    }
     onClose == null ? void 0 : onClose();
     setOpen(false);
     removeSessionStorage == null ? void 0 : removeSessionStorage();

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const EventBooking: () => JSX.Element;
 export default EventBooking;

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

@@ -46,19 +46,20 @@ var offline = [
   "pisell.custom_payment"
 ];
 var PaymentList = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c;
   const [paymentList, setPaymentList] = (0, import_react.useState)([]);
   const [paymentType, setPaymentType] = (0, import_react.useState)("");
   const [loading, setLoading] = (0, import_react.useState)(true);
   const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const _paymentList = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = props == null ? void 0 : props.store) == null ? void 0 : _a2.paymentList) || paymentList;
-  }, [paymentList, (_a = props == null ? void 0 : props.store) == null ? void 0 : _a.paymentList]);
+  }, [paymentList, (_b = props == null ? void 0 : props.store) == null ? void 0 : _b.paymentList]);
   const _paymentType = (0, import_react.useMemo)(() => {
     var _a2;
     return ((_a2 = props == null ? void 0 : props.store) == null ? void 0 : _a2.paymentType) || paymentType;
-  }, [paymentType, (_b = props == null ? void 0 : props.store) == null ? void 0 : _b.paymentType]);
+  }, [paymentType, (_c = props == null ? void 0 : props.store) == null ? void 0 : _c.paymentType]);
   const _getPaymentList = async (initProps) => {
     var _a2;
     setLoading(true);
@@ -85,11 +86,15 @@ var PaymentList = (props, ref) => {
     setPaymentList(list);
     return list;
   };
+  const isApp = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2);
+  }, []);
   const init = (list) => {
     var _a2, _b2;
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
-    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform);
+    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform, isApp);
     if (paymentList2.length > 0) {
       let first = paymentList2[0];
       setPaymentList(paymentList2);
@@ -131,13 +136,13 @@ var PaymentList = (props, ref) => {
     })
   );
   const renderToast = (_item) => {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c2;
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "surcharge-modal-title" }, _item.title + " " + (((_a2 = _item == null ? void 0 : _item.params) == null ? void 0 : _a2.description) ? import_utils2.locales.getText("tocPay.text.paymentInstructions") : import_utils2.locales.getText("tocPay.text.serviceCharge"))), /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "surcharge-info",
         dangerouslySetInnerHTML: {
-          __html: ((_b2 = _item == null ? void 0 : _item.params) == null ? void 0 : _b2.description) ? (_c = _item == null ? void 0 : _item.params) == null ? void 0 : _c.description : _item.surcharge_fee
+          __html: ((_b2 = _item == null ? void 0 : _item.params) == null ? void 0 : _b2.description) ? (_c2 = _item == null ? void 0 : _item.params) == null ? void 0 : _c2.description : _item.surcharge_fee
         }
       }
     ));

package/lib/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform?: string) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
     message: string;
     status: string;
     paymentList: any[];

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

@@ -31,12 +31,12 @@ var getPaymentList = async (values) => {
   let { data = [] } = await import_utils.request.getRequest().get("/h5/pay/order/payments", values);
   return filterPaymentList(data);
 };
-var filterPaymentList = (list, platform = "h5") => {
+var filterPaymentList = (list, platform = "h5", isApp) => {
   let paymentList = [...list];
   let _paymentKeys = [...import_status.paymentKeys];
   const walletPass = paymentList.find((d) => d.service === "pisell.wallet_pass");
   let arr = [];
-  if (!(0, import_utils2.isWx)()) {
+  if (!(0, import_utils2.isWx)() && !isApp) {
     arr = arr.concat(["globepay.wechat.jsapi", "superpay.wechat.h5"]);
   }
   if (platform === "h5") {
@@ -45,6 +45,9 @@ var filterPaymentList = (list, platform = "h5") => {
   if (!(0, import_utils2.isIOS)()) {
     arr = arr.concat(["mw.apple"]);
   }
+  if ((0, import_utils2.isIOS)() && isApp) {
+    arr = arr.concat(["mw.google"]);
+  }
   _paymentKeys = _paymentKeys.filter((d) => !arr.includes(d));
   paymentList = paymentList.filter(
     (d) => _paymentKeys.includes(d.service)

package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js

@@ -39,12 +39,21 @@ var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoadi
 var import_serve = require("./serve");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var SuperPayAliPayH5 = (props, ref) => {
+  var _a;
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ payGroup }) => {
-    setOpen(true);
+    var _a2, _b;
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "aliPay", values, interaction });
+    }
+    setOpen(true);
     if (!values) {
       setOpen(false);
       return;

package/lib/components/pay/toC/PaymentMethods/SuperPayWxPayH5/index.js

@@ -39,11 +39,20 @@ var import_serve = require("./serve");
 var import_payGroup = require("../../payGroup");
 var import_index = require("./index.less");
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("../../utils");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var SuperPayWxPayH5 = (props, ref) => {
+  var _a;
   const [open, setOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ payGroup }) => {
-    setOpen(true);
+    var _a2, _b;
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
+    if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "wxPay", values, interaction });
+    }
+    setOpen(true);
     if (!values) {
       setOpen(false);
       return;

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

@@ -51,6 +51,9 @@ var import_GlobePayWxH5 = __toESM(require("./GlobePayWxH5"));
 var import_GlobePayQrcode = __toESM(require("./GlobePayQrcode"));
 var import_serve = require("./WalletPass/serve");
 var import_utils = require("../utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("@pisell/utils");
+var import_serve2 = require("./GlobePayQrcode/serve");
 var isOfflinePayment = (type) => {
   if ((0, import_status.isCustomPayment)(type)) {
     return true;
@@ -63,6 +66,7 @@ var isOfflinePayment = (type) => {
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
+  var _a;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -77,10 +81,12 @@ var PaymentMethods = (props, ref) => {
   const GlobePayPaypalH5Ref2 = (0, import_react.useRef)(null);
   const GlobePayWxH5Ref2 = (0, import_react.useRef)(null);
   const GlobePayQrcodeRef2 = (0, import_react.useRef)(null);
+  const context = (0, import_useEngineContext.default)();
+  const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ type, payGroup }) => {
-    var _a, _b;
+    var _a2, _b;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
-    const cards = (_b = (_a = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a.cards) == null ? void 0 : _b.length;
+    const cards = (_b = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b.length;
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -110,11 +116,29 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
+  (0, import_react.useEffect)(() => {
+    var _a2, _b, _c, _d;
+    console.log("paymentResult isAppEnv", (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2));
+    if ((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) {
+      interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
+        console.log("paymentResult", strResult);
+        if (!(0, import_utils2.isJson)(strResult)) return;
+        const result = JSON.parse(strResult);
+        const { type, pay_number, order_id } = result;
+        if (type && order_id && pay_number) {
+          (0, import_payGroup.setPayNumber)(order_id, pay_number);
+        }
+        const url = `${(0, import_serve2.getReturnUrl)()}?order_id=${order_id}&status=success`;
+        console.log(url, "paymentResult");
+        window.location.href = url;
+      });
+    }
+  }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
-      await ((_a = ApplePayRef2.current) == null ? void 0 : _a.init({ payGroup }));
+      await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
       return;
     }
     if (type === "mw.google") {

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/lib/components/pay/toC/WalletPassBlock/index.less

@@ -10,6 +10,10 @@
       display: flex;
       align-items: center;
       justify-content: center;
+      & > span:first-child {
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
 

package/lib/components/pay/toC/index.js

@@ -70,7 +70,7 @@ var ToCPay = (props, ref) => {
   import_utils.locales.init(import_locales.default, ((_m = dvaStore.core) == null ? void 0 : _m.translateLocale) || "en");
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   const _initStore = (initProps) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2;
     dispatch({
       type: "init",
       payload: {
@@ -78,15 +78,15 @@ var ToCPay = (props, ref) => {
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
+        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history
         // 支付组
-        payGroup: {
-          order_id: (_b2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _b2.order_id,
-          total_amount: (_c2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _c2.amount,
-          // 原订单信息
-          _order: initProps == null ? void 0 : initProps.order,
-          payment_group_id: (_d2 = initProps == null ? void 0 : initProps.order) == null ? void 0 : _d2.payment_group_id
-        }
+        // payGroup: {
+        //   order_id: initProps?.order?.order_id,
+        //   total_amount: initProps?.order?.amount,
+        //   // 原订单信息
+        //   _order: initProps?.order,
+        //   payment_group_id: initProps?.order?.payment_group_id,
+        // },
       }
     });
   };
@@ -140,7 +140,12 @@ var ToCPay = (props, ref) => {
       dispatch({
         type: "setPayGroup",
         payload: {
-          ...state.payGroup,
+          // ...state.payGroup,
+          order_id: order == null ? void 0 : order.order_id,
+          // total_amount: order?.amount,
+          // 原订单信息
+          _order: order,
+          payment_group_id: order == null ? void 0 : order.payment_group_id,
           // 支付方式没有walletPass时walletPass设置null
           walletPass: walletPass ? {
             ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
@@ -148,7 +153,7 @@ var ToCPay = (props, ref) => {
             amount: wallet_pass_amount,
             cards: wallet_pass_recommend_list
           } : null,
-          total_amount: order.amount,
+          total_amount: order == null ? void 0 : order.amount,
           wait_amount: remain_amount
         }
       });
@@ -277,13 +282,15 @@ var ToCPay = (props, ref) => {
     (_a2 = props.callback) == null ? void 0 : _a2.call(props, res);
   };
   const onCancel = () => {
-    var _a2;
+    var _a2, _b2;
     (0, import_payGroup.removePayGroupFromStorage)((_a2 = state.payGroup) == null ? void 0 : _a2.order_id);
     setShowInformation(false);
     setOpen(false);
     payCallback({
       key: "cancel",
-      data: {}
+      data: {
+        order_id: (_b2 = state.payGroup) == null ? void 0 : _b2.order_id
+      }
     });
   };
   (0, import_ahooks.useUpdateEffect)(() => {

package/lib/components/pay/toC/utils.d.ts

@@ -49,3 +49,9 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
+export declare const clientPayment: (params: {
+    order_id: number;
+    type: "aliPay" | "wxPay";
+    values: any;
+    interaction?: any;
+}) => void;

package/lib/components/pay/toC/utils.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   calcWalletPassListAmount: () => calcWalletPassListAmount,
+  clientPayment: () => clientPayment,
   formatFranchiseeRoute: () => formatFranchiseeRoute,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
   formatWalletPassParams: () => formatWalletPassParams,
@@ -85,9 +86,23 @@ var formatFranchiseeRoute = (url, history) => {
 var getAvailableMaxAmount = (data) => {
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
+var clientPayment = (params) => {
+  var _a, _b;
+  const { interaction, type, order_id, values } = params;
+  (_b = (_a = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a.postMessageToApp) == null ? void 0 : _b.call(_a, {
+    module: "global",
+    key: "paymentClient",
+    data: {
+      type,
+      order_id,
+      ...values
+    }
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
+  clientPayment,
   formatFranchiseeRoute,
   formatWalletPassList2PreparePayments,
   formatWalletPassParams,