Merge remote-tracking branch 'aliyun/master-0720-lyc' into master-0720-lyc

src/views/study/coursenew.vue

@@ -1386,7 +1386,7 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
-            if (rs.result.course.isPermission){
+            if (rs.result.isPermission){
               this.getInternet()
               console.log('需要内网环境')
             }
@@ -1395,6 +1395,14 @@
           }
         });
       },
+      getXmlHttpRequest() {
+        if (window.XMLHttpRequest) {
+          return new XMLHttpRequest();
+        }
+        else if (window.ActiveXObject) {
+          return new ActiveXObject("Microsoft.XMLHTTP");
+        }
+      },
       // 检测是否为内网
       getInternet() {
         this.Internet = 3;