component-sanzhizhou 1.0.2 → 1.0.3

package/dist/Auth/index.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+interface Props {
+    productType: string;
+    apiUrl?: string;
+    clientUniqueKeyList: string[];
+    loginTypeList: Global.AuthClientLoginType[];
+    domain?: string;
+    env?: Global.Env;
+    roleType?: UserAuth.RoleType;
+    postData: {
+        [name: string]: any;
+    };
+    onLoginSuccess: () => void;
+}
+declare const Auth: React.FC<Props>;
+export default Auth;

package/dist/Auth/index.js

@@ -0,0 +1,374 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useState, useEffect, useRef } from 'react';
+import { WechatOutlined, RedoOutlined, UserOutlined } from '@ant-design/icons';
+import { Tabs } from 'antd';
+import { useRequest } from '@umijs/hooks';
+import * as AuthController from "../service/api/AuthController";
+import PageContentWarp from "../UI/PageContentWarp";
+import AuthLoginReg from "../AuthClient/login-reg";
+import Platform from "../lib/platform";
+import QrWs from "../AuthClient/qr/ws";
+import { getApiEnv } from "../lib/getApiUrl";
+import styles from "../AuthClient/qr/index.css";
+import QRCode from 'qrcode.react';
+import h5WePublicLogin from "../AuthClient/qr/h5-we-public-login";
+import Tool from "../lib/Tool";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var reTryMaxCount = 120;
+var reTryTimeLoop = 1000; // ms
+var FromWhere = 'web';
+
+// 逐渐弃用 AuthClient ，使用 本函数
+var Auth = function Auth(_ref) {
+  var productType = _ref.productType,
+    apiUrl = _ref.apiUrl,
+    clientUniqueKeyList = _ref.clientUniqueKeyList,
+    loginTypeList = _ref.loginTypeList,
+    env = _ref.env,
+    postData = _ref.postData,
+    roleType = _ref.roleType,
+    _ref$domain = _ref.domain,
+    domain = _ref$domain === void 0 ? document.location.hostname : _ref$domain,
+    _ref$onLoginSuccess = _ref.onLoginSuccess,
+    onLoginSuccess = _ref$onLoginSuccess === void 0 ? function () {} : _ref$onLoginSuccess;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var qrWsRef = useRef();
+  var _useState3 = useState(_toConsumableArray(loginTypeList)),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentLoginTypeList = _useState4[0],
+    setCurrentLoginTypeList = _useState4[1];
+  var _useState5 = useState((currentLoginTypeList === null || currentLoginTypeList === void 0 ? void 0 : currentLoginTypeList[0]) || 'wechat'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    activeKey = _useState6[0],
+    setActiveKey = _useState6[1];
+  var _useState7 = useState("".concat(Tool.math.randWord(20))),
+    _useState8 = _slicedToArray(_useState7, 1),
+    loginId = _useState8[0];
+  var _useState9 = useState(''),
+    _useState10 = _slicedToArray(_useState9, 2),
+    weQrUrl = _useState10[0],
+    setWeQrUrl = _useState10[1];
+  var isNextTryRef = useRef(activeKey === 'wechat');
+
+  // 要不要继续 try
+  var _useState11 = useState(isNextTryRef.current),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isNextTry = _useState12[0],
+    setNextTry = _useState12[1];
+  var reTryCountRef = useRef(0);
+  var _useState13 = useState(0),
+    _useState14 = _slicedToArray(_useState13, 2),
+    reTryCount = _useState14[0],
+    setReTryCount = _useState14[1];
+  var timer = useRef(setTimeout(function () {}, 1));
+  var eventSourceRef = useRef(null);
+  var onLoginCancel = function onLoginCancel() {
+    var _eventSourceRef$curre, _qrWsRef$current;
+    (_eventSourceRef$curre = eventSourceRef.current) === null || _eventSourceRef$curre === void 0 || _eventSourceRef$curre.close();
+    clearInterval(timer.current);
+    reTryCountRef.current = 0;
+    setReTryCount(0);
+    (_qrWsRef$current = qrWsRef.current) === null || _qrWsRef$current === void 0 || _qrWsRef$current.destroy();
+  };
+  var onCheckLogin = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var init, post;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            qrWsRef.current = new QrWs();
+
+            // 先初始化
+            _context.next = 3;
+            return qrWsRef.current.init().catch(function (err) {
+              Tool.toastError(err.message);
+            });
+          case 3:
+            init = _context.sent;
+            if (init) {
+              _context.next = 7;
+              break;
+            }
+            onLoginError();
+            return _context.abrupt("return");
+          case 7:
+            _context.next = 9;
+            return qrWsRef.current.post({
+              fromWhere: FromWhere,
+              loginId: loginId
+            }, {
+              onData: function onData(text) {}
+            }).catch(function (err) {
+              Tool.toastError(err.message);
+              onLoginError();
+            });
+          case 9:
+            post = _context.sent;
+            // 登录成功
+            if (post) {
+              // 登陆成功；
+              // let info = {};
+              // try {
+              //   info = JSON.parse( post.data );
+              // }catch (e) {
+              //   console.log("result:", post, e )
+              // }
+              onCheckSuccess(post.data);
+            }
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onCheckLogin() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onCheckSuccess = function onCheckSuccess(userInfo) {
+    Tool.setLocalUserInfo(_objectSpread(_objectSpread({}, userInfo), {}, {
+      isLogin: true
+    }));
+    onLoginSuccess();
+    Tool.event.run('login-success');
+    Tool.event.run("".concat(roleType || 'user', "-login-success"), _objectSpread(_objectSpread({}, userInfo), {}, {
+      isLogin: true
+    }));
+    Tool.toast('登录成功');
+  };
+  var _useRequest = useRequest(function () {
+      return AuthController.weMiniLoginQr({
+        loginId: loginId,
+        //string 32
+        loginType: 'client',
+        from: "web",
+        // 没有推荐者，会根据域名判断 经销商
+        inviteUserId: Tool.getInviteUserId(),
+        domain: domain || document.location.hostname,
+        env: getApiEnv()
+      });
+    }, {
+      manual: true,
+      //,
+      onSuccess: function onSuccess(result) {
+        setWeQrUrl(result.url);
+        onRunCheck();
+      }
+    }),
+    runWeLoginQr = _useRequest.run,
+    loadingWeLoginQr = _useRequest.loading,
+    errorWeLoginQr = _useRequest.error;
+  var onRunCheck = function onRunCheck() {
+    clearInterval(timer.current);
+    onCheckLogin();
+    reTryCountRef.current = 0;
+    setReTryCount(0);
+    timer.current = setInterval(function () {
+      reTryCountRef.current++;
+      setReTryCount(reTryCountRef.current);
+      console.log("reTryCount:", reTryCountRef.current);
+      if (reTryCountRef.current >= reTryMaxCount) {
+        onLoginError();
+        return;
+      }
+    }, reTryTimeLoop);
+  };
+  var onRetryWeQr = function onRetryWeQr() {
+    isNextTryRef.current = true;
+    setNextTry(true);
+    setReTryCount(0);
+    reTryCountRef.current = 0;
+
+    // 重新
+    setWeQrUrl('');
+    runWeLoginQr();
+  };
+  var onTabChange = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(keyName) {
+      var _qrWsRef$current2;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            // @ts-ignore
+            setActiveKey(keyName);
+            if (keyName === 'wechat') {
+              // await runWeLoginQr();
+              onRetryWeQr();
+            } else {
+              // 停止 weixin
+              (_qrWsRef$current2 = qrWsRef.current) === null || _qrWsRef$current2 === void 0 || _qrWsRef$current2.destroy();
+            }
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onTabChange(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var onLoginError = function onLoginError() {
+    clearInterval(timer.current);
+    isNextTryRef.current = false;
+    setNextTry(false);
+    reTryCountRef.current = 0;
+    setReTryCount(0);
+    onLoginCancel();
+  };
+  var onInit = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!Platform.isWechat) {
+              _context3.next = 7;
+              break;
+            }
+            setLoading(true);
+            // jump
+            _context3.next = 4;
+            return h5WePublicLogin();
+          case 4:
+            setLoading(false);
+            _context3.next = 10;
+            break;
+          case 7:
+            if (!currentLoginTypeList.includes('wechat')) {
+              _context3.next = 10;
+              break;
+            }
+            _context3.next = 10;
+            return runWeLoginQr();
+          case 10:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function onInit() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onCallWechat = function onCallWechat() {
+    currentLoginTypeList.push('wechat');
+    setCurrentLoginTypeList(_toConsumableArray(currentLoginTypeList));
+  };
+  var onCallAccount = function onCallAccount() {
+    currentLoginTypeList.push('account', 'account-reg', 'account-login');
+    setCurrentLoginTypeList(_toConsumableArray(currentLoginTypeList));
+  };
+  useEffect(function () {
+    onInit();
+    return function () {
+      clearTimeout(timer.current);
+    };
+  }, []);
+  return /*#__PURE__*/_jsxs(styles.AuthQrLogin, {
+    children: [/*#__PURE__*/_jsxs(styles.LoginForm, {
+      children: [/*#__PURE__*/_jsx(styles.WebTitle, {
+        children: /*#__PURE__*/_jsx("span", {
+          children: "\u767B\u5F55/\u6CE8\u518C"
+        })
+      }), /*#__PURE__*/_jsxs(Tabs, {
+        activeKey: activeKey,
+        onChange: function onChange(keyName) {
+          onTabChange(keyName);
+        },
+        children: [!((currentLoginTypeList === null || currentLoginTypeList === void 0 ? void 0 : currentLoginTypeList.length) > 0 && !currentLoginTypeList.includes('wechat')) && /*#__PURE__*/_jsx(Tabs.TabPane, {
+          tab: /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx(WechatOutlined, {}), " \u5FAE\u4FE1"]
+          }),
+          disabled: (currentLoginTypeList === null || currentLoginTypeList === void 0 ? void 0 : currentLoginTypeList.length) > 0 && !currentLoginTypeList.includes('wechat'),
+          children: /*#__PURE__*/_jsx(PageContentWarp, {
+            loading: loadingWeLoginQr || loading,
+            error: errorWeLoginQr,
+            onReload: function onReload() {
+              return onRetryWeQr();
+            },
+            children: /*#__PURE__*/_jsxs(styles.WeQrUrlBox, {
+              children: [/*#__PURE__*/_jsxs("div", {
+                style: {
+                  // backgroundImage: `url('${ weQrUrl }')`,
+                },
+                className: "qr wechat ".concat(isNextTry ? '' : 'noTry'),
+                children: [!isNextTry && /*#__PURE__*/_jsx("div", {
+                  className: "reTry",
+                  onClick: onRetryWeQr,
+                  children: /*#__PURE__*/_jsx("a", {
+                    children: /*#__PURE__*/_jsx(RedoOutlined, {})
+                  })
+                }), /*#__PURE__*/_jsx("div", {
+                  className: "weQrUrl",
+                  children: /*#__PURE__*/_jsx(QRCode, {
+                    value: weQrUrl,
+                    fgColor: "#0bc160",
+                    size: 230
+                  })
+                })]
+              }), Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
+                className: "altWeb",
+                children: [/*#__PURE__*/_jsx("div", {
+                  className: "titles",
+                  children: "\u4E0B\u9762\u4EFB\u9009\u4E00\u4E2A\u65B9\u6CD5\u90FD\u53EF\u4EE5\u767B\u5F55\uFF1A"
+                }), /*#__PURE__*/_jsxs("ul", {
+                  children: [/*#__PURE__*/_jsx("li", {
+                    children: "1\u3001\u628A\u672C\u9875\u7F51\u5740\u590D\u5236\u5230\u5FAE\u4FE1\u91CC\u9762\u6253\u5F00"
+                  }), /*#__PURE__*/_jsx("li", {
+                    children: "2\u3001\u8BF7\u7528\u5FAE\u4FE1\u626B\u7801\u767B\u5F55"
+                  }), /*#__PURE__*/_jsx("li", {
+                    children: "3\u3001\u628A\u672C\u9875\u7F51\u5740\u590D\u5236\u5230\u5FAE\u4FE1\u91CC\u9762\u6253\u5F00"
+                  })]
+                })]
+              }) : /*#__PURE__*/_jsx("div", {
+                className: "alt"
+              })]
+            })
+          })
+        }, "wechat"), /*#__PURE__*/_jsx(Tabs.TabPane, {
+          tab: /*#__PURE__*/_jsxs("span", {
+            className: "tab-icon",
+            children: [/*#__PURE__*/_jsx(UserOutlined, {}), " \u8D26\u6237"]
+          }),
+          disabled: !currentLoginTypeList.includes('account-login') && !currentLoginTypeList.includes('account'),
+          children: /*#__PURE__*/_jsx(AuthLoginReg, {
+            env: env,
+            apiUrl: apiUrl,
+            roleType: roleType,
+            postData: postData,
+            productType: productType,
+            clientUniqueKeyList: clientUniqueKeyList,
+            accountRegDisabled: !currentLoginTypeList.includes('account-reg'),
+            onSuccess: function onSuccess() {
+              return onLoginSuccess();
+            }
+          })
+        }, "account")]
+      }), activeKey === 'wechat' && /*#__PURE__*/_jsx("div", {
+        className: "percent",
+        children: /*#__PURE__*/_jsx("div", {
+          className: "warp",
+          style: {
+            width: "".concat(reTryCount / reTryMaxCount * 100, "%")
+          }
+        })
+      })]
+    }), /*#__PURE__*/_jsx("div", {
+      className: "callWechat",
+      onClick: onCallWechat
+    }), /*#__PURE__*/_jsx("div", {
+      className: "callAccount",
+      onClick: onCallAccount
+    })]
+  });
+};
+export default Auth;

package/dist/AuthClient/login.js

@@ -112,13 +112,11 @@ var AuthReg = function AuthReg(_ref) {
     onSuccess();
   };
   var onFinish = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var values,
-        _args = arguments;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            values = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            values.accountName = values.accountName.replace(/\s+/ig, '');
             run(values);
           case 2:
           case "end":
@@ -126,7 +124,7 @@ var AuthReg = function AuthReg(_ref) {
         }
       }, _callee);
     }));
-    return function onFinish() {
+    return function onFinish(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -138,24 +136,23 @@ var AuthReg = function AuthReg(_ref) {
       disabled: loading,
       autoComplete: "off",
       children: [/*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
-        label: "\u8D26\u53F7"
+        label: "\u624B\u673A\u53F7\u7801"
       }, formItemLayout), {}, {
         name: "accountName",
         rules: [{
           required: true,
-          message: '请输入'
-        }
+          message: '请输入手机号码'
+        },
         // {
         //   pattern: /^([a-z0-9]+[_\-.]?)*[a-z0-9]+@([a-z0-9]+[_\-.]?)*[a-z0-9]+\.[a-z]{2,10}$/i,
         //   message: '这似乎不是一个电子邮箱'
         // },
-        // {
-        //   pattern: /^\s*1\d{10}\s*$/,
-        //   message: '这似乎不是大陆手机号？'
-        // }
-        ],
+        {
+          pattern: /^\s*1\d{2}\s*\d{4}\s*\d{4}\s*$/,
+          message: '这似乎不是大陆手机号码？'
+        }],
         children: /*#__PURE__*/_jsx(Input, {
-          placeholder: "\u8D26\u53F7",
+          placeholder: "\u624B\u673A\u53F7\u7801",
           prefix: /*#__PURE__*/_jsx(UserOutlined, {
             className: "input-prefix-icon"
           })

package/dist/AuthClient/reg.js

@@ -81,13 +81,11 @@ var Reg = function Reg(_ref) {
     onSuccess();
   };
   var onFinish = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var values,
-        _args = arguments;
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            values = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            values.accountName = values.accountName.replace(/\s+/ig, '');
             run(values);
           case 2:
           case "end":
@@ -95,7 +93,7 @@ var Reg = function Reg(_ref) {
         }
       }, _callee);
     }));
-    return function onFinish() {
+    return function onFinish(_x) {
       return _ref2.apply(this, arguments);
     };
   }();

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import './global.less';
 export { default as Buy } from './Buy';
 export { default as Login } from './Login';
+export { default as Auth } from './Auth';
 export { default as AuthClient } from './AuthClient';
 export { default as Product } from './Product';
 export { default as ClientUpdate } from './Client/ClientUpdate';

package/dist/index.js

@@ -3,6 +3,7 @@
 import "./global.less";
 export { default as Buy } from "./Buy";
 export { default as Login } from "./Login";
+export { default as Auth } from "./Auth";
 export { default as AuthClient } from "./AuthClient";
 export { default as Product } from "./Product";
 export { default as ClientUpdate } from "./Client/ClientUpdate";

package/package.json

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