feat:合并

This commit is contained in:
lixg
2022-12-17 15:26:48 +08:00
parent 756221c47d
commit 0e01c8de18
3 changed files with 54 additions and 42 deletions

View File

@@ -1,7 +1,7 @@
import router from "@/router";
import {reactive, ref, toRefs, watch} from "vue";
import { reactive, ref, toRefs, watch } from "vue";
import axios from 'axios';
import {getCookie} from "@/api/utils";
import { getCookie } from "@/api/utils";
export function usePage(_url, param) {
@@ -11,11 +11,11 @@ export function usePage(_url, param) {
total: 0,
size: 10,
current: 1,
params: {pageNo: 1, pageSize: 10, ...param}
params: { pageNo: 1, pageSize: 10, ...param }
})
watch(param, () => {
state.params = {...state.params, ...param}
state.params = { ...state.params, ...param }
fetchData()
})
@@ -86,14 +86,14 @@ export async function request(_url, params) {
method,
headers: {
'token': getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: import.meta.env.VITE_BASE_API,
...method !== 'get' ? {data: JSON.stringify(body)} : {}
...method !== 'get' ? { data: JSON.stringify(body) } : {}
}).then(resp => resp.data).then(response => {
if (response.code !== 200 && response.code !== 0) {
if (response.code === 1000) {
import.meta.env.MODE === 'development' ? router.push({path: '/login'}) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
}
// if (import.meta.env.DEV && response.code === 1000) {
// router.push({path: '/login'})
@@ -108,7 +108,7 @@ export async function request(_url, params) {
}
return response
}).catch(e => {
console.log(e)
console.log('eeeee', e)
// router.push({path: '/login'})
})
}
@@ -135,10 +135,10 @@ export async function boeRequest(_url, params) {
method,
headers: {
token: getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: '',
...method !== 'get' ? {data: JSON.stringify(body)} : {}
...method !== 'get' ? { data: JSON.stringify(body) } : {}
}).then(resp => resp.data).then(response => {
return response
}).catch(e => {