hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-25 02:32:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

-- bug

Browse Source
This commit is contained in:
yuping
2022-12-22 18:49:43 +08:00
parent 6a4d11efa4
commit 71b43545d1
2 changed files with 115 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/api/request.js
View File

@@ -1,7 +1,9 @@
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 JSONBigInt from 'json-bigint';
const JSONBigIntStr = JSONBigInt({ storeAsString: true });
export function usePage(_url, param) {
const state = reactive({
@@ -10,18 +12,18 @@ 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()
})
function fetchData() {
state.loading = true
request(_url, state.params).then(r => {
state.params.pageNo === 1 ? (state.data = (r.data.records||r.data.rows)) : (state.data = [...state.data, ...(r.data.records||r.data.rows)])
state.params.pageNo === 1 ? (state.data = (r.data.records || r.data.rows)) : (state.data = [...state.data, ...(r.data.records || r.data.rows)])
state.size = r.data.size
state.total = r.data.total
state.current = r.data.current
@@ -84,34 +86,34 @@ export async function request(_url, params) {
url,
method,
headers: {
'X-Token': localStorage.getItem('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
'token': getCookie('token'),
...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
},
baseURL: '/manageApi-release',
...method !== 'get' ? {data: JSON.stringify(body)} : {}
baseURL: import.meta.env.VITE_BASE_API,
...method !== 'get' ? { data: JSON.stringify(body) } : {}
}).then(resp => resp.data).then(response => {
if (response.code !== 200 && response.code !== 0) {
console.log(1111111111)
console.log(response.code)
if (import.meta.env.DEV && response.code === 1000) {
router.push({path: '/login'})
} else {
// response.showMsg && notification.open({
// message: response.showMsg,
// duration: 2,
// });
if (response.code === 1000) {
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'})
// } else {
// window.open()
// response.showMsg && notification.open({
// message: response.showMsg,
// duration: 2,
// });
// }
throw new Error('接口异常')
}
return response
}).catch(e => {
console.log(2222)
console.log(e)
console.log('eeeee', e)
// router.push({path: '/login'})
})
}
// 这个方法要有 和request不一样
export async function boeRequest(_url, params) {
const s = _url.split(' ')
let url = s[0]
@@ -129,20 +131,16 @@ export async function boeRequest(_url, params) {
}
}
const body = method !== 'get' ? params || {} : {}
return axios({
url,
return fetch(url,{
method,
headers: {
headers:{
token: getCookie('token'),
...method !== 'get' ? {'Content-Type': 'application/json'} : {}
},
baseURL: '',
...method !== 'get' ? {data: JSON.stringify(body)} : {}
}).then(resp => resp.data).then(response => {
return response
}).catch(e => {
console.log(2222)
console.log(e)
// router.push({path: '/login'})
...method !== 'get' ? {body: JSON.stringify(body)} : {}
}).then(res=>{
return res.text()
}).then(res=>{
return JSONBigIntStr.parse(res)
})
}

171
vite.config.js
View File

@@ -2,97 +2,96 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2022-12-13 20:49:00
* @LastEditTime: 2022-12-15 11:51:59
* @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { defineConfig } from 'vite'
import { defineConfig, loadEnv } from 'vite'
import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy'
import { viteMockServe } from 'vite-plugin-mock'
import topLevelAwait from "vite-plugin-top-level-await";
const path = require('path')
// const url = 'http://localhost:30001'
const url = 'http://111.231.196.214:12013/manageApi'
export default defineConfig(({ command }) =>
({
base: '/fe-student-release/',
plugins: [
vue(),
// legacy({
// targets: ['chrome 64', 'defaults', 'not IE 11']
// }),
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
],
resolve: {
alias: [
{ find: '@', replacement: path.resolve(__dirname, 'src') }
]
},
server: {
proxy: {
'/file/upload': {
target: 'http://111.231.196.214:30001',
changeOrigin: true,
},
'/stu': {
target: url,
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
target: url,
changeOrigin: true,
},
'/work': {
target: url,
changeOrigin: true,
},
'/discuss': {
target: url,
changeOrigin: true,
},
'/discussSubmit': {
target: url,
changeOrigin: true,
},
'/comment': {
target: url,
changeOrigin: true,
},
'/vote': {
target: url,
changeOrigin: true,
},
'/admin': {
target: url,
changeOrigin: true,
}, '/activity': {
target: url,
changeOrigin: true,
}, '/liveBroadcast': {
target: url,
changeOrigin: true,
}, '/examination': {
target: url,
changeOrigin: true,
}, '/assessment': {
target: url,
changeOrigin: true,
}, '/workSubmit': {
target: url,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
},
export default defineConfig(({ command, mode }) =>
({
base: loadEnv(mode, process.cwd()).VITE_BASE,
plugins: [
vue(),
// legacy({
// targets: ['chrome 64', 'defaults', 'not IE 11']
// }),
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
],
resolve: {
alias: [
{ find: '@', replacement: path.resolve(__dirname, 'src') }
]
},
server: {
proxy: {
'/file/upload': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/stu': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/work': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discuss': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discussSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/comment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/vote': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/admin': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/activity': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/liveBroadcast': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/examination': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/assessment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/workSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
}, '/link': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
}
}
}
})
})
)