component-shipinlv 0.0.12 → 0.0.16

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    .qr{\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        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    .weQrUrl{\n      position: absolute;\n      left: 50%;\n      transform: translateX(-50%);\n    }\n    .qr{\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        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  "]))),
   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/AuthClient/qr/index.js

@@ -14,12 +14,13 @@ import Platform from "../../lib/platform";
 import QrWs from "./ws";
 import { getApiEnv } from "../../lib/getApiUrl";
 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";
 var reTryMaxCount = 120;
 var reTryTimeLoop = 1000; // ms
 var FromWhere = 'web';
+import QRCode from 'qrcode.react';
+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 LoginQr = function LoginQr(_ref) {
   var defaultLoginType = _ref.defaultLoginType,
     wechatDisabled = _ref.wechatDisabled,
@@ -144,7 +145,7 @@ var LoginQr = function LoginQr(_ref) {
     }, {
       manual: defaultLoginType !== 'wechat',
       onSuccess: function onSuccess(result) {
-        setWeQrUrl(Tool.makeQrUrl(result.url, '#0bc160'));
+        setWeQrUrl(result.url);
         onRunCheck();
       }
     }),
@@ -252,18 +253,25 @@ var LoginQr = function LoginQr(_ref) {
               return onRetryWeQr();
             },
             children: /*#__PURE__*/_jsxs(styles.WeQrUrlBox, {
-              children: [/*#__PURE__*/_jsx("div", {
+              children: [/*#__PURE__*/_jsxs("div", {
                 style: {
-                  backgroundImage: "url('".concat(weQrUrl, "')")
+                  // backgroundImage: `url('${ weQrUrl }')`,
                 },
                 className: "qr wechat ".concat(isNextTry ? '' : 'noTry'),
-                children: !isNextTry && /*#__PURE__*/_jsx("div", {
+                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", {

package/dist/Buy/index.js

@@ -49,6 +49,7 @@ var Buy = function Buy(_ref) {
     };
   }();
   var onOpenVipQr = function onOpenVipQr() {
+    var _ref3;
     var userId = Tool.getLocalUserInfo().id;
     if (Platform.isWechat || Platform.isH5) {
       Tool.h5Pay({
@@ -73,7 +74,7 @@ var Buy = function Buy(_ref) {
           Tool.toast('^_^，谢谢购买，祝您发财');
         }
       }),
-      width: Math.min(520, window.innerWidth * 0.95)
+      width: Math.min(520, ((_ref3 = global || window) === null || _ref3 === void 0 ? void 0 : _ref3.innerWidth) * 0.95)
     });
     // 广播，点击了 购买；
     Tool.event.run('vip-buy-click');

package/dist/Buy/qr.js

@@ -5,6 +5,7 @@ import { CloseOutlined, PauseOutlined, WechatOutlined } from '@ant-design/icons'
 import { useRequest } from '@umijs/hooks';
 import * as TradeController from "../service/api/TradeController";
 import * as VipController from "../service/api/VipController";
+import QRCode from 'qrcode.react';
 import Tool from "../lib/Tool";
 import PageContentWarp from "../UI/PageContentWarp";
 import styles from "./qr.css";
@@ -79,7 +80,8 @@ var VipQr = function VipQr(_ref) {
           } else {}
         } else {}
         setOrderPayInfo(result);
-        setPayQrImageUrl(Tool.makeQrUrl(result.codeUrl || result.mWebUrl, '#0bc160'));
+        // setPayQrImageUrl( Tool.makeQrUrl( result.codeUrl || result.mWebUrl, '#0bc160') );
+        setPayQrImageUrl(result.codeUrl || result.mWebUrl);
         // 五秒后自动弹出；
         setTimeout(function () {
           setPayResult(true);
@@ -143,9 +145,9 @@ var VipQr = function VipQr(_ref) {
         })]
       }), /*#__PURE__*/_jsx("div", {
         className: "qrImage",
-        children: payQrImageUrl && /*#__PURE__*/_jsx("img", {
-          src: payQrImageUrl,
-          alt: ""
+        children: payQrImageUrl && /*#__PURE__*/_jsx(QRCode, {
+          value: payQrImageUrl,
+          fgColor: "#0bc160"
         })
       }), Platform.isH5 ? /*#__PURE__*/_jsxs("div", {
         className: "altInH5",

package/dist/UI/DialogDrawer.js

@@ -6,6 +6,7 @@ import styles from "./DialogDrawer.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 // 抽屉
 var DialogDrawer = function DialogDrawer(props) {
+  var _window;
   var state = Tool.extend({
     id: '',
     title: '提示',
@@ -20,7 +21,7 @@ var DialogDrawer = function DialogDrawer(props) {
   }, props);
 
   // 宽度
-  state.width = Math.min(state.width, window.innerWidth);
+  state.width = Math.min(state.width, (_window = window) === null || _window === void 0 ? void 0 : _window.innerWidth);
 
   // 管理 显示隐藏
   var _useState = useState(true),

package/dist/lib/Tool.d.ts

@@ -153,6 +153,7 @@ declare const Tool: {
         top: number;
     };
     makeQrUrl(url: string, foreground?: string, size?: number): any;
+    makeQr(url: string, fgColor?: string, size?: number): import("react/jsx-runtime").JSX.Element;
     onLogin(): void;
     getObjectURL(file: File): string;
     onDownFile(url: string): void;

package/dist/lib/Tool.js

@@ -5,7 +5,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // @ts-nocheck
 
 import { Modal, message, Tooltip } from 'antd';
-var JrQrcode = require('jr-qrcode');
+// const JrQrcode = require('jr-qrcode');
+import QRCode from 'qrcode.react';
 
 // import { history } from 'umi';
 
@@ -20,13 +21,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var packageJson = require("../../package.json");
 var store = {
   key: function key() {
-    var WebBaseConfig = window.WebBaseConfig || {};
+    var _window;
+    var WebBaseConfig = ((_window = window) === null || _window === void 0 ? void 0 : _window.WebBaseConfig) || {};
     return "__".concat(WebBaseConfig.webKind, "-").concat(WebBaseConfig.productName, "__");
   },
   get: function get(name) {
     var getData;
     try {
-      getData = window.localStorage.getItem(this.key() + name);
+      var _window2;
+      getData = (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.localStorage.getItem(this.key() + name);
       if (getData) {
         getData = JSON.parse(getData);
       }
@@ -47,7 +50,8 @@ var store = {
       value: value
     };
     try {
-      window.localStorage.setItem(this.key() + name, JSON.stringify(saveData));
+      var _window3;
+      (_window3 = window) === null || _window3 === void 0 || _window3.localStorage.setItem(this.key() + name, JSON.stringify(saveData));
     } catch (e) {
       console.error('LocalStorage set Error:', e);
     }
@@ -60,7 +64,7 @@ var Tool = _objectSpread(_objectSpread({
   GData: {
     userInfo: {}
   },
-  //window._GData,
+  //win dow._GData,
   data: function data(key, value) {
     if (typeof value === 'undefined') {
       this.GData[key] = value;
@@ -319,16 +323,18 @@ var Tool = _objectSpread(_objectSpread({
   },
   //参数：变量名，url为空则表从当前页面的url中取
   getQuery: function getQuery(name) {
+    var _window4, _document;
     var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    var u = arguments[1] || window.location.search.replace('?', '') || document.location.hash.replace('#', ''),
+    var u = arguments[1] || ((_window4 = window) === null || _window4 === void 0 || (_window4 = _window4.location) === null || _window4 === void 0 ? void 0 : _window4.search.replace('?', '')) || ((_document = document) === null || _document === void 0 || (_document = _document.location) === null || _document === void 0 ? void 0 : _document.hash.replace('#', '')),
       reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)'),
       r = u.substr(u.indexOf('?') + 1).match(reg);
     return r != null ? decodeURIComponent(r[2]) : '';
   },
   getQueryAll: function getQueryAll() {
+    var _window5, _document2;
     var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var theRequest = {};
-    var str = url || window.location.search.replace('?', '') || document.location.hash.replace('#', '');
+    var str = url || ((_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.location) === null || _window5 === void 0 ? void 0 : _window5.search.replace('?', '')) || ((_document2 = document) === null || _document2 === void 0 || (_document2 = _document2.location) === null || _document2 === void 0 ? void 0 : _document2.hash.replace('#', ''));
     if (url.indexOf('?') !== -1) {
       str = url.substr(url.indexOf('?') + 1);
     }
@@ -1032,11 +1038,21 @@ var Tool = _objectSpread(_objectSpread({
       foreground: foreground // 二维码颜色（默认黑色）
     });
   },
+  makeQr: function makeQr(url) {
+    var fgColor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#1677ff';
+    var size = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 600;
+    return /*#__PURE__*/_jsx(QRCode, {
+      value: url,
+      fgColor: fgColor,
+      size: size
+    });
+  },
   onLogin: function onLogin() {
     return PostMessage('login');
   },
   getObjectURL: function getObjectURL(file) {
-    var url = window.URL || window.webkitURL;
+    var _window6, _window7;
+    var url = ((_window6 = window) === null || _window6 === void 0 ? void 0 : _window6.URL) || ((_window7 = window) === null || _window7 === void 0 ? void 0 : _window7.webkitURL);
     return url.createObjectURL(file);
   },
   // file
@@ -1078,13 +1094,16 @@ var Tool = _objectSpread(_objectSpread({
     var data = JSON.stringify(_objectSpread({
       payBackUrl: document.location.href
     }, query));
-    (top || window).document.location.href = 'https://pay.shanren.wang/pay/we-h5?data=' + encodeURIComponent(data);
+    document.location.href = 'https://pay.shanren.wang/pay/we-h5?data=' + encodeURIComponent(data);
   }
 });
-if (!window._GData) {
-  window._GData = {};
+if (window) {
+  var _window8;
+  if (!((_window8 = window) !== null && _window8 !== void 0 && _window8._GData)) {
+    window._GData = {};
+  }
+  Tool.GData = window._GData;
+  window._Tool = Tool;
 }
-Tool.GData = window._GData;
-window._Tool = Tool;
 Tool.onWindowError();
 export default Tool;

package/dist/lib/getApiUrl.js

@@ -1,11 +1,11 @@
 import ApiUrlsInfo, { currentEnv } from "../config/apiUrls";
 var ApiUrls = function ApiUrls() {
-  var _window$WebBaseConfig, _window$WebBaseConfig2;
-  return ((_window$WebBaseConfig = window.WebBaseConfig) === null || _window$WebBaseConfig === void 0 || (_window$WebBaseConfig = _window$WebBaseConfig[(_window$WebBaseConfig2 = window.WebBaseConfig) === null || _window$WebBaseConfig2 === void 0 ? void 0 : _window$WebBaseConfig2.webKind]) === null || _window$WebBaseConfig === void 0 ? void 0 : _window$WebBaseConfig.apiUrls) || ApiUrlsInfo;
+  var _window$WebBaseConfig, _window;
+  return ((_window$WebBaseConfig = window.WebBaseConfig) === null || _window$WebBaseConfig === void 0 || (_window$WebBaseConfig = _window$WebBaseConfig[(_window = window) === null || _window === void 0 || (_window = _window.WebBaseConfig) === null || _window === void 0 ? void 0 : _window.webKind]) === null || _window$WebBaseConfig === void 0 ? void 0 : _window$WebBaseConfig.apiUrls) || ApiUrlsInfo;
 };
 var envData = function envData() {
-  var _window$WebBaseConfig3;
-  return ((_window$WebBaseConfig3 = window.WebBaseConfig) === null || _window$WebBaseConfig3 === void 0 ? void 0 : _window$WebBaseConfig3.currentEnv) || currentEnv;
+  var _window2;
+  return ((_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.WebBaseConfig) === null || _window2 === void 0 ? void 0 : _window2.currentEnv) || currentEnv;
 };
 var getApiUrl = function getApiUrl() {
   var _ref, _domain;

package/dist/lib/js-error.js

@@ -1,6 +1,9 @@
 import * as JsErrorController from "../service/api/JsErrorController";
 var packageJson = require("../../package.json");
 var JsError = function JsError() {
+  if (!window) {
+    return;
+  }
   if (window.__onBindWindowError) {
     console.log('onWindowError Binded 2!');
     return false;

package/dist/lib/platform.js

@@ -1,4 +1,5 @@
-var ua = window.navigator.userAgent.toLowerCase();
+var _window;
+var ua = (_window = window) === null || _window === void 0 || (_window = _window.navigator) === null || _window === void 0 ? void 0 : _window.userAgent.toLowerCase();
 
 // android平台
 var isAndroid = function () {
@@ -16,8 +17,8 @@ var isWechat = function () {
 }();
 
 // 微信小程序
-var isWxmp = function () {
-  return /miniProgram/i.test(ua) || window.__wxjs_environment === 'miniprogram';
+var isWxmp = function (_window2) {
+  return /miniProgram/i.test(ua) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__wxjs_environment) === 'miniprogram';
 }();
 
 // 钉钉环境

package/dist/lib/request.js

@@ -72,7 +72,7 @@ var requestApi = function requestApi() {
   });
 };
 var onError = function onError(pageUrl) {
-  var _window$__recordError;
+  var _window;
   var apiUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   var title = arguments.length > 2 ? arguments[2] : undefined;
   var content = arguments.length > 3 ? arguments[3] : undefined;
@@ -80,7 +80,7 @@ var onError = function onError(pageUrl) {
   if (silent) {
     return;
   }
-  (_window$__recordError = window.__recordError) === null || _window$__recordError === void 0 || _window$__recordError.create([{
+  (_window = window) === null || _window === void 0 || (_window = _window.__recordError) === null || _window === void 0 || _window.create([{
     title: title,
     siteUserId: Tool.getLocalUserInfo().id,
     errorLevel: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "0.0.12",
+  "version": "0.0.16",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -72,6 +72,7 @@
     "@umijs/hooks": "^1.9.3",
     "jr-qrcode": "^1.1.4",
     "moment": "^2.29.4",
+    "qrcode.react": "^3.1.0",
     "styled-components": "^6.1.8",
     "umi-request": "^1.4.0",
     "yarn": "^1.22.19"