|
@@ -120,18 +120,23 @@ var http = {
|
|
|
response.data.data = page.data;
|
|
|
} else {
|
|
|
page.state = false;
|
|
|
- resolve(false);
|
|
|
- /*
|
|
|
- if (page.key) {
|
|
|
- resolve(response.data.data[page.key], false);
|
|
|
- } else {
|
|
|
- resolve(response.data.data, false);
|
|
|
+ if (page.key) {
|
|
|
+ if (options && options.concat && options.concat == -1) {
|
|
|
+ response.data.data[page.key] = page.data;
|
|
|
+ resolve(response.data.data, false);
|
|
|
+ } else {
|
|
|
+ resolve(response.data.data[page.key], false);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (options && options.concat && options.concat == -1) {
|
|
|
+ response.data.data = page.data;
|
|
|
+ }
|
|
|
+ resolve(response.data.data, false);
|
|
|
}
|
|
|
- */
|
|
|
if (options && options.noloading) {
|
|
|
|
|
|
} else {
|
|
|
- dever.hideLoading(loading_method, options, url);
|
|
|
+ dever.hideLoading(loading_method, options, url);
|
|
|
}
|
|
|
return;
|
|
|
}
|