|
@@ -1,8 +1,8 @@
|
|
import { extend } from 'umi-request';
|
|
import { extend } from 'umi-request';
|
|
import { Toast } from 'vant';
|
|
import { Toast } from 'vant';
|
|
import cleanDeep from 'clean-deep';
|
|
import cleanDeep from 'clean-deep';
|
|
-import { browser } from '/src/helpers/utils';
|
|
|
|
-import ApiRouter from '/src/api-router';
|
|
|
|
|
|
+import { browser } from '@/helpers/utils';
|
|
|
|
+import { postMessage } from './native-message';
|
|
|
|
|
|
export interface SearchInitParams {
|
|
export interface SearchInitParams {
|
|
rows?: string | number;
|
|
rows?: string | number;
|
|
@@ -11,7 +11,7 @@ export interface SearchInitParams {
|
|
|
|
|
|
export interface InitSearchRespones {
|
|
export interface InitSearchRespones {
|
|
data: {
|
|
data: {
|
|
- rows: any[],
|
|
|
|
|
|
+ rows: any[];
|
|
[key: string]: any
|
|
[key: string]: any
|
|
};
|
|
};
|
|
[key: string]: any
|
|
[key: string]: any
|
|
@@ -24,16 +24,16 @@ const request = extend({
|
|
timeout: 10000
|
|
timeout: 10000
|
|
});
|
|
});
|
|
|
|
|
|
-request.use(async (ctx, next) => {
|
|
|
|
- const { url, options } = ctx.req
|
|
|
|
- const prefix = options.prefix || '';
|
|
|
|
- const baseUrl: string = url.replace(prefix, '') || '';
|
|
|
|
- const linkUrl: string = (ApiRouter as any)[baseUrl];
|
|
|
|
- if (linkUrl) {
|
|
|
|
- ctx.req.url = prefix + linkUrl;
|
|
|
|
- }
|
|
|
|
- await next();
|
|
|
|
-})
|
|
|
|
|
|
+// request.use(async (ctx, next) => {
|
|
|
|
+// const { url, options } = ctx.req
|
|
|
|
+// const prefix = options.prefix || '';
|
|
|
|
+// const baseUrl: string = url.replace(prefix, '') || '';
|
|
|
|
+// const linkUrl: string = (ApiRouter as any)[baseUrl];
|
|
|
|
+// if (linkUrl) {
|
|
|
|
+// ctx.req.url = prefix + linkUrl;
|
|
|
|
+// }
|
|
|
|
+// await next();
|
|
|
|
+// })
|
|
|
|
|
|
request.interceptors.request.use(
|
|
request.interceptors.request.use(
|
|
(url, options: any) => {
|
|
(url, options: any) => {
|
|
@@ -82,14 +82,12 @@ request.interceptors.response.use(
|
|
if (!(data.code === 403 || data.code === 401)) {
|
|
if (!(data.code === 403 || data.code === 401)) {
|
|
Toast(msg);
|
|
Toast(msg);
|
|
}
|
|
}
|
|
- const browserInfo = browser()
|
|
|
|
|
|
+ const browserInfo = browser();
|
|
if (data.code === 403 && browserInfo.isApp && !isOpenLogin) {
|
|
if (data.code === 403 && browserInfo.isApp && !isOpenLogin) {
|
|
- if (browserInfo.android) {
|
|
|
|
- (window as any).DAYA.postMessage(JSON.stringify({ api: 'login' }));
|
|
|
|
- } else if (browserInfo.iPhone) {
|
|
|
|
- (window as any).webkit.messageHandlers.DAYA.postMessage(
|
|
|
|
- JSON.stringify({ api: 'login' })
|
|
|
|
- );
|
|
|
|
|
|
+ if (browserInfo.isApp) {
|
|
|
|
+ postMessage({
|
|
|
|
+ api: 'login'
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
throw new Error(msg);
|
|
throw new Error(msg);
|