component-shipinlv 1.0.2 → 1.0.5

package/dist/Buy/qr.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState } from 'react';
@@ -32,7 +31,7 @@ var VipQr = function VipQr(_ref) {
   var _useState = useState(Tool.getLocalUserInfo()),
     _useState2 = _slicedToArray(_useState, 1),
     userInfo = _useState2[0];
-  var _useState3 = useState('wepay'),
+  var _useState3 = useState(payMethod === null || payMethod === void 0 ? void 0 : payMethod[0]),
     _useState4 = _slicedToArray(_useState3, 2),
     payChannel = _useState4[0],
     setPayChannel = _useState4[1];
@@ -106,6 +105,9 @@ var VipQr = function VipQr(_ref) {
         if (payOrderInfo[result.payChannel]) {
           payOrderInfo[result.payChannel].qrUrl = result.codeUrl || result.mWebUrl;
           setPayOrderInfo(_objectSpread({}, payOrderInfo));
+          console.log('payOrderInfo:', payOrderInfo);
+          setItemsTabs(getItemsTabs(payOrderInfo));
+
           // 五秒后自动弹出；
           setTimeout(function () {
             setPayResult(true);
@@ -141,22 +143,19 @@ var VipQr = function VipQr(_ref) {
     loading = _useRequest2.loading,
     run = _useRequest2.run,
     error = _useRequest2.error;
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    itemsTabs = _useState14[0],
-    setItemsTabs = _useState14[1];
-  var PayMethodList = {
-    wepay: [{
+  var getPayMethodList = function getPayMethodList() {
+    var payInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payOrderInfo;
+    var payMethodList = [{
       key: 'wepay',
       label: '微信支付',
       icon: /*#__PURE__*/_jsx(WechatOutlined, {
         className: "tabIcon"
       }),
       disabled: loadingPay,
-      children: payOrderInfo.wepay.message ? /*#__PURE__*/_jsx(Result, {
+      children: payInfo.wepay.message ? /*#__PURE__*/_jsx(Result, {
         status: "error",
         title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
-        subTitle: payOrderInfo.wepay.message,
+        subTitle: payInfo.wepay.message,
         children: /*#__PURE__*/_jsx(Button, {
           type: "primary",
           children: "\u91CD\u8BD5"
@@ -164,8 +163,8 @@ var VipQr = function VipQr(_ref) {
       }) : /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx("div", {
           className: "qrImage",
-          children: payOrderInfo.wepay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
-            value: payOrderInfo.wepay.qrUrl,
+          children: payInfo.wepay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
+            value: payInfo.wepay.qrUrl,
             fgColor: "#0bc160",
             size: 180
           }) : /*#__PURE__*/_jsx(LoadingOutlined, {
@@ -189,18 +188,17 @@ var VipQr = function VipQr(_ref) {
           })
         })]
       })
-    }],
-    alipay: [{
+    }, {
       key: 'alipay',
       label: '支付宝',
       disabled: loadingPay,
       icon: /*#__PURE__*/_jsx(AlipayCircleOutlined, {
         className: "tabIcon"
       }),
-      children: payOrderInfo.alipay.message ? /*#__PURE__*/_jsx(Result, {
+      children: payInfo.alipay.message ? /*#__PURE__*/_jsx(Result, {
         status: "error",
         title: "\u4E0B\u5355\u53D1\u751F\u4E00\u4E9B\u95EE\u9898",
-        subTitle: payOrderInfo.alipay.message,
+        subTitle: payInfo.alipay.message,
         children: /*#__PURE__*/_jsx(Button, {
           type: "primary",
           children: "\u91CD\u8BD5"
@@ -208,8 +206,8 @@ var VipQr = function VipQr(_ref) {
       }) : /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx("div", {
           className: "qrImage",
-          children: payOrderInfo.alipay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
-            value: payOrderInfo.alipay.qrUrl,
+          children: payInfo.alipay.qrUrl ? /*#__PURE__*/_jsx(QRCode, {
+            value: payInfo.alipay.qrUrl,
             fgColor: "#1677ff",
             size: 180
           }) : /*#__PURE__*/_jsx(LoadingOutlined, {
@@ -233,25 +231,51 @@ var VipQr = function VipQr(_ref) {
           })
         })]
       })
-    }]
+    }];
+    return payMethodList;
   };
-  var onInit = function onInit() {
+  var getItemsTabs = function getItemsTabs() {
+    var payInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : payOrderInfo;
+    var itemsTabs = [];
+    var payMethodList = getPayMethodList(payInfo);
     payMethod === null || payMethod === void 0 || payMethod.forEach(function (payMethod) {
-      var itemData = PayMethodList[payMethod];
-      if (!itemData) {
+      var index = -1;
+      if (!payMethodList) {
         return;
       }
-      if (itemsTabs) {
-        itemsTabs.push(itemData[0]);
+      payMethodList === null || payMethodList === void 0 || payMethodList.some(function (item, i) {
+        if (item.key === payMethod) {
+          index = i;
+        }
+      });
+      if (index < 0) {
+        return;
+      }
+      if (payMethodList) {
+        itemsTabs.push(payMethodList[index]);
       }
     });
-    if (itemsTabs) {
-      setItemsTabs(_toConsumableArray(itemsTabs));
-    }
+    return itemsTabs;
+  };
+  var _useState13 = useState(getItemsTabs()),
+    _useState14 = _slicedToArray(_useState13, 2),
+    itemsTabs = _useState14[0],
+    setItemsTabs = _useState14[1];
+  var onInit = function onInit() {
+    // payMethod?.forEach( payMethod => {
+    //   const itemData = PayMethodList[ payMethod ];
+    //   if( ! itemData){
+    //     return;
+    //   }
+    //   if( itemsTabs ){
+    //     itemsTabs.push( itemData[0] );
+    //   }
+    // });
+    // if( itemsTabs ){
+    //   setItemsTabs([...itemsTabs]);
+    // }
   };
-  useEffect(function () {
-    onInit();
-  }, []);
+  useEffect(function () {}, []);
   return /*#__PURE__*/_jsx(PageContentWarp, {
     loading: loading,
     error: error

package/dist/lib/getApiUrl.d.ts

@@ -1,3 +1,4 @@
+export declare const getMainPort: () => number;
 declare const getApiUrl: (apiName?: string, apiEnv?: Global.Env | '') => string;
 export declare const getApiEnv: (apiEnv?: Global.Env | '') => Global.Env;
 export declare const getEnv: (env?: Global.Env | '') => Global.Env;

package/dist/lib/getApiUrl.js

@@ -7,6 +7,9 @@ var envData = function envData() {
   var _window3;
   return ((_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.WebBaseConfig) === null || _window3 === void 0 ? void 0 : _window3.currentEnv) || currentEnv;
 };
+export var getMainPort = function getMainPort() {
+  return window.__ShipinlvMainPort || 61800;
+};
 var getApiUrl = function getApiUrl() {
   var _domain;
   var apiName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -15,10 +18,11 @@ var getApiUrl = function getApiUrl() {
   if (/^https?:\/\//i.test(apiName)) {
     return apiName;
   }
+  var mainPort = getMainPort();
 
   // 主客户端
   if (/_main\//i.test(apiName)) {
-    return "http://127.0.0.1:61800/".concat(apiName.replace(/^_main\//i, ''));
+    return "http://127.0.0.1:".concat(mainPort, "/").concat(apiName.replace(/^_main\//i, ''));
   }
 
   // 替换第一个 /

package/dist/lib/request.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 二次封装 hooks request ;
 // 参数详见：https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
 import request from 'umi-request';
-import getApiUrl, { getApiEnv } from "./getApiUrl";
+import getApiUrl, { getApiEnv, getMainPort } from "./getApiUrl";
 import goAuth from "./goAuth";
 import Tool from "./Tool";
 var requestApi = function requestApi() {
@@ -67,7 +67,7 @@ var requestApi = function requestApi() {
         err = new Error();
       }
       console.log('request component shipinlv:', JSON.stringify(err), url);
-      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf('http://127.0.0.1:61800') === 0) {
+      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
         err.name = "shipinlv-client-not-run";
         err.message = "\u8BF7\u5148\u6253\u5F00\u7535\u8111\u4E0A\u5DF2\u5B89\u88C5\u7684\uFF1A\u3010\u89C6\u9891\u9A74\u5DE5\u5177\u7BB1\u3011\uFF0C\u518D\u64CD\u4F5C";
         reject(err);

package/dist/service/api/SubClientController.js

@@ -2,6 +2,7 @@ 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";
+import { getMainPort } from "../../lib/getApiUrl";
 export function start(_x, _x2) {
   return _start.apply(this, arguments);
 }
@@ -33,7 +34,7 @@ function _runStatus() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("http://127.0.0.1:".concat((body === null || body === void 0 ? void 0 : body.port) || 61800, "/sub-client/runStatus"), _objectSpread({
+          return _context2.abrupt("return", request("http://127.0.0.1:".concat((body === null || body === void 0 ? void 0 : body.port) || getMainPort(), "/sub-client/runStatus"), _objectSpread({
             method: 'GET',
             params: _objectSpread({}, body)
           }, options || {})));

package/dist/window.d.ts

@@ -5,5 +5,6 @@ declare interface Window{
   __onBindWindowError: boolean;
   __wxjs_environment: string;
   __recordError: any;
+  __ShipinlvMainPort: number;
 }
 

package/package.json

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