@pisell/private-materials 3.0.121 → 3.0.123

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

@@ -145,13 +145,15 @@ var PaymentList = function PaymentList(props, ref) {
    * @Date: 2024-08-16 10:53
    */
   var init = function init(list) {
-    var _context$appHelper, _context$appHelper$co, _filterPaymentList;
+    var _context$appHelper, _context$appHelper$co;
     // 打开loading
     setLoading(true);
     var platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$co = _context$appHelper.constants) === null || _context$appHelper$co === void 0 ? void 0 : _context$appHelper$co.platform) || 'h5';
 
     // 过滤数据
-    var paymentList = (_filterPaymentList = filterPaymentList(list, platform)) === null || _filterPaymentList === void 0 ? void 0 : _filterPaymentList.paymentList;
+    var _filterPaymentList = filterPaymentList(list, platform),
+      paymentList = _filterPaymentList.paymentList,
+      walletPass = _filterPaymentList.walletPass;
 
     // 当支付方式大于1的时候
     if (paymentList.length > 0) {
@@ -165,7 +167,7 @@ var PaymentList = function PaymentList(props, ref) {
       paymentTypeChange(first.service, first);
 
       // 如果只有一个支付方式, 则直接支付
-      isAutoPayment(paymentList);
+      isAutoPayment(paymentList, walletPass);
     }
 
     // 解除loading
@@ -181,9 +183,14 @@ var PaymentList = function PaymentList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 10:53
    */
-  var isAutoPayment = function isAutoPayment(list) {
+  var isAutoPayment = function isAutoPayment(list, walletPass) {
     var _list = list;
 
+    // 有钱包支付时 不自动触发支付
+    if (walletPass) {
+      return;
+    }
+
     // 只有一个支付方式时
     if (_list.length === 1) {
       var isOfflinePayment = _list.find(function (d) {

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

@@ -10,6 +10,7 @@ export declare const getPaymentList: (values: any) => Promise<{
     message: string;
     status: string;
     paymentList: any[];
+    walletPass: any;
 }>;
 /**
  * @title: 过滤支付列表
@@ -23,4 +24,5 @@ export declare const filterPaymentList: (list: any[], platform?: string) => {
     message: string;
     status: string;
     paymentList: any[];
+    walletPass: any;
 };

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

@@ -62,6 +62,11 @@ export var filterPaymentList = function filterPaymentList(list) {
   var platform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h5';
   var paymentList = _toConsumableArray(list);
   var _paymentKeys = _toConsumableArray(paymentKeys);
+
+  // 找出walletPass
+  var walletPass = paymentList.find(function (d) {
+    return d.service === 'pisell.wallet_pass';
+  });
   var arr = [];
 
   // 微信环境去除支付宝支付、信用卡、谷歌支付
@@ -107,7 +112,8 @@ export var filterPaymentList = function filterPaymentList(list) {
       message: '该店铺暂未启用支付功能',
       // '该支付功能暂未启用',
       status: 'error',
-      paymentList: []
+      paymentList: [],
+      walletPass: walletPass
     };
   }
 
@@ -130,6 +136,7 @@ export var filterPaymentList = function filterPaymentList(list) {
   return {
     message: '',
     status: 'ready',
-    paymentList: paymentList
+    paymentList: paymentList,
+    walletPass: walletPass
   };
 };

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

@@ -30,7 +30,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   if (isCustomPayment(type)) {
     return true;
   }
-  return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'custom_bank_transfer'].includes(type);
+  return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
   var MWCreditCardRef = useRef(null);
@@ -159,7 +159,7 @@ var PaymentMethods = function PaymentMethods(props, ref) {
           case 16:
             return _context2.abrupt("return");
           case 17:
-            if (!(type === 'superpay.wechat.jsapi')) {
+            if (!(type === 'superpay.wechat.h5')) {
               _context2.next = 21;
               break;
             }

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

@@ -86,21 +86,24 @@ var PaymentList = (props, ref) => {
     return list;
   };
   const init = (list) => {
-    var _a2, _b2, _c;
+    var _a2, _b2;
     setLoading(true);
     const platform = ((_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform) || "h5";
-    const paymentList2 = (_c = (0, import_serve.filterPaymentList)(list, platform)) == null ? void 0 : _c.paymentList;
+    const { paymentList: paymentList2, walletPass } = (0, import_serve.filterPaymentList)(list, platform);
     if (paymentList2.length > 0) {
       let first = paymentList2[0];
       setPaymentList(paymentList2);
       paymentTypeChange(first.service, first);
-      isAutoPayment(paymentList2);
+      isAutoPayment(paymentList2, walletPass);
     }
     setLoading(false);
     return paymentList2;
   };
-  const isAutoPayment = (list) => {
+  const isAutoPayment = (list, walletPass) => {
     const _list = list;
+    if (walletPass) {
+      return;
+    }
     if (_list.length === 1) {
       let isOfflinePayment = _list.find(
         (d) => offline.find((t) => d.service.includes(t))

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

@@ -10,6 +10,7 @@ export declare const getPaymentList: (values: any) => Promise<{
     message: string;
     status: string;
     paymentList: any[];
+    walletPass: any;
 }>;
 /**
  * @title: 过滤支付列表
@@ -23,4 +24,5 @@ export declare const filterPaymentList: (list: any[], platform?: string) => {
     message: string;
     status: string;
     paymentList: any[];
+    walletPass: any;
 };

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

@@ -34,6 +34,7 @@ var getPaymentList = async (values) => {
 var filterPaymentList = (list, platform = "h5") => {
   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)()) {
     arr = arr.concat(["globepay.wechat.jsapi", "superpay.wechat.h5"]);
@@ -53,7 +54,8 @@ var filterPaymentList = (list, platform = "h5") => {
       message: "该店铺暂未启用支付功能",
       // '该支付功能暂未启用',
       status: "error",
-      paymentList: []
+      paymentList: [],
+      walletPass
     };
   }
   paymentList = paymentList.map((d) => {
@@ -73,7 +75,8 @@ var filterPaymentList = (list, platform = "h5") => {
   return {
     message: "",
     status: "ready",
-    paymentList
+    paymentList,
+    walletPass
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -59,7 +59,7 @@ var isOfflinePayment = (type) => {
     "pisell.bank_deposit",
     "pisell.offline_payment",
     "pisell.other.cashmanual",
-    "custom_bank_transfer"
+    "pisell.custom_bank_transfer"
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
@@ -124,7 +124,7 @@ var PaymentMethods = (props, ref) => {
       await ((_d = SuperPayAliPayH5Ref2.current) == null ? void 0 : _d.init({ payGroup }));
       return;
     }
-    if (type === "superpay.wechat.jsapi") {
+    if (type === "superpay.wechat.h5") {
       await ((_e = SuperPayWxPayH5Ref2.current) == null ? void 0 : _e.init({ payGroup }));
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.121",
+  "version": "3.0.123",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.28",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "3.0.38",
+    "@pisell/utils": "1.0.28",
+    "@pisell/materials": "3.0.39",
     "@pisell/date-picker": "1.0.97"
   },
   "peerDependencies": {