diff --git a/bin/serve.js b/bin/serve.js index fa8cd113..6a73f568 100644 --- a/bin/serve.js +++ b/bin/serve.js @@ -68,16 +68,6 @@ const start = () => { return json.pages.push(app) } }), - findPages('src/saas', file => { - if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) { - let app = { - name: file.replace(/.*\\([^\\]+).vue/g, '$1'), - path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/') - } - getFileInfo(app, file) - return json.pages.push(app) - } - }), findPages('src/project', file => { if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) { let app = { diff --git a/package.json b/package.json index 2fa8b161..32f82f4f 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "src/common/modules.js", "src/common/http.js", "src/common/crypto-js.js", - "src/apps", - "src/saas" + "src/apps" ], "workspaces": [ "src/project/*" diff --git a/src/common/axios.js b/src/common/axios.js index cb289ee2..3d00dd2c 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -19,8 +19,6 @@ instance.interceptors.request.use(config => { if (['xaxc'].includes(module)) { config.url = config.url.replace(/(app|auth|admin)\//, "api/") } - } else if (sessionStorage.getItem("prj") == "saas" || module == "saas") { - config.baseURL = '/online' } else config.baseURL = "/lan" return config }, err => { diff --git a/src/main.js b/src/main.js index 126bd4e8..1aa7b05f 100644 --- a/src/main.js +++ b/src/main.js @@ -35,7 +35,7 @@ const app = new Vue({ ...App }); let params = {} -if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {//上架版 +if (/saas/.test(location.pathname) > -1) {//上架版 params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"} } if (/AppCountryAlbum/.test(location.pathname)) {//乡村相册版 diff --git a/src/pages/loading.vue b/src/pages/loading.vue index 7dedd943..17b146f6 100644 --- a/src/pages/loading.vue +++ b/src/pages/loading.vue @@ -5,23 +5,19 @@ - - {{ op.label }} -
-