Procházet zdrojové kódy

Merge branch 'fix/Attendance_baidu_map_https' into 'develop'

Merge of fix/Attendance_baidu_map_https to develop

See merge request o2oa/o2oa!144
蔡祥熠 před 5 roky
rodič
revize
bd01d59628

+ 6 - 1
o2web/source/x_component_Attendance/AddressExplorer.js

@@ -161,7 +161,12 @@ MWF.xApplication.Attendance.AddressExplorer.BaiduMap = new Class({
     loadResource: function (callback) {
         window.BMap_loadScriptTime = (new Date).getTime();
         //var apiPath = "http://api.map.baidu.com/api?v=2.0&ak=Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg";
-        var apiPath = "http://api.map.baidu.com/getscript?v=2.0&ak=Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg&services=&t=20161219171637";
+        var apiPath;
+        if( window.location.protocol.toLowerCase() === "https" ){
+            apiPath = "https://api.map.baidu.com/getscript?v=2.0&ak=Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg&services=&t=20161219171637";
+        }else{
+            apiPath = "http://api.map.baidu.com/getscript?v=2.0&ak=Qac4WmBvHXiC87z3HjtRrbotCE3sC9Zg&services=&t=20161219171637";
+        }
         if( !window.BDMapApiLoaded ){
             COMMON.AjaxModule.loadDom(apiPath, function () {
                 window.BDMapApiLoaded = true;