优化文件

张志伟
1 parent 56001e24
Showing 13 changed files with 195 additions and 55 deletions
client/layout/index.tsx
client/util/createError.ts
client/util/fp/getWinxinEnv.ts
client/util/fp/location.ts
client/util/fp/prevAppLaunch.ts
client/util/fp/typeOf.ts
client/util/http.ts
client/util/index.ts
client/util/server.ts
client/util/tool/commonApi.ts
client/util/tool/index.ts
client/util/tool/mmLocal.ts
typings/common.d.ts
@@ -12,7 +12,6 @@ export default class Layout extends React.Component&lt;PropTypes&gt; {
   public render() {
     const { title, helper, entry, store, children } = this.props;
     const htmlString = children as string;
-
     return (
       <html>
         <head>
-import { AxiosError } from 'axios';
+import { AxiosError, AxiosResponse } from 'axios';
 import { HttpClientResponse } from 'urllib';
-interface ErrorCode {
+export interface ErrorCode {
   [key: number]: string;
 }
-interface ErrorMsg extends Error {
+export interface ErrorMsg extends Error {
   errorCode?: number | string;
   errorMsg?: string;
   response?: any;
-import utils from 'client/utils';
+import utils from 'client/util';
 /**
  * 获取当前的微信执行环境
@@ -9,19 +9,19 @@ export interface Res {
   /**
    * 是否在微信环境
    */
-  wx: boolean,
+  wx: boolean;
   /**
    * 是否在小程序环境
    */
-  wxMini: boolean
+  wxMini: boolean;
 }
 function getWinxinEnv(): Promise<Res> {
   let curEnv = {
     wx: utils.isWeixin(),
-    wxMini: false
-  }
+    wxMini: false,
+  };
   let i = 0;
   return new Promise((resolve) => {
@@ -40,24 +40,24 @@ function getWinxinEnv(): Promise&lt;Res&gt; {
         }
         // @ts-ignore
-        if (window.wx && window.wx.miniProgram) {
+        if (window.wx?.miniProgram) {
           // @ts-ignore
-          window.wx.miniProgram.getEnv(res => {
+          window.wx.miniProgram.getEnv((res) => {
             if (res.miniprogram) {
               curEnv.wxMini = true;
               return resolve(curEnv);
             }
             return resolve(curEnv);
-          })
+          });
         } else {
           curEnv.wxMini = false;
           resolve(curEnv);
         }
-      }, 50)
+      }, 50);
     }
     check();
   });
 }
-export default getWinxinEnv;
 \ No newline at end of file
+export default getWinxinEnv;
-import http from 'client/utils/http';
-import host from 'client/utils/host';
+import http from 'client/util/http';
+import host from 'client/util/server';
 /**
  * 请求权限
@@ -13,13 +13,13 @@ const getJSApiConfig = (params: any) =&gt; {
  * @param apiList
  * @returns {*}
  */
-export function initJSSDK(apiList: any) {
+export function initJSSDK(apiList: any): Promise<void> {
   return new Promise((resolve, reject) => {
     getJSApiConfig({
-      url: window.location.href
+      url: window.location.href,
     })
       .then((config: any) => {
-        //@ts-ignore
+        // @ts-ignore
         window.wx.config({
           debug: false,
           jsApiList: apiList,
@@ -27,22 +27,22 @@ export function initJSSDK(apiList: any) {
             resolve();
           },
           fail: () => {
-            reject({ message: '配置jssdk失败' });
+            reject(new Error('配置jssdk失败'));
           },
           complete: () => {},
-          ...config.data
+          ...config.data,
         });
-        //@ts-ignore
+        // @ts-ignore
         window.wx.ready(() => {
           resolve();
         });
-        //@ts-ignore
+        // @ts-ignore
         window.wx.error((res: any) => {
-          reject({ message: res.errMsg });
+          reject(new Error(res.errMsg));
         });
       })
       .catch((e: any) => {
-        reject({ message: e.message });
+        reject(e);
       });
   });
 }
@@ -51,7 +51,7 @@ export const _getLocationFromWx = () =&gt; {
   return new Promise((resolve, reject) => {
     initJSSDK(['getLocation'])
       .then(() => {
-        //@ts-ignore
+        // @ts-ignore
         window.wx.getLocation({
           type: 'wgs84', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
           success: (res: any) => {
@@ -59,12 +59,12 @@ export const _getLocationFromWx = () =&gt; {
             const longitude = res.longitude; // 经度，浮点数，范围为180 ~ -180。
             resolve({
               latitude: latitude,
-              longitude: longitude
+              longitude: longitude,
             });
           },
           fail: (res: any) => {
-            reject({ message: res.errMsg });
-          }
+            reject(new Error(res.errMsg));
+          },
         });
       })
       .catch(reject);
@@ -72,32 +72,32 @@ export const _getLocationFromWx = () =&gt; {
 };
 const getLocationByGeo = () => {
-  //@ts-ignore
+  // @ts-ignore
   if (!window.BMap) {
     throw new Error('BMap is not an Object.');
   }
   return new Promise((resolve, reject) => {
-    //@ts-ignore
+    // @ts-ignore
     const geoLocation = new window.BMap.Geolocation();
     geoLocation.enableSDKLocation();
     geoLocation.getCurrentPosition(function getCurrPos(r: any) {
-      //@ts-ignore
+      // @ts-ignore
       if (this.getStatus() === window.BMAP_STATUS_SUCCESS) {
         resolve(r);
       } else {
-        reject();
+        reject(new Error('地图初始化失败'));
       }
     });
   });
 };
 const getLocationByIP = () => {
-  //@ts-ignore
+  // @ts-ignore
   if (!window.BMap) {
     throw new Error('BMap is not an Object.');
   }
   return new Promise((resolve) => {
-    //@ts-ignore
+    // @ts-ignore
     const localCity = new window.BMap.LocalCity();
     localCity.get((r: any) => {
       resolve(r);
@@ -17,11 +17,11 @@ export const prevAppLaunch = async () =&gt; {
   if ('addEventListener' in document) {
     document.addEventListener(
       'DOMContentLoaded',
-      function() {
+      () => {
         // @ts-ignore
-        window.FastClick && window.FastClick.attach(document.body);
+        window.FastClick?.attach(document.body);
       },
-      false
+      false,
     );
   }
@@ -4,7 +4,10 @@
  */
 function typeOf(value: any): string {
-  return Object.prototype.toString.call(value).split(' ')[1].slice(0, -1)
+  return Object.prototype.toString
+    .call(value)
+    .split(' ')[1]
+    .slice(0, -1)
     .replace(/^[A-Z]{1}/, (p: any) => p.toLowerCase());
 }
+import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
+import createError, { createErrorByError, ErrorMsg } from './createError';
+import { IndexLogin } from 'client/components/BottomBar/entity';
+// @ts-ignore
+import each from 'lodash/each';
+
+interface req extends AxiosRequestConfig {
+  requestType?: 'JSONString' | 'paramString' | 'formdata' | 'plainString';
+  hasToken?: boolean;
+  token?: string;
+}
+
+interface ExceptionHandle {
+  reload?: boolean;
+}
+
+/**
+ * 请求头信息拦截调整
+ */
+axios.interceptors.request.use(
+  async (config: req): Promise<req> => {
+    if (!config.timeout) {
+      config.timeout = 30 * 1000;
+    }
+
+    /**
+     * 给每个请求新增时间戳
+     */
+    config.params = { _s: Date.now(), ...config.params };
+
+    if (config.token) {
+      config.headers.Authorization = config.token;
+    }
+    return config;
+  },
+);
+
+axios.interceptors.response.use(
+  (response): any => {
+    let data = response.data;
+
+    if (data) {
+      if (data.success === false) {
+        return createError(response as any);
+      }
+
+      if (Object.prototype.hasOwnProperty.call(data, 'data')) {
+        data.status = response.status;
+        return data;
+      }
+
+      return parseResponse(response);
+    }
+
+    return createError(response as any);
+  },
+  (error) => {
+    return createErrorByError(error);
+  },
+);
+
+export function get<T>(requestURL: string, config?: req): Promise<ICommon.ServerResponse<T>> {
+  // @ts-ignore
+  return axios.get(requestURL, config);
+}
+
+export function post<T>(requestURL: string, params: any, config?: req): Promise<ICommon.ServerResponse<T>> {
+  // @ts-ignore
+  return axios.post(requestURL, params, config);
+}
+
+/**
+ * 如果找不到response.data.data，则将返回格式解析为统一格式
+ */
+function parseResponse<T>(response: AxiosResponse): ICommon.ServerResponse<T> {
+  const code: number = response.status;
+  const success = true;
+  const result: string = response.statusText;
+  const status: number = response.status;
+  const data = response.data;
+
+  return { code, success, result, data, status };
+}
+
+function exceptionHandle(error: ErrorMsg, config?: ExceptionHandle) {
+  const code: number = Number(error.errorCode) || 0;
+  /**
+   * 用户未登陆
+   */
+  if ([401, 40101, 40102, 40103, 40104].includes(code) && config && config.reload) {
+    // 跳转小程序登录
+    handleLoginPage();
+  }
+}
+
+const handleLoginPage = () => {
+  try {
+    const url = IndexLogin;
+    // @ts-ignore
+    wx.miniProgram.navigateTo({ url: `${url}?hasBack=0` });
+  } catch (e) {}
+};
+
+const http = {
+  get,
+  post,
+  exceptionHandle,
+};
+
+export default http;
@@ -61,37 +61,37 @@ const checkEnv = () =&gt; {
   return new Promise<any>((resolve) => {
     const ua = window.navigator.userAgent.toLowerCase();
     if (/MicroMessenger/i.test(ua)) {
-      //判断是否是微信环境
-      //微信环境
+      // 判断是否是微信环境
+      // 微信环境
       // @ts-ignore
-      if (window.wx && window.wx.miniProgram) {
+      if (window.wx?.miniProgram) {
         // @ts-ignore
-        window.wx.miniProgram.getEnv(function(res: any) {
+        window.wx.miniProgram.getEnv((res: any) => {
           if (res.miniprogram) {
             // 小程序环境下逻辑
             resolve({
               miniProgram: true,
-              wxEnv: true
+              wxEnv: true,
             });
           } else {
             resolve({
               miniProgram: false,
-              wxEnv: true
+              wxEnv: true,
             });
-            //非小程序环境下逻辑
+            // 非小程序环境下逻辑
           }
         });
       } else {
         resolve({
           miniProgram: false,
-          wxEnv: true
+          wxEnv: true,
         });
       }
     } else {
-      //非微信环境逻辑
+      // 非微信环境逻辑
       resolve({
         miniProgram: false,
-        wxEnv: false
+        wxEnv: false,
       });
     }
   });
@@ -112,5 +112,5 @@ export default {
   isSupportSticky,
   typeOf,
   prevAppLaunch,
-  checkEnv
+  checkEnv,
 };
@@ -9,6 +9,7 @@ import config from &#39;../../config.json&#39;;
  */
 interface HOST {
   pstn?: string;
+  passport?: string;
   [key: string]: any;
 }
@@ -18,7 +19,7 @@ export function setHost() {
   const proxy = config?.env ? `http://${config?.env || ''}` : 'https://';
   const _host = `${proxy}gate.feewee.cn`;
-  ['pstn'].forEach((sub) => {
+  ['pstn', 'passport'].forEach((sub) => {
     server[sub] = `${_host}/${sub}`;
   });
 }
 import http from 'client/util/http';
-import host from 'client/util/host';
-import { request } from 'client/util/http/interface';
+import host from 'client/util/server';
 import _URL from 'client/util/url';
 const _url = _URL.current(window.location.href);
@@ -9,6 +8,6 @@ const token = _url.query.token as string;
 /**
  * 检测是否关注公众号
  */
-export function checkFollowOffice(): request.PromiseResp<boolean> {
+export function checkFollowOffice(): Promise<ICommon.ServerResponse<boolean>> {
   return http.get(`${host.passport}/getWechatUserInfo/byUserId`, { params: { token } });
 }
@@ -96,3 +96,29 @@ export const hiddenPhone = (phone: string, length = 4): string =&gt; {
   }
   return temp;
 };
+
+/**
+ * 保留两位小数 四舍五入
+ * @param n
+ * @param digit 需要的小数位数
+ * @returns
+ */
+export const toFixed = (n: number, digit: number): string => {
+  if (typeof n !== 'number') {
+    throw new Error('n is not a number');
+  }
+  let result = String(Math.round(Math.pow(10, digit) * n) / Math.pow(10, digit));
+  if (result.indexOf('.') == -1) {
+    if (digit != 0) {
+      result += '.';
+      result += new Array(digit + 1).join('0');
+    }
+  } else {
+    let arr = result.split('.');
+    if (arr[1].length < digit) {
+      arr[1] += new Array(digit - arr[1].length + 1).join('0');
+    }
+    result = arr.join('.');
+  }
+  return result;
+};
@@ -19,7 +19,8 @@ moment.locale(&#39;zh-cn&#39;, {
     llll: 'YYYY年MMMD日ddddAh点mm分',
   },
   meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-  meridiemHour(hour: number, meridiem: string) {
+  meridiemHour(_hour: number, meridiem: string) {
+    let hour: number = _hour;
     if (hour === 12) {
       hour = 0;
     }
@@ -32,6 +32,7 @@ declare namespace ICommon {
     data?: T;
     code?: number;
     result?: string;
+    status?: number;
   }
   /**