component-sanzhizhou 1.0.5 → 1.0.6

package/dist/config/apiUrls.js

@@ -1,5 +1,5 @@
 // 业务服务器 api
-export var currentEnv = 'local';
+export var currentEnv = 'prod';
 var ApiUrls = {
   local: {
     api: 'http://localhost:51818/',

package/dist/pay/alipay-qr.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import './qr.less';
+interface Props {
+    selectPayChannel: Pay.ChannelListChildrenList;
+    vipId: number;
+    payChannel: Pay.PayChannel;
+    moneyAmount: number;
+    size?: number;
+}
+declare const UserVipOrderPayQr: React.FC<Props>;
+export default UserVipOrderPayQr;

package/dist/pay/alipay-qr.js

@@ -0,0 +1,118 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useState } from 'react';
+import { Button, Divider, QRCode, Spin } from 'antd';
+import "./qr.less";
+import { useRequest } from "@umijs/hooks";
+import * as PayController from "../service/api/PayController";
+import { CheckCircleOutlined, ReloadOutlined } from "@ant-design/icons";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
+  var selectPayChannel = _ref.selectPayChannel,
+    moneyAmount = _ref.moneyAmount,
+    vipId = _ref.vipId,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 260 : _ref$size;
+  var _useState = useState('loading'),
+    _useState2 = _slicedToArray(_useState, 2),
+    qrStatus = _useState2[0],
+    setQrStatus = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    qrUrl = _useState4[0],
+    setQrUrl = _useState4[1];
+  var _useRequest = useRequest(function () {
+      return PayController.getPaymentQr({
+        payChannel: selectPayChannel.name,
+        vipId: vipId,
+        moneyAmount: moneyAmount
+      });
+    }, {
+      onSuccess: function onSuccess(result) {
+        setQrUrl(result.qrUrl);
+        setQrStatus('active');
+      },
+      onError: function onError(e) {
+        setQrStatus('expired');
+      }
+    }),
+    run = _useRequest.run,
+    loading = _useRequest.loading;
+  var getPaymentQr = function getPaymentQr() {
+    setQrStatus('loading');
+    run();
+  };
+  return /*#__PURE__*/_jsxs("div", {
+    className: "ssz-payQr",
+    children: [/*#__PURE__*/_jsxs(Divider, {
+      orientation: "center",
+      className: "ssz-altBox",
+      children: ["\u626B\u7801\u652F\u4ED8", /*#__PURE__*/_jsxs("span", {
+        className: "ssz-qr-moneyAmountBox",
+        children: [/*#__PURE__*/_jsx("small", {
+          children: "\xA5"
+        }), /*#__PURE__*/_jsx("span", {
+          className: "ssz-qr-moneyAmount",
+          children: moneyAmount
+        }), /*#__PURE__*/_jsx("small", {
+          children: "\u5143"
+        })]
+      })]
+    }), /*#__PURE__*/_jsxs("div", {
+      className: "ssz-qrImage",
+      style: {
+        width: size
+      },
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "ssz-name",
+        style: {
+          color: selectPayChannel.color
+        },
+        children: [selectPayChannel.icon, " ", selectPayChannel.label]
+      }), /*#__PURE__*/_jsx("div", {
+        className: "ssz-qrImageWarp",
+        children: /*#__PURE__*/_jsx(QRCode, {
+          type: "svg",
+          color: selectPayChannel.color,
+          bgColor: "#FFF",
+          size: size,
+          value: qrUrl || '内容为空',
+          status: qrStatus,
+          errorLevel: "M",
+          statusRender: function statusRender(info) {
+            if (info.status === 'loading') {
+              return /*#__PURE__*/_jsx(Spin, {
+                size: "large"
+              });
+            }
+            if (info.status === 'scanned') {
+              return /*#__PURE__*/_jsxs("div", {
+                children: [/*#__PURE__*/_jsx(CheckCircleOutlined, {}), " \u5DF2\u626B\u7801"]
+              });
+            }
+            if (info.status === 'expired') {
+              return /*#__PURE__*/_jsxs("div", {
+                children: ["\u4E8C\u7EF4\u7801\u5DF2\u7ECF\u8FC7\u671F", /*#__PURE__*/_jsx("div", {
+                  style: {
+                    paddingTop: 18
+                  },
+                  children: /*#__PURE__*/_jsx(Button, {
+                    type: "link",
+                    icon: /*#__PURE__*/_jsx(ReloadOutlined, {}),
+                    onClick: getPaymentQr,
+                    children: "\u5237\u65B0"
+                  })
+                })]
+              });
+            }
+            return '';
+          }
+        })
+      }), /*#__PURE__*/_jsx("div", {
+        className: "ssz-alt",
+        children: "\u8BF7\u626B\u7801\u652F\u4ED8"
+      })]
+    })]
+  });
+};
+export default UserVipOrderPayQr;

package/dist/pay/alipay-qr.less

@@ -0,0 +1,49 @@
+.ssz-payQr{
+  .ssz-altBox{
+    font-size: large;
+    .ssz-qr-moneyAmountBox{
+      padding: 0 0 0 12px;
+      font-weight: 300;
+
+      small{
+        opacity: 0.7;
+      }
+      .ssz-qr-moneyAmount{
+        padding: 0 3px;
+        color: #C00;
+        font-size: x-large;
+        font-weight: 700;
+        font-family: Arial, Helvetica, sans-serif;
+      }
+    }
+
+  }
+  .ssz-qrImage{
+    margin: 0 auto 60px;
+    //width: 220px;
+    //height: 220px;
+    .name{
+      font-size: 20px;
+      font-weight: 300;
+      padding: 0 0 16px;
+      text-align: center;
+    }
+    .ssz-qrImageWarp{
+      background-color: #EEE;
+
+    }
+    .ssz-alt{
+      text-align: center;
+      color: #AAA;
+      padding: 6px 0;
+      font-weight: 300;
+    }
+
+  }
+  .ssz-name{
+    text-align: center;
+    padding: 5px 0 12px 0;
+  }
+
+
+}

package/dist/pay/qr.d.ts

@@ -6,6 +6,7 @@ interface Props {
     payChannel: Pay.PayChannel;
     moneyAmount: number;
     size?: number;
+    env?: Global.Env;
 }
 declare const UserVipOrderPayQr: React.FC<Props>;
 export default UserVipOrderPayQr;

package/dist/pay/qr.js

@@ -3,33 +3,42 @@ import React, { useState } from 'react';
 import { Button, Divider, QRCode, Spin } from 'antd';
 import "./qr.less";
 import { useRequest } from "@umijs/hooks";
-import * as PayController from "../service/api/PayController";
+import * as RechargeController from "../service/api/RechargeController";
 import { CheckCircleOutlined, ReloadOutlined } from "@ant-design/icons";
+import { getEnv } from "../lib/getApiUrl";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var QrDict = {
+  local: 'https://pay.sanzhizhou.com/pay/wepay-qr',
+  // 'http://localhost:8001/pay/wepay-qr',
+  pre: 'http://localhost:8001/pay/wepay-qr',
+  prod: 'https://pay.sanzhizhou.com/pay/wepay-qr'
+};
 var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
   var selectPayChannel = _ref.selectPayChannel,
     moneyAmount = _ref.moneyAmount,
     vipId = _ref.vipId,
     _ref$size = _ref.size,
-    size = _ref$size === void 0 ? 260 : _ref$size;
-  var _useState = useState('loading'),
+    size = _ref$size === void 0 ? 260 : _ref$size,
+    env = _ref.env;
+  var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
-    qrStatus = _useState2[0],
-    setQrStatus = _useState2[1];
-  var _useState3 = useState(''),
+    qrUrl = _useState2[0],
+    setQrUrl = _useState2[1];
+  var _useState3 = useState('loading'),
     _useState4 = _slicedToArray(_useState3, 2),
-    qrUrl = _useState4[0],
-    setQrUrl = _useState4[1];
+    qrStatus = _useState4[0],
+    setQrStatus = _useState4[1];
   var _useRequest = useRequest(function () {
-      return PayController.getPaymentQr({
+      return RechargeController.create({
         payChannel: selectPayChannel.name,
-        vipId: vipId,
         moneyAmount: moneyAmount
       });
     }, {
       onSuccess: function onSuccess(result) {
-        setQrUrl(result.qrUrl);
+        var qrUrlBase = QrDict[getEnv()] || QrDict.prod;
+        var qrUrl = qrUrlBase + (qrUrlBase.indexOf('?') !== -1 ? '?' : '&') + "tradeIdKey=".concat(result.tradeIdKey);
+        setQrUrl(qrUrl);
         setQrStatus('active');
       },
       onError: function onError(e) {

package/dist/pay/recharge.js

@@ -6,7 +6,7 @@ import React, { useState } from 'react';
 import { Button, Divider, Form, InputNumber, Radio, Tag } from 'antd';
 import styles from "./recharge.css";
 import { WechatOutlined, AlipayCircleOutlined, CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
-import UserVipOrderPayQr from "./qr";
+import PayQr from "./qr";
 import notification from "../lib/notification";
 import sleep from "../lib/sleep";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -169,12 +169,14 @@ var PayRecharge = function PayRecharge(_ref) {
             })
           })
         })]
-      }), step === 'qr-show' && /*#__PURE__*/_jsx(UserVipOrderPayQr, {
-        moneyAmount: formData.moneyAmount,
-        vipId: 0,
-        payChannel: formData.payChannel,
-        selectPayChannel: selectPayChannel,
-        size: 260
+      }), step === 'qr-show' && /*#__PURE__*/_jsx(_Fragment, {
+        children: formData.payChannel === 'wepay' && /*#__PURE__*/_jsx(PayQr, {
+          moneyAmount: formData.moneyAmount,
+          vipId: 0,
+          payChannel: formData.payChannel,
+          selectPayChannel: selectPayChannel,
+          size: 260
+        })
       }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsxs("div", {
         className: "ssz-submits",
         children: [/*#__PURE__*/_jsx("div", {

package/dist/service/api/RechargeController.d.ts

@@ -0,0 +1,3 @@
+export declare function create(body: Recharge.CreateQuery, options?: {
+    [key: string]: any;
+}): Promise<Recharge.CreateResult>;

package/dist/service/api/RechargeController.js

@@ -0,0 +1,27 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import request from "../../lib/request";
+export function create(_x, _x2) {
+  return _create.apply(this, arguments);
+}
+function _create() {
+  _create = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("user/recharge/create", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _create.apply(this, arguments);
+}

package/dist/types/Pay.d.ts

@@ -7,7 +7,7 @@ declare namespace Pay {
         childrenList: ChannelListChildrenList[];
     }
     interface ChannelListChildrenList {
-        name: string;
+        name: Pay.PayChannel;
         label: React.ReactNode;
         icon: React.ReactNode;
         color: string;

package/dist/types/Recharge.d.ts

@@ -0,0 +1,9 @@
+declare namespace Recharge {
+    interface CreateQuery {
+        payChannel: Pay.PayChannel;
+        moneyAmount: number;
+    }
+    interface CreateResult {
+        tradeIdKey: string;
+    }
+}

package/dist/typings/Trade.d.ts

@@ -1,6 +1,6 @@
 declare namespace Trade {
     type PayType = 'NATIVE' | 'MWEB';
-    type PayChannel = 'wepay' | 'alipay';
+    type PayChannel = 'wepay' | 'alipay' | 'paypal';
     interface CommonCreateQuery {
         productKind: Global.ProductKind;
         productTypeId: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-sanzhizhou",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",