component-shipinlv 0.0.19 → 0.0.20

package/dist/AuthClient/qr/index.js

@@ -18,6 +18,7 @@ var reTryMaxCount = 120;
 var reTryTimeLoop = 1000; // ms
 var FromWhere = 'web';
 import QRCode from 'qrcode.react';
+import isInClient from "../../lib/isInClient";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -143,7 +144,7 @@ var LoginQr = function LoginQr(_ref) {
         env: getApiEnv()
       });
     }, {
-      manual: defaultLoginType !== 'wechat',
+      manual: !isInClient() || defaultLoginType !== 'wechat',
       onSuccess: function onSuccess(result) {
         setWeQrUrl(result.url);
         onRunCheck();

package/dist/Buy/index.d.ts

@@ -3,7 +3,7 @@ interface Props {
     env?: Global.Env;
     vipId: number;
     productCount: number;
-    productKind: Global.ProductKind;
+    productKind: 'vip' | 'card-vip';
     disabled?: boolean;
     children: React.ReactNode;
 }

package/dist/Buy/qr.css.js

@@ -2,5 +2,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLit
 var _templateObject;
 import styled from 'styled-components';
 export default {
-  BuyQr: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ktv-ai-vipQr{\n      position: relative;\n      text-align: center;\n      display: flex;\n      flex-direction: column;\n      height: 100%;\n      .qrImage{\n        width: 200px;\n        height: 200px;\n        margin: 20px auto 10px;\n        img{\n          display: block;\n          width: 100%;\n          max-width: 100%;\n        }\n      }\n      .price{\n        font-size: 16px;\n        strong{\n          font-size: 20px;\n          color: #F60;\n        }\n        .multiply{\n          display: inline-block;\n          margin: 0 10px;\n          color: #AAA;\n        }\n        .productCount{\n          font-size: 20px;\n        }\n        .equal{\n          transform: rotate(90deg);\n          display: inline-block;\n          margin: 0 10px;\n          color: #AAA;\n        }\n        .moneyAll{\n          color: #F60;\n          font-size: 32px;\n        }\n      }\n      .alt{\n        color: #999;\n        font-size: 13px;\n        .wechatIcon{\n          color: #0bc160;\n        }\n      }\n      .altInH5{\n        padding: 8px 0 0;\n        color: #C00;\n        font-size: 15px;\n        .toFriend{\n          font-size: 13px;\n          color: #888;\n          padding: 0;\n          margin: 0;\n        }\n      }\n\n      .payResult{\n        .ant-result{\n          padding: 0 30px 30px;\n        }\n        .ant-result-icon{\n          display: none;\n        }\n      }\n    }\n\n  "])))
+  BuyQr: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    position: relative;\n    text-align: center;\n    display: flex;\n    flex-direction: column;\n    height: 100%;\n    .qrImage{\n      width: 200px;\n      height: 200px;\n      margin: 30px auto 0;\n      img{\n        display: block;\n        width: 100%;\n        max-width: 100%;\n      }\n    }\n    .loadingIcon{\n      font-size: 68px;\n      color: #BBB;\n    }\n    .price{\n      font-size: 16px;\n      strong{\n        font-size: 20px;\n        color: #F60;\n      }\n      .multiply{\n        display: inline-block;\n        margin: 0 10px;\n        color: #AAA;\n      }\n      .productCount{\n        font-size: 20px;\n      }\n      .equal{\n        transform: rotate(90deg);\n        display: inline-block;\n        margin: 0 10px;\n        color: #AAA;\n      }\n      .moneyAll{\n        color: #F60;\n        font-size: 32px;\n      }\n    }\n    .alt{\n      color: #999;\n      font-size: 13px;\n      .wechatIcon{\n        color: #0bc160;\n      }\n      .alipayIcon{\n        color: #1677ff;\n      }\n    }\n    .altInH5{\n      padding: 8px 0 0;\n      color: #C00;\n      font-size: 15px;\n      .toFriend{\n        font-size: 13px;\n        color: #888;\n        padding: 0;\n        margin: 0;\n      }\n    }\n    .tabIcon{\n      font-size: 18px;\n    }\n    .qrAlt{\n      padding: 0 0 12px;\n    }\n    .payResult{\n      .ant-result{\n        padding: 0 30px 30px;\n      }\n      .ant-result-icon{\n        display: none;\n      }\n    }\n    .payChannel{\n      padding: 30px 20px 20px;\n      .payChannelTabs{\n        position: relative;\n        .ant-tabs-content-holder{\n          border: 1px solid #E8E8E8;\n          margin: -17px 0 0;\n        }\n      }\n    }\n  "])))
 };

package/dist/Buy/qr.js

@@ -1,7 +1,8 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
-import { Result, Button, Space, Divider } from 'antd';
-import { CloseOutlined, PauseOutlined, WechatOutlined } from '@ant-design/icons';
+import { Result, Button, Space, Divider, Tabs } from 'antd';
+import { AlipayCircleOutlined, CloseOutlined, LoadingOutlined, PauseOutlined, WechatOutlined } from '@ant-design/icons';
 import { useRequest } from '@umijs/hooks';
 import * as TradeController from "../service/api/TradeController";
 import * as VipController from "../service/api/VipController";
@@ -10,8 +11,9 @@ import Tool from "../lib/Tool";
 import PageContentWarp from "../UI/PageContentWarp";
 import styles from "./qr.css";
 import Platform from "../lib/platform";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import isInClient from "../lib/isInClient";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var VipQr = function VipQr(_ref) {
   var _ref$env = _ref.env,
@@ -27,22 +29,36 @@ var VipQr = function VipQr(_ref) {
   var _useState = useState(Tool.getLocalUserInfo()),
     _useState2 = _slicedToArray(_useState, 1),
     userInfo = _useState2[0];
-  var _useState3 = useState(false),
+  var _useState3 = useState('wepay'),
     _useState4 = _slicedToArray(_useState3, 2),
-    payResult = _useState4[0],
-    setPayResult = _useState4[1];
-  var _useState5 = useState({
+    payChannel = _useState4[0],
+    setPayChannel = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    payResult = _useState6[0],
+    setPayResult = _useState6[1];
+  var _useState7 = useState({
       codeUrl: '',
-      mWebUrl: ''
+      mWebUrl: '',
+      payChannel: payChannel
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    orderPayInfo = _useState6[0],
-    setOrderPayInfo = _useState6[1];
-  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    payQrImageUrl = _useState8[0],
-    setPayQrImageUrl = _useState8[1];
+    orderPayInfo = _useState8[0],
+    setOrderPayInfo = _useState8[1];
   var _useState9 = useState({
+      wepay: {
+        message: '',
+        qrUrl: ''
+      },
+      alipay: {
+        message: '',
+        qrUrl: ''
+      }
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    payOrderInfo = _useState10[0],
+    setPayOrderInfo = _useState10[1];
+  var _useState11 = useState({
       id: 0,
       marketPrice: 0,
       month: 0,
@@ -55,18 +71,21 @@ var VipQr = function VipQr(_ref) {
       alt: '',
       recommend: 0
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    detailData = _useState10[0],
-    setDetailData = _useState10[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    detailData = _useState12[0],
+    setDetailData = _useState12[1];
   // 允许帮别人支付，只认码; 不认支付的小程序
 
   var _useRequest = useRequest(function () {
+      var channel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payChannel;
       return TradeController.create({
         productKind: productKind,
         productTypeId: vipId,
         productCount: productCount,
         userId: Tool.getLocalUserInfo().id,
-        payType: 'NATIVE' //Platform.isH5 ? 'MWEB' : 'NATIVE',
+        payType: 'NATIVE',
+        //Platform.isH5 ? 'MWEB' : 'NATIVE',
+        payChannel: channel
       }, {
         env: env
       });
@@ -80,12 +99,23 @@ var VipQr = function VipQr(_ref) {
           } else {}
         } else {}
         setOrderPayInfo(result);
-        // setPayQrImageUrl( Tool.makeQrUrl( result.codeUrl || result.mWebUrl, '#0bc160') );
-        setPayQrImageUrl(result.codeUrl || result.mWebUrl);
-        // 五秒后自动弹出；
-        setTimeout(function () {
-          setPayResult(true);
-        }, 20e3);
+        // setPayOrderInfo( Tool.makeQrUrl( result.codeUrl || result.mWebUrl, '#0bc160') );
+        if (payOrderInfo[result.payChannel]) {
+          payOrderInfo[result.payChannel].qrUrl = result.codeUrl || result.mWebUrl;
+          setPayOrderInfo(_objectSpread({}, payOrderInfo));
+          // 五秒后自动弹出；
+          setTimeout(function () {
+            setPayResult(true);
+          }, 20e3);
+        } else {
+          Tool.toast('支付类型有问题');
+        }
+      },
+      onError: function onError(e) {
+        if (payOrderInfo[payChannel]) {
+          payOrderInfo[payChannel].message = "\u521B\u5EFA\u8BA2\u5355\u5931\u8D25\uFF1A".concat(e.message || '');
+          setPayOrderInfo(_objectSpread({}, payOrderInfo));
+        }
       }
     }),
     loadingPay = _useRequest.loading,
@@ -98,25 +128,112 @@ var VipQr = function VipQr(_ref) {
         env: env
       });
     }, {
+      manual: !isInClient(),
       onSuccess: function onSuccess(result) {
-        runPay();
         console.log('re 1', result);
         setDetailData(result);
+        runPay();
       }
     }),
     loading = _useRequest2.loading,
     run = _useRequest2.run,
     error = _useRequest2.error;
-  return /*#__PURE__*/_jsx(styles.BuyQr, {
-    children: /*#__PURE__*/_jsxs(PageContentWarp, {
-      loading: loading || loadingPay,
-      error: error || errorPay
-      // title="购买会员"
-      ,
-      onReload: function onReload() {
-        return run();
-      },
-      className: "ktv-ai-vipQr",
+  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"]
+        })
+      })]
+    })
+  }, {
+    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: 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"]
+        })
+      })]
+    })
+  }];
+  return /*#__PURE__*/_jsx(PageContentWarp, {
+    loading: loading,
+    error: error
+    // title="购买会员"
+    ,
+    onReload: function onReload() {
+      return run();
+    },
+    children: /*#__PURE__*/_jsxs(styles.BuyQr, {
       children: [/*#__PURE__*/_jsxs("h2", {
         children: ["\u8D2D\u4E70\u4F1A\u5458\uFF1A", detailData.productName || detailData.productType]
       }), /*#__PURE__*/_jsxs("div", {
@@ -144,24 +261,21 @@ var VipQr = function VipQr(_ref) {
           })]
         })]
       }), /*#__PURE__*/_jsx("div", {
-        className: "qrImage",
-        children: payQrImageUrl && /*#__PURE__*/_jsx(QRCode, {
-          value: payQrImageUrl,
-          fgColor: "#0bc160"
+        className: "payChannel",
+        children: /*#__PURE__*/_jsx(Tabs, {
+          activeKey: payChannel,
+          items: itemsTabs,
+          type: "card",
+          className: "payChannelTabs",
+          onChange: function onChange(keyName) {
+            // @ts-ignore
+            var channel = keyName;
+            setPayChannel(channel);
+            if (!payOrderInfo[channel]) {
+              runPay(channel);
+            }
+          }
         })
-      }), 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"]
       }), payResult && /*#__PURE__*/_jsxs("div", {
         className: "payResult",
         children: [/*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(Result, {

package/dist/VipCompare/index.js

@@ -14,6 +14,7 @@ import VipCommend from "./commend";
 import * as UserController from "../service/api/UserController";
 import * as ProductController from "../service/api/ProductController";
 import Buy from "../Buy";
+import isInClient from "../lib/isInClient";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -44,6 +45,7 @@ var VipCompare = function VipCompare(_ref) {
         env: env
       });
     }, {
+      manual: !isInClient(),
       onSuccess: function onSuccess(result) {
         setProductDetail(result);
       }
@@ -163,6 +165,7 @@ var VipCompare = function VipCompare(_ref) {
         env: env
       });
     }, {
+      manual: !isInClient(),
       onSuccess: function onSuccess(result) {
         setListData(result);
       }
@@ -179,7 +182,7 @@ var VipCompare = function VipCompare(_ref) {
   _objectDestructuringEmpty(useRequest(function () {
     return UserController.userVipInfo();
   }, {
-    manual: !Tool.getLocalUserInfo().isLogin,
+    manual: !isInClient() || !Tool.getLocalUserInfo().isLogin,
     onSuccess: function onSuccess(result) {
       var dataDict = {};
       result === null || result === void 0 || result.forEach(function (items) {

package/dist/lib/isInClient.d.ts

@@ -0,0 +1,2 @@
+declare const isInClient: () => boolean;
+export default isInClient;

package/dist/lib/isInClient.js

@@ -0,0 +1,4 @@
+var isInClient = function isInClient() {
+  return typeof window !== 'undefined';
+};
+export default isInClient;

package/dist/typings/Trade.d.ts

@@ -1,16 +1,19 @@
 declare namespace Trade {
     type PayType = 'NATIVE' | 'MWEB';
+    type PayChannel = 'wepay' | 'alipay';
     interface CommonCreateQuery {
         productKind: Global.ProductKind;
         productTypeId: number;
         productCount: number;
         userId: number;
         payType: PayType;
+        payChannel: PayChannel;
         [name: string]: any;
     }
     interface CreateResult {
         codeUrl: string;
         mWebUrl: string;
+        payChannel: PayChannel;
     }
     interface CommonCreateResult {
         "h5PayUrl": string;

package/package.json

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