component-shipinlv 0.1.12 → 0.1.13

package/dist/Buy/index.d.ts

@@ -4,6 +4,7 @@ interface Props {
     vipId: number;
     productCount: number;
     productKind: 'vip' | 'vip-card';
+    showPrice?: number;
     disabled?: boolean;
     onBuySuccess?: () => void;
     children: React.ReactNode;

package/dist/Buy/index.js

@@ -5,6 +5,7 @@ import Tool from "../lib/Tool";
 import styles from "./index.css";
 import VipQr from "./qr";
 import Platform from "../lib/platform";
+import BuyTrialMember from "./trial-member";
 import { jsx as _jsx } from "react/jsx-runtime";
 var Buy = function Buy(_ref) {
   var _ref$env = _ref.env,
@@ -17,12 +18,13 @@ var Buy = function Buy(_ref) {
     productCount = _ref$productCount === void 0 ? 1 : _ref$productCount,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    showPrice = _ref.showPrice,
     _ref$onBuySuccess = _ref.onBuySuccess,
     onBuySuccess = _ref$onBuySuccess === void 0 ? function () {} : _ref$onBuySuccess,
     children = _ref.children;
   var onBuy = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var userInfo;
+      var userInfo, _ref3, dialog;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -41,8 +43,28 @@ var Buy = function Buy(_ref) {
             console.log("not login");
             return _context.abrupt("return", Tool.onLogin());
           case 6:
+            if (!(showPrice === 0)) {
+              _context.next = 9;
+              break;
+            }
+            // 直接开通
+            dialog = Tool.drawer({
+              title: '开通',
+              content: /*#__PURE__*/_jsx(BuyTrialMember, {
+                env: env,
+                vipId: vipId,
+                onBack: function onBack() {
+                  onBuySuccess();
+                  dialog.destroy();
+                }
+              }),
+              zIndex: 1200,
+              width: Math.min(520, ((_ref3 = global || window) === null || _ref3 === void 0 ? void 0 : _ref3.innerWidth) * 0.95)
+            });
+            return _context.abrupt("return");
+          case 9:
             onOpenVipQr();
-          case 7:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -53,7 +75,7 @@ var Buy = function Buy(_ref) {
     };
   }();
   var onOpenVipQr = function onOpenVipQr() {
-    var _ref3;
+    var _ref4;
     var userId = Tool.getLocalUserInfo().id;
     if (Platform.isWechat || Platform.isH5) {
       Tool.h5Pay({
@@ -79,8 +101,8 @@ var Buy = function Buy(_ref) {
           Tool.toast('^_^，谢谢购买，祝您发财');
         }
       }),
-      zIndex: 5000,
-      width: Math.min(520, ((_ref3 = global || window) === null || _ref3 === void 0 ? void 0 : _ref3.innerWidth) * 0.95)
+      zIndex: 1200,
+      width: Math.min(520, ((_ref4 = global || window) === null || _ref4 === void 0 ? void 0 : _ref4.innerWidth) * 0.95)
     });
     // 广播，点击了 购买；
     Tool.event.run('vip-buy-click');

package/dist/Buy/trial-member.css.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+declare const _default: {
+    TrialMember: import("styled-components").IStyledComponent<"web", import("styled-components/dist/types").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>;
+};
+export default _default;

package/dist/Buy/trial-member.css.js

@@ -0,0 +1,6 @@
+import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
+var _templateObject;
+import styled from 'styled-components';
+export default {
+  TrialMember: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    :global{\n      //.ktv-ai-vip-compare{\n      //  .vip-compare-price{\n      //    small{\n      //      color: #888;\n      //      vertical-align: middle;\n      //    }\n      //  }\n      //  .listMore{\n      //    position: absolute;\n      //    right: 10px;\n      //    top: 9px;\n      //  }\n      //\n      //  .vipCompareListMoreContent{\n      //    width: 500px;\n      //    .ratioAlt{\n      //      padding: 6px 0;\n      //      font-size: 13px;\n      //      color: #777;\n      //      .vip-compare-alt{\n      //\n      //      }\n      //    }\n      //  }\n      //\n      //}\n    }\n  "])))
+};

package/dist/Buy/trial-member.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface Props {
+    env?: Global.Env;
+    vipId: number;
+    onBack?: () => void;
+}
+declare const BuyTrialMember: React.FC<Props>;
+export default BuyTrialMember;

package/dist/Buy/trial-member.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import styles from "./trial-member.css";
+import { useRequest } from "@umijs/hooks";
+import * as UserVipController from "../service/api/UserVipController";
+import { Button, Result } from "antd";
+import PageContentWarp from "../UI/PageContentWarp";
+import { jsx as _jsx } from "react/jsx-runtime";
+var BuyTrialMember = function BuyTrialMember(_ref) {
+  var _ref$env = _ref.env,
+    env = _ref$env === void 0 ? 'prod' : _ref$env,
+    _ref$vipId = _ref.vipId,
+    vipId = _ref$vipId === void 0 ? 0 : _ref$vipId,
+    _ref$onBack = _ref.onBack,
+    onBack = _ref$onBack === void 0 ? function () {} : _ref$onBack;
+  var _useRequest = useRequest(function () {
+      return UserVipController.trial({
+        vipId: vipId
+      }, {
+        env: env
+      });
+    }, {
+      onSuccess: function onSuccess(result) {}
+    }),
+    loading = _useRequest.loading,
+    run = _useRequest.run,
+    error = _useRequest.error;
+  return /*#__PURE__*/_jsx(styles.TrialMember, {
+    children: /*#__PURE__*/_jsx(PageContentWarp, {
+      loading: loading,
+      error: error,
+      onReload: run,
+      children: /*#__PURE__*/_jsx(Result, {
+        status: "success",
+        title: "\u5DF2\u5F00\u901A",
+        subTitle: "\u5FEB\u53BB\u8BD5\u7528\u5427",
+        extra: [/*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          onClick: onBack,
+          children: "\u8FD4\u56DE"
+        }, "back")]
+      })
+    })
+  });
+};
+export default BuyTrialMember;

package/dist/VipList/index.css.js

@@ -2,5 +2,5 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLit
 var _templateObject;
 import styled from 'styled-components';
 export default {
-  pricingCompare: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    th{\n      font-size: 20px;\n      padding: 20px 0 !important;\n      font-weight: 400 !important;\n      text-align: center !important;\n    }\n\n    .classifyKind{\n      font-size: 18px;\n    }\n\n    .onBuy{\n      padding: 16px 0;\n    }\n\n    .title{\n      font-size: 16px;\n    }\n    .subtitle{\n      margin: 1px 0 0;\n      font-size: 12px;\n      color: #999;\n      font-weight: 300;\n    }\n    .value{\n      text-align: center;\n      font-size: 16px;\n      .allow{\n        color: #00b70d;\n        font-size: 18px;\n      }\n      .notAllow{\n        color: #C00;\n        font-size: 18px;\n      }\n      small{\n        color: #999;\n        padding-left: 2px;\n      }\n    }\n  "])))
+  pricingCompare: styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    th{\n      font-size: 20px;\n      padding: 20px 0 !important;\n      font-weight: 400 !important;\n      text-align: center !important;\n    }\n\n    .vipTitle{\n    }\n\n    .classifyKind{\n      font-size: 18px;\n    }\n\n    .onBuy{\n      //padding: 16px 0;\n      text-align: center;\n    }\n\n    .title{\n      font-size: 16px;\n    }\n    .subtitle{\n      margin: 1px 0 0;\n      font-size: 12px;\n      color: #999;\n      font-weight: 300;\n    }\n    .value{\n      text-align: center;\n      font-size: 16px;\n      .allow{\n        color: #00b70d;\n        font-size: 18px;\n      }\n      .notAllow{\n        color: #C00;\n        font-size: 18px;\n      }\n      small{\n        color: #999;\n        padding-left: 2px;\n      }\n    }\n  "])))
 };

package/dist/VipList/index.d.ts

@@ -1,10 +1,12 @@
 import React from "react";
 interface Props {
+    productType: string;
     disabledPrice?: boolean;
     disabledBuy?: boolean;
     applyDemoWechatUrl?: string;
     applyDemoTitle?: string;
     tableOffsetHeader?: number;
+    env?: Global.Env;
     tableScrollY?: number | string;
     onBuySuccess?: () => void;
 }

package/dist/VipList/index.js

@@ -32,7 +32,8 @@ var ApplyColorDict = {
   }
 };
 var VipList = function VipList(_ref) {
-  var _ref$disabledPrice = _ref.disabledPrice,
+  var productType = _ref.productType,
+    _ref$disabledPrice = _ref.disabledPrice,
     disabledPrice = _ref$disabledPrice === void 0 ? false : _ref$disabledPrice,
     _ref$disabledBuy = _ref.disabledBuy,
     disabledBuy = _ref$disabledBuy === void 0 ? false : _ref$disabledBuy,
@@ -42,15 +43,23 @@ var VipList = function VipList(_ref) {
     applyDemoTitle = _ref$applyDemoTitle === void 0 ? '预约演示' : _ref$applyDemoTitle,
     _ref$tableScrollY = _ref.tableScrollY,
     tableScrollY = _ref$tableScrollY === void 0 ? '65vh' : _ref$tableScrollY,
+    env = _ref.env,
     _ref$tableOffsetHeade = _ref.tableOffsetHeader,
     tableOffsetHeader = _ref$tableOffsetHeade === void 0 ? 56 : _ref$tableOffsetHeade,
     _ref$onBuySuccess = _ref.onBuySuccess,
     onBuySuccess = _ref$onBuySuccess === void 0 ? function () {} : _ref$onBuySuccess;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    listData = _useState2[0],
-    setListData = _useState2[1];
-  var _useState3 = useState([{
+  var _useState = useState(Tool.getLocalUserInfo()),
+    _useState2 = _slicedToArray(_useState, 1),
+    userInfo = _useState2[0];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    buyList = _useState4[0],
+    setBuyList = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    listData = _useState6[0],
+    setListData = _useState6[1];
+  var _useState7 = useState([{
       title: '功能',
       dataIndex: 'title',
       key: 'title',
@@ -71,30 +80,37 @@ var VipList = function VipList(_ref) {
         });
       }
     }]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    columns = _useState4[0],
-    setColumns = _useState4[1];
+    _useState8 = _slicedToArray(_useState7, 2),
+    columns = _useState8[0],
+    setColumns = _useState8[1];
   var _useRequest = useRequest(function () {
       return VipPowerController.list({
+        productType: productType,
         dealerId: Tool.getLocalSiteInfo().dealerId || 0
       }, {
-        env: getApiEnv()
+        env: env
       });
     }, {
       onSuccess: function onSuccess(result) {
         var list = [];
         var listLen = result.vipList.length;
+        var buyList = [];
         result.vipList.forEach(function (item) {
+          buyList.push({
+            id: item.id,
+            price: item.price
+          });
           var dataIndex = "vipLevel".concat(item.vipLevel);
           var colorPrimary = ApplyColorDict[item.vipLevel].color || '#722ED1';
           list.push({
             title: /*#__PURE__*/_jsxs("div", {
               children: [/*#__PURE__*/_jsx("div", {
+                className: "vipTitle",
                 style: {
                   color: colorPrimary
                 },
                 children: item.title
-              }), applyDemoWechatUrl && /*#__PURE__*/_jsx(ConfigProvider, {
+              }), applyDemoWechatUrl && item.price > 0 && /*#__PURE__*/_jsx(ConfigProvider, {
                 theme: {
                   components: {
                     Button: {
@@ -117,42 +133,18 @@ var VipList = function VipList(_ref) {
             render: function render(value, record) {
               return /*#__PURE__*/_jsx("div", {
                 className: "value",
-                children: (record === null || record === void 0 ? void 0 : record.title) === ':buy' ? /*#__PURE__*/_jsx("div", {
-                  className: "onBuy",
-                  children: /*#__PURE__*/_jsx(ConfigProvider, {
-                    theme: {
-                      components: {
-                        Button: {
-                          colorPrimary: '#722ED1'
-                        }
-                      }
-                    },
-                    children: (item === null || item === void 0 ? void 0 : item.price) > 0 && /*#__PURE__*/_jsx(Buy, {
-                      env: getApiEnv(),
-                      productKind: "vip",
-                      vipId: (item === null || item === void 0 ? void 0 : item.id) || 0,
-                      productCount: 1,
-                      onBuySuccess: onBuySuccess,
-                      children: /*#__PURE__*/_jsx(Button, {
-                        type: "primary",
-                        icon: /*#__PURE__*/_jsx(ShoppingCartOutlined, {}),
-                        children: "\u8D2D\u4E70"
-                      })
-                    })
-                  })
-                }) : /*#__PURE__*/_jsx(_Fragment, {
-                  children: ['true', 'false'].includes(value) ? /*#__PURE__*/_jsxs(_Fragment, {
-                    children: [value === 'true' && /*#__PURE__*/_jsx(CheckCircleFilled, {
-                      className: "allow"
-                    }), value === 'false' && /*#__PURE__*/_jsx(CloseCircleFilled, {
-                      className: "notAllow"
-                    })]
-                  }) : value
-                })
+                children: ['true', 'false'].includes(value) ? /*#__PURE__*/_jsxs(_Fragment, {
+                  children: [value === 'true' && /*#__PURE__*/_jsx(CheckCircleFilled, {
+                    className: "allow"
+                  }), value === 'false' && /*#__PURE__*/_jsx(CloseCircleFilled, {
+                    className: "notAllow"
+                  })]
+                }) : value
               });
             }
           });
         });
+        setBuyList([].concat(buyList));
         columns.push.apply(columns, list);
         setColumns(_toConsumableArray(columns));
 
@@ -201,16 +193,18 @@ var VipList = function VipList(_ref) {
             })
           });
         }
-        if (!disabledBuy) {
-          listDataValues.push({
-            name: ':buy',
-            classifyTitle: ':buy',
-            classifySubtitle: '',
-            classifyIndex: -1,
-            classifyKind: '购买',
-            list: []
-          });
-        }
+
+        // if( ! disabledBuy ){
+        //   listDataValues.push({
+        //     name: ':buy',
+        //     classifyTitle: ':buy',
+        //     classifySubtitle: '',
+        //     classifyIndex: -1,
+        //     classifyKind: '购买',
+        //     list: [],
+        //   });
+        // }
+
         var listData = [];
         listDataValues.forEach(function (items, index) {
           var onlyShowTitle = false;
@@ -299,7 +293,15 @@ var VipList = function VipList(_ref) {
     }
     Tool.pageDialog({
       title: applyDemoTitle,
-      content: Tool.makeQr(applyDemoWechatUrl, '#29ae67', 220),
+      content: /*#__PURE__*/_jsxs("div", {
+        children: [Tool.makeQr(applyDemoWechatUrl, '#29ae67', 220), /*#__PURE__*/_jsx("p", {
+          style: {
+            textAlign: 'center',
+            color: '#999'
+          },
+          children: "\u5FAE\u4FE1\u626B\u4E00\u626B\uFF0C\u52A0\u597D\u53CB"
+        })]
+      }),
       width: 320,
       zIndex: 9999
     });
@@ -331,9 +333,54 @@ var VipList = function VipList(_ref) {
         },
         columns: columns,
         dataSource: listData,
-        pagination: false,
-        sticky: {
-          offsetHeader: tableOffsetHeader
+        pagination: false
+        // sticky={{offsetHeader: tableOffsetHeader }}
+        ,
+        summary: function summary() {
+          return disabledBuy ? undefined : /*#__PURE__*/_jsx(Table.Summary, {
+            fixed: true,
+            children: /*#__PURE__*/_jsxs(Table.Summary.Row, {
+              children: [/*#__PURE__*/_jsx(Table.Summary.Cell, {
+                index: 0,
+                children: " "
+              }), buyList.map(function (item, i) {
+                var _userInfo$userVip;
+                // 从不是会员；
+                var userVip = !!((_userInfo$userVip = userInfo.userVip) !== null && _userInfo$userVip !== void 0 && _userInfo$userVip[productType]);
+                var colorPrimary = (item === null || item === void 0 ? void 0 : item.price) > 0 ? '#722ED1' : 'green';
+                return /*#__PURE__*/_jsx(Table.Summary.Cell, {
+                  index: i,
+                  children: /*#__PURE__*/_jsx("div", {
+                    className: "onBuy",
+                    children: /*#__PURE__*/_jsx(ConfigProvider, {
+                      theme: {
+                        components: {
+                          Button: {
+                            colorPrimary: colorPrimary
+                          }
+                        }
+                      },
+                      children: /*#__PURE__*/_jsx(Buy, {
+                        env: getApiEnv(),
+                        disabled: userVip,
+                        productKind: "vip",
+                        vipId: (item === null || item === void 0 ? void 0 : item.id) || 0,
+                        productCount: 1,
+                        showPrice: item === null || item === void 0 ? void 0 : item.price,
+                        onBuySuccess: onBuySuccess,
+                        children: /*#__PURE__*/_jsx(Button, {
+                          disabled: userVip && item.price === 0,
+                          type: "primary",
+                          icon: /*#__PURE__*/_jsx(ShoppingCartOutlined, {}),
+                          children: (item === null || item === void 0 ? void 0 : item.price) > 0 ? '购买' : '免费开通'
+                        })
+                      })
+                    })
+                  })
+                });
+              })]
+            })
+          });
         }
       })
     })

package/dist/config/apiUrls.js

@@ -1,5 +1,5 @@
 // 业务服务器 api
-export var currentEnv = 'local';
+export var currentEnv = 'prod';
 var ApiUrls = {
   local: {
     api: 'http://localhost:9999/',

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: "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/service/api/UserVipController.d.ts

@@ -0,0 +1,3 @@
+export declare function trial(body: {
+    vipId: number;
+}, options?: Global.RequestOptions): Promise<Vip.List>;

package/dist/service/api/UserVipController.js

@@ -0,0 +1,27 @@
+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";
+export function trial(_x, _x2) {
+  return _trial.apply(this, arguments);
+}
+function _trial() {
+  _trial = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("user/userVip/trial", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: _objectSpread({}, body)
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _trial.apply(this, arguments);
+}

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

@@ -1,3 +1,4 @@
 export declare function list(body: {
+    productType: string;
     dealerId: number;
 }, options?: ServicesApi.RequestOptions): Promise<VipPower.ListResult>;

package/dist/types/VipPower.d.ts

@@ -42,4 +42,8 @@ declare namespace VipPower {
         [vipLevel: string]: TypeCompareVipLevel;
     }
     type TypeCompareVipLevel = boolean | React.ReactNode;
+    interface BuyList {
+        id: number;
+        price: number;
+    }
 }

package/package.json

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