From e575022c49d3798a447d93129d16bee44a3a6f8f Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Fri, 28 Apr 2023 11:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83,=E4=BE=9D=E8=B5=96=E5=8E=BB=E9=99=A4pulic/config.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        | 1 +
 src/config/app.js | 2 +-
 src/main.js       | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45ee6c8..d2bfdea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 node_modules
 /dist
 /stage
+/SP_SYNC_CLIENT
 
 # local env files
 .env.local
diff --git a/src/config/app.js b/src/config/app.js
index fbe86aa..fb3f32f 100644
--- a/src/config/app.js
+++ b/src/config/app.js
@@ -6,7 +6,7 @@
  * imgBaseUrl: 图片所在域名地址
  *
  */
-import "../../public/config"
+//import "../../public/config"
 let BASE_URL = process.env.VUE_APP_API_BASE;
 // let ROUTER_MODE = "history";
 let ROUTER_MODE = "";
diff --git a/src/main.js b/src/main.js
index 9d96f0e..3df55dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,11 +25,12 @@ Object.keys(filters).forEach(key => {
 
 Vue.config.productionTip = false;
 let getUrl = "";
+let BASE_URL = process.env.VUE_APP_API_BASE;
 let startApp = function() {
     console.log(window.global_config.BASE_URL);
-    axios.get("./config.json").then(res => {
+//    axios.get("./config.json").then(res => {
         // 基础地址
-        getUrl = res.data.BASE_URL;
+        getUrl = BASE_URL;
         myReq.defaults.baseURL = getUrl;
         // mySock.ws_url =  res.data.BASE_URL2;
         console.log( res.data.BASE_URL+"\n"+ res.data.BASE_URL2)
@@ -38,7 +39,7 @@ let startApp = function() {
             store,
             render: h => h(App)
         }).$mount("#app");
-    });
+//    });
 };
 
 startApp();