Merge branch 'iteration-temp-http' of http://git.dayaedu.com/huangqiyong/classroom into staging

.env.devProd

@@ -1,15 +1,15 @@
-# 开发打包
-NODE_ENV = production
-
-VUE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
-VUE_APP_URL_GYM = "https://dev.dayaedu.com"
-VUE_APP_URL_GYT = "https://dev.lexiaoya.cn"
-
-# 标注画板地址
-VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
-
-#管乐团 云教练
-VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
-
-#管乐迷 云教练
-VUE_APP_TEACH_GYM ="https://mantest.dayaedu.com/accompany/"
+# 开发打包
+NODE_ENV = production
+
+VUE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
+VUE_APP_URL_GYM = "https://dev.dayaedu.com"
+VUE_APP_URL_GYT = "https://dev.lexiaoya.cn"
+
+# 标注画板地址
+VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-web/"

.env.development

@@ -1,14 +1,14 @@
-# 开发环境  管乐团和管乐迷 接口需要跨域  所以代理了一下
-
-VUE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
-VUE_APP_URL_GYM = "/gym"
-VUE_APP_URL_GYT = "/gyt"
-
-# 标注画板地址
-VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
-
-#管乐团 云教练
-VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
-
-#管乐迷 云教练
-VUE_APP_TEACH_GYM ="https://mantest.dayaedu.com/accompany/"
+# 开发环境  管乐团和管乐迷 接口需要跨域  所以代理了一下
+
+VUE_APP_URL = "https://dev.resource.colexiu.com/cbs-app"
+VUE_APP_URL_GYM = "/gym"
+VUE_APP_URL_GYT = "/gyt"
+
+# 标注画板地址
+VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-web/"

.env.production

@@ -1,14 +1,14 @@
-# 生产环境
-
-VUE_APP_URL = "https://mec.colexiu.com/cbs-app"
-VUE_APP_URL_GYM = "https://online.dayaedu.com"
-VUE_APP_URL_GYT = "https://online.lexiaoya.cn"
-
-# 标注画板地址
-VUE_APP_WHITEBOARD = "https://online.lexiaoya.cn/whiteboard-noCollab"
-
-#管乐团 云教练
-VUE_APP_TEACH_GYT = "https://online.lexiaoya.cn/orchestra-music-score/"
-
-#管乐迷 云教练
-VUE_APP_TEACH_GYM ="https://online.dayaedu.com/accompany/"
+# 生产环境
+
+VUE_APP_URL = "https://mec.colexiu.com/cbs-app"
+VUE_APP_URL_GYM = "https://online.dayaedu.com"
+VUE_APP_URL_GYT = "https://online.lexiaoya.cn"
+
+# 标注画板地址
+VUE_APP_WHITEBOARD = "https://online.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://online.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://gym.lexiaoya.cn/accompany-web/"

.env.staging

@@ -1,15 +1,15 @@
-# 测试环境
-NODE_ENV = production
-
-VUE_APP_URL = "https://test.resource.colexiu.com/cbs-app"
-VUE_APP_URL_GYM = "https://test.dayaedu.com"
-VUE_APP_URL_GYT = "https://test.lexiaoya.cn"
-
-# 标注画板地址
-VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
-
-#管乐团 云教练
-VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
-
-#管乐迷 云教练
-VUE_APP_TEACH_GYM ="https://mantest.dayaedu.com/accompany/"
+# 测试环境
+NODE_ENV = production
+
+VUE_APP_URL = "https://test.resource.colexiu.com/cbs-app"
+VUE_APP_URL_GYM = "https://test.dayaedu.com"
+VUE_APP_URL_GYT = "https://test.lexiaoya.cn"
+
+# 标注画板地址
+VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
+
+#管乐团 云教练
+VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
+
+#管乐迷 云教练
+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-web/"

dist/index.html

@@ -11,6 +11,7 @@
       <script>
          if (!!window.ActiveXObject || "ActiveXObject" in window) {
             window.location.href = "./ieIncompatible/index.html"
+<<<<<<< HEAD
          }
       </script>
    <script defer src="/js/chunk-vendors.js"></script><script defer src="/js/app.js"></script></head>
@@ -23,6 +24,9 @@
       <div id="app">
          <style>
             .firstLoading {
+=======
+         }</script><script defer="defer" src="/js/chunk-vendors.bf0b2587.js"></script><script defer="defer" src="/js/app.0c2a760b.js"></script><link href="/css/app.36097b9e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
+>>>>>>> b1b86af6457c534d5629a947195d1560b716db4e
                position: fixed;
                left: 50%;
                top: 50%;