component-shipinlv 2.3.1 → 2.3.3

package/dist/ActiveAccountMode/setting.js

@@ -132,13 +132,13 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
       autoComplete: "off",
       initialValues: _objectSpread({}, formData),
       onFinish: onFinish,
-      children: [notVip && /*#__PURE__*/_jsx(Form.Item, {
-        label: "\u505C\u7528",
+      children: [notVip ? /*#__PURE__*/_jsx(Form.Item, {
+        label: "\u542F\u7528",
         children: /*#__PURE__*/_jsx(Alert, {
           type: "error",
           message: "\u4E0D\u662F\u4F1A\u5458\uFF0C\u6B64\u529F\u80FD\u7981\u7528"
         })
-      }), /*#__PURE__*/_jsx(Form.Item, {
+      }) : /*#__PURE__*/_jsx(Form.Item, {
         label: "\u542F\u7528",
         name: "enabled",
         children: /*#__PURE__*/_jsx(Switch, {

package/dist/VideoPublish/account-manage/list.js

@@ -18,7 +18,6 @@ import toast from "../../lib/toast";
 import Money from "../../UI/Money";
 import AccountManageSettingConfig from "../../lib/accountManageSettingConfig";
 import VideoPlatform from "../../component/video-platform/logo";
-import isInstalledChrome from "../../component/is-installed-chrome";
 import Tool from "../../lib/Tool";
 import VideoPublishVideoAccountBaseInfo from "../video-account/base-info";
 import VideoPublishVideoAccountProxySelect from "../proxy/select";
@@ -195,31 +194,29 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             Tool.toast("\u4E0D\u662F\u4F1A\u5458\uFF0C\u53EA\u80FD\u6DFB\u52A0 ".concat(NotVipCanAddAccountCount, "\u4E2A\u8D26\u6237"));
             return _context.abrupt("return");
           case 4:
-            if (isInstalledChrome()) {
-              _context.next = 8;
-              break;
-            }
-            Tool.toast('没有安装谷歌浏览器（Chrome），请安装');
-            onMenu('setting');
-            return _context.abrupt("return");
-          case 8:
+            // if( ! isInstalledChrome() ){
+            //   Tool.toast('没有安装谷歌浏览器（Chrome），请安装');
+            //   onMenu('setting');
+            //   return;
+            // }
+
             console.log('onAdd:', platform);
             settingConfig = AccountManageSettingConfig();
             if (settingConfig.chromeUserDataDir) {
-              _context.next = 14;
+              _context.next = 10;
               break;
             }
             notification.notificationError('请先设置：“谷歌浏览器 - 多开位置”', '选个稍微大点的盘存储，每个用户会有几百M的数据');
             onMenu('setting');
             return _context.abrupt("return");
-          case 14:
+          case 10:
             if (!(listData.length >= 200)) {
-              _context.next = 17;
+              _context.next = 13;
               break;
             }
             notification.notificationError('这电脑绑定到上限了', '每台电脑最多绑定 200 个账号');
             return _context.abrupt("return");
-          case 17:
+          case 13:
             toast('正在启动浏览器，请扫码登录', 12);
 
             // const platformName = platform ; // == 'kuaishou' ? 'kwai' : '';
@@ -231,12 +228,12 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             chromeProfileName = Date.now() + '-' + Tool.math.randWord(16);
             videoPlatformInfo = VideoPlatformDict[platform];
             if (videoPlatformInfo) {
-              _context.next = 23;
+              _context.next = 19;
               break;
             }
             toast('请配置信息：' + platform);
             return _context.abrupt("return");
-          case 23:
+          case 19:
             openChrome({
               action: 'add-account',
               platform: platform,
@@ -250,7 +247,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
               proxyInfo: proxyInfo,
               isOpen: true // settingConfig.isChromeOpen,
             }, true, env);
-          case 24:
+          case 20:
           case "end":
             return _context.stop();
         }

package/dist/VideoPublish/account-manage/setting/index.js

@@ -4,11 +4,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectDestructuringEmpty from "@babel/runtime/helpers/esm/objectDestructuringEmpty";
 import React, { useEffect, useState } from 'react';
-import { ConfigProvider, Divider, Form, InputNumber, Modal, Space, Switch, Tag, TimePicker, Tooltip } from 'antd';
+import { ConfigProvider, Divider, Form, InputNumber, Modal, Space, Switch, Tag, TimePicker } from 'antd';
 import "./index.less";
 import LayoutContent from "../../../UI/LayoutContent";
 import AccountManageSettingConfig from "../../../lib/accountManageSettingConfig";
-import FileSelect from "../../../component/file-select";
 import Tool from "../../../lib/Tool";
 import FolderSelect from "../../../component/folder-select";
 import dayjs from "dayjs";
@@ -101,30 +100,6 @@ var AccountManageSettingPage = function AccountManageSettingPage(_ref) {
             _onFinish(formData);
           }
         })
-      }), /*#__PURE__*/_jsx(Form.Item, {
-        label: "\u8C37\u6B4C\u6D4F\u89C8\u5668\uFF08Chrome\uFF09\u4F4D\u7F6E"
-        // name="disabledApplyTask"
-        ,
-        extra: /*#__PURE__*/_jsxs("div", {
-          children: ["\u4E0B\u8F7D\u5730\u5740", /*#__PURE__*/_jsx(Tooltip, {
-            title: "https://google.cn/chrome/",
-            children: /*#__PURE__*/_jsx("a", {
-              children: " https://google.cn/chrome/"
-            })
-          })]
-        }),
-        children: /*#__PURE__*/_jsx(FileSelect, {
-          path: formData.chromePath,
-          disabled: false,
-          placeholder: "\u8BF7\u9009\u62E9 Chrome \u6D4F\u89C8\u5668\u8DEF\u5F84",
-          allowClear: false,
-          extName: extName,
-          onFinish: function onFinish(chromePath) {
-            formData.chromePath = chromePath;
-            setFormData(_objectSpread({}, formData));
-            _onFinish(formData);
-          }
-        })
       }), /*#__PURE__*/_jsx(Form.Item, {
         label: "\u8C37\u6B4C\u6D4F\u89C8\u5668 - \u591A\u5F00\u4F4D\u7F6E",
         children: /*#__PURE__*/_jsx(FolderSelect, {

package/dist/active-code/index.js

@@ -6,7 +6,9 @@ import { useRequest } from '@umijs/hooks';
 import * as VipCardController from "../service/api/VipCardController";
 import updateUserInfo from "../lib/updateUserInfo";
 import Tool from "../lib/Tool";
+import UserProfileUserVip from "./user-vip";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var UserProfileVipCard = function UserProfileVipCard(_ref) {
   var env = _ref.env,
     onActive = _ref.onActive;
@@ -34,7 +36,7 @@ var UserProfileVipCard = function UserProfileVipCard(_ref) {
     error = _useRequest.error;
   var onFinish = function onFinish(postData) {
     var _postData$vipCardCode;
-    var vipCardCode = (_postData$vipCardCode = postData.vipCardCode) === null || _postData$vipCardCode === void 0 ? void 0 : _postData$vipCardCode.replace(/^\s*AI\d?-/i, '').replace(/\s+/g, '').toLocaleUpperCase();
+    var vipCardCode = (_postData$vipCardCode = postData.vipCardCode) === null || _postData$vipCardCode === void 0 ? void 0 : _postData$vipCardCode.replace(/^[\s0-9a-z]+-/i, '').replace(/\s+/g, '').toLocaleUpperCase();
     if (!vipCardCode) {
       return;
     }
@@ -43,8 +45,8 @@ var UserProfileVipCard = function UserProfileVipCard(_ref) {
   var onupdateUserInfo = function onupdateUserInfo() {
     updateUserInfo();
   };
-  return /*#__PURE__*/_jsx("div", {
-    children: /*#__PURE__*/_jsx(Form, {
+  return /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(Form, {
       form: form,
       disabled: loading,
       onFinish: onFinish,
@@ -70,7 +72,7 @@ var UserProfileVipCard = function UserProfileVipCard(_ref) {
           placeholder: "\u7C7B\u4F3C: AI-AAAA-BBBB-CCCC"
         })
       })
-    })
+    }), /*#__PURE__*/_jsx(UserProfileUserVip, {})]
   });
 };
 export default UserProfileVipCard;

package/dist/active-code/user-vip.d.ts

@@ -0,0 +1,3 @@
+import './user-vip.less';
+declare const UserProfileUserVip: () => import("react/jsx-runtime").JSX.Element | null;
+export default UserProfileUserVip;

package/dist/active-code/user-vip.js

@@ -0,0 +1,84 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useEffect, useState } from 'react';
+import { Divider, Table } from 'antd';
+import { useRequest } from '@umijs/hooks';
+import "./user-vip.less";
+import * as UserController from "../service/api/UserController";
+import ProductType from "../component/product-type";
+import Time from "../UI/Time";
+import PageContentWarp from "../UI/PageContentWarp";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var UserProfileUserVip = function UserProfileUserVip() {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    listData = _useState2[0],
+    setListData = _useState2[1];
+  var _useRequest = useRequest(function () {
+      return UserController.userVipInfo();
+    }, {
+      manual: true,
+      onSuccess: function onSuccess(result) {
+        setListData(result);
+      }
+    }),
+    run = _useRequest.run,
+    loading = _useRequest.loading,
+    error = _useRequest.error;
+  var columns = [{
+    title: '名称',
+    dataIndex: 'productName',
+    key: 'productName',
+    render: function render(productName, record) {
+      return /*#__PURE__*/_jsx(ProductType, {
+        productType: (record === null || record === void 0 ? void 0 : record.productType) || '',
+        productName: productName
+      });
+    }
+  }, {
+    title: '等级',
+    dataIndex: 'vipLevelName',
+    key: 'vipLevelName',
+    render: function render(vipLevelName, record) {
+      return /*#__PURE__*/_jsx("div", {
+        children: vipLevelName
+      });
+    }
+  }, {
+    title: '过期时间',
+    dataIndex: 'expired',
+    key: 'expired',
+    render: function render(expired, record) {
+      return /*#__PURE__*/_jsx(Time, {
+        time: expired
+      });
+    }
+  }];
+  useEffect(function () {
+    run();
+  }, []);
+  return listData.length > 0 ? /*#__PURE__*/_jsxs("div", {
+    className: "userVip",
+    children: [/*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(PageContentWarp
+    // title="我的会员等级"
+    , {
+      loading: loading,
+      error: error,
+      onReload: function onReload() {
+        return run();
+      },
+      children: /*#__PURE__*/_jsx(Table, {
+        size: "small",
+        bordered: true,
+        rowKey: function rowKey(record) {
+          return "".concat(record.productType);
+        },
+        loading: loading,
+        columns: columns,
+        dataSource: listData,
+        pagination: false
+      })
+    })]
+  }) : null;
+};
+export default UserProfileUserVip;

package/dist/active-code/user-vip.less

@@ -0,0 +1,3 @@
+.userVip{
+
+}

package/dist/component/product-type.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface Props {
     productType: string;
+    productName: string;
 }
 declare const ProductType: React.FC<Props>;
 export default ProductType;

package/dist/component/product-type.js

@@ -3,17 +3,18 @@ import ProductTypeDict from "./product-dict";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProductType = function ProductType(_ref) {
   var _ref$productType = _ref.productType,
-    productType = _ref$productType === void 0 ? '' : _ref$productType;
+    productType = _ref$productType === void 0 ? '' : _ref$productType,
+    productName = _ref.productName;
   var itemData = ProductTypeDict[productType] || {
     color: '',
     icon: '',
-    title: productType
+    title: ''
   };
   return /*#__PURE__*/_jsxs("span", {
     style: {
       color: itemData.color
     },
-    children: [itemData.icon, " ", itemData.title]
+    children: [itemData.icon, " ", itemData.title || productName || productType]
   });
 };
 export default ProductType;

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

@@ -75,6 +75,7 @@ declare namespace User {
     vipLevel: number; // 1,
     isVip: boolean;
     expired: number;
+    productType: string;
   }
 
   interface StaffUserInfo{

package/package.json

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