diff --git a/config.js b/config.js index 45357d2..fe3ca80 100755 --- a/config.js +++ b/config.js @@ -9,12 +9,12 @@ module.exports = { appSecret: '1f1d186d98ea4620ac65afbf34940051', // 开发环境 - apiUrl: "http://127.0.0.1:9090/api", + // apiUrl: "http://127.0.0.1:9090/api", // socketUrl: 'ws://localhost:9190', // fileUrl: 'https://file.wsdns.cn', // 测试环境 - // apiUrl: 'https://server.gxwebsoft.com/api', + apiUrl: 'https://server.gxwebsoft.com/api', socketUrl: 'wss://server.gxwebsoft.com', fileUrl: 'https://file.wsdns.cn', diff --git a/pages/house/house.vue b/pages/house/house.vue index 3c5b10b..33c463a 100644 --- a/pages/house/house.vue +++ b/pages/house/house.vue @@ -198,7 +198,7 @@ return d }) // 合并新数据 - app.list = app.list.concat(list) + app.list.push.apply(app.list,list); if (result.data.count > app.list.length) { app.canReset = true } else { diff --git a/pages/index/index.vue b/pages/index/index.vue index 26764e0..dd1fbc2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -194,7 +194,7 @@ return d }) // 合并新数据 - app.list = app.list.concat(list) + app.list.push.apply(app.list,list); if (result.data.count > app.list.length) { app.canReset = true } else {