Browse Source

Merge branch 'cpq-dev' of wangfan/adweb3-web into master

chenpeiqing 4 months ago
parent
commit
862d6599b8
2 changed files with 4 additions and 2 deletions
  1. 1 1
      .env.development
  2. 3 1
      src/views/adweb/theme/AdwebThemeList.vue

+ 1 - 1
.env.development

@@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = /
 VITE_PROXY = [["/adweb3","http://localhost:8080/adweb3"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8080/adweb3
+VITE_GLOB_DOMAIN_URL=http://localhost:8080
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/adweb3

+ 3 - 1
src/views/adweb/theme/AdwebThemeList.vue

@@ -75,6 +75,8 @@
   import { nextTick, onMounted, reactive, ref } from 'vue';
   import { useMessage } from '@/hooks/web/useMessage';
   import AdwebCreateSite from '@/views/adweb/theme/components/AdwebCreateSite.vue';
+  import { useGlobSetting } from '@/hooks/setting';
+  const globSetting = useGlobSetting();
 
   const url = reactive({
     list: '/adweb/adwebTheme/list',
@@ -87,7 +89,7 @@
     getAdwebVipUrl: 'adweb/adwebSiteManage/getAdwebVip',
   });
 
-  const domainUrl = ref(window._CONFIG.domianURL);
+  const domainUrl = ref(globSetting.apiUrl);
 
   const userRole = ref('');