Merge branch 'iteration-oss-up' into jenkins

src/components/VueFormMaking/components/GenerateFormItem.vue

@@ -722,7 +722,7 @@ export default {
     },
     // 教务地址
     validManageUrl() {
-      let url = window.location.href;
+      let url = window.location.hostname;
       let returnUrl = "";
       if (/dev/.test(url)) {
         // dev 环境
@@ -730,12 +730,9 @@ export default {
       } else if (/test/.test(url)) {
         // dev 环境
         returnUrl = "https://test.gym.lexiaoya.cn/manager";
-      } else if (/online/.test(url)) {
+      } else {
         //线上
         returnUrl = "https://gym.lexiaoya.cn/manager";
-      } else {
-        // 默认dev环境
-        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       }
       return returnUrl;
     },

src/views/process/list/handle.vue

@@ -488,7 +488,7 @@ export default {
     },
     // 教务地址
     validManageUrl() {
-      let url = window.location.href;
+      let url = window.location.hostname;
       let returnUrl = "";
       if (/dev/.test(url)) {
         // dev 环境
@@ -496,12 +496,9 @@ export default {
       } else if (/test/.test(url)) {
         // dev 环境
         returnUrl = "https://test.gym.lexiaoya.cn/manager";
-      } else if (/online/.test(url)) {
+      } else {
         //线上
         returnUrl = "https://gym.lexiaoya.cn/manager";
-      } else {
-        // 默认dev环境
-        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       }
       return returnUrl;
     },