diff --git a/.env.development b/.env.development index e774d25..dc23e2f 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com VITE_SERVER_URL=https://server.gxwebsoft.com/api -#VITE_API_URL=https://cms-api.websoft.top/api +VITE_API_URL=https://cms-api.websoft.top/api #VITE_SOCKET_URL=ws://127.0.0.1:9191 #VITE_SERVER_URL=http://127.0.0.1:8000/api -VITE_API_URL=http://127.0.0.1:9000/api +#VITE_API_URL=http://127.0.0.1:9000/api #/booking/bookingItem diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..acea6cc --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +.DS_Store +node_modules +/dist +/dist-ssr + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +.pnpm-debug.log +.eslintcache + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/.idea/modules.xml b/.idea/modules.xml index bbbcf4d..e75d8a6 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/mp.iml b/.idea/mp.iml index 24643cc..9f9644f 100644 --- a/.idea/mp.iml +++ b/.idea/mp.iml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..02961c5 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/src/views/cms/cmsWebsite/components/websiteEdit.vue b/src/views/cms/cmsWebsite/components/websiteEdit.vue index c0694b6..19ec1e0 100644 --- a/src/views/cms/cmsWebsite/components/websiteEdit.vue +++ b/src/views/cms/cmsWebsite/components/websiteEdit.vue @@ -131,6 +131,7 @@ import { FileRecord } from '@/api/system/file/model'; import { checkExistence } from '@/api/cms/cmsDomain'; import { updateCmsDomain } from '@/api/cms/cmsDomain'; + import {updateTenant} from "@/api/system/tenant"; // 是否是修改 const isUpdate = ref(false); @@ -342,10 +343,14 @@ updateVisible(false); updateCmsDomain({ websiteId: form.websiteId, - domain: `${localStorage.getItem('TenantId')}.wsdns.cn` + domain: `${localStorage.getItem('TenantId')}.shoplnk.cn` }); - localStorage.setItem('Domain', `${form.websiteCode}.wsdns.cn`); + updateTenant({ + tenantName: `${form.websiteName}` + }).then(() => {}) + localStorage.setItem('Domain', `${form.websiteCode}.shoplnk.cn`); localStorage.setItem('WebsiteId', `${form.websiteId}`); + localStorage.setItem('WebsiteName', `${form.websiteName}`); message.destroy(); message.success(msg); // window.location.reload(); diff --git a/src/views/passport/register/index.vue b/src/views/passport/register/index.vue index ac29993..eca38fd 100644 --- a/src/views/passport/register/index.vue +++ b/src/views/passport/register/index.vue @@ -559,8 +559,8 @@ const submit = () => { goHome(); }, 2000) }) - .catch((e: Error) => { - message.error(e.message); + .catch(() => { + message.error('该手机号码已经被注册'); loading.value = false; }); })