component-shipinlv 0.1.8 → 0.1.10

package/dist/AuthClient/qr/h5-we-public-login.d.ts

@@ -0,0 +1,2 @@
+declare const h5WePublicLogin: () => Promise<void>;
+export default h5WePublicLogin;

package/dist/AuthClient/qr/h5-we-public-login.js

@@ -0,0 +1,42 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+// h5 页面 登录公众号
+import * as WechatController from "../../service/api/WechatController";
+import Tool from "../../lib/Tool";
+var h5WePublicLogin = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var domainUrl, redirectUrl, inviteUserId, loginResult;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // 首先获取 登录跳转地址；
+          domainUrl = 'https://auth.shanren.wang';
+          redirectUrl = "".concat(domainUrl, "/h5-wechat-login-callback?");
+          inviteUserId = Tool.getInviteUserId();
+          _context.next = 5;
+          return WechatController.h5WePublicLogin({
+            redirectUrl: redirectUrl,
+            inviteUserId: inviteUserId
+          }).catch(function () {});
+        case 5:
+          loginResult = _context.sent;
+          if (loginResult) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return");
+        case 8:
+          // 因为 微信 会校验跳转域名，所以 用制定 中转；
+
+          document.location.href = loginResult.redirectUrl;
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function h5WePublicLogin() {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default h5WePublicLogin;

package/dist/AuthClient/qr/index.js

@@ -19,6 +19,7 @@ var reTryTimeLoop = 1000; // ms
 var FromWhere = 'web';
 import QRCode from 'qrcode.react';
 import isInClient from "../../lib/isInClient";
+import h5WePublicLogin from "./h5-we-public-login";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -144,7 +145,7 @@ var LoginQr = function LoginQr(_ref) {
         env: getApiEnv()
       });
     }, {
-      manual: !isInClient() || defaultLoginType !== 'wechat',
+      manual: Platform.isWechat || !isInClient() || defaultLoginType !== 'wechat',
       onSuccess: function onSuccess(result) {
         setWeQrUrl(result.url);
         onRunCheck();
@@ -216,6 +217,25 @@ var LoginQr = function LoginQr(_ref) {
       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 = 9;
+            break;
+          case 7:
+            _context3.next = 9;
+            return runWeLoginQr();
+          case 9:
+            _context3.next = 11;
+            return runWeLoginQr();
+          case 11:
           case "end":
             return _context3.stop();
         }

package/dist/join-client/index.css.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+declare const _default: {
+    div: import("styled-components").IStyledComponent<"web", import("styled-components/dist/types").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>;
+};
+export default _default;

package/dist/join-client/index.css.js

@@ -0,0 +1,6 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
+var _templateObject;
+import styled from 'styled-components';
+export default {
+  div: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    :global{\n       .clientStatus{\n          .loading{\n            opacity: 0.7;\n          }\n\n          .downloading{\n            margin-left: 12px;\n          }\n\n          .working{\n            color: green;\n          }\n      }\n  "])))
+};

package/dist/join-client/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import './index.less';
 interface Props {
     productType: string;
     port?: number;

package/dist/join-client/index.js

@@ -4,10 +4,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useRef, useState } from 'react';
 import * as SubClientController from "../service/api/SubClientController";
 import { useRequest } from '@umijs/hooks';
-import "./index.less";
 import { CheckCircleFilled, ExclamationCircleFilled, LoadingOutlined, QuestionCircleOutlined, RedoOutlined } from "@ant-design/icons";
 import { Button, Divider, Tooltip } from "antd";
 import Tool from "../lib/Tool";
+import styles from "./index.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -197,14 +197,16 @@ var JoinClient = function JoinClient(_ref) {
   useEffect(function () {
     onRunStatus(runStatus);
   }, [runStatus]);
-  return /*#__PURE__*/_jsxs("div", {
-    className: "clientStatus",
-    children: [$status(), /*#__PURE__*/_jsx(Divider, {
-      type: "vertical"
-    }), /*#__PURE__*/_jsxs(Tooltip, {
-      title: "\u672C\u9875\u9762\u529F\u80FD\u9700\u8981\u4F60\u7684\u7535\u8111\u4E0A\u5B89\u88C5\u4E13\u7528\u5BA2\u6237\u7AEF\u8F6F\u4EF6",
-      children: [" ", /*#__PURE__*/_jsx(QuestionCircleOutlined, {})]
-    })]
+  return /*#__PURE__*/_jsx(styles.div, {
+    children: /*#__PURE__*/_jsxs("div", {
+      className: "clientStatus",
+      children: [$status(), /*#__PURE__*/_jsx(Divider, {
+        type: "vertical"
+      }), /*#__PURE__*/_jsxs(Tooltip, {
+        title: "\u672C\u9875\u9762\u529F\u80FD\u9700\u8981\u4F60\u7684\u7535\u8111\u4E0A\u5B89\u88C5\u4E13\u7528\u5BA2\u6237\u7AEF\u8F6F\u4EF6",
+        children: [" ", /*#__PURE__*/_jsx(QuestionCircleOutlined, {})]
+      })]
+    })
   });
 };
 export default JoinClient;

package/dist/lib/Tool.d.ts

@@ -163,7 +163,7 @@ declare const Tool: {
     setTimeOffset(serverTime: number): void;
     getTime(): number;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "info" | "error" | "success" | "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/service/api/WechatController.d.ts

@@ -0,0 +1,8 @@
+export declare function share(body: {
+    url: string;
+    dealerId: number;
+}, options?: ServicesApi.RequestOptions): Promise<Wechat.Share>;
+export declare function h5WePublicLogin(body: {
+    redirectUrl: string;
+    inviteUserId: number;
+}, options?: ServicesApi.RequestOptions): Promise<Wechat.H5WePublicLogin>;

package/dist/service/api/WechatController.js

@@ -0,0 +1,50 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import request from "../../lib/request";
+export function share(_x, _x2) {
+  return _share.apply(this, arguments);
+}
+function _share() {
+  _share = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("wechat/jsConfigByWechatAppId", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _share.apply(this, arguments);
+}
+export function h5WePublicLogin(_x3, _x4) {
+  return _h5WePublicLogin.apply(this, arguments);
+}
+function _h5WePublicLogin() {
+  _h5WePublicLogin = _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("wechat/h5WePublicLogin", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _h5WePublicLogin.apply(this, arguments);
+}

package/dist/typings/Wechat.d.ts

@@ -0,0 +1,19 @@
+declare namespace Wechat {
+    interface Share {
+        appId: string;
+        timestamp: string;
+        nonceStr: string;
+        signature: string;
+    }
+    interface H5WePublicLogin {
+        redirectUrl: string;
+    }
+    interface WeJsConfig {
+        debug: boolean;
+        jsApiList: string[];
+        appId: string;
+        nonceStr: string;
+        signature: string;
+        timestamp: number;
+    }
+}

package/package.json

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

package/dist/join-client/index.less

@@ -1,15 +0,0 @@
-.clientStatus{
-
-  .loading{
-    opacity: 0.7;
-  }
-
-  .downloading{
-    margin-left: 12px;
-  }
-
-  .working{
-    color: green;
-  }
-
-}