许成详 6 years ago
parent
commit
74c01a3b1f
1 changed files with 0 additions and 5 deletions
  1. 0
    5
      config/index.js

+ 0
- 5
config/index.js View File

12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15
-<<<<<<< HEAD
16
-        target: 'http://192.168.0.62:8080', //wf
17
-        // target: 'http://localhost:8080', 
18
-=======
19
         // target: 'http://192.168.0.62:8080', //wf
15
         // target: 'http://192.168.0.62:8080', //wf
20
         target: 'http://localhost:8080', 
16
         target: 'http://localhost:8080', 
21
->>>>>>> 39e74bdea82b0a3170a0477becad3a119521b6f0
22
         // target: 'http://192.168.0.11', //ys
17
         // target: 'http://192.168.0.11', //ys
23
         // target: 'http://192.168.0.11', //ys
18
         // target: 'http://192.168.0.11', //ys
24
         // target: 'http://dev.ycjcjy.com/', //frp
19
         // target: 'http://dev.ycjcjy.com/', //frp