component-sanzhizhou 1.1.2 → 1.1.3

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: "info" | "error" | "warning" | "success", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;

package/dist/lib/Tool.js

@@ -15,7 +15,7 @@ if (!window.__events) {
 
 import ReactDOM from 'react-dom/client';
 import { useRequest } from '@umijs/hooks';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import DialogDrawer from "../UI/DialogDrawer";
 import notification from "./notification";
 import JsError from "./js-error";
@@ -178,7 +178,7 @@ var Tool = _objectSpread(_objectSpread({
         time = time * 1000;
       }
     }
-    return moment(time).format(format);
+    return dayjs(time).format(format);
   },
   openWindow: function openWindow(url) {
     var _this = this;
@@ -220,7 +220,10 @@ var Tool = _objectSpread(_objectSpread({
     var getWidthString = function getWidthString(num) {
       return num < 10 ? "0".concat(num) : num;
     };
-    oldTime = new Date(moment(str).valueOf());
+    oldTime = new Date(dayjs(str).valueOf());
+    if (oldTime.getTime() < 864000e3) {
+      return '';
+    }
     delta = currentTime.getTime() - oldTime.getTime();
     if (delta < 0) {
       return this.getFriendlyTimeFuture(delta);
@@ -300,22 +303,22 @@ var Tool = _objectSpread(_objectSpread({
     // delta = currentTime - oldTime.getTime();
 
     var out = '';
-    if (moment(currentTime).format('YYYY/MM/DD') === moment(oldTime).format('YYYY/MM/DD')) {
+    if (dayjs(currentTime).format('YYYY/MM/DD') === dayjs(oldTime).format('YYYY/MM/DD')) {
       out = '今天';
-    } else if (moment(currentTime - 86400000).format('YYYY/MM/DD') === moment(oldTime).format('YYYY/MM/DD')) {
+    } else if (dayjs(currentTime - 86400000).format('YYYY/MM/DD') === dayjs(oldTime).format('YYYY/MM/DD')) {
       out = '昨天';
-    } else if (moment(currentTime - 86400000 * 2).format('YYYY/MM/DD') === moment(oldTime).format('YYYY/MM/DD')) {
+    } else if (dayjs(currentTime - 86400000 * 2).format('YYYY/MM/DD') === dayjs(oldTime).format('YYYY/MM/DD')) {
       out = '前天';
-    } else if (moment(currentTime + 86400000).format('YYYY/MM/DD') === moment(oldTime).format('YYYY/MM/DD')) {
+    } else if (dayjs(currentTime + 86400000).format('YYYY/MM/DD') === dayjs(oldTime).format('YYYY/MM/DD')) {
       out = '明天';
-    } else if (moment(currentTime + 86400000 * 2).format('YYYY/MM/DD') === moment(oldTime).format('YYYY/MM/DD')) {
+    } else if (dayjs(currentTime + 86400000 * 2).format('YYYY/MM/DD') === dayjs(oldTime).format('YYYY/MM/DD')) {
       out = '后天';
     } else {
       // 如果是今年，就不展示年
-      if (moment(oldTime).format('YYYY') === moment(currentTime).format('YYYY')) {
-        out = moment(oldTime).format(format.replace(/^YYYY[-\/]/g, ''));
+      if (dayjs(oldTime).format('YYYY') === dayjs(currentTime).format('YYYY')) {
+        out = dayjs(oldTime).format(format.replace(/^YYYY[-\/]/g, ''));
       } else {
-        out = moment(oldTime).format(format);
+        out = dayjs(oldTime).format(format);
       }
     }
     return out;

package/dist/pay/qr.d.ts

@@ -3,6 +3,7 @@ import './qr.less';
 interface Props {
     productKind: Pay.ProductKind;
     vipId: number;
+    idKey?: string;
     couponCode: string;
     payChannel: Pay.PayChannel;
     productCount: number;

package/dist/pay/qr.js

@@ -26,6 +26,7 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
     moneyAmount = _ref.moneyAmount,
     productCount = _ref.productCount,
     vipId = _ref.vipId,
+    idKey = _ref.idKey,
     couponCode = _ref.couponCode,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 260 : _ref$size,
@@ -86,6 +87,7 @@ var UserVipOrderPayQr = function UserVipOrderPayQr(_ref) {
       return TradeController.commonCreate({
         productKind: productKind,
         productTypeId: vipId,
+        productTypeIdKey: idKey || '',
         productCount: moneyAmount,
         userId: 0,
         payChannel: 'alipay',

package/dist/pay/vip.js

@@ -231,6 +231,7 @@ var PayVip = function PayVip(_ref) {
         }), /*#__PURE__*/_jsxs("div", {
           children: [['pay-channel'].includes(step) && /*#__PURE__*/_jsxs(Button, {
             type: "primary",
+            disabled: !(allowPayChannelList !== null && allowPayChannelList !== void 0 && allowPayChannelList.length),
             htmlType: "submit",
             children: [formatMessage('下一步'), " ", /*#__PURE__*/_jsx(CaretRightOutlined, {})]
           }), ['qr-show'].includes(step) && /*#__PURE__*/_jsx(Button, {

package/dist/types/User.d.ts

@@ -41,7 +41,6 @@ declare namespace User {
     gender: Gender;
     avatarUrl: string;
     enabled: boolean;
-    expired: moment.Moment;
   }
 
   interface CreateQuery{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-sanzhizhou",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -73,7 +73,6 @@
     "jr-qrcode": "^1.1.4",
     "js-base64": "^3.7.8",
     "markdown-to-jsx": "^7.5.0",
-    "moment": "^2.29.4",
     "styled-components": "^6.1.8",
     "umi-request": "^1.4.0"
   },