merge
This commit is contained in:
parent
2e442e6e8c
commit
608d8b03f5
@ -95,16 +95,16 @@ export function StationStandList() {
|
||||
// jlmapstationdata.splice(0,1);
|
||||
console.log(standsdata);
|
||||
console.log(jlmapstationdata);
|
||||
for(let i=0;i<jlmapstationdata.length;i++){
|
||||
if(jlmapstationdata[i].visible == false || jlmapstationdata[i].subheadDisplay == false){
|
||||
jlmapstationdata.splice(i,1);
|
||||
i--;
|
||||
}else{
|
||||
standsdata[i].code = jlmapstationdata[i].code;
|
||||
standsdata[i].name = jlmapstationdata[i].name;
|
||||
}
|
||||
// console.log(jlmapstationdata[i].subheadDisplay);
|
||||
}
|
||||
// for(let i=0;i<jlmapstationdata.length;i++){// || jlmapstationdata[i].subheadDisplay == false
|
||||
// if(jlmapstationdata[i].visible == false){
|
||||
// jlmapstationdata.splice(i,1);
|
||||
// i--;
|
||||
// }else{
|
||||
// standsdata[i].code = jlmapstationdata[i].code;
|
||||
// standsdata[i].name = jlmapstationdata[i].name;
|
||||
// }
|
||||
// // console.log(jlmapstationdata[i].subheadDisplay);
|
||||
// }
|
||||
|
||||
// console.log(jlmapstationdata);
|
||||
console.log(standsdata);
|
||||
|
@ -1,8 +1,8 @@
|
||||
export function getBaseUrl() {
|
||||
let BASE_API;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
BASE_API = 'https://joylink.club/jlcloud';
|
||||
// BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'https://joylink.club/jlcloud';
|
||||
BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'http://192.168.8.107:9000'; // 袁琪
|
||||
// BASE_API = 'http://192.168.8.129:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.8.119:9000'; // 张赛
|
||||
|
Loading…
Reference in New Issue
Block a user