Kaynağa Gözat

Merge branch '2.0.1' of http://git.ycjcjy.com/SpaceOfCheng/admin into 2.0.1

yuantianjiao 6 yıl önce
ebeveyn
işleme
c89ec4e338
2 değiştirilmiş dosya ile 7 ekleme ve 4 silme
  1. 3
    3
      config/index.js
  2. 4
    1
      dist/index.html

+ 3
- 3
config/index.js Dosyayı Görüntüle

@@ -14,9 +14,9 @@ module.exports = {
14 14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15 15
         // target: 'http://192.168.0.62:8080', //wf
16 16
         // target: 'http://127.0.0.1:8080', 
17
-        // target: 'http://192.168.0.11:8080', //ys
18
-        // target: 'http://192.168.0.102:8080', //hyq
19
-        target: 'http://dev.ycjcjy.com', //frp
17
+        target: 'http://192.168.0.11:8080', //ys
18
+        // target: 'http://192.168.0.125:8080', //hyq
19
+        // target: 'http://dev.ycjcjy.com', //frp
20 20
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
21 21
         // pathRewrite: {
22 22
         //   '^/api': 'api'

+ 4
- 1
dist/index.html Dosyayı Görüntüle

@@ -1 +1,4 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.cc1f90c9ffc52c3f483a949e2c10acd6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.5c35c9c3aac1bbcf9f74.js></script></body></html>
1
+<<<<<<< HEAD
2
+=======
3
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.cc1f90c9ffc52c3f483a949e2c10acd6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.5c35c9c3aac1bbcf9f74.js></script></body></html>
4
+>>>>>>> 0b9bbc49e3efad436d5b6723a315ca00d7060653