component-sanzhizhou 1.0.18 → 1.0.19

package/dist/Buy/qr.js

@@ -86,7 +86,8 @@ var VipQr = function VipQr(_ref) {
         userId: Tool.getLocalUserInfo().id,
         payType: 'NATIVE',
         //Platform.isH5 ? 'MWEB' : 'NATIVE',
-        payChannel: channel
+        payChannel: channel,
+        userToken: Tool.getLocalUserInfo().sid
       }, {
         env: env
       });

package/dist/pay/qr.js

@@ -4,10 +4,9 @@ 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 { jsx as _jsx } from "react/jsx-runtime";
@@ -39,27 +38,33 @@ 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');
-  };
+
+  // const makeQrUrl = () => {
+  //   const query = {
+  //     // fromSid: Tool.getLocalUserInfo().sid,
+  //     // fromChannel: 'web',
+  //     fromChannel: selectPayChannel.name ,
+  //     productKind: productKind ? productKind : ( vipId == 0 ? 'recharge' : '' ),
+  //     productCount,
+  //     productId: vipId,
+  //     userToken: Tool.getLocalUserInfo().sid,
+  //     productName,
+  //     payMoney: moneyAmount,
+  //   };
+  //   const qrUrl = CallMiniUrl(
+  //     appId,
+  //     '',
+  //     query,
+  //   );
+  //   console.log('makeQrUrl bind:', query, qrUrl );
+  //   setQrUrl( qrUrl );
+  //   setQrStatus('active');
+  // }
+
   var _useRequest = useRequest(function () {
       return WechatMinAppController.getUrlLink({
         pagePath: 'pages/recharge/index',
-        pathQuery: "moneyAmount=".concat(moneyAmount, "&userToken=").concat(getLocalUserInfo().sid || '', "&productKind=recharge"),
+        pathQuery: "moneyAmount=".concat(moneyAmount, "&userToken=").concat(getLocalUserInfo().sid || '', "&productKind=").concat(productKind),
         envVersion: getApiEnv() === 'local' ? "develop" : 'release'
       }, {
         env: env
@@ -76,6 +81,29 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     }),
     runWechatMinApp = _useRequest.run,
     loadingWechatMinApp = _useRequest.loading;
+  var _useRequest2 = useRequest(function () {
+      return TradeController.commonCreate({
+        productKind: productKind,
+        productTypeId: 0,
+        productCount: moneyAmount,
+        userId: 0,
+        payChannel: 'alipay',
+        userToken: getLocalUserInfo().sid || ''
+      }, {
+        env: env
+      });
+    }, {
+      manual: true,
+      onSuccess: function onSuccess(result) {
+        setQrUrl(result.qrUrl || '');
+        setQrStatus('active');
+      },
+      onError: function onError(e) {
+        setQrStatus('expired');
+      }
+    }),
+    runAlipay = _useRequest2.run,
+    loadingAlipay = _useRequest2.loading;
   var onInit = function onInit() {
     // const qrUrlBase = QrDict[ getEnv() ] || QrDict.prod;
     // const data = JSON.stringify({
@@ -94,11 +122,11 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     if (selectPayChannel.name === 'wepay') {
       runWechatMinApp();
     } else if (selectPayChannel.name === 'alipay') {
-      makeQrUrl();
+      runAlipay();
     }
   };
   var getPaymentQr = function getPaymentQr() {
-    runWechatMinApp();
+    onInit();
   };
   useEffect(function () {
     onInit();

package/dist/pay/recharge.js

@@ -70,10 +70,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];

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/{typings → types}/Trade.d.ts

@@ -6,8 +6,9 @@ declare namespace Trade {
         productTypeId: number;
         productCount: number;
         userId: number;
-        payType: PayType;
+        payType?: PayType;
         payChannel: PayChannel;
+        userToken: string;
         [name: string]: any;
     }
     interface CreateResult {
@@ -15,12 +16,12 @@ declare namespace Trade {
         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 +29,6 @@ declare namespace Trade {
             package: string;
             paySign: string;
         };
+        qrUrl?: string;
     }
 }

package/package.json

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