component-sanzhizhou 1.0.7 → 1.0.8

package/dist/pay/qr.d.ts

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

package/dist/pay/qr.js

@@ -1,25 +1,27 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Button, Divider, QRCode, Spin } from 'antd';
 import "./qr.less";
-import { useRequest } from "@umijs/hooks";
-import * as RechargeController from "../service/api/RechargeController";
 import { CheckCircleOutlined, ReloadOutlined } from "@ant-design/icons";
 import { getEnv } from "../lib/getApiUrl";
+import Tool from "../lib/Tool";
 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',
+  local: 'https://pay.sanzhizhou.com/pay/we-h5',
   // 'http://localhost:8001/pay/wepay-qr',
-  pre: 'http://localhost:8001/pay/wepay-qr',
-  prod: 'https://pay.sanzhizhou.com/pay/wepay-qr'
+  pre: 'http://localhost:8001/pay/we-h5r',
+  prod: 'https://pay.sanzhizhou.com/pay/we-h5'
 };
 var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
   var selectPayChannel = _ref.selectPayChannel,
     moneyAmount = _ref.moneyAmount,
+    productCount = _ref.productCount,
     vipId = _ref.vipId,
+    productName = _ref.productName,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 260 : _ref$size,
+    productKind = _ref.productKind,
     env = _ref.env;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -29,30 +31,47 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     qrStatus = _useState4[0],
     setQrStatus = _useState4[1];
-  var _useRequest = useRequest(function () {
-      return RechargeController.create({
-        payChannel: selectPayChannel.name,
-        moneyAmount: moneyAmount
-      }, {
-        env: env
-      });
-    }, {
-      onSuccess: function onSuccess(result) {
-        var qrUrlBase = QrDict[getEnv()] || QrDict.prod;
-        var qrUrl = qrUrlBase + (qrUrlBase.indexOf('?') !== -1 ? '?' : '&') + "tradeIdKey=".concat(result.tradeIdKey);
-        setQrUrl(qrUrl);
-        setQrStatus('active');
-      },
-      onError: function onError(e) {
-        setQrStatus('expired');
-      }
-    }),
-    run = _useRequest.run,
-    loading = _useRequest.loading;
+
+  // const { run, loading } = useRequest(
+  //   () => RechargeController.create({
+  //     payChannel: selectPayChannel.name,
+  //     moneyAmount,
+  //   }, {
+  //     env,
+  //   }),
+  //   {
+  //     onSuccess(result) {
+  //
+  //     },
+  //     onError( e ){
+  //       setQrStatus('expired');
+  //     }
+  //   },
+  // );
+
+  var onInit = function onInit() {
+    var qrUrlBase = QrDict[getEnv()] || QrDict.prod;
+    var data = JSON.stringify({
+      productKind: productKind ? productKind : vipId == 0 ? 'recharge' : '',
+      productCount: productCount,
+      productId: vipId,
+      userToken: Tool.getLocalUserInfo().sid,
+      wechatAppId: '',
+      productName: productName,
+      payMoney: moneyAmount
+    });
+    var qrUrl = qrUrlBase + (qrUrlBase.indexOf('?') === -1 ? '?' : '&') + "data=" + encodeURIComponent(data);
+    console.log('recharge qr:', qrUrl);
+    setQrUrl(qrUrl);
+    setQrStatus('active');
+  };
   var getPaymentQr = function getPaymentQr() {
-    setQrStatus('loading');
-    run();
+    // setQrStatus('loading');
+    // run();
   };
+  useEffect(function () {
+    onInit();
+  }, []);
   return /*#__PURE__*/_jsxs("div", {
     className: "ssz-payQr",
     children: [/*#__PURE__*/_jsxs(Divider, {

package/dist/pay/recharge.js

@@ -173,11 +173,14 @@ var PayRecharge = function PayRecharge(_ref) {
       }), step === 'qr-show' && /*#__PURE__*/_jsx(_Fragment, {
         children: formData.payChannel === 'wepay' && /*#__PURE__*/_jsx(PayQr, {
           moneyAmount: formData.moneyAmount,
+          productCount: formData.moneyAmount,
+          productName: "\u5145\u503C",
           vipId: 0,
           payChannel: formData.payChannel,
           selectPayChannel: selectPayChannel,
           size: 260,
-          env: env
+          env: env,
+          productKind: "recharge"
         })
       }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsxs("div", {
         className: "ssz-submits",

package/dist/types/Pay.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 declare namespace Pay {
     type PayChannel = Trade.PayChannel;
+    type ProductKind = 'vip' | 'vip-card' | 'recharge';
     interface ChannelList {
         groupTitle: string;
         disabled?: boolean;

package/package.json

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