component-sanzhizhou 1.2.12 → 1.3.0

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" | "warning" | "error" | "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/pay/qr.d.ts

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

package/dist/pay/qr.js

@@ -30,7 +30,8 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 260 : _ref$size,
     productKind = _ref.productKind,
-    env = _ref.env;
+    env = _ref.env,
+    balanceType = _ref.balanceType;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     qrUrl = _useState2[0],
@@ -58,7 +59,7 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
   var _useRequest = useRequest(function () {
       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),
+        pathQuery: "moneyAmount=".concat(moneyAmount, "&productCount=").concat(productCount, "&userToken=").concat(getLocalUserInfo().sid || '', "&productKind=").concat(productKind, "&productTypeId=").concat(vipId, "&payChannel=").concat(payChannel).concat(balanceType ? "&balanceType=".concat(balanceType) : ''),
         couponCode: couponCode,
         envVersion: getApiEnv() === 'local' ? "develop" : 'release'
       };
@@ -91,7 +92,8 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
         userId: 0,
         payChannel: 'alipay',
         couponCode: couponCode,
-        userToken: getLocalUserInfo().sid || ''
+        userToken: getLocalUserInfo().sid || '',
+        balanceType: balanceType
       }, {
         apiUrl: apiUrl,
         env: env

package/dist/pay/recharge-moneyAmount-alt.less

@@ -1,5 +1,6 @@
 .ssz-recharge-form-moneyAmount-input{
   position: relative;
+
   .ssz-recharge-form-moneyAmount-input-bonus{
     position: absolute;
     top: -5px;

package/dist/pay/recharge-rule.d.ts

@@ -5,6 +5,7 @@ interface Props {
     env?: Global.Env;
     money: number;
     onList: (list: RechargeRule.List[]) => void;
+    balanceType?: Pay.BalanceType;
 }
 declare const RechargeRule: React.FC<Props>;
 export default RechargeRule;

package/dist/pay/recharge-rule.js

@@ -12,16 +12,20 @@ var RechargeRule = function RechargeRule(_ref) {
   var formItemSpan = _ref.formItemSpan,
     env = _ref.env,
     money = _ref.money,
-    onList = _ref.onList;
+    onList = _ref.onList,
+    balanceType = _ref.balanceType;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     listData = _useState2[0],
     setListData = _useState2[1];
   var _useRequest = useRequest(function () {
-      return RechargeRuleController.list({}, {
+      return RechargeRuleController.list({
+        balanceType: balanceType
+      }, {
         env: env
       });
     }, {
+      refreshDeps: [balanceType],
       onSuccess: function onSuccess(result) {
         result.sort(function (a, b) {
           return a.rechargeMoney - b.rechargeMoney;

package/dist/pay/recharge.css.js

@@ -3,5 +3,5 @@ export default {
   PayRecharge: styled.div.withConfig({
     displayName: "PayRecharge",
     componentId: "component-sanzhizhou__sc-1np6liz-0"
-  })([".ssz-recharge-form-moneyAmount-input{input{width:120px;}}.ssz-groupItems{padding:0 0 12px 0;}.ssz-submits{display:flex;flex-direction:row;justify-content:space-between;padding:0 0 18px;}.ssz-groupTitle{font-size:14px;color:#777;font-weight:300;padding:0 0 3px 0;}.ant-radio-wrapper-disabled{.ssz-color-tag{opacity:0.4;-webkit-filter:grayscale(100%);filter:grayscale(100%);}}"])
+  })([".ssz-recharge-form-moneyAmount-input{input{}}.ssz-groupItems{padding:0 0 12px 0;}.ssz-submits{display:flex;flex-direction:row;justify-content:space-between;padding:0 0 18px;}.ssz-groupTitle{font-size:14px;color:#777;font-weight:300;padding:0 0 3px 0;}.ant-radio-wrapper-disabled{.ssz-color-tag{opacity:0.4;-webkit-filter:grayscale(100%);filter:grayscale(100%);}}"])
 };

package/dist/pay/recharge.d.ts

@@ -13,6 +13,11 @@ interface Props {
     maxPrice?: number;
     onHandSuccess: () => void;
     env?: Global.Env;
+    balanceTypeOptions?: {
+        label: React.ReactNode;
+        value: Pay.BalanceType;
+    }[];
+    defaultBalanceType?: Pay.BalanceType;
 }
 declare const PayRecharge: React.FC<Props>;
 export default PayRecharge;

package/dist/pay/recharge.js

@@ -12,7 +12,6 @@ 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";
 var BaseDict = {
   productKind: {
@@ -21,7 +20,7 @@ var BaseDict = {
   }
 };
 var PayRecharge = function PayRecharge(_ref) {
-  var _PayChannelList$filte;
+  var _PayChannelList$filte, _balanceTypeOptions$;
   var appId = _ref.appId,
     apiUrl = _ref.apiUrl,
     nickName = _ref.nickName,
@@ -41,7 +40,9 @@ var PayRecharge = function PayRecharge(_ref) {
     _ref$maxPrice = _ref.maxPrice,
     maxPrice = _ref$maxPrice === void 0 ? 5000 : _ref$maxPrice,
     onHandSuccess = _ref.onHandSuccess,
-    env = _ref.env;
+    env = _ref.env,
+    balanceTypeOptions = _ref.balanceTypeOptions,
+    defaultBalanceType = _ref.defaultBalanceType;
   var _useState = useState(((_PayChannelList$filte = PayChannelList.filter(function (items) {
       var itemList = items.childrenList.filter(function (item) {
         return item.name === defaultPayChannel;
@@ -55,7 +56,8 @@ var PayRecharge = function PayRecharge(_ref) {
     setSelectPayChannel = _useState2[1];
   var _useState3 = useState({
       moneyAmount: defaultPrice,
-      payChannel: defaultPayChannel
+      payChannel: defaultPayChannel,
+      balanceType: defaultBalanceType || (balanceTypeOptions === null || balanceTypeOptions === void 0 || (_balanceTypeOptions$ = balanceTypeOptions[0]) === null || _balanceTypeOptions$ === void 0 ? void 0 : _balanceTypeOptions$.value)
     }),
     _useState4 = _slicedToArray(_useState3, 2),
     formData = _useState4[0],
@@ -118,7 +120,15 @@ var PayRecharge = function PayRecharge(_ref) {
     onFinish: onMakeQr
   }, step === 'pay-channel' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
     label: formatMessage('账号')
-  }, /*#__PURE__*/React.createElement("strong", null, nickName)), /*#__PURE__*/React.createElement(Form.Item, {
+  }, /*#__PURE__*/React.createElement("strong", null, nickName)), (balanceTypeOptions || []).length > 0 && /*#__PURE__*/React.createElement(Form.Item, {
+    name: "balanceType",
+    label: formatMessage('余额类别')
+  }, /*#__PURE__*/React.createElement(Radio.Group, null, (balanceTypeOptions || []).map(function (item) {
+    return /*#__PURE__*/React.createElement(Radio, {
+      key: item.value,
+      value: item.value
+    }, item.label);
+  }))), /*#__PURE__*/React.createElement(Form.Item, {
     label: formatMessage('金额'),
     name: "moneyAmount",
     rules: [{
@@ -127,13 +137,16 @@ var PayRecharge = function PayRecharge(_ref) {
     }],
     extra: /*#__PURE__*/React.createElement("small", null, formatMessage('充值'), "\uFF1A", formatMessage('最低'), " ", /*#__PURE__*/React.createElement("strong", null, " ", minPrice), /*#__PURE__*/React.createElement("small", null, " ", formatMessage('元')), "\uFF0C", formatMessage('最大'), " ", /*#__PURE__*/React.createElement("strong", null, " ", maxPrice), /*#__PURE__*/React.createElement("small", null, " ", formatMessage('元')))
   }, /*#__PURE__*/React.createElement(InputNumber, {
-    prefix: /*#__PURE__*/React.createElement(React.Fragment, null, "\xA5"),
-    suffix: /*#__PURE__*/React.createElement(PayRechargeMoneyAmountAlt, {
-      moneyAmount: formData.moneyAmount,
-      rechargeRuleList: rechargeRuleList
-    }),
+    prefix: /*#__PURE__*/React.createElement(React.Fragment, null, "\xA5")
+    // suffix={(
+    //   <PayRechargeMoneyAmountAlt
+    //     moneyAmount={ formData.moneyAmount }
+    //     rechargeRuleList={ rechargeRuleList }
+    //   />
+    // )}
+    ,
     style: {
-      // minWidth: 300,
+      minWidth: 150
     },
     className: "ssz-recharge-form-moneyAmount-input",
     precision: precision,
@@ -178,6 +191,7 @@ var PayRecharge = function PayRecharge(_ref) {
     formItemSpan: FormItemSpan,
     env: env,
     money: formData.moneyAmount,
+    balanceType: formData.balanceType,
     onList: function onList(list) {
       return setRechargeRuleList(_toConsumableArray(list));
     }
@@ -196,7 +210,8 @@ var PayRecharge = function PayRecharge(_ref) {
     size: size,
     env: env,
     productKind: productKind,
-    couponCode: ""
+    couponCode: "",
+    balanceType: formData.balanceType
   })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement("div", {
     className: "ssz-submits"
   }, /*#__PURE__*/React.createElement("div", null, ['qr-show'].includes(step) && /*#__PURE__*/React.createElement(Button, {

package/dist/types/Pay.d.ts

@@ -2,6 +2,7 @@
 declare namespace Pay {
     type PayChannel = Trade.PayChannel;
     type ProductKind = 'vip' | 'vip-card' | 'recharge' | 'added-service';
+    type BalanceType = 'software-fee' | 'package-fee';
     interface ChannelList {
         groupTitle: string;
         disabled?: boolean;
@@ -17,6 +18,7 @@ declare namespace Pay {
     interface RechargeFormData {
         moneyAmount: number;
         payChannel: PayChannel;
+        balanceType?: BalanceType;
     }
     interface GetPaymentQr {
         qrUrl: string;

package/dist/types/RechargeRule.d.ts

@@ -5,5 +5,6 @@ declare namespace RechargeRule {
         "rechargeMoney": number;
         "giveMoney": number;
         "enabled": boolean;
+        "balanceType"?: Pay.BalanceType;
     }
 }

package/dist/types/Trade.d.ts

@@ -10,6 +10,7 @@ declare namespace Trade {
         payChannel: PayChannel;
         couponCode: string;
         userToken: string;
+        balanceType?: Pay.BalanceType;
         [name: string]: any;
     }
     interface PayMoneyInfo {

package/package.json

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