hy-app 0.3.10 → 0.3.12

package/api/http.ts

@@ -1,8 +1,4 @@
-import type {
-  HttpRequestConfig,
-  HttpInterceptorManager,
-  HttpResponse,
-} from "../typing";
+import type { HttpRequestConfig } from "../typing";
 import { objectToUrlParams } from "../utils";
 
 export default class Http {
@@ -20,18 +16,27 @@ export default class Http {
     timeout: 10000,
   };
 
+  /* 私有回调槽 */
+  private _requestHook?: (
+    conf: UniNamespace.RequestOptions,
+  ) => UniNamespace.RequestOptions;
+  private _responseSuccessHook?: (
+    res: UniNamespace.RequestSuccessCallbackResult,
+  ) => any;
+  private _responseFailHook?: (err: UniNamespace.GeneralCallbackResult) => any;
+
   /**
    * @description 拦截器
    */
   interceptor = {
     /**
      * @description 请求拦截 请求配置
-     * @param config
+     * @param hook
      */
-    request: (config: HttpRequestConfig) => {
-      if (config) {
-        this.requestBefore(config);
-      }
+    request: (
+      hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions,
+    ) => {
+      this._requestHook = hook;
     },
     /**
      * @description 响应拦截
@@ -39,66 +44,55 @@ export default class Http {
      * @param fail 失败响应
      */
     response: (
-      success: (response: HttpResponse) => any,
-      fail: (error: HttpResponse) => any,
+      success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
+      fail?: (error: UniNamespace.GeneralCallbackResult) => any,
     ) => {
       if (success) {
-        this.responseSuccess = success;
+        this._responseSuccessHook = success;
       }
       if (fail) {
-        this.responseFail = fail;
+        this._responseFailHook = fail;
       }
     },
   };
 
   /**
    * @description 请求拦截
-   * @param config 请求配置
-   */
-  requestBefore(config: HttpRequestConfig) {
-    return config;
-  }
-
-  /**
-   * @description 成功响应
-   * @param response
-   */
-  responseSuccess(response: UniNamespace.RequestSuccessCallbackResult) {
-    return response;
-  }
-
-  /**
-   * @description 失败响应
-   * @param response
+   * @param conf 请求配置
    */
-  responseFail(response: UniNamespace.GeneralCallbackResult) {
-    return response;
+  private requestBefore(
+    conf: UniNamespace.RequestOptions,
+  ): UniNamespace.RequestOptions {
+    return this._requestHook ? this._requestHook(conf) : conf;
   }
 
   /**
    * @description uni异步请求
    * @param options 请求配置
    */
-  async request(options: Record<string, any>) {
+  async request(options: UniNamespace.RequestOptions) {
     options.url = this.config.baseURL + options.url || this.config.url;
     options.data = options.data || this.config.data;
     options.header = options.header || this.config.header;
     options.method = options.method || this.config.method;
     options.responseType = options.responseType || this.config.responseType;
     options.timeout = options.timeout || this.config.timeout;
-    return new Promise<any>((resolve, reject) => {
-      options = this.requestBefore(options);
+    /* 合并默认配置 ... */
+    return new Promise((resolve, reject) => {
+      options = this.requestBefore(options); // ⭐这里会调用钩子
       uni.request({
-        url: options.url,
-        data: options.data,
-        header: options.header,
-        method: options.method,
-        timeout: options.timeout,
-        success: (response: UniNamespace.RequestSuccessCallbackResult) => {
-          resolve(this.responseSuccess(response));
+        ...options,
+        success: (res: UniNamespace.RequestSuccessCallbackResult) => {
+          const after = this._responseSuccessHook
+            ? this._responseSuccessHook(res)
+            : res;
+          resolve(after);
         },
-        fail: (error: UniNamespace.GeneralCallbackResult) => {
-          reject(this.responseFail(error));
+        fail: (err: UniNamespace.GeneralCallbackResult) => {
+          const after = this._responseFailHook
+            ? this._responseFailHook(err)
+            : err;
+          reject(after);
         },
       });
     });
@@ -110,7 +104,7 @@ export default class Http {
    * @param params 请求JSON参数
    * @param options 请求配置
    */
-  post(url: string, params?: any, options?: Record<string, any>) {
+  post(url: string, params?: any, options?: HttpRequestConfig) {
     return this.request({
       url: url,
       method: "POST",
@@ -125,7 +119,7 @@ export default class Http {
    * @param params URL查询参数
    * @param options 请求配置
    */
-  get(url: string, params?: any, options?: Record<string, any>) {
+  get(url: string, params?: any, options?: HttpRequestConfig) {
     if (params) {
       url += "?" + objectToUrlParams(params);
     }

package/components/hy-card/hy-card.vue

@@ -134,7 +134,7 @@ const props = defineProps({
   /** 卡片与屏幕两边和上下元素的间距，需带单位，如"30px 20px" */
   margin: {
     type: String,
-    default: "10px",
+    default: "0 0 20rpx",
   },
   /** 卡片整体的圆角值，单位px */
   borderRadius: {

package/components/hy-input/hy-input.vue

@@ -110,18 +110,10 @@ export default {
 </script>
 
 <script setup lang="ts">
-import {
-  computed,
-  nextTick,
-  ref,
-  toRefs,
-  watch,
-  getCurrentInstance,
-  inject,
-} from "vue";
+import { computed, nextTick, ref, watch, inject } from "vue";
 import type { CSSProperties, PropType } from "vue";
 import HyIcon from "../hy-icon/hy-icon.vue";
-import { addUnit, formatObject } from "../../utils";
+import { addUnit, formatObject, sleep } from "../../utils";
 import { IconConfig } from "../../config";
 import type { IInputEmits } from "./typing";
 import type HyIconProps from "../hy-icon/typing";
@@ -322,20 +314,9 @@ const props = defineProps({
   /** 自定义外部类名 */
   customClass: String,
 });
-const {
-  disabled,
-  disabledColor,
-  border,
-  color,
-  inputAlign,
-  fontSize,
-  readonly,
-  placeholderStyle,
-} = toRefs(props);
 const emit = defineEmits<IInputEmits>();
 const formItem = inject<FormItemContext | null>("formItem", null);
 
-const instance = getCurrentInstance();
 // 清除操作
 const clearInput = ref<boolean>(false);
 // 输入框的值
@@ -359,9 +340,6 @@ watch(
     // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
     if (firstChange.value === false && changeFromInner.value === false) {
       valueChange(innerValue.value, true);
-    } else {
-      // 尝试调用up-form的验证方法
-      // if (!firstChange.value) formValidate(this, "change");
     }
     firstChange.value = false;
     // 重置changeFromInner的值为false，标识下一次引起默认为外部引起的
@@ -388,7 +366,7 @@ const inputClass = computed((): string => {
   classes.push(`hy-input--${shape}`);
   border === "bottom" &&
     (classes = classes.concat(["hy-border__bottom", "hy-input--no-radius"]));
-  disabled.value && classes.push("hy-input--disabled");
+  props.disabled && classes.push("hy-input--disabled");
   return classes.join(" ");
 });
 
@@ -402,8 +380,8 @@ const wrapperStyle = computed((): CSSProperties => {
   style.paddingLeft = "9px";
   style.paddingRight = "9px";
   // 禁用状态下，被背景色加上对应的样式
-  if (disabled.value) {
-    style.backgroundColor = disabledColor.value;
+  if (props.disabled) {
+    style.backgroundColor = props.disabledColor;
   }
   return Object.assign(style, props.customStyle);
 });
@@ -412,9 +390,9 @@ const wrapperStyle = computed((): CSSProperties => {
  * */
 const inputStyle = computed((): CSSProperties => {
   return {
-    color: color.value,
-    fontSize: addUnit(fontSize.value),
-    textAlign: inputAlign.value,
+    color: props.color,
+    fontSize: addUnit(props.fontSize),
+    textAlign: props.inputAlign,
   };
 });
 
@@ -425,7 +403,7 @@ const borderStyle = computed(() => {
   return (isFocus: boolean) => {
     let style: CSSProperties = {};
     if (isFocus) {
-      switch (border.value) {
+      switch (props.border) {
         case "surround":
           style = { border: `1px solid var(--hy-theme-color, #3c9cff)` };
           break;
@@ -457,14 +435,11 @@ const onInput = (e: any) => {
 /**
  * @description 输入框失去焦点时触发
  * */
-const onBlur = (event: InputOnBlurEvent) => {
+const onBlur = async (event: InputOnBlurEvent) => {
   emit("blur", event, event.detail.value);
   if (formItem) formItem.handleBlur(event.detail.value);
-  // H5端的blur会先于点击清除控件的点击click事件触发，导致focused
-  // 瞬间为false，从而隐藏了清除控件而无法被点击到
-  setTimeout(() => {
-    focused.value = false;
-  }, 150);
+  await sleep();
+  focused.value = false;
 };
 /**
  * @description 输入框聚焦时触发
@@ -524,7 +499,7 @@ const onClear = () => {
  */
 const clickHandler = () => {
   // 隐藏键盘
-  if (disabled.value || readonly.value) {
+  if (props.disabled || props.readonly) {
     uni.hideKeyboard();
   }
 };

package/components/hy-search/hy-search.vue

@@ -40,22 +40,19 @@
         ></HyIcon>
       </view>
       <input
-        confirm-type="search"
-        @blur="blur"
+        :confirm-type="confirmType"
         :value="keyword"
-        @confirm="search"
-        @input="inputChange"
         :disabled="disabled"
-        @focus="getFocus"
-        :focus="focus"
         :maxlength="maxlength"
         :adjust-position="adjustPosition"
+        :focus="autoFocus"
         :auto-blur="autoBlur"
         placeholder-class="hy-search__content__input--placeholder"
         :placeholder="placeholder"
         :placeholder-style="`color: ${placeholderColor}`"
         class="hy-search__content__input"
         type="text"
+        :always-embed="true"
         :style="[
           {
             pointerEvents: disabled ? 'none' : 'auto',
@@ -66,20 +63,24 @@
           },
           inputStyle,
         ]"
+        @blur="onBlur"
+        @focus="onFocus"
+        @confirm="onSearch"
+        @input="inputChange"
       />
       <view
         class="hy-search__content__icon hy-search__content__close"
-        v-if="keyword && clear && focused"
-        @click="clear"
+        v-if="showClear"
+        @click="onClear"
       >
-        <HyIcon :name="IconConfig.CLOSE" color="#ffffff"></HyIcon>
+        <HyIcon :name="IconConfig.CLOSE"></HyIcon>
       </view>
     </view>
     <text
       :style="[actionStyle]"
       class="hy-search__action"
       :class="[(showActionBtn || show) && 'hy-search__action--active']"
-      @tap.stop.prevent="confirm"
+      @tap.stop.prevent="onConfirm"
     >
       {{ actionText }}
     </text>
@@ -101,7 +102,7 @@ export default {
 import { computed, nextTick, ref, watch } from "vue";
 import type { PropType, CSSProperties } from "vue";
 import type { ISearchEmits } from "./typing";
-import { sleep, addUnit } from "../../utils";
+import { addUnit } from "../../utils";
 import { IconConfig } from "../../config";
 import HyIcon from "../hy-icon/hy-icon.vue";
 import type HyIconProps from "../hy-icon/typing";
@@ -110,6 +111,7 @@ import type {
   InputOnConfirmEvent,
   InputOnFocusEvent,
   InputOnInputEvent,
+  InputConfirmType,
 } from "@uni-helper/uni-types";
 
 /**
@@ -140,16 +142,34 @@ const props = defineProps({
     type: String,
     default: "请输入关键字",
   },
+  /**
+   * 设置右下角按钮的文字，兼容性详见uni-app文档
+   * @valuse send,search,next,go,done
+   * */
+  confirmType: {
+    type: String as PropType<InputConfirmType>,
+    default: "search",
+  },
   /** 是否启用清除控件 */
-  clear: {
+  clearable: {
     type: Boolean,
     default: true,
   },
   /** 是否自动获得焦点 */
-  focus: {
+  autoFocus: {
     type: Boolean,
     default: false,
   },
+  /** 键盘收起时，是否自动失去焦点 */
+  autoBlur: {
+    type: Boolean,
+    default: true,
+  },
+  /** 键盘弹起时，是否自动上推页面 */
+  adjustPosition: {
+    type: Boolean,
+    default: true,
+  },
   /** 是否显示右侧控件 */
   showAction: {
     type: Boolean,
@@ -216,16 +236,6 @@ const props = defineProps({
   },
   /** 搜索框左边显示内容 */
   label: String,
-  /** 键盘弹起时，是否自动上推页面 */
-  adjustPosition: {
-    type: Boolean,
-    default: true,
-  },
-  /** 键盘收起时，是否自动失去焦点 */
-  autoBlur: {
-    type: Boolean,
-    default: true,
-  },
   /** 定义需要用到的外部样式 */
   customStyle: {
     type: Object as PropType<CSSProperties>,
@@ -235,11 +245,11 @@ const props = defineProps({
 });
 const emit = defineEmits<ISearchEmits>();
 
-const keyword = ref<string>("");
+const keyword = ref<string>(props.modelValue);
 // 显示右边搜索按钮
 const show = ref<boolean>(false);
 // 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
-const focused = ref(props.focus);
+const focused = ref(false);
 
 watch(
   () => keyword.value,
@@ -249,17 +259,15 @@ watch(
   },
 );
 
-watch(
-  () => props.modelValue,
-  (newValue: string) => {
-    keyword.value = newValue;
-  },
-  { immediate: true },
-);
-
+// 是否显示右边控件
 const showActionBtn = computed<boolean>(() => {
   return !props.animation && props.showAction;
 });
+// 是否显示清除控件
+const showClear = computed(() => {
+  const { clearable, disabled } = props;
+  return clearable && !disabled && !!focused.value && keyword.value !== "";
+});
 
 /**
  * 值改变触发
@@ -270,7 +278,7 @@ const inputChange = (e: InputOnInputEvent) => {
 /**
  * @description 清空输入
  * */
-const clear = () => {
+const onClear = () => {
   keyword.value = "";
   // 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
   nextTick(() => {
@@ -280,7 +288,7 @@ const clear = () => {
 /**
  * @description 确定搜索
  * */
-const search = (e: InputOnConfirmEvent) => {
+const onSearch = (e: InputOnConfirmEvent) => {
   emit("search", e, e.detail.value);
   try {
     // 收起键盘
@@ -290,7 +298,7 @@ const search = (e: InputOnConfirmEvent) => {
 /**
  * @description 点击右边自定义按钮的事件
  */
-const confirm = () => {
+const onConfirm = () => {
   emit("confirm", keyword.value);
   try {
     // 收起键盘
@@ -300,22 +308,17 @@ const confirm = () => {
 /**
  * @description 获取焦点
  * */
-const getFocus = (e: InputOnFocusEvent) => {
+const onFocus = (e: InputOnFocusEvent) => {
   focused.value = true;
   // 开启右侧搜索按钮展开的动画效果
   if (props.animation && props.showAction) show.value = true;
   emit("focus", e, keyword.value);
 };
-/**
- * @description 失去焦点
- */
-const blur = async (e: InputOnBlurEvent) => {
-  // 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错
-  // 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时
+
+// 失去焦点
+const onBlur = (e: InputOnBlurEvent) => {
   show.value = false;
   emit("blur", e, keyword.value);
-  await sleep(100);
-  focused.value = false;
 };
 /**
  * @description 点击搜索框，只有disabled=true时才发出事件，因为禁止了输入，意味着是想跳转真正的搜索页

package/components/hy-text/hy-text.vue

@@ -13,7 +13,13 @@
       ￥
     </text>
     <view class="hy-text__prefix-icon" v-if="prefixIcon">
-      <HyIcon :name="prefixIcon" :customStyle="iconStyle"></HyIcon>
+      <HyIcon
+        :name="prefixIcon"
+        :color="color"
+        :size="size"
+        space="2"
+        :customStyle="iconStyle"
+      ></HyIcon>
     </view>
     <template v-if="openType && isMp">
       <button
@@ -51,7 +57,12 @@
       {{ value }}
     </text>
     <view class="hy-text__suffix-icon" v-if="suffixIcon">
-      <HyIcon :name="suffixIcon" :customStyle="iconStyle"></HyIcon>
+      <HyIcon
+        :name="suffixIcon"
+        :color="color"
+        :size="size"
+        :customStyle="iconStyle"
+      ></HyIcon>
     </view>
   </view>
 </template>

package/components/hy-transition/index.scss

@@ -111,3 +111,9 @@ $u-zoom-scale: scale(0.95);
 .u-zoom-leave-to {
   transform: $u-zoom-scale
 }
+
+@include b(transition) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.3.10",
-  "description": "修复icon图标不显示",
+  "version": "0.3.12",
+  "description": "http网络请求修复",
   "main": "./index.ts",
   "private": false,
   "scripts": {},

package/typing/modules/http.ts

@@ -1,57 +1,6 @@
-export interface HttpRequestConfig {
+export interface HttpRequestConfig extends UniNamespace.RequestOptions {
   /** 请求基地址 */
   baseURL?: string;
-  /** 请求服务器接口地址 */
-  url?: string;
-
-  /** 请求查询参数，自动拼接为查询字符串 */
-  params?: AnyObject;
-  /** 请求体参数 */
-  data?: AnyObject;
-
-  /** 文件对应的 key */
-  name?: string;
-  /** HTTP 请求中其他额外的 form data */
-  formData?: AnyObject;
-  /** 要上传文件资源的路径。 */
-  filePath?: string;
-  /** 需要上传的文件列表。使用 files 时，filePath 和 name 不生效，App、H5（ 2.6.15+） */
-  files?: Array<{
-    name?: string;
-    file?: File;
-    uri: string;
-  }>;
-  /** 要上传的文件对象，仅H5（2.6.15+）支持 */
-  file?: File;
-
-  /** 请求头信息 */
-  header?: AnyObject;
-  /** 请求方式 */
-  method?:
-    | "GET"
-    | "POST"
-    | "PUT"
-    | "DELETE"
-    | "CONNECT"
-    | "HEAD"
-    | "OPTIONS"
-    | "TRACE"
-    | "UPLOAD"
-    | "DOWNLOAD";
-  /** 如果设为 json，会尝试对返回的数据做一次 JSON.parse */
-  dataType?: string;
-  /** 设置响应的数据类型，支付宝小程序不支持 */
-  responseType?: "text" | "arraybuffer";
-  /** 自定义参数 */
-  custom?: AnyObject;
-  /** 超时时间，仅微信小程序（2.10.0）、支付宝小程序支持 */
-  timeout?: number;
-  /** DNS解析时优先使用ipv4，仅 App-Android 支持 (HBuilderX 2.8.0+) */
-  firstIpv4?: boolean;
-  /** 验证 ssl 证书 仅5+App安卓端支持（HBuilderX 2.3.3+） */
-  sslVerify?: boolean;
-  /** 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+） */
-  withCredentials?: boolean;
 }
 
 export interface HttpResponse<T = any> {

package/utils/inside.ts

@@ -1,5 +1,5 @@
 // 内部使用方法
-import { inject } from 'vue'
+import { inject } from "vue";
 
 /**
  * 生成bem规则类名
@@ -18,31 +18,33 @@ export const bem = (
   change?: string[],
 ): string | string[] => {
   // 类名前缀
-  const prefix = `hy-${name}--`
-  const classes: Record<string, string | boolean> = {}
+  const prefix = `hy-${name}--`;
+  const classes: Record<string, string | boolean> = {};
   if (fixed) {
     fixed.map((item: string) => {
       // 这里的类名，会一直存在
-      classes[prefix + props[item]] = true
-      if (item === 'type' && props['plain']) {
-        classes[prefix + props[item] + '__plain'] = true
+      classes[prefix + props[item]] = true;
+      if (item === "type" && props["plain"]) {
+        classes[prefix + props[item] + "__plain"] = true;
       }
-    })
+    });
   }
   if (change) {
     change.map((item: string) => {
       // 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
-      props[item] ? (classes[prefix + item] = props[item]) : delete classes[prefix + item]
-    })
+      props[item]
+        ? (classes[prefix + item] = props[item])
+        : delete classes[prefix + item];
+    });
   }
   return (
     Object.keys(classes)
       // 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
       // #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK
-      .join(' ')
+      .join(" ")
     // #endif
-  )
-}
+  );
+};
 
 /**
  * @description 在u-form的子组件内容发生变化，或者失去焦点时，尝试通知u-form执行校验方法
@@ -51,7 +53,7 @@ export const bem = (
  */
 export function formValidate(event) {
   // const formItem = $parent.call(instance, "u-form-item");
-  const form = inject('uForm')
+  const form = inject("uForm");
   // 如果发生变化的input或者textarea等，其父组件中有u-form-item或者u-form等，就执行form的validate方法
   // 同时将form-item的pros传递给form，让其进行精确对象验证
   // if (formItem && form) {
@@ -65,18 +67,18 @@ export function formValidate(event) {
  */
 export function error(err: string) {
   // 开发环境才提示，生产环境不会提示
-  if (process.env.NODE_ENV === 'development') {
-    console.error(`华玥组件提示：${err}`)
+  if (process.env.NODE_ENV === "development") {
+    console.error(`华玥组件提示：${err}`);
   }
 }
 
-export const sleep = (value = 30) => {
+export const sleep = (value = 100) => {
   return new Promise((resolve) => {
     setTimeout(() => {
-      resolve()
-    }, value)
-  })
-}
+      resolve();
+    }, value);
+  });
+};
 
 /**
  * @param {Number} len uuid的长度
@@ -84,62 +86,67 @@ export const sleep = (value = 30) => {
  * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
  */
 export function guid(len = 32, firstU = true, radix = null) {
-  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-  const uuid = []
-  radix = radix || chars.length
+  const chars =
+    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split("");
+  const uuid = [];
+  radix = radix || chars.length;
 
   if (len) {
     // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
-    for (let i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
+    for (let i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)];
   } else {
-    let r
+    let r;
     // rfc4122标准要求返回的uuid中,某些位为固定的字符
-    uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
-    uuid[14] = '4'
+    uuid[8] = uuid[13] = uuid[18] = uuid[23] = "-";
+    uuid[14] = "4";
 
     for (let i = 0; i < 36; i++) {
       if (!uuid[i]) {
-        r = 0 | (Math.random() * 16)
-        uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
+        r = 0 | (Math.random() * 16);
+        uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r];
       }
     }
   }
   // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
   if (firstU) {
-    uuid.shift()
-    return `hy${uuid.join('')}`
+    uuid.shift();
+    return `hy${uuid.join("")}`;
   }
-  return uuid.join('')
+  return uuid.join("");
 }
 
 /**
  * @description 获取设备信息
  * */
 export const getWindowInfo = (): UniNamespace.GetWindowInfoResult => {
-  let ret: UniNamespace.GetWindowInfoResult
+  let ret: UniNamespace.GetWindowInfoResult;
   // #ifdef APP || H5 || MP-WEIXIN
-  ret = uni.getWindowInfo()
+  ret = uni.getWindowInfo();
   // #endif
-  return ret
-}
+  return ret;
+};
 
 function pickExclude(obj, keys) {
   // 某些情况下，type可能会为
-  if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
-    return {}
+  if (
+    !["[object Object]", "[object File]"].includes(
+      Object.prototype.toString.call(obj),
+    )
+  ) {
+    return {};
   }
   return Object.keys(obj).reduce((prev, key) => {
     if (!keys.includes(key)) {
-      prev[key] = obj[key]
+      prev[key] = obj[key];
     }
-    return prev
-  }, {})
+    return prev;
+  }, {});
 }
 
 function formatImage(res) {
   return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ['path']),
-    type: 'image',
+    ...pickExclude(item, ["path"]),
+    type: "image",
     url: item.path,
     thumb: item.path,
     size: item.size,
@@ -147,14 +154,14 @@ function formatImage(res) {
     name: item.name,
     file: item,
     // #endif
-  }))
+  }));
 }
 
 function formatVideo(res) {
   return [
     {
-      ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
-      type: 'video',
+      ...pickExclude(res, ["tempFilePath", "thumbTempFilePath", "errMsg"]),
+      type: "video",
       url: res.tempFilePath,
       thumb: res.thumbTempFilePath,
       size: res.size,
@@ -163,25 +170,25 @@ function formatVideo(res) {
       file: res,
       // #endif
     },
-  ]
+  ];
 }
 
 function formatMedia(res) {
   return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']),
+    ...pickExclude(item, ["fileType", "thumbTempFilePath", "tempFilePath"]),
     type: res.type,
     url: item.tempFilePath,
-    thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath,
+    thumb: res.type === "video" ? item.thumbTempFilePath : item.tempFilePath,
     size: item.size,
     // #ifdef H5
     file: item,
     // #endif
-  }))
+  }));
 }
 
 function formatFile(res) {
   return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ['path']),
+    ...pickExclude(item, ["path"]),
     url: item.path,
     size: item.size,
     // #ifdef H5
@@ -189,7 +196,7 @@ function formatFile(res) {
     type: item.type,
     file: item,
     // #endif
-  }))
+  }));
 }
 
 export function chooseFile({
@@ -205,18 +212,18 @@ export function chooseFile({
 }: any) {
   return new Promise((resolve, reject) => {
     switch (accept) {
-      case 'image':
+      case "image":
         uni.chooseImage({
           count: multiple ? Math.min(maxCount, 9) : 1,
           sourceType: capture,
           sizeType,
           success: (res) => resolve(formatImage(res)),
           fail: reject,
-        })
-        break
+        });
+        break;
       // #ifdef MP-WEIXIN
       // 只有微信小程序才支持chooseMedia接口
-      case 'media':
+      case "media":
         wx.chooseMedia({
           count: multiple ? Math.min(maxCount, 9) : 1,
           sourceType: capture,
@@ -225,10 +232,10 @@ export function chooseFile({
           camera,
           success: (res) => resolve(formatMedia(res)),
           fail: reject,
-        })
-        break
+        });
+        break;
       // #endif
-      case 'video':
+      case "video":
         uni.chooseVideo({
           sourceType: capture,
           compressed,
@@ -236,18 +243,18 @@ export function chooseFile({
           camera,
           success: (res) => resolve(formatVideo(res)),
           fail: reject,
-        })
-        break
+        });
+        break;
       // #ifdef MP-WEIXIN || H5
       // 只有微信小程序才支持chooseMessageFile接口
-      case 'file':
+      case "file":
         // #ifdef MP-WEIXIN
         wx.chooseMessageFile({
           count: multiple ? maxCount : 1,
           type: accept,
           success: (res) => resolve(formatFile(res)),
           fail: reject,
-        })
+        });
         // #endif
         // #ifdef H5
         // 需要hx2.9.9以上才支持uni.chooseFile
@@ -256,39 +263,39 @@ export function chooseFile({
           type: accept,
           success: (res) => resolve(formatFile(res)),
           fail: reject,
-        }
+        };
         if (extension.length && extension.length > 0) {
-          params.extension = extension
+          params.extension = extension;
         }
-        uni.chooseFile(params)
+        uni.chooseFile(params);
         // #endif
-        break
+        break;
       // #endif
       default:
         // 此为保底选项，在accept不为上面任意一项的时候选取全部文件
         // #ifdef MP-WEIXIN
         wx.chooseMessageFile({
           count: multiple ? maxCount : 1,
-          type: 'all',
+          type: "all",
           success: (res) => resolve(formatFile(res)),
           fail: reject,
-        })
+        });
         // #endif
         // #ifdef H5
         // 需要hx2.9.9以上才支持uni.chooseFile
         let paramsFile = {
           count: multiple ? maxCount : 1,
-          type: 'all',
+          type: "all",
           success: (res) => resolve(formatFile(res)),
           fail: reject,
-        }
+        };
         if (extension.length && extension.length > 0) {
-          paramsFile.extension = extension
+          paramsFile.extension = extension;
         }
-        uni.chooseFile(paramsFile)
+        uni.chooseFile(paramsFile);
       // #endif
     }
-  })
+  });
 }
 
 /**
@@ -302,27 +309,28 @@ export function chooseFile({
 export function priceFormat(
   number: string | number,
   decimals = 0,
-  decimalPoint = '.',
-  thousandsSeparator = ',',
+  decimalPoint = ".",
+  thousandsSeparator = ",",
 ) {
-  number = `${number}`.replace(/[^0-9+-Ee.]/g, '')
-  const n = !isFinite(+number) ? 0 : +number
-  const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
-  const sep = typeof thousandsSeparator === 'undefined' ? ',' : thousandsSeparator
-  const dec = typeof decimalPoint === 'undefined' ? '.' : decimalPoint
-  let s = ''
+  number = `${number}`.replace(/[^0-9+-Ee.]/g, "");
+  const n = !isFinite(+number) ? 0 : +number;
+  const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals);
+  const sep =
+    typeof thousandsSeparator === "undefined" ? "," : thousandsSeparator;
+  const dec = typeof decimalPoint === "undefined" ? "." : decimalPoint;
+  let s = "";
 
-  s = (prec ? n + '' : `${Math.round(n)}`).split('.')
-  const re = /(-?\d+)(\d{3})/
+  s = (prec ? n + "" : `${Math.round(n)}`).split(".");
+  const re = /(-?\d+)(\d{3})/;
   while (re.test(s[0])) {
-    s[0] = s[0].replace(re, `$1${sep}$2`)
+    s[0] = s[0].replace(re, `$1${sep}$2`);
   }
 
-  if ((s[1] || '').length < prec) {
-    s[1] = s[1] || ''
-    s[1] += new Array(prec - s[1].length + 1).join('0')
+  if ((s[1] || "").length < prec) {
+    s[1] = s[1] || "";
+    s[1] += new Array(prec - s[1].length + 1).join("0");
   }
-  return s.join(dec)
+  return s.join(dec);
 }
 
 /**
@@ -331,17 +339,20 @@ export function priceFormat(
  * @return {string}
  * */
 export const formatName = (name: string): string => {
-  let value = ''
+  let value = "";
   if (name.length === 2) {
-    value = name.substring(0, 1) + '*'
+    value = name.substring(0, 1) + "*";
   } else if (name.length > 2) {
-    let char = ''
+    let char = "";
     for (let i = 0, len = name.length - 2; i < len; i++) {
-      char += '*'
+      char += "*";
     }
-    value = name.substring(0, 1) + char + name.substring(name.length - 1, name.length)
+    value =
+      name.substring(0, 1) +
+      char +
+      name.substring(name.length - 1, name.length);
   } else {
-    value = name
+    value = name;
   }
-  return value
-}
+  return value;
+};