component-shipinlv 2.3.1 → 2.3.2

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/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.2",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",