Merge remote-tracking branch 'origin/master'

This commit is contained in:
92895 2020-11-23 10:46:14 +08:00
commit dc6e2186f8
2 changed files with 5 additions and 5 deletions

8
app.js
View File

@ -36,12 +36,12 @@ let opts = {
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); //app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
//app.use('/app',proxy('http://192.168.1.16:8012',opts)); app.use('/app',proxy('http://192.168.1.16:8012',opts));
//app.listen(3000); //app.listen(3000);
app.use(express.json()); app.use(express.json());

View File

@ -90,7 +90,7 @@
//关闭model //关闭model
vc.toast("处理成功"); vc.toast("处理成功");
$('#importMeterWaterFeeModel').modal('hide'); $('#importMeterWaterFeeModel').modal('hide');
vc.emit('roomFeeImport', 'listFee', {}); vc.emit('meterWaterManage', 'listMeterWater', {});
return; return;
} }
vc.toast(json, 10000); vc.toast(json, 10000);