Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

1
2
3
4
5
6
7
8
9
10
 var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
//var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
 // var my_api_server_url = 'zuul.kidgrow.cloud/';
//var my_api_server_url = 'https://zuul.kidgrow.cloud/';
 
if(my_api_server_url.indexOf("http")<0)
{
    my_api_server_url=((nowUrl=window.location.href.indexOf("ttps://")>0))?"https://"+my_api_server_url:"http://"+my_api_server_url;
}