lex 9 місяців тому
батько
коміт
75b0819e73

+ 1 - 1
.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://mandev.dayaedu.com'
+#VUE_APP_BASE_API = 'http://dev.gym.lexiaoya.cn'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

+ 4 - 4
src/components/VueFormMaking/components/GenerateFormItem.vue

@@ -726,16 +726,16 @@ export default {
       let returnUrl = "";
       if (/dev/.test(url)) {
         // dev 环境
-        returnUrl = "http://mandev.dayaedu.com";
+        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       } else if (/test/.test(url)) {
         // dev 环境
-        returnUrl = "http://mantest.dayaedu.com";
+        returnUrl = "https://test.gym.lexiaoya.cn/manager";
       } else if (/online/.test(url)) {
         //线上
-        returnUrl = "https://manonline.dayaedu.com";
+        returnUrl = "https://gym.lexiaoya.cn/manager";
       } else {
         // 默认dev环境
-        returnUrl = "http://mandev.dayaedu.com";
+        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       }
       return returnUrl;
     },

+ 4 - 4
src/views/process/list/handle.vue

@@ -492,16 +492,16 @@ export default {
       let returnUrl = "";
       if (/dev/.test(url)) {
         // dev 环境
-        returnUrl = "http://mandev.dayaedu.com";
+        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       } else if (/test/.test(url)) {
         // dev 环境
-        returnUrl = "http://mantest.dayaedu.com";
+        returnUrl = "https://test.gym.lexiaoya.cn/manager";
       } else if (/online/.test(url)) {
         //线上
-        returnUrl = "https://manonline.dayaedu.com";
+        returnUrl = "https://gym.lexiaoya.cn/manager";
       } else {
         // 默认dev环境
-        returnUrl = "http://mandev.dayaedu.com";
+        returnUrl = "https://dev.gym.lexiaoya.cn/manager";
       }
       return returnUrl;
     },

+ 2 - 9
vue.config.js

@@ -16,8 +16,7 @@ const name = defaultSettings.title || "OA系统"; // page title
 const port = process.env.port || process.env.npm_config_port || 9527; // dev port
 
 const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
-// const target = "https://manonline.dayaedu.com";
-const target = "https://mantest.dayaedu.com";
+const target = "https://test.gym.lexiaoya.cn";
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**
@@ -27,7 +26,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: "/",
+  publicPath: "./",
   outputDir: "web",
   assetsDir: "static/web",
   lintOnSave: false, // process.env.NODE_ENV === 'development',
@@ -42,12 +41,6 @@ module.exports = {
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      // http://47.99.212.176:8000
-      // http://192.168.3.28:8000
-      // http://192.168.3.134
-      // http://47.114.176.40:8000
-      // let target = 'http://dev.dayaedu.com'
-      // 'http://dev.dayaedu.com'
       "/api-auth": {
         target: target,
         // target : target,