component-shipinlv 2.3.6 → 2.3.7

package/dist/Auth/index.js

@@ -1,6 +1,7 @@
 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';
@@ -17,8 +18,8 @@ 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";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var reTryMaxCount = 120;
 var reTryTimeLoop = 1000; // ms
 var FromWhere = 'web';
@@ -41,29 +42,33 @@ var Auth = function Auth(_ref) {
     loading = _useState2[0],
     setLoading = _useState2[1];
   var qrWsRef = useRef();
-  var _useState3 = useState((loginTypeList === null || loginTypeList === void 0 ? void 0 : loginTypeList[0]) || 'wechat'),
+  var _useState3 = useState(_toConsumableArray(loginTypeList)),
     _useState4 = _slicedToArray(_useState3, 2),
-    activeKey = _useState4[0],
-    setActiveKey = _useState4[1];
-  var _useState5 = useState("".concat(Tool.math.randWord(20))),
-    _useState6 = _slicedToArray(_useState5, 1),
-    loginId = _useState6[0];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    weQrUrl = _useState8[0],
-    setWeQrUrl = _useState8[1];
+    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 _useState9 = useState(isNextTryRef.current),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isNextTry = _useState10[0],
-    setNextTry = _useState10[1];
-  var reTryCountRef = useRef(0);
-  var _useState11 = useState(0),
+  var _useState11 = useState(isNextTryRef.current),
     _useState12 = _slicedToArray(_useState11, 2),
-    reTryCount = _useState12[0],
-    setReTryCount = _useState12[1];
+    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() {
@@ -238,7 +243,7 @@ var Auth = function Auth(_ref) {
             _context3.next = 10;
             break;
           case 7:
-            if (!loginTypeList.includes('wechat')) {
+            if (!currentLoginTypeList.includes('wechat')) {
               _context3.next = 10;
               break;
             }
@@ -254,28 +259,36 @@ var Auth = function Auth(_ref) {
       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__*/_jsx(styles.AuthQrLogin, {
-    children: /*#__PURE__*/_jsxs(styles.LoginForm, {
-      children: [/*#__PURE__*/_jsx(styles.WebTitle, {
-        children: /*#__PURE__*/_jsx("span", {
+  return /*#__PURE__*/_jsxs(styles.AuthQrLogin, {
+    children: [/*#__PURE__*/_jsxs(styles.LoginForm, {
+      children: [/*#__PURE__*/_jsxs(styles.WebTitle, {
+        children: [/*#__PURE__*/_jsx("span", {
           children: "\u767B\u5F55/\u6CE8\u518C"
-        })
+        }), JSON.stringify(currentLoginTypeList)]
       }), /*#__PURE__*/_jsxs(Tabs, {
         activeKey: activeKey,
         onChange: function onChange(keyName) {
           onTabChange(keyName);
         },
-        children: [!((loginTypeList === null || loginTypeList === void 0 ? void 0 : loginTypeList.length) > 0 && !loginTypeList.includes('wechat')) && /*#__PURE__*/_jsx(Tabs.TabPane, {
+        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: (loginTypeList === null || loginTypeList === void 0 ? void 0 : loginTypeList.length) > 0 && !loginTypeList.includes('wechat'),
+          disabled: (currentLoginTypeList === null || currentLoginTypeList === void 0 ? void 0 : currentLoginTypeList.length) > 0 && !currentLoginTypeList.includes('wechat'),
           children: /*#__PURE__*/_jsx(PageContentWarp, {
             loading: loadingWeLoginQr || loading,
             error: errorWeLoginQr,
@@ -326,7 +339,7 @@ var Auth = function Auth(_ref) {
             className: "tab-icon",
             children: [/*#__PURE__*/_jsx(UserOutlined, {}), " \u8D26\u6237"]
           }),
-          disabled: !loginTypeList.includes('account-login'),
+          disabled: !currentLoginTypeList.includes('account-login') && !currentLoginTypeList.includes('account'),
           children: /*#__PURE__*/_jsx(AuthLoginReg, {
             env: env,
             apiUrl: apiUrl,
@@ -334,7 +347,7 @@ var Auth = function Auth(_ref) {
             postData: postData,
             productType: productType,
             clientUniqueKeyList: clientUniqueKeyList,
-            accountRegDisabled: !loginTypeList.includes('account-reg'),
+            accountRegDisabled: !currentLoginTypeList.includes('account-reg'),
             onSuccess: function onSuccess() {
               return onLoginSuccess();
             }
@@ -349,7 +362,13 @@ var Auth = function Auth(_ref) {
           }
         })
       })]
-    })
+    }), /*#__PURE__*/_jsx("div", {
+      className: "callWechat",
+      onClick: onCallWechat
+    }), /*#__PURE__*/_jsx("div", {
+      className: "callAccount",
+      onClick: onCallAccount
+    })]
   });
 };
 export default Auth;

package/dist/AuthClient/qr/index.css.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLit
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 import styled from 'styled-components';
 export default {
-  AuthQrLogin: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-tabs-tab-btn{\n      .anticon{\n        margin-right: 6px;\n      }\n    }\n    .weQrUrl{\n      position: absolute;\n      left: 50%;\n      transform: translateX(-50%);\n    }\n    .qr{\n      position: relative;\n      display: block;\n      margin: 12px auto 0;\n      width: 230px;\n      height: 230px;\n      background-repeat: no-repeat;\n      background-size: cover;\n      background-position: center;\n      &.qrAlipay{\n        border: 3px solid #1677ff;\n      }\n      .reTry{\n        position: absolute;\n        z-index: 100;\n        left: 0;\n        top: 0;\n        width: 100%;\n        font-size: 80px;\n        background-color: rgba( 255, 255, 255, 0.95 );\n        text-align: center;\n        line-height: 210px;\n        height: 100%;\n        a{\n          display: block;\n        }\n      }\n    }\n    .alt{\n      padding: 10px 0 0;\n      color: #999;\n      text-align: center;\n    }\n    .altWeb{\n      padding: 16px 0 0;\n      max-width: 300px;\n      margin: 0 auto;\n      .titles{\n        text-align: center;\n        font-weight: bold;\n      }\n      ul{\n        margin: 0 10px;\n      }\n\n    }\n    .percent{\n      width: 100%;\n      position: absolute;\n      overflow: hidden;\n      left: 0;\n      bottom: 0;\n      .warp{\n        height: 4px;\n        background-color: #1677ff;\n        transition: all 1.6s ease-in-out;\n        -webkit-transition: all 1.6s ease-in-out;\n      }\n    }\n  "]))),
+  AuthQrLogin: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    position: relative;\n    .ant-tabs-tab-btn{\n      .anticon{\n        margin-right: 6px;\n      }\n    }\n    .weQrUrl{\n      position: absolute;\n      left: 50%;\n      transform: translateX(-50%);\n    }\n    .qr{\n      position: relative;\n      display: block;\n      margin: 12px auto 0;\n      width: 230px;\n      height: 230px;\n      background-repeat: no-repeat;\n      background-size: cover;\n      background-position: center;\n      &.qrAlipay{\n        border: 3px solid #1677ff;\n      }\n      .reTry{\n        position: absolute;\n        z-index: 100;\n        left: 0;\n        top: 0;\n        width: 100%;\n        font-size: 80px;\n        background-color: rgba( 255, 255, 255, 0.95 );\n        text-align: center;\n        line-height: 210px;\n        height: 100%;\n        a{\n          display: block;\n        }\n      }\n    }\n    .alt{\n      padding: 10px 0 0;\n      color: #999;\n      text-align: center;\n    }\n    .altWeb{\n      padding: 16px 0 0;\n      max-width: 300px;\n      margin: 0 auto;\n      .titles{\n        text-align: center;\n        font-weight: bold;\n      }\n      ul{\n        margin: 0 10px;\n      }\n\n    }\n    .percent{\n      width: 100%;\n      position: absolute;\n      overflow: hidden;\n      left: 0;\n      bottom: 0;\n      .warp{\n        height: 4px;\n        background-color: #1677ff;\n        transition: all 1.6s ease-in-out;\n        -webkit-transition: all 1.6s ease-in-out;\n      }\n    }\n\n    .callWechat{\n      position: absolute;\n      left: 0;\n      bottom: 0;\n      background: #F6F6F6;\n      width: 4px;\n      height: 4px;\n    }\n    .callAccount{\n      position: absolute;\n      right: 0;\n      bottom: 0;\n      background: #F6F6F6;\n      width: 4px;\n      height: 4px;\n    }\n\n  "]))),
   LoginForm: styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    margin: 0 auto;\n    padding: 0 0 5px 0  ;\n    background-color: rgba(255, 255, 255, 0.75 );\n    border-radius: 6px;\n  "]))),
   WebTitle: styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    font-weight: normal;\n    font-size: 22px;\n    text-align: center;\n    padding: 0;\n    margin: 6px 0 0 0;\n    line-height: 1em;\n    span{\n      display: inline-block;\n      padding-left: 5px;\n      font-weight: lighter;\n      font-size: 16px;\n    }\n  "]))),
   WeQrUrlBox: styled.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    min-height: 240px !important;\n  "])))

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: "error" | "success" | "info" | "warning", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;

package/dist/typings.d.ts

@@ -1,6 +1,6 @@
 declare namespace Global {
   export type Env = 'local' | 'pre' | 'prod';
-  type AuthClientLoginType = 'wechat' | 'account-login' | 'account-reg' | 'alipay';
+  type AuthClientLoginType = 'wechat' | 'account' | 'account-login' | 'account-reg' | 'alipay';
   export type ProductKind = 'vip' | 'vip-card' | string;
   type OsName = '' | 'darwin' | 'windows' | 'linux' | 'other';
   type MineTypeKind = 'video' | 'image' | 'sound' | '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",