component-shipinlv 0.1.20 → 0.1.22

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

@@ -1,24 +1,15 @@
 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:
           document.location.replace("https://auth.shanren.wang/auth/wechat/login?url=".concat(document.location.href));
           return _context.abrupt("return");
-        case 7:
-          loginResult = _context.sent;
-          if (loginResult) {
-            _context.next = 10;
-            break;
-          }
-          return _context.abrupt("return");
-        case 10:
+        case 2:
         case "end":
           return _context.stop();
       }

package/dist/AuthClient/qr/index.d.ts

@@ -6,6 +6,7 @@ interface Props {
     accountHidden?: boolean;
     accountRegDisabled?: boolean;
     alipayDisabled?: boolean;
+    domain?: string;
     onLoginSuccess: () => void;
 }
 declare const LoginQr: React.FC<Props>;

package/dist/AuthClient/qr/index.js

@@ -18,7 +18,6 @@ var reTryMaxCount = 120;
 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";
@@ -30,6 +29,8 @@ var LoginQr = function LoginQr(_ref) {
     accountRegDisabled = _ref.accountRegDisabled,
     accountHidden = _ref.accountHidden,
     alipayDisabled = _ref.alipayDisabled,
+    _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),
@@ -142,10 +143,12 @@ var LoginQr = function LoginQr(_ref) {
         from: "web",
         // 没有推荐者，会根据域名判断 经销商
         inviteUserId: Tool.getInviteUserId(),
+        domain: domain || document.location.hostname,
         env: getApiEnv()
       });
     }, {
-      manual: Platform.isWechat || !isInClient() || defaultLoginType !== 'wechat',
+      manual: true,
+      //,
       onSuccess: function onSuccess(result) {
         setWeQrUrl(result.url);
         onRunCheck();
@@ -233,9 +236,6 @@ var LoginQr = function LoginQr(_ref) {
             _context3.next = 9;
             return runWeLoginQr();
           case 9:
-            _context3.next = 11;
-            return runWeLoginQr();
-          case 11:
           case "end":
             return _context3.stop();
         }
@@ -306,8 +306,7 @@ var LoginQr = function LoginQr(_ref) {
                   })]
                 })]
               }) : /*#__PURE__*/_jsx("div", {
-                className: "alt",
-                children: "\u8BF7\u7528\u5FAE\u4FE1\u626B\u7801\u767B\u5F55"
+                className: "alt"
               })]
             })
           })

package/dist/Login/index.js

@@ -1,5 +1,5 @@
 import PostMessage from "../lib/postMessage";
 var Login = function Login() {
-  PostMessage('login');
+  PostMessage('need-login');
 };
 export default Login;

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

@@ -1053,7 +1053,7 @@ var Tool = _objectSpread(_objectSpread({
     });
   },
   onLogin: function onLogin() {
-    return PostMessage('login');
+    return PostMessage('need-login');
   },
   getObjectURL: function getObjectURL(file) {
     var _window5, _window6;

package/dist/lib/goAuth.js

@@ -2,7 +2,7 @@ import PostMessage from "./postMessage";
 export default function goAuth() {
   var authType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   // Tool.go(`${ authType }/auth`);
-  return PostMessage('login');
+  return PostMessage('need-login');
   // return;
   // if( window._openAuth_ ){
   //   return Promise.reject( false );

package/dist/lib/postMessage.d.ts

@@ -1,3 +1,3 @@
-type PostMessage = 'login' | 'menu';
+type PostMessage = 'need-login' | 'menu';
 declare const PostMessage: (type: PostMessage, data?: any) => void;
 export default PostMessage;

package/dist/service/api/AuthController.d.ts

@@ -9,6 +9,7 @@ export declare function weMiniLoginQr(body: {
     loginType: 'client';
     from: string;
     inviteUserId: number;
+    domain: string;
     env: Global.Env;
 }): Promise<UserAuth.WeQrResult>;
 export declare function reg(body: {

package/package.json

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