duanxiaoduan 1 year ago
parent
commit
e4c9bb84ff
1 changed files with 1 additions and 58 deletions
  1. 1 58
      .env.development

+ 1 - 58
.env.development

@@ -4,64 +4,7 @@ ENV = 'development'
 # base api
 # 测试线
 
-VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-
-#许义平本地
-<<<<<<< .mine
-# VUE_APP_BASE_API = 'http://192.168.1.96:8082/'
-=======
-VUE_APP_BASE_API = 'http://192.168.1.70:8088/'
->>>>>>> .theirs
-
-<<<<<<< .mine
-
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
-# VUE_APP_BASE_API = 'http://kpttestnt.kptyun.com/'
-
-
-# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
-# 南通测试线
-# VUE_APP_BASE_API = 'http://kpttestnt.kptyun.com/'
-
-# VUE_APP_BASE_API = 'http://tmrwatch.cn/'
-# 测试线
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
-
-# VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
-
-# VUE_APP_BASE_API = 'http://lhpc81.kptyun.com/'
-
-
-
-# 白少杰
-# VUE_APP_BASE_API = 'http://192.168.1.77:8081/'
-
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
+VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().