component-sanzhizhou 1.0.18 → 1.0.23

package/dist/Buy/index.d.ts

@@ -4,6 +4,7 @@ interface Props {
     vipId: number;
     productCount: number;
     productKind: 'vip' | 'vip-card';
+    couponCode: string;
     showPrice?: number;
     disabled?: boolean;
     payMethod?: Global.PayMethod;

package/dist/Buy/index.js

@@ -17,6 +17,7 @@ var Buy = function Buy(_ref) {
     _ref$productCount = _ref.productCount,
     productCount = _ref$productCount === void 0 ? 1 : _ref$productCount,
     payMethod = _ref.payMethod,
+    couponCode = _ref.couponCode,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     showPrice = _ref.showPrice,
@@ -99,6 +100,7 @@ var Buy = function Buy(_ref) {
         vipId: vipId,
         productCount: productCount,
         payMethod: payMethod,
+        couponCode: couponCode,
         onHandlePaySuccess: function onHandlePaySuccess() {
           onBuySuccess();
           dialog.destroy();

package/dist/Buy/qr.d.ts

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

package/dist/Buy/qr.js

@@ -23,6 +23,7 @@ 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,
+    couponCode = _ref.couponCode,
     _ref$payMethod = _ref.payMethod,
     payMethod = _ref$payMethod === void 0 ? ['wepay', 'alipay'] : _ref$payMethod,
     _ref$onHandlePaySucce = _ref.onHandlePaySuccess,
@@ -80,13 +81,15 @@ var VipQr = function VipQr(_ref) {
   var _useRequest = useRequest(function () {
       var channel = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payChannel;
       return TradeController.create({
+        couponCode: couponCode,
         productKind: productKind,
         productTypeId: vipId,
         productCount: productCount,
         userId: Tool.getLocalUserInfo().id,
         payType: 'NATIVE',
         //Platform.isH5 ? 'MWEB' : 'NATIVE',
-        payChannel: channel
+        payChannel: channel,
+        userToken: Tool.getLocalUserInfo().sid
       }, {
         env: env
       });

package/dist/UI/Money/index.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 interface Props {
-    value?: number;
+    value?: number | string;
     pre?: React.ReactNode;
     end?: React.ReactNode;
     precision?: number;

package/dist/UI/Money/index.js

@@ -2,6 +2,7 @@ import styles from "./index.css";
 import React from "react";
 import moneySimple from "../../lib/moneySimple";
 import { Tooltip } from "antd";
+import formatMessage from "../../lib/formatMessage";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -11,7 +12,7 @@ var Money = function Money(_ref) {
       children: "\xA5"
     }) : _ref$pre,
     _ref$end = _ref.end,
-    end = _ref$end === void 0 ? '元' : _ref$end,
+    end = _ref$end === void 0 ? formatMessage('元') : _ref$end,
     value = _ref.value,
     _ref$precision = _ref.precision,
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
@@ -28,13 +29,17 @@ var Money = function Money(_ref) {
       className: className,
       children: [/*#__PURE__*/_jsx("span", {
         className: "yen",
-        children: pre
+        children: /*#__PURE__*/_jsx("small", {
+          children: pre
+        })
       }), /*#__PURE__*/_jsx("span", {
         className: "value ".concat(value === 0 ? 'zero' : '', " "),
-        children: typeof value === 'number' ? disabledMoneySimple ? parseFloat(value.toFixed(precision)) : moneySimple(value, false, precision) : ''
+        children: typeof value === 'number' ? disabledMoneySimple ? parseFloat(value.toFixed(precision)) : moneySimple(value, false, precision) : value
       }), /*#__PURE__*/_jsx("span", {
         className: "yen",
-        children: end
+        children: /*#__PURE__*/_jsx("small", {
+          children: end
+        })
       })]
     })
   });

package/dist/VipList/index.js

@@ -372,6 +372,7 @@ var VipList = function VipList(_ref) {
                         productKind: "vip",
                         vipId: (item === null || item === void 0 ? void 0 : item.id) || 0,
                         productCount: 1,
+                        couponCode: "",
                         payMethod: payMethod,
                         showPrice: item === null || item === void 0 ? void 0 : item.price,
                         onBuySuccess: onBuySuccess,

package/dist/index.d.ts

@@ -14,3 +14,6 @@ export { default as fileListContent } from './base/fileListContent';
 export { default as fileList } from './base/fileList';
 export { default as Ad } from './Ad';
 export { default as PayRecharge } from './pay/recharge';
+export { default as PayVip } from './pay/vip';
+export { default as PayQr } from './pay/qr';
+export { default as PayChannel } from './pay/pay-channel';

package/dist/index.js

@@ -1,5 +1,3 @@
-// import soundInfo from "component-sanzhizhou/base/soundInfo";
-// import fileList from "component-sanzhizhou/base/fileList";
 import "./global.less";
 export { default as Buy } from "./Buy";
 export { default as Login } from "./Login";
@@ -15,4 +13,7 @@ export { default as openInFolder } from "./base/openInFolder";
 export { default as fileListContent } from "./base/fileListContent";
 export { default as fileList } from "./base/fileList";
 export { default as Ad } from "./Ad";
-export { default as PayRecharge } from "./pay/recharge";
+export { default as PayRecharge } from "./pay/recharge";
+export { default as PayVip } from "./pay/vip";
+export { default as PayQr } from "./pay/qr";
+export { default as PayChannel } from "./pay/pay-channel";

package/dist/lib/Tool.d.ts

@@ -162,7 +162,7 @@ declare const Tool: {
     getTitleByPath(path: string): string;
     getDirByPath(path: string): string;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
+    notification(type: "info" | "error" | "warning" | "success", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;

package/dist/locales/zh-CN.json

@@ -33,5 +33,7 @@
   "重试": "重试",
   "充值就送": "充值就送",
   "送": "送",
-  "选择": "选择"
+  "选择": "选择",
+  "名称": "名称",
+  "优惠券": "优惠券"
 }

package/dist/pay/pay-channel.d.ts

@@ -0,0 +1,8 @@
+import React from "react";
+interface Props {
+    defaultPayChannel: Pay.PayChannel;
+    allowPayChannelList: Pay.PayChannel[];
+    onSelect: (payChannelInfo: Pay.ChannelListChildrenList) => void;
+}
+declare const PayChannel: React.FC<Props>;
+export default PayChannel;

package/dist/pay/pay-channel.js

@@ -0,0 +1,43 @@
+import PayChannelList from "./payChannelList";
+import { Radio, Tag } from "antd";
+import formatMessage from "../lib/formatMessage";
+import React from "react";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var PayChannel = function PayChannel(_ref) {
+  var defaultPayChannel = _ref.defaultPayChannel,
+    _ref$allowPayChannelL = _ref.allowPayChannelList,
+    allowPayChannelList = _ref$allowPayChannelL === void 0 ? [] : _ref$allowPayChannelL,
+    onSelect = _ref.onSelect;
+  return /*#__PURE__*/_jsx(Radio.Group, {
+    defaultValue: defaultPayChannel,
+    onChange: function onChange(e) {
+      var _e$target$id, _e$target$id$split;
+      var idInfo = ((_e$target$id = e.target.id) === null || _e$target$id === void 0 || (_e$target$id$split = _e$target$id.split) === null || _e$target$id$split === void 0 ? void 0 : _e$target$id$split.call(_e$target$id, '-')) || [];
+      var index = parseInt(idInfo[1]) || 0;
+      var i = parseInt(idInfo[2]) || 0;
+      onSelect(PayChannelList[index].childrenList[i]);
+    },
+    children: PayChannelList.map(function (items, index) {
+      return items.disabled ? null : /*#__PURE__*/_jsxs("div", {
+        className: "ssz-groupItems",
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "ssz-groupTitle",
+          children: items.groupTitle
+        }), items.childrenList.map(function (item, i) {
+          return item.disabled || !(allowPayChannelList !== null && allowPayChannelList !== void 0 && allowPayChannelList.includes(item.name)) ? null : /*#__PURE__*/_jsx(Radio, {
+            disabled: item.disabled,
+            value: item.name,
+            id: "payChannel-".concat(index, "-").concat(i),
+            children: /*#__PURE__*/_jsxs(Tag, {
+              color: item.color,
+              className: "ssz-color-tag",
+              children: [item.icon, " ", formatMessage(item.label)]
+            })
+          }, "".concat(i, "-").concat(item.name));
+        })]
+      }, "".concat(index, "-").concat(items.groupTitle));
+    })
+  });
+};
+export default PayChannel;

package/dist/pay/payChannelList.d.ts

@@ -0,0 +1,2 @@
+declare const PayChannelList: Pay.ChannelList[];
+export default PayChannelList;

package/dist/pay/payChannelList.js

@@ -0,0 +1,30 @@
+import { AlipayCircleOutlined, WechatOutlined } from "@ant-design/icons";
+import React from "react";
+import { jsx as _jsx } from "react/jsx-runtime";
+var PayChannelList = [{
+  groupTitle: '',
+  childrenList: [{
+    name: 'wepay',
+    label: '微信支付',
+    icon: /*#__PURE__*/_jsx(WechatOutlined, {}),
+    color: '#2bae68',
+    disabled: false
+  }, {
+    name: 'alipay',
+    label: '支付宝',
+    icon: /*#__PURE__*/_jsx(AlipayCircleOutlined, {}),
+    color: '#1c6cf4',
+    disabled: false
+  }]
+}, {
+  groupTitle: '国际支付',
+  disabled: true,
+  childrenList: [{
+    name: 'paypal',
+    label: 'Paypal',
+    icon: /*#__PURE__*/_jsx(WechatOutlined, {}),
+    color: '#F60',
+    disabled: true
+  }]
+}];
+export default PayChannelList;

package/dist/pay/qr.d.ts

@@ -1,13 +1,11 @@
 import React from 'react';
 import './qr.less';
 interface Props {
-    appId: string;
     productKind: Pay.ProductKind;
-    selectPayChannel: Pay.ChannelListChildrenList;
     vipId: number;
+    couponCode: string;
     payChannel: Pay.PayChannel;
     productCount: number;
-    productName: string;
     moneyAmount: number;
     size?: number;
     env?: Global.Env;

package/dist/pay/qr.js

@@ -1,15 +1,16 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState } from 'react';
 import { Button, Divider, QRCode, Spin } from 'antd';
 import "./qr.less";
 import { useRequest } from "@umijs/hooks";
 import { CheckCircleOutlined, ReloadOutlined } from "@ant-design/icons";
-import Tool from "../lib/Tool";
-import CallMiniUrl from "../lib/call-mini-url";
 import formatMessage from "../lib/formatMessage";
 import * as WechatMinAppController from "../service/api/WechatMinAppController";
+import * as TradeController from "../service/api/TradeController";
 import { getApiEnv } from "../lib/getApiUrl";
 import getLocalUserInfo from "../lib/getLocalUserInfo";
+import PayChannelList from "./payChannelList";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 // type QrDict = Record<Global.Env, string>;
@@ -21,12 +22,11 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 // };
 
 var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
-  var appId = _ref.appId,
-    selectPayChannel = _ref.selectPayChannel,
+  var payChannel = _ref.payChannel,
     moneyAmount = _ref.moneyAmount,
     productCount = _ref.productCount,
     vipId = _ref.vipId,
-    productName = _ref.productName,
+    couponCode = _ref.couponCode,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 260 : _ref$size,
     productKind = _ref.productKind,
@@ -39,36 +39,42 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     qrStatus = _useState4[0],
     setQrStatus = _useState4[1];
-  var makeQrUrl = function makeQrUrl() {
-    var query = {
-      // fromSid: Tool.getLocalUserInfo().sid,
-      // fromChannel: 'web',
-      fromChannel: selectPayChannel.name,
-      productKind: productKind ? productKind : vipId == 0 ? 'recharge' : '',
-      productCount: productCount,
-      productId: vipId,
-      userToken: Tool.getLocalUserInfo().sid,
-      productName: productName,
-      payMoney: moneyAmount
-    };
-    var qrUrl = CallMiniUrl(appId, '', query);
-    console.log('makeQrUrl bind:', query, qrUrl);
-    setQrUrl(qrUrl);
-    setQrStatus('active');
-  };
+  var _useState5 = useState({
+      needPayMoney: 0
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    payMoneyInfo = _useState6[0],
+    setPayMoneyInfo = _useState6[1];
+  var selectPayChannel = function (_PayChannelList$filte) {
+    var selectItem = ((_PayChannelList$filte = PayChannelList.filter(function (items) {
+      return items.childrenList.filter(function (item) {
+        return item.name === payChannel;
+      });
+    })[0]) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte.childrenList) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte.filter(function (item) {
+      return item.name === payChannel;
+    })) === null || _PayChannelList$filte === void 0 ? void 0 : _PayChannelList$filte[0]) || {};
+    return selectItem;
+  }();
   var _useRequest = useRequest(function () {
-      return WechatMinAppController.getUrlLink({
-        pagePath: 'pages/recharge/index',
-        pathQuery: "moneyAmount=".concat(moneyAmount, "&userToken=").concat(getLocalUserInfo().sid || '', "&productKind=recharge"),
+      var postQuery = {
+        pagePath: "pages/recharge/index",
+        pathQuery: "moneyAmount=".concat(moneyAmount, "&productCount=").concat(productCount, "&userToken=").concat(getLocalUserInfo().sid || '', "&productKind=").concat(productKind, "&productTypeId=").concat(vipId, "&payChannel=").concat(payChannel),
+        couponCode: couponCode,
         envVersion: getApiEnv() === 'local' ? "develop" : 'release'
-      }, {
+      };
+      console.log('WechatMinApp.GetUrlLinkQuery postQuery:', postQuery);
+      return WechatMinAppController.getUrlLink(postQuery, {
         env: env
       });
     }, {
       manual: true,
       onSuccess: function onSuccess(result) {
+        var _result$payMoneyInfo$, _result$payMoneyInfo;
         setQrUrl(result.url);
         setQrStatus('active');
+        setPayMoneyInfo(_objectSpread(_objectSpread({}, result.payMoneyInfo), {}, {
+          needPayMoney: (_result$payMoneyInfo$ = result === null || result === void 0 || (_result$payMoneyInfo = result.payMoneyInfo) === null || _result$payMoneyInfo === void 0 ? void 0 : _result$payMoneyInfo.needPayMoney) !== null && _result$payMoneyInfo$ !== void 0 ? _result$payMoneyInfo$ : moneyAmount
+        }));
       },
       onError: function onError(e) {
         setQrStatus('expired');
@@ -76,29 +82,43 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     }),
     runWechatMinApp = _useRequest.run,
     loadingWechatMinApp = _useRequest.loading;
+  var _useRequest2 = useRequest(function () {
+      return TradeController.commonCreate({
+        productKind: productKind,
+        productTypeId: vipId,
+        productCount: moneyAmount,
+        userId: 0,
+        payChannel: 'alipay',
+        couponCode: couponCode,
+        userToken: getLocalUserInfo().sid || ''
+      }, {
+        env: env
+      });
+    }, {
+      manual: true,
+      onSuccess: function onSuccess(result) {
+        var _result$payMoneyInfo$2, _result$payMoneyInfo2;
+        setQrUrl(result.qrUrl || '');
+        setQrStatus('active');
+        setPayMoneyInfo(_objectSpread(_objectSpread({}, result.payMoneyInfo), {}, {
+          needPayMoney: (_result$payMoneyInfo$2 = result === null || result === void 0 || (_result$payMoneyInfo2 = result.payMoneyInfo) === null || _result$payMoneyInfo2 === void 0 ? void 0 : _result$payMoneyInfo2.needPayMoney) !== null && _result$payMoneyInfo$2 !== void 0 ? _result$payMoneyInfo$2 : moneyAmount
+        }));
+      },
+      onError: function onError(e) {
+        setQrStatus('expired');
+      }
+    }),
+    runTrade = _useRequest2.run,
+    loadingTrade = _useRequest2.loading;
   var onInit = function onInit() {
-    // const qrUrlBase = QrDict[ getEnv() ] || QrDict.prod;
-    // const data = JSON.stringify({
-    //   productKind: productKind ? productKind : ( vipId == 0 ? 'recharge' : '' ),
-    //   productCount,
-    //   productId: vipId,
-    //   userToken: Tool.getLocalUserInfo().sid,
-    //   wechatAppId: '',
-    //   productName,
-    //   payMoney: moneyAmount,
-    // });
-    // const qrUrl = qrUrlBase + ( qrUrlBase.indexOf('?') === -1 ? '?' : '&' ) + `data=`+ encodeURIComponent( data ) ;
-    // console.log('recharge qr:', qrUrl );
-    // setQrUrl( qrUrl );
-    // setQrStatus('active');
-    if (selectPayChannel.name === 'wepay') {
+    if (payChannel === 'wepay') {
       runWechatMinApp();
-    } else if (selectPayChannel.name === 'alipay') {
-      makeQrUrl();
+    } else if (payChannel === 'alipay') {
+      runTrade();
     }
   };
   var getPaymentQr = function getPaymentQr() {
-    runWechatMinApp();
+    onInit();
   };
   useEffect(function () {
     onInit();
@@ -112,9 +132,9 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
         className: "ssz-qr-moneyAmountBox",
         children: [/*#__PURE__*/_jsx("small", {
           children: "\xA5"
-        }), /*#__PURE__*/_jsx("span", {
+        }), loadingTrade || loadingWechatMinApp ? '...' : /*#__PURE__*/_jsx("span", {
           className: "ssz-qr-moneyAmount",
-          children: moneyAmount
+          children: payMoneyInfo.needPayMoney
         }), /*#__PURE__*/_jsx("small", {
           children: formatMessage('元')
         })]

package/dist/pay/recharge.js

@@ -6,42 +6,17 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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 { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
 import PayQr from "./qr";
 import notification from "../lib/notification";
 import sleep from "../lib/sleep";
 import formatMessage from "../lib/formatMessage";
 import RechargeRule from "./recharge-rule";
 import PayRechargeMoneyAmountAlt from "./recharge-moneyAmount-alt";
+import PayChannelList from "./payChannelList";
 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 PayChannelList = [{
-  groupTitle: '',
-  childrenList: [{
-    name: 'wepay',
-    label: '微信支付',
-    icon: /*#__PURE__*/_jsx(WechatOutlined, {}),
-    color: '#2bae68',
-    disabled: false
-  }, {
-    name: 'alipay',
-    label: '支付宝',
-    icon: /*#__PURE__*/_jsx(AlipayCircleOutlined, {}),
-    color: '#1c6cf4',
-    disabled: false
-  }]
-}, {
-  groupTitle: '国际支付',
-  disabled: true,
-  childrenList: [{
-    name: 'paypal',
-    label: 'Paypal',
-    icon: /*#__PURE__*/_jsx(WechatOutlined, {}),
-    color: '#F60',
-    disabled: true
-  }]
-}];
 var BaseDict = {
   productKind: {
     recharge: '充值',
@@ -70,10 +45,13 @@ var PayRecharge = function PayRecharge(_ref) {
     onHandSuccess = _ref.onHandSuccess,
     env = _ref.env;
   var _useState = useState(((_PayChannelList$filte = PayChannelList.filter(function (items) {
-      return items.childrenList.map(function (item) {
+      var itemList = items.childrenList.filter(function (item) {
         return item.name === defaultPayChannel;
       });
-    })) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte[0]) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte.childrenList) === null || _PayChannelList$filte === void 0 ? void 0 : _PayChannelList$filte[0]) || PayChannelList[0].childrenList[0]),
+      return itemList.length > 0;
+    })) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte[0]) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte.childrenList.filter(function (item) {
+      return item.name === defaultPayChannel;
+    })) === null || _PayChannelList$filte === void 0 ? void 0 : _PayChannelList$filte[0]) || PayChannelList[0].childrenList[0]),
     _useState2 = _slicedToArray(_useState, 2),
     selectPayChannel = _useState2[0],
     setSelectPayChannel = _useState2[1];
@@ -190,8 +168,8 @@ var PayRecharge = function PayRecharge(_ref) {
           label: formatMessage('支付渠道'),
           children: /*#__PURE__*/_jsx(Radio.Group, {
             onChange: function onChange(e) {
-              var _e$target$id;
-              var idInfo = ((_e$target$id = e.target.id) === null || _e$target$id === void 0 ? void 0 : _e$target$id.split('-')) || [];
+              var _e$target$id, _e$target$id$split;
+              var idInfo = ((_e$target$id = e.target.id) === null || _e$target$id === void 0 || (_e$target$id$split = _e$target$id.split) === null || _e$target$id$split === void 0 ? void 0 : _e$target$id$split.call(_e$target$id, '-')) || [];
               var index = parseInt(idInfo[1]) || 0;
               var i = parseInt(idInfo[2]) || 0;
               setSelectPayChannel(PayChannelList[index].childrenList[i]);
@@ -226,17 +204,21 @@ var PayRecharge = function PayRecharge(_ref) {
           }
         })]
       }), step === 'qr-show' && /*#__PURE__*/_jsx(_Fragment, {
-        children: /*#__PURE__*/_jsx(PayQr, {
-          appId: appId,
+        children: /*#__PURE__*/_jsx(PayQr
+        // appId={ appId }
+        , {
           moneyAmount: formData.moneyAmount,
-          productCount: formData.moneyAmount,
-          productName: BaseDict.productKind[productKind],
+          productCount: formData.moneyAmount
+          // productName={ BaseDict.productKind[ productKind ] || '' }
+          ,
           vipId: 0,
-          payChannel: formData.payChannel,
-          selectPayChannel: selectPayChannel,
+          payChannel: formData.payChannel
+          // selectPayChannel={selectPayChannel}
+          ,
           size: size,
           env: env,
-          productKind: productKind
+          productKind: productKind,
+          couponCode: ""
         })
       }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsxs("div", {
         className: "ssz-submits",

package/dist/pay/vip.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import './vip.less';
+interface Props {
+    name: React.ReactNode;
+    priceColor?: string;
+    allowPayChannelList: Pay.PayChannel[];
+    defaultPayChannel: Pay.PayChannel;
+    singlePrice: number;
+    vipId: number;
+    productKind: Pay.ProductKind;
+    size?: number;
+    defaultProductCount?: number;
+    minProductCount?: number;
+    precision?: number;
+    maxProductCount?: number;
+    onHandSuccess: () => void;
+    env?: Global.Env;
+}
+declare const PayVip: React.FC<Props>;
+export default PayVip;

package/dist/pay/vip.js

@@ -0,0 +1,249 @@
+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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useState } from 'react';
+import { Button, Divider, Form, Input, InputNumber, Radio, Space, Tag } from 'antd';
+import "./vip.less";
+import { CaretLeftOutlined, CaretRightOutlined, CloseOutlined, PauseOutlined } from '@ant-design/icons';
+import PayQr from "./qr";
+import notification from "../lib/notification";
+import sleep from "../lib/sleep";
+import formatMessage from "../lib/formatMessage";
+import PayChannelList from "./payChannelList";
+import math from "../lib/math";
+import Money from "../UI/Money";
+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 BaseDict = {
+  productKind: {
+    recharge: '充值',
+    vip: '会员卡'
+  }
+};
+var PayVip = function PayVip(_ref) {
+  var _PayChannelList$filte;
+  var name = _ref.name,
+    _ref$priceColor = _ref.priceColor,
+    priceColor = _ref$priceColor === void 0 ? '#F60' : _ref$priceColor,
+    allowPayChannelList = _ref.allowPayChannelList,
+    productKind = _ref.productKind,
+    singlePrice = _ref.singlePrice,
+    vipId = _ref.vipId,
+    defaultPayChannel = _ref.defaultPayChannel,
+    _ref$minProductCount = _ref.minProductCount,
+    minProductCount = _ref$minProductCount === void 0 ? 1 : _ref$minProductCount,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 280 : _ref$size,
+    _ref$defaultProductCo = _ref.defaultProductCount,
+    defaultProductCount = _ref$defaultProductCo === void 0 ? 1 : _ref$defaultProductCo,
+    _ref$maxProductCount = _ref.maxProductCount,
+    maxProductCount = _ref$maxProductCount === void 0 ? 5000 : _ref$maxProductCount,
+    onHandSuccess = _ref.onHandSuccess,
+    env = _ref.env;
+  var _useState = useState(((_PayChannelList$filte = PayChannelList.filter(function (items) {
+      var itemList = items.childrenList.filter(function (item) {
+        return item.name === defaultPayChannel;
+      });
+      return itemList.length > 0;
+    })) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte[0]) === null || _PayChannelList$filte === void 0 || (_PayChannelList$filte = _PayChannelList$filte.childrenList.filter(function (item) {
+      return item.name === defaultPayChannel;
+    })) === null || _PayChannelList$filte === void 0 ? void 0 : _PayChannelList$filte[0]) || PayChannelList[0].childrenList[0]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectPayChannel = _useState2[0],
+    setSelectPayChannel = _useState2[1];
+  var _useState3 = useState({
+      productCount: defaultProductCount,
+      payChannel: defaultPayChannel,
+      couponCode: ''
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formData = _useState4[0],
+    setFormData = _useState4[1];
+  var _useState5 = useState('pay-channel'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    step = _useState6[0],
+    setStep = _useState6[1];
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var onChoosePayChannel = function onChoosePayChannel() {
+    setStep('pay-channel');
+  };
+  var onMakeQr = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(formData) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            console.log('on formData : ', formData);
+            // 检查金额
+            if (formData.productCount) {
+              _context.next = 4;
+              break;
+            }
+            notification.notificationError(formatMessage('数量'), '请输入数量', {
+              duration: 6
+            });
+            return _context.abrupt("return");
+          case 4:
+            setFormData(_objectSpread({}, formData));
+            _context.next = 7;
+            return sleep(200);
+          case 7:
+            setStep('qr-show');
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onMakeQr(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onIPayed = function onIPayed() {
+    onHandSuccess === null || onHandSuccess === void 0 || onHandSuccess();
+  };
+  var FormItemSpan = 6;
+  return /*#__PURE__*/_jsx("div", {
+    className: "ssz-payVipCard",
+    children: /*#__PURE__*/_jsxs(Form, {
+      form: form,
+      labelCol: {
+        span: FormItemSpan
+      },
+      initialValues: _objectSpread({}, formData),
+      onFinish: onMakeQr,
+      children: [step === 'pay-channel' && /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(Form.Item, {
+          label: formatMessage('名称'),
+          children: /*#__PURE__*/_jsx("strong", {
+            children: name
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
+          label: formatMessage('数量'),
+          name: "productCount",
+          children: /*#__PURE__*/_jsx(InputNumber, {
+            style: {
+              width: 160
+            },
+            addonAfter: "\u4E2A",
+            precision: 0,
+            step: 1,
+            min: minProductCount,
+            max: maxProductCount,
+            placeholder: formatMessage('请输入'),
+            onChange: function onChange(productCount) {
+              formData.productCount = parseInt("".concat(productCount)) || 0;
+              setFormData(_objectSpread({}, formData));
+            }
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
+          label: formatMessage('价格'),
+          children: /*#__PURE__*/_jsx("div", {
+            className: "ssz-priceMoney-warp",
+            children: /*#__PURE__*/_jsxs(Space, {
+              children: [singlePrice, /*#__PURE__*/_jsx(CloseOutlined, {
+                className: "ssz-priceMoney-icon"
+              }), formData.productCount, /*#__PURE__*/_jsx(PauseOutlined, {
+                className: "ssz-priceMoney-icon ssz-priceMoney-icon-pause"
+              }), /*#__PURE__*/_jsx(Money, {
+                value: singlePrice * formData.productCount,
+                className: "ssz-priceMoney",
+                color: priceColor,
+                disabledMoneySimple: true,
+                end: formatMessage('元')
+              })]
+            })
+          })
+        }), /*#__PURE__*/_jsx(Form.Item, {
+          name: "payChannel",
+          label: formatMessage('支付渠道'),
+          children: /*#__PURE__*/_jsx(Radio.Group, {
+            onChange: function onChange(e) {
+              var _split, _ref3;
+              var idInfo = ((_split = (_ref3 = e.target.id || '').split) === null || _split === void 0 ? void 0 : _split.call(_ref3, '-')) || [];
+              var index = parseInt(idInfo[1]) || 0;
+              var i = parseInt(idInfo[2]) || 0;
+              setSelectPayChannel(PayChannelList[index].childrenList[i]);
+            },
+            children: PayChannelList.map(function (items, index) {
+              return items.disabled ? null : /*#__PURE__*/_jsxs("div", {
+                className: "ssz-groupItems",
+                children: [/*#__PURE__*/_jsx("div", {
+                  className: "ssz-groupTitle",
+                  children: items.groupTitle
+                }), items.childrenList.map(function (item, i) {
+                  return item.disabled || !(allowPayChannelList !== null && allowPayChannelList !== void 0 && allowPayChannelList.includes(item.name)) ? null : /*#__PURE__*/_jsx(Radio, {
+                    disabled: item.disabled,
+                    value: item.name,
+                    id: "payChannel-".concat(index, "-").concat(i),
+                    children: /*#__PURE__*/_jsxs(Tag, {
+                      color: item.color,
+                      className: "ssz-color-tag",
+                      children: [item.icon, " ", formatMessage(item.label)]
+                    })
+                  }, "".concat(i, "-").concat(item.name));
+                })]
+              }, "".concat(index, "-").concat(items.groupTitle));
+            })
+          })
+        }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(Form.Item, {
+          label: formatMessage('优惠券'),
+          name: "couponCode",
+          children: /*#__PURE__*/_jsx(Input, {
+            className: "ssz-coupon-input",
+            placeholder: formatMessage('请输入'),
+            maxLength: 30
+          })
+        })]
+      }), step === 'qr-show' && /*#__PURE__*/_jsx(_Fragment, {
+        children: /*#__PURE__*/_jsx(PayQr
+        // appId={ appId }
+        , {
+          moneyAmount: math.multiply(formData.productCount, singlePrice),
+          productCount: formData.productCount
+          // productName={ BaseDict.productKind[ productKind ] }
+          ,
+          vipId: vipId,
+          payChannel: formData.payChannel
+          // selectPayChannel={selectPayChannel}
+          ,
+          couponCode: formData.couponCode,
+          size: size,
+          env: env,
+          productKind: productKind
+        })
+      }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsxs("div", {
+        className: "ssz-submits",
+        children: [/*#__PURE__*/_jsx("div", {
+          children: ['qr-show'].includes(step) && /*#__PURE__*/_jsx(Button, {
+            type: "link",
+            icon: /*#__PURE__*/_jsx(CaretLeftOutlined, {})
+            // ghost
+            ,
+            onClick: function onClick() {
+              return onChoosePayChannel();
+            },
+            children: formatMessage('上一步')
+          })
+        }), /*#__PURE__*/_jsxs("div", {
+          children: [['pay-channel'].includes(step) && /*#__PURE__*/_jsxs(Button, {
+            type: "primary",
+            htmlType: "submit",
+            children: [formatMessage('下一步'), " ", /*#__PURE__*/_jsx(CaretRightOutlined, {})]
+          }), ['qr-show'].includes(step) && /*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            ghost: true,
+            onClick: function onClick() {
+              return onIPayed();
+            },
+            children: formatMessage('已支付')
+          })]
+        })]
+      })]
+    })
+  });
+};
+export default PayVip;

package/dist/pay/vip.less

@@ -0,0 +1,29 @@
+ .ssz-payVipCard{
+   .ssz-priceMoney{
+     font-size: 20px;
+     line-height: 20px;
+   }
+
+   .ssz-submits{
+     display: flex;
+     flex-direction: row;
+     justify-content: space-between;
+     padding: 0 0 18px;
+   }
+
+   .ssz-coupon-input{
+     max-width: 70%;
+     width: 280px;
+   }
+
+   .ssz-priceMoney-warp{
+     font-size: 16px;
+     .ssz-priceMoney-icon{
+       color: #CCC;
+       font-size: smaller;
+     }
+     .ssz-priceMoney-icon-pause{
+       transform: rotate(-90deg);
+     }
+   }
+ }

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

@@ -1,7 +1,4 @@
 export declare function create(body: Trade.CommonCreateQuery, options?: {
     [key: string]: any;
 }): Promise<Trade.CreateResult>;
-export declare function versionList(body?: {
-    dealerId: number;
-    productType: string;
-}, options?: Global.RequestOptions): Promise<Product.VersionList[]>;
+export declare function commonCreate(body: Trade.CommonCreateQuery, options?: Global.RequestOptions): Promise<Trade.CommonCreate>;

package/dist/service/api/TradeController.js

@@ -27,20 +27,20 @@ function _create() {
   }));
   return _create.apply(this, arguments);
 }
-export function versionList(_x3, _x4) {
-  return _versionList.apply(this, arguments);
+export function commonCreate(_x3, _x4) {
+  return _commonCreate.apply(this, arguments);
 }
-function _versionList() {
-  _versionList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
+function _commonCreate() {
+  _commonCreate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("clientVersion/list", _objectSpread({
-            method: 'GET',
+          return _context2.abrupt("return", request("trade/commonCreate", _objectSpread({
+            method: 'POST',
             headers: {
               'Content-Type': 'application/json'
             },
-            params: _objectSpread({}, body)
+            data: _objectSpread({}, body)
           }, options || {})));
         case 1:
         case "end":
@@ -48,5 +48,5 @@ function _versionList() {
       }
     }, _callee2);
   }));
-  return _versionList.apply(this, arguments);
+  return _commonCreate.apply(this, arguments);
 }

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

@@ -1,5 +1 @@
-export declare function getUrlLink(body: {
-    pagePath: string;
-    pathQuery: string;
-    envVersion: "release" | "trial" | "develop";
-}, options?: ServicesApi.RequestOptions): Promise<WechatMinApp.GetUrlLink>;
+export declare function getUrlLink(body: WechatMinApp.GetUrlLinkQuery, options?: ServicesApi.RequestOptions): Promise<WechatMinApp.GetUrlLink>;

package/dist/types/Pay.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 declare namespace Pay {
     type PayChannel = Trade.PayChannel;
-    type ProductKind = 'vip' | 'vip-card' | 'recharge';
+    type ProductKind = 'vip' | 'vip-card' | 'recharge' | 'added-service';
     interface ChannelList {
         groupTitle: string;
         disabled?: boolean;
@@ -21,4 +21,9 @@ declare namespace Pay {
     interface GetPaymentQr {
         qrUrl: string;
     }
+    interface VipFormData {
+        productCount: number;
+        payChannel: PayChannel;
+        couponCode: string;
+    }
 }

package/dist/{typings → types}/Trade.d.ts

@@ -6,21 +6,26 @@ declare namespace Trade {
         productTypeId: number;
         productCount: number;
         userId: number;
-        payType: PayType;
+        payType?: PayType;
         payChannel: PayChannel;
+        couponCode: string;
+        userToken: string;
         [name: string]: any;
     }
+    interface PayMoneyInfo {
+        needPayMoney: number;
+    }
     interface CreateResult {
         codeUrl: string;
         mWebUrl: string;
         payChannel: PayChannel;
     }
-    interface CommonCreateResult {
-        "h5PayUrl": string;
-        "orderIdKey": string;
-        "tradeIdKey": string;
-        "tradeNo": string;
-        jsApiInfo: {
+    interface CommonCreate {
+        h5PayUrl?: string;
+        orderIdKey?: string;
+        tradeIdKey?: string;
+        tradeNo?: string;
+        jsApiInfo?: {
             appId: string;
             timeStamp: string;
             nonceStr: string;
@@ -28,5 +33,7 @@ declare namespace Trade {
             package: string;
             paySign: string;
         };
+        qrUrl?: string;
+        payMoneyInfo: PayMoneyInfo;
     }
 }

package/dist/types/WechatMinApp.d.ts

@@ -1,5 +1,12 @@
 declare namespace WechatMinApp {
     interface GetUrlLink {
         url: string;
+        payMoneyInfo: Trade.PayMoneyInfo;
+    }
+    interface GetUrlLinkQuery {
+        pagePath: string;
+        pathQuery: string;
+        couponCode: string;
+        envVersion: "release" | "trial" | "develop";
     }
 }

package/package.json

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