@freelog/tools-lib 0.1.30 → 0.1.34

package/dist/utils/format.d.ts

@@ -11,6 +11,5 @@ export declare function formatDateTime(date: string, showTime?: boolean): string
 /**
  * 根据传入的子域名拼合成完整的适合的url
  * @param domain 要组合的三级域名
- * @param strict 是否严格返回，如 localhost 就放回空字符
  */
-export declare function completeUrlByDomain(domain: string, strict?: boolean): string;
+export declare function completeUrlByDomain(domain: string): string;

package/dist/utils/linkTo.d.ts

@@ -87,6 +87,7 @@ interface RetrieveUserPasswordParamsType {
     goTo?: string;
 }
 export declare function retrieveUserPassword({ goTo }?: RetrieveUserPasswordParamsType): string;
+export declare function retrievePayPassword(): string;
 export declare function wallet(): string;
 export declare function contract(): string;
 export declare function setting(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.30",
+  "version": "0.1.34",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/service-API/transactions.ts

@@ -8,9 +8,6 @@ interface DetailsParamsType {
 }
 
 export function details({accountId, ...params}: DetailsParamsType) {
-  // return FUtil.Axios.get(`/v2/transactions/details/${accountId}`, {
-  //   params,
-  // });
   return FUtil.Request({
     method: 'GET',
     url: `/v2/transactions/details/${accountId}`,
@@ -24,9 +21,6 @@ interface IndividualAccountsParamsType {
 }
 
 export function individualAccounts({userId, ...params}: IndividualAccountsParamsType) {
-  // return FUtil.Axios.get(`/v2/accounts/individualAccounts/${userId}`, {
-  //   params,
-  // });
   return FUtil.Request({
     method: 'GET',
     url: `/v2/accounts/individualAccounts/${userId}`,
@@ -34,6 +28,19 @@ export function individualAccounts({userId, ...params}: IndividualAccountsParams
   });
 }
 
+// 查询交易记录详情
+interface TransactionDetailsParamsType {
+  recordId: string;
+}
+
+export function transactionDetails({recordId}: TransactionDetailsParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/transactions/records/${recordId}`,
+    // params: params,
+  });
+}
+
 // 激活个人账户
 interface ActivateIndividualAccountsParamsType {
   password: string;
@@ -42,7 +49,6 @@ interface ActivateIndividualAccountsParamsType {
 }
 
 export function activateIndividualAccounts({...params}: ActivateIndividualAccountsParamsType) {
-  // return FUtil.Axios.put(`/v2/accounts/individualAccounts/activate`, params);
   return FUtil.Request({
     method: 'PUT',
     url: `/v2/accounts/individualAccounts/activate`,
@@ -59,10 +65,25 @@ interface ChangePasswordParamsType {
 }
 
 export function changePassword({...params}: ChangePasswordParamsType) {
-  // return FUtil.Axios.put(`/v2/accounts/individualAccounts`, params);
   return FUtil.Request({
     method: 'PUT',
     url: `/v2/accounts/individualAccounts`,
     data: params,
   });
 }
+
+// 重置交易密码
+interface ResetPasswordParamsType {
+  loginPassword: string;
+  password: string;
+  authCode: string;
+  messageAddress: string;
+}
+
+export function resetPassword({...params}: ResetPasswordParamsType) {
+  return FUtil.Request({
+    method: 'PUT',
+    url: `/v2/accounts/individualAccounts/resetPassword`,
+    data: params,
+  });
+}

package/src/utils/format.ts

@@ -1,43 +1,38 @@
-import moment from 'moment';
-
-/**
- * 将对应的字节数，转换为易读单位数量
- * @param bytes
- * @return {string}
- */
-export function humanizeSize(bytes: number): string {
-  // console.log('dddhumanizeSizesdfsd');
-  if (bytes <= 0) {
-    return '0 B';
-  }
-  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-  const index = Math.floor(Math.log(bytes) / Math.log(1024));
-  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
-  return size + ' ' + unitArr[index];
-}
-
-/**
- * 格式化日期时间
- */
-export function formatDateTime(date: string, showTime: boolean = false) {
-  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
-}
-
-/**
- * 根据传入的子域名拼合成完整的适合的url
- * @param domain 要组合的三级域名
- * @param strict 是否严格返回，如 localhost 就放回空字符
- */
-export function completeUrlByDomain(domain: string, strict: boolean = false): string {
-  let origin: string = '';
-
-  if (!strict) {
-    origin = `http://${domain}.testfreelog.com`;
-  }
-
-  if (window.location.origin.includes('.freelog.com')) {
-    origin = `https://${domain}.freelog.com`;
-  }
-
-  return origin;
-}
+import moment from 'moment';
+
+/**
+ * 将对应的字节数，转换为易读单位数量
+ * @param bytes
+ * @return {string}
+ */
+export function humanizeSize(bytes: number): string {
+  // console.log('dddhumanizeSizesdfsd');
+  if (bytes <= 0) {
+    return '0 B';
+  }
+  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  const index = Math.floor(Math.log(bytes) / Math.log(1024));
+  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
+  return size + ' ' + unitArr[index];
+}
+
+/**
+ * 格式化日期时间
+ */
+export function formatDateTime(date: string, showTime: boolean = false) {
+  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
+}
+
+/**
+ * 根据传入的子域名拼合成完整的适合的url
+ * @param domain 要组合的三级域名
+ */
+export function completeUrlByDomain(domain: string): string {
+  let origin: string = `http://${domain}.testfreelog.com`;
+
+  if (window.location.origin.includes('.freelog.com')) {
+    origin = `https://${domain}.freelog.com`;
+  }
+
+  return origin;
+}

package/src/utils/linkTo.ts

@@ -226,6 +226,15 @@ export function retrieveUserPassword({goTo}: RetrieveUserPasswordParamsType = {}
   })}`;
 }
 
+// 找回支付密码
+// interface RetrievePayPasswordParamsType {
+//   goTo?: string;
+// }
+
+export function retrievePayPassword() {
+  return `/retrievePayPassword`;
+}
+
 // 钱包
 // interface WalletParamsType {
 // }

package/src/utils/regexp.ts

@@ -1,35 +1,35 @@
-// 展品名称
-export const EXHIBIT_NAME: RegExp = /^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/;
-
-// 资源名称
-export const RESOURCE_NAME: RegExp = /^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/;
-
-// 资源类型
-export const RESOURCE_TYPE: RegExp = /^(?!_)[a-z0-9_]{3,20}(?<!_)$/;
-
-// 自定义属性键
-export const CUSTOM_KEY: RegExp = /^[a-zA-Z0-9_]{1,20}$/;
-
-// 节点名称
-export const NODE_NAME: RegExp = /^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/;
-
-// 节点地址
-export const NODE_DOMAIN = /^(?!-)[a-z0-9-]{4,24}(?<!-)$/;
-
-// 支付密码
-export const PAY_PASSWORD = /^\d{6}$/;
-
-// 手机号码
-export const MOBILE_PHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
-// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
-
-// 邮箱地址
-export const EMAIL_ADDRESS = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
-
-// 用户名
-// export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
-export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
-
-// 用户密码
-// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
-export const PASSWORD = /^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/;
+// 展品名称
+export const EXHIBIT_NAME: RegExp = /^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/;
+
+// 资源名称
+export const RESOURCE_NAME: RegExp = /^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/;
+
+// 资源类型
+export const RESOURCE_TYPE: RegExp = /^(?!_)[a-z0-9_]{3,20}(?<!_)$/;
+
+// 自定义属性键
+export const CUSTOM_KEY: RegExp = /^[a-zA-Z0-9_]{1,20}$/;
+
+// 节点名称
+export const NODE_NAME: RegExp = /^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/;
+
+// 节点地址
+export const NODE_DOMAIN = /^(?!-)[a-z0-9-]{4,24}(?<!-)$/;
+
+// 支付密码
+export const PAY_PASSWORD = /^\d{6}$/;
+
+// 手机号码
+export const MOBILE_PHONE_NUMBER = /^1[345789]\d{9}$/;
+// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
+
+// 邮箱地址
+export const EMAIL_ADDRESS = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+
+// 用户名
+// export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
+export const USERNAME = /^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/;
+
+// 用户密码
+// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
+export const PASSWORD = /^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/;