网站：顶级域名改为自定义域名

src/layout/index.vue

@@ -49,14 +49,16 @@
     <router-layout />
     <!-- logo 图标 -->
     <template #logo>
-      <AImage
-        v-if="logoPath"
-        :preview="false"
-        :style="{ width: '100px', height: '30px' }"
-        :src="logoPath"
-        @click="openUrl(`/system/profile`)"
-        alt="logo"
-      />
+      <div class="sys-logo mr-2 flex items-center flex-col">
+        <AAvatar
+          shape="square"
+          :preview="false"
+          :size="28"
+          :src="logoPath"
+          @click="push(`/system/profile`)"
+          alt="logo"
+        />
+      </div>
     </template>
     <!-- 顶栏右侧区域 -->
     <template #right>
@@ -118,7 +120,6 @@
     setHomeComponents
   } from '@/utils/page-tab-util';
   import type { TabCtxMenuOption } from 'ele-admin-pro/es/ele-pro-layout/types';
-  import { openUrl } from '@/utils/common';
 
   const { push } = useRouter();
   const { t, locale } = useI18n();
@@ -128,9 +129,7 @@
   // 租户信息
   const { company } = storeToRefs(tenantStore);
   // 网站名称
-  const projectName = !company.value?.companyLogo
-    ? company.value?.shortName
-    : '';
+  const projectName = company.value?.shortName || 'WEBSOFT';
   // 网站LOGO
   const logoPath =
     company.value?.companyLogo || 'https://www.gxwebsoft.com/ws-logo.svg';

src/utils/common.ts

@@ -70,7 +70,6 @@ export function openUrl(url: string, params?: any): void {
  */
 export function openSpmUrl(path: string, d?: any, id = 0): void {
   const domain = getSiteDomain();
-  console.log(domain);
   const spm = ref<string>('');
   const token = ref<string>();
   const url = ref<string>();
@@ -98,7 +97,8 @@ export function openSpmUrl(path: string, d?: any, id = 0): void {
 
   // 跳转页面
   url.value = `${domain}${path}${spm.value}${token.value}`;
-  window.open(`https://${url.value}`);
+  console.log(url.value,'domain>>>>');
+  window.open(`${url.value}`);
 }
 
 /**

src/utils/domain.ts

@@ -113,8 +113,12 @@ export function getSiteDomain(): string {
     listWebsite({ limit: 1 }).then((list) => {
       if (list.length > 0) {
         const d = list[0];
-        localStorage.setItem('Domain', `${d.prefix}${d.domain}`);
-        return `${d.prefix}${d.domain}`;
+        if (d.domain) {
+          localStorage.setItem('Domain', `https://${d.domain}`);
+        } else {
+          localStorage.setItem('Domain', `https://$${d.websiteCode}.wsdns.cn`);
+        }
+        return localStorage.getItem('Domain');
       }
     });
   }

src/views/cms/navigation/components/navigation-edit.vue

@@ -372,7 +372,8 @@
       .validate()
       .then(() => {
         const navigationForm = {
-          ...form
+          ...form,
+          parentId: form.parentId || 0
         };
         const saveOrUpdate = isUpdate.value ? updateNavigation : addNavigation;
         saveOrUpdate(navigationForm)

src/views/cms/navigation/index.vue

@@ -139,7 +139,6 @@
               <a-divider type="vertical" />
               <a-popconfirm
                 placement="topRight"
-                :disabled="record.home == 1"
                 title="确定要删除此菜单吗？"
                 @confirm="remove(record)"
               >
@@ -369,37 +368,37 @@
     //   return;
     // }
     // TODO 单页模型
-    if (row?.model == 'custom') {
-      router.push({
-        path: `/cms/design`,
-        query: {
-          id: row.navigationId,
-          type: row.model
-        }
-      });
-      return;
-    }
+    // if (row?.model == 'custom') {
+    //   router.push({
+    //     path: `/cms/design`,
+    //     query: {
+    //       id: row.navigationId,
+    //       type: row.model
+    //     }
+    //   });
+    //   return;
+    // }
 
     // TODO 文章列表
-    if (row?.model === 'article') {
-      router.push({
-        path: `/cms/article`,
-        query: {
-          id: row.navigationId,
-          type: row.model
-        }
-      });
-      return;
-    }
+    // if (row?.model === 'article') {
+    //   router.push({
+    //     path: `/cms/article`,
+    //     query: {
+    //       id: row.navigationId,
+    //       type: row.model
+    //     }
+    //   });
+    //   return;
+    // }
 
     // TODO 产品列表
-    if (row?.model === 'product') {
-      router.push({
-        path: '/goods/index',
-        query: { categoryId: row.navigationId, type: row.type }
-      });
-      return;
-    }
+    // if (row?.model === 'product') {
+    //   router.push({
+    //     path: '/goods/index',
+    //     query: { categoryId: row.navigationId, type: row.type }
+    //   });
+    //   return;
+    // }
   };
 
   const openLayout = (row?: Navigation) => {
@@ -410,6 +409,7 @@
 
   /* 删除单个 */
   const remove = (row: Navigation) => {
+    console.log(row);
     if (row.children?.length) {
       message.error('请先删除子节点');
       return;

src/views/cms/website/components/websiteEdit.vue

@@ -35,7 +35,7 @@
           v-model:value="form.websiteName"
         />
       </a-form-item>
-      <a-form-item label="二级域名" name="websiteCode">
+      <a-form-item label="赠送域名" name="websiteCode">
         <a-input
           v-model:value="form.websiteCode"
           placeholder="huawei"
@@ -43,13 +43,13 @@
           addon-after=".wsdns.cn"
         />
       </a-form-item>
-      <!--      <a-form-item label="顶级域名" name="domain" v-if="form.websiteCode">-->
-      <!--        <a-input-->
-      <!--          v-model:value="form.domain"-->
-      <!--          placeholder="huawei.com"-->
-      <!--          addon-before="https://"-->
-      <!--        />-->
-      <!--      </a-form-item>-->
+      <a-form-item label="自定义域名" name="domain">
+        <a-input
+          v-model:value="form.domain"
+          placeholder="huawei.com"
+          addon-before="https://"
+        />
+      </a-form-item>
       <a-form-item label="网站描述" name="comments">
         <a-textarea
           :rows="4"
@@ -143,8 +143,8 @@
   import { Website } from '@/api/cms/website/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
+  import { FormInstance, type Rule } from 'ant-design-vue/es/form';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance } from 'ant-design-vue/es/form';
   import { FileRecord } from '@/api/system/file/model';
   import { checkExistence } from '@/api/cms/domain';
 
@@ -199,21 +199,6 @@
     statusText: undefined
   });
 
-  const websiteType = ref<SelectProps['options']>([
-    {
-      value: '企业官网',
-      label: '企业官网'
-    },
-    {
-      value: '门户网站',
-      label: '门户网站'
-    },
-    {
-      value: '电子商城',
-      label: '电子商城'
-    }
-  ]);
-
   /* 更新visible */
   const updateVisible = (value: boolean) => {
     emit('update:visible', value);
@@ -334,7 +319,8 @@
       .then(() => {
         loading.value = true;
         const formData = {
-          ...form
+          ...form,
+          tenantId: localStorage.getItem('TenantId')
         };
         const saveOrUpdate = isUpdate.value ? updateWebsite : addWebsite;
         saveOrUpdate(formData)
@@ -342,7 +328,11 @@
             loading.value = false;
             message.success(msg);
             updateVisible(false);
-            localStorage.setItem('Domain', `${form.websiteCode}.wsdns.cn`);
+            if (form.domain) {
+              localStorage.setItem('Domain', `https://${form.domain}`);
+            } else {
+              localStorage.setItem('Domain', `${form.websiteCode}.wsdns.cn`);
+            }
             emit('done');
           })
           .catch((e) => {

src/views/cms/website/index.vue

@@ -29,7 +29,15 @@
             </template>
             <template v-if="column.key === 'domain'">
               <a-button
+                v-if="record.domain"
                 type="link"
+                @click="openSpmUrl(`${record.domain}`, record)"
+              >
+                {{ record.domain }}
+              </a-button>
+              <a-button
+                type="link"
+                v-if="!record.domain"
                 @click="
                   openSpmUrl(
                     `https://${record.websiteCode}.wsdns.cn`,