From 70365bc3c9de75e16e959166728cc608f3664740 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 16:21:15 +0800
Subject: [PATCH] 属性对比

---
 company_admin/.env.development |    3 ---
 h5/manifest.json               |    3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/company_admin/.env.development b/company_admin/.env.development
index 02e8212..e53d86e 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,11 +3,8 @@
 
 # VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
 
-<<<<<<< HEAD
 VUE_APP_API = 'http://192.168.0.35:10022/'
-=======
 # VUE_APP_API = 'http://192.168.0.15:10024/'
->>>>>>> 3fbfdefe98e5d35e32d74138ce73a1b4e2fe5465
 
 VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
 
diff --git a/h5/manifest.json b/h5/manifest.json
index fae0a9b..b8c114d 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -84,7 +84,8 @@
                     // "target" : "http://192.168.0.15:10022/",
                     // "target" : "https://dmtest.ahapp.net/",
                     "changeOrigin" : true,
-                    "secure" : false
+                    "secure" : false,
+                    "pathRewrite" : {"^/web_interface":""}
                 }
             }
         },

--
Gitblit v1.9.3