component-shipinlv 1.0.0 → 1.0.3

package/dist/Buy/index.d.ts

@@ -6,6 +6,7 @@ interface Props {
     productKind: 'vip' | 'vip-card';
     showPrice?: number;
     disabled?: boolean;
+    payMethod?: Global.PayMethod;
     onBuySuccess?: () => void;
     children: React.ReactNode;
 }

package/dist/Buy/index.js

@@ -16,6 +16,7 @@ var Buy = function Buy(_ref) {
     vipId = _ref$vipId === void 0 ? 0 : _ref$vipId,
     _ref$productCount = _ref.productCount,
     productCount = _ref$productCount === void 0 ? 1 : _ref$productCount,
+    payMethod = _ref.payMethod,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     showPrice = _ref.showPrice,
@@ -29,22 +30,23 @@ var Buy = function Buy(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!disabled) {
-              _context.next = 2;
+              _context.next = 3;
               break;
             }
+            console.log('buy disabled.');
             return _context.abrupt("return");
-          case 2:
+          case 3:
             // 先要登录；
             userInfo = Tool.getLocalUserInfo();
             if (userInfo.isLogin) {
-              _context.next = 6;
+              _context.next = 7;
               break;
             }
             console.log("not login");
             return _context.abrupt("return", Tool.onLogin());
-          case 6:
+          case 7:
             if (!(showPrice === 0)) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
             // 直接开通
@@ -62,9 +64,9 @@ var Buy = function Buy(_ref) {
               width: Math.min(520, ((_ref3 = global || window) === null || _ref3 === void 0 ? void 0 : _ref3.innerWidth) * 0.95)
             });
             return _context.abrupt("return");
-          case 9:
-            onOpenVipQr();
           case 10:
+            onOpenVipQr();
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -77,6 +79,7 @@ var Buy = function Buy(_ref) {
   var onOpenVipQr = function onOpenVipQr() {
     var _ref4;
     var userId = Tool.getLocalUserInfo().id;
+    console.log('onOpenVipQr.');
     if (Platform.isWechat || Platform.isH5) {
       Tool.h5Pay({
         productKind: productKind,
@@ -95,6 +98,7 @@ var Buy = function Buy(_ref) {
         productKind: productKind,
         vipId: vipId,
         productCount: productCount,
+        payMethod: payMethod,
         onHandlePaySuccess: function onHandlePaySuccess() {
           onBuySuccess();
           dialog.destroy();

package/dist/Buy/qr.d.ts

@@ -4,6 +4,7 @@ interface Props {
     productKind: string;
     vipId: number;
     productCount: number;
+    payMethod?: Global.PayMethod;
     onHandlePaySuccess: () => void;
 }
 declare const VipQr: React.FC<Props>;

package/dist/Buy/qr.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Result, Button, Space, Divider, Tabs } from 'antd';
 import { AlipayCircleOutlined, CloseOutlined, LoadingOutlined, PauseOutlined, WechatOutlined } from '@ant-design/icons';
 import { useRequest } from '@umijs/hooks';
@@ -24,12 +24,14 @@ var VipQr = function VipQr(_ref) {
     productCount = _ref$productCount === void 0 ? 1 : _ref$productCount,
     _ref$vipId = _ref.vipId,
     vipId = _ref$vipId === void 0 ? 0 : _ref$vipId,
+    _ref$payMethod = _ref.payMethod,
+    payMethod = _ref$payMethod === void 0 ? ['wepay', 'alipay'] : _ref$payMethod,
     _ref$onHandlePaySucce = _ref.onHandlePaySuccess,
     onHandlePaySuccess = _ref$onHandlePaySucce === void 0 ? function () {} : _ref$onHandlePaySucce;
   var _useState = useState(Tool.getLocalUserInfo()),
     _useState2 = _slicedToArray(_useState, 1),
     userInfo = _useState2[0];
-  var _useState3 = useState('wepay'),
+  var _useState3 = useState(payMethod === null || payMethod === void 0 ? void 0 : payMethod[0]),
     _useState4 = _slicedToArray(_useState3, 2),
     payChannel = _useState4[0],
     setPayChannel = _useState4[1];
@@ -103,6 +105,9 @@ var VipQr = function VipQr(_ref) {
         if (payOrderInfo[result.payChannel]) {
           payOrderInfo[result.payChannel].qrUrl = result.codeUrl || result.mWebUrl;
           setPayOrderInfo(_objectSpread({}, payOrderInfo));
+          console.log('payOrderInfo:', payOrderInfo);
+          setItemsTabs(getItemsTabs(payOrderInfo));
+
           // 五秒后自动弹出；
           setTimeout(function () {
             setPayResult(true);
@@ -138,93 +143,139 @@ var VipQr = function VipQr(_ref) {
     loading = _useRequest2.loading,
     run = _useRequest2.run,
     error = _useRequest2.error;
-  var itemsTabs = [{
-    key: 'wepay',
-    label: '微信支付',
-    icon: /*#__PURE__*/_jsx(WechatOutlined, {
-      className: "tabIcon"
-    }),
-    disabled: loadingPay,
-    children: payOrderInfo.wepay.message ? /*#__PURE__*/_jsx(Result, {
-      status: "error",
-      title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
-      subTitle: payOrderInfo.wepay.message,
-      children: /*#__PURE__*/_jsx(Button, {
-        type: "primary",
-        children: "\u91CD\u8BD5"
-      })
-    }) : /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx("div", {
-        className: "qrImage",
-        children: payOrderInfo.wepay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
-          value: payOrderInfo.wepay.qrUrl,
-          fgColor: "#0bc160",
-          size: 180
-        }) : /*#__PURE__*/_jsx(LoadingOutlined, {
-          className: "loadingIcon"
-        })
-      }), /*#__PURE__*/_jsx("div", {
-        className: "qrAlt",
-        children: Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
-          className: "altInH5",
-          children: ["\u957F\u6309\u4E8C\u7EF4\u7801\uFF0C\u53EF\u8BC6\u522B\u4E8C\u7EF4\u7801\u652F\u4ED8", /*#__PURE__*/_jsx("p", {
-            className: "toFriend",
-            children: "\u6216\u8005\u4FDD\u5B58\u56FE\u7247\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"
-          })]
-        }) : /*#__PURE__*/_jsxs("div", {
-          className: "alt",
-          children: ["\u8BF7\u7528 ", /*#__PURE__*/_jsx(WechatOutlined, {
-            className: "wechatIcon"
-          }), " \u5FAE\u4FE1 \u626B\u7801\u652F\u4ED8 ", /*#__PURE__*/_jsx(Divider, {
-            type: "vertical"
-          }), " \u4E5F\u53EF\u4EE5\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"]
+  var getPayMethodList = function getPayMethodList() {
+    var payInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payOrderInfo;
+    var payMethodList = [{
+      key: 'wepay',
+      label: '微信支付',
+      icon: /*#__PURE__*/_jsx(WechatOutlined, {
+        className: "tabIcon"
+      }),
+      disabled: loadingPay,
+      children: payInfo.wepay.message ? /*#__PURE__*/_jsx(Result, {
+        status: "error",
+        title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
+        subTitle: payInfo.wepay.message,
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u91CD\u8BD5"
         })
-      })]
-    })
-  }, {
-    key: 'alipay',
-    label: '支付宝',
-    disabled: loadingPay,
-    icon: /*#__PURE__*/_jsx(AlipayCircleOutlined, {
-      className: "tabIcon"
-    }),
-    children: payOrderInfo.alipay.message ? /*#__PURE__*/_jsx(Result, {
-      status: "error",
-      title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
-      subTitle: payOrderInfo.alipay.message,
-      children: /*#__PURE__*/_jsx(Button, {
-        type: "primary",
-        children: "\u91CD\u8BD5"
+      }) : /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "qrImage",
+          children: payInfo.wepay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
+            value: payInfo.wepay.qrUrl,
+            fgColor: "#0bc160",
+            size: 180
+          }) : /*#__PURE__*/_jsx(LoadingOutlined, {
+            className: "loadingIcon"
+          })
+        }), /*#__PURE__*/_jsx("div", {
+          className: "qrAlt",
+          children: Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
+            className: "altInH5",
+            children: ["\u957F\u6309\u4E8C\u7EF4\u7801\uFF0C\u53EF\u8BC6\u522B\u4E8C\u7EF4\u7801\u652F\u4ED8", /*#__PURE__*/_jsx("p", {
+              className: "toFriend",
+              children: "\u6216\u8005\u4FDD\u5B58\u56FE\u7247\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"
+            })]
+          }) : /*#__PURE__*/_jsxs("div", {
+            className: "alt",
+            children: ["\u8BF7\u7528 ", /*#__PURE__*/_jsx(WechatOutlined, {
+              className: "wechatIcon"
+            }), " \u5FAE\u4FE1 \u626B\u7801\u652F\u4ED8 ", /*#__PURE__*/_jsx(Divider, {
+              type: "vertical"
+            }), " \u4E5F\u53EF\u4EE5\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"]
+          })
+        })]
       })
-    }) : /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx("div", {
-        className: "qrImage",
-        children: payOrderInfo.alipay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
-          value: payOrderInfo.alipay.qrUrl,
-          fgColor: "#1677ff",
-          size: 180
-        }) : /*#__PURE__*/_jsx(LoadingOutlined, {
-          className: "loadingIcon"
-        })
-      }), /*#__PURE__*/_jsx("div", {
-        className: "qrAlt",
-        children: Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
-          className: "altInH5",
-          children: ["\u957F\u6309\u4E8C\u7EF4\u7801\uFF0C\u53EF\u8BC6\u522B\u4E8C\u7EF4\u7801\u652F\u4ED8", /*#__PURE__*/_jsx("p", {
-            className: "toFriend",
-            children: "\u6216\u8005\u4FDD\u5B58\u56FE\u7247\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"
-          })]
-        }) : /*#__PURE__*/_jsxs("div", {
-          className: "alt",
-          children: ["\u8BF7\u7528 ", /*#__PURE__*/_jsx(AlipayCircleOutlined, {
-            className: "alipayIcon"
-          }), " \u652F\u4ED8\u5B9D \u626B\u7801\u652F\u4ED8 ", /*#__PURE__*/_jsx(Divider, {
-            type: "vertical"
-          }), " \u4E5F\u53EF\u4EE5\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"]
+    }, {
+      key: 'alipay',
+      label: '支付宝',
+      disabled: loadingPay,
+      icon: /*#__PURE__*/_jsx(AlipayCircleOutlined, {
+        className: "tabIcon"
+      }),
+      children: payInfo.alipay.message ? /*#__PURE__*/_jsx(Result, {
+        status: "error",
+        title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
+        subTitle: payInfo.alipay.message,
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u91CD\u8BD5"
         })
-      })]
-    })
-  }];
+      }) : /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "qrImage",
+          children: payInfo.alipay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
+            value: payInfo.alipay.qrUrl,
+            fgColor: "#1677ff",
+            size: 180
+          }) : /*#__PURE__*/_jsx(LoadingOutlined, {
+            className: "loadingIcon"
+          })
+        }), /*#__PURE__*/_jsx("div", {
+          className: "qrAlt",
+          children: Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
+            className: "altInH5",
+            children: ["\u957F\u6309\u4E8C\u7EF4\u7801\uFF0C\u53EF\u8BC6\u522B\u4E8C\u7EF4\u7801\u652F\u4ED8", /*#__PURE__*/_jsx("p", {
+              className: "toFriend",
+              children: "\u6216\u8005\u4FDD\u5B58\u56FE\u7247\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"
+            })]
+          }) : /*#__PURE__*/_jsxs("div", {
+            className: "alt",
+            children: ["\u8BF7\u7528 ", /*#__PURE__*/_jsx(AlipayCircleOutlined, {
+              className: "alipayIcon"
+            }), " \u652F\u4ED8\u5B9D \u626B\u7801\u652F\u4ED8 ", /*#__PURE__*/_jsx(Divider, {
+              type: "vertical"
+            }), " \u4E5F\u53EF\u4EE5\u8BA9\u670B\u53CB\u626B\u7801\u4EE3\u4ED8"]
+          })
+        })]
+      })
+    }];
+    return payMethodList;
+  };
+  var getItemsTabs = function getItemsTabs() {
+    var payInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payOrderInfo;
+    var itemsTabs = [];
+    var payMethodList = getPayMethodList(payInfo);
+    payMethod === null || payMethod === void 0 || payMethod.forEach(function (payMethod) {
+      var index = -1;
+      if (!payMethodList) {
+        return;
+      }
+      payMethodList === null || payMethodList === void 0 || payMethodList.some(function (item, i) {
+        if (item.key === payMethod) {
+          index = i;
+        }
+      });
+      if (index < 0) {
+        return;
+      }
+      if (payMethodList) {
+        itemsTabs.push(payMethodList[index]);
+      }
+    });
+    return itemsTabs;
+  };
+  var _useState13 = useState(getItemsTabs()),
+    _useState14 = _slicedToArray(_useState13, 2),
+    itemsTabs = _useState14[0],
+    setItemsTabs = _useState14[1];
+  var onInit = function onInit() {
+    // payMethod?.forEach( payMethod => {
+    //   const itemData = PayMethodList[ payMethod ];
+    //   if( ! itemData){
+    //     return;
+    //   }
+    //   if( itemsTabs ){
+    //     itemsTabs.push( itemData[0] );
+    //   }
+    // });
+    // if( itemsTabs ){
+    //   setItemsTabs([...itemsTabs]);
+    // }
+  };
+  useEffect(function () {}, []);
   return /*#__PURE__*/_jsx(PageContentWarp, {
     loading: loading,
     error: error

package/dist/VipList/index.d.ts

@@ -7,6 +7,7 @@ interface Props {
     applyDemoTitle?: string;
     tableOffsetHeader?: number;
     env?: Global.Env;
+    payMethod?: Global.PayMethod;
     tableScrollY?: number | string;
     onBuySuccess?: () => void;
 }

package/dist/VipList/index.js

@@ -46,6 +46,7 @@ var VipList = function VipList(_ref) {
     _ref$tableScrollY = _ref.tableScrollY,
     tableScrollY = _ref$tableScrollY === void 0 ? '65vh' : _ref$tableScrollY,
     env = _ref.env,
+    payMethod = _ref.payMethod,
     _ref$tableOffsetHeade = _ref.tableOffsetHeader,
     tableOffsetHeader = _ref$tableOffsetHeade === void 0 ? 56 : _ref$tableOffsetHeade,
     _ref$onBuySuccess = _ref.onBuySuccess,
@@ -368,10 +369,11 @@ var VipList = function VipList(_ref) {
                       },
                       children: /*#__PURE__*/_jsx(Buy, {
                         env: env,
-                        disabled: userVip,
+                        disabled: userVip && item.price === 0,
                         productKind: "vip",
                         vipId: (item === null || item === void 0 ? void 0 : item.id) || 0,
                         productCount: 1,
+                        payMethod: payMethod,
                         showPrice: item === null || item === void 0 ? void 0 : item.price,
                         onBuySuccess: onBuySuccess,
                         children: /*#__PURE__*/_jsx(Button, {

package/dist/lib/Tool.d.ts

@@ -158,7 +158,7 @@ declare const Tool: {
     setTimeOffset(serverTime: number): void;
     getTime(): number;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "info" | "error" | "success" | "warning", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;

package/dist/lib/Tool.js

@@ -7,6 +7,9 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { Modal, message, Tooltip } from 'antd';
 // const JrQrcode = require('jr-qrcode');
 import QRCode from 'qrcode.react';
+if (!window.__events) {
+  window.__events = [];
+}
 
 // import { history } from 'umi';
 

package/dist/typings.d.ts

@@ -65,6 +65,8 @@ declare namespace Global {
     ws: string;
     authApi: string;
   }
+
+  type PayMethod = ( 'wepay' | 'alipay' )[];
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",