mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-10 11:26:45 +08:00
Merge branch 'master_sync_1202' into master_1202
This commit is contained in:
@@ -373,7 +373,8 @@ export function useThrottlePage(_url, params = {}, init = true) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return request(_url, params).then(r => {
|
return request(_url, params).then(r => {
|
||||||
state.data = params.pageNo === 1 ? r.data.list : [...state.data, ...r.data.list];
|
console.log("r.data --> ",r.data)
|
||||||
|
state.data = params.pageNo === 1 ? r.data : [...state.data, ...r.data];
|
||||||
state.totalPage = r.data.total / 10 || 1;
|
state.totalPage = r.data.total / 10 || 1;
|
||||||
state.total = r.data.total;
|
state.total = r.data.total;
|
||||||
state.loading = false;
|
state.loading = false;
|
||||||
@@ -538,7 +539,7 @@ export async function request(_url, params) {
|
|||||||
}).then(res => {
|
}).then(res => {
|
||||||
return JSONBigIntStr.parse(res);
|
return JSONBigIntStr.parse(res);
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
if (res.code === 0 || res.code === 200) {
|
if (res.code === 0 || res.code === 200 || res.status === 200) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
if (res.code === 1000 || res.code === 1002) {
|
if (res.code === 1000 || res.code === 1002) {
|
||||||
|
|||||||
Reference in New Issue
Block a user