component-sanzhizhou 1.2.11 → 1.2.13

package/dist/lib/Tool.js

@@ -1161,7 +1161,7 @@ if (window) {
   setTimeout(function () {
     if (!window.getBridge) {
       window.getBridge = function () {
-        return window.bridge;
+        return window.bridge || window.WdAppBridge;
       };
     }
   }, 1e3);

package/dist/lib/product-detail-link.js

@@ -43,7 +43,7 @@ export var getProductDetailUrl = function getProductDetailUrl(_ref) {
   var platform = _ref.platform,
     skuId = _ref.skuId,
     query = _ref.query;
-  if (skuId === undefined || skuId === null || skuId === '') {
+  if (!skuId) {
     return '';
   }
   var build = PLATFORM_URL_BUILDERS[platform];
@@ -75,13 +75,15 @@ var ProductDetailLink = function ProductDetailLink(_ref2) {
     // 客户端内通过桥接在本机浏览器打开，避免新开浏览器标签页
     if (isInClient()) {
       var _window$getBridge, _window;
+      console.log('ProductDetailLink handleClick in client:', event);
       var bridge = (_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.call(_window);
       if (bridge !== null && bridge !== void 0 && bridge.openLocalBrowser) {
         event.preventDefault();
         bridge.openLocalBrowser(href);
+        return;
       }
     }
-    onClick === null || onClick === void 0 || onClick(event);
+    return onClick === null || onClick === void 0 ? void 0 : onClick(event);
   };
   return /*#__PURE__*/React.createElement("a", _extends({
     href: href,

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.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

@@ -21,7 +21,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 +41,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 +57,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 +121,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: [{
@@ -196,7 +207,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/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.11",
+  "version": "1.2.13",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",