Merge branch 'dongjian' into develop
# Conflicts: # package-lock.json # package.json
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
import request from '@/utils/request.js';
|
import request from '@/utils/request.js';
|
||||||
import qs from "qs";
|
|
||||||
// import { APPID } from '@/utils/config.js';
|
// import { APPID } from '@/utils/config.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { getStorageFun, TOKEN_NAME } from './auth.js';
|
import { getStorageFun, TOKEN_NAME } from './auth.js';
|
||||||
import qs from "qs";
|
|
||||||
import { BASE_URL, Authorization } from '@/utils/config.js'
|
import { BASE_URL, Authorization } from '@/utils/config.js'
|
||||||
|
|
||||||
// utils/http.js (修改后的版本)
|
// utils/http.js (修改后的版本)
|
||||||
|
|||||||
Reference in New Issue
Block a user