修复商户Id读取及保存

src/api/cms/design/model/index.ts

@@ -49,6 +49,7 @@ export interface Design {
   demoUrl?: string;
   account?: string;
   docUrl?: string;
+  merchantId?: number;
 }
 
 /**

src/api/cms/link/model/index.ts

@@ -18,6 +18,7 @@ export interface Link {
   deleted?: number;
   status?: number;
   createTime?: number;
+  merchantId?: number;
 }
 
 /**

src/api/cms/navigation/model/index.ts

@@ -42,6 +42,7 @@ export interface Navigation {
   label?: string;
   value?: number;
   style?: string;
+  merchantId?: number;
 }
 
 /**
@@ -52,5 +53,6 @@ export interface NavigationParam {
   path?: string;
   authority?: string;
   parentId?: number;
+  merchantId?: number;
   navigationId?: number;
 }

src/components/SelectNavigsation/components/select-data.vue

@@ -79,7 +79,7 @@
 
 <script lang="ts" setup>
   import { ref } from 'vue';
-  import { listNavigation, pageNavigation } from '@/api/cms/navigation';
+  import { listNavigation } from '@/api/cms/navigation';
   import { EleProTable } from 'ele-admin-pro';
   import { toTreeData, eachTreeData } from 'ele-admin-pro/es';
   import type {
@@ -88,7 +88,7 @@
     EleProTableDone
   } from 'ele-admin-pro/es/ele-pro-table/types';
   import type { Navigation, NavigationParam } from '@/api/cms/navigation/model';
-  import type { Menu } from '@/api/system/menu/model';
+  import { getMerchantId } from '@/utils/common';
 
   const props = defineProps<{
     // 弹窗是否打开
@@ -154,6 +154,7 @@
       where.bottom = 0;
     }
     where.isMpWeixin = false;
+    where.merchantId = getMerchantId();
     return listNavigation({ ...where });
   };
 

src/views/cms/article/index.vue

@@ -334,7 +334,9 @@
 
   // 加载栏目数据
   if (!navigationList.value) {
-    listNavigation({}).then((res) => {
+    listNavigation({
+      merchantId: getMerchantId()
+    }).then((res) => {
       navigationList.value = toTreeData({
         data: res?.map((d) => {
           d.value = d.navigationId;

src/views/cms/design/index.vue

@@ -98,7 +98,7 @@
   import type { Design, DesignParam } from '@/api/cms/design/model';
   import { useRouter } from 'vue-router';
   import { toTreeData } from 'ele-admin-pro';
-  import { openUrl } from '@/utils/common';
+  import { getMerchantId, openUrl } from '@/utils/common';
   import { getSiteDomain } from '@/utils/domain';
   import { Navigation } from '@/api/cms/navigation/model';
   import { listNavigation } from '@/api/cms/navigation';
@@ -275,7 +275,7 @@
     loading.value = true;
     // 加载栏目数据
     if (!navigationList.value) {
-      listNavigation({}).then((res) => {
+      listNavigation({ merchantId: getMerchantId() }).then((res) => {
         navigationList.value = toTreeData({
           data: res?.map((d) => {
             d.value = d.navigationId;

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

@@ -103,7 +103,7 @@
   import type { Link } from '@/api/cms/link/model';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { uploadFile } from '@/api/system/file';
-  import { getDictionaryOptions } from '@/utils/common';
+  import { getDictionaryOptions, getMerchantId } from "@/utils/common";
   import { FileRecord } from '@/api/system/file/model';
   import { Navigation } from '@/api/cms/navigation/model';
 
@@ -143,6 +143,7 @@
     sortNumber: 100,
     linkType: undefined,
     categoryId: undefined,
+    merchantId: undefined,
     comments: undefined
   });
 
@@ -226,6 +227,7 @@
       .then(() => {
         loading.value = true;
         const saveOrUpdate = isUpdate.value ? updateLink : addLink;
+        form.merchantId = getMerchantId();
         saveOrUpdate(form)
           .then((msg) => {
             loading.value = false;

src/views/cms/link/index.vue

@@ -81,7 +81,7 @@
   import { pageLink, removeLink } from '@/api/cms/link';
   import { toTreeData } from 'ele-admin-pro';
   import type { Link, LinkParam } from '@/api/cms/link/model';
-  import { openSpmUrl, openUrl } from '@/utils/common';
+  import { getMerchantId, openSpmUrl, openUrl } from '@/utils/common';
   import LinkSearch from './components/link-search.vue';
   import { listNavigation } from '@/api/cms/navigation';
   import { Navigation } from '@/api/cms/navigation/model';
@@ -146,6 +146,7 @@
 
   // 表格数据源
   const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
+    where.merchantId = getMerchantId();
     return pageLink({ ...where, ...orders, limit, page });
   };
 
@@ -163,7 +164,7 @@
 
   // 加载栏目数据
   if (!navigationList.value) {
-    listNavigation({}).then((res) => {
+    listNavigation({ merchantId: getMerchantId() }).then((res) => {
       navigationList.value = toTreeData({
         data: res?.map((d) => {
           d.value = d.navigationId;

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

@@ -166,7 +166,7 @@ import TinymceEditor from "@/components/TinymceEditor/index.vue";
 import useFormData from "@/utils/use-form-data";
 import {removeSiteInfoCache} from "@/api/cms/website";
 import {FileRecord} from "@/api/system/file/model";
-import { openSpmUrl } from "@/utils/common";
+import { getMerchantId, openSpmUrl } from "@/utils/common";
 
 // 是否是修改
 const isUpdate = ref(false);
@@ -224,8 +224,8 @@ const { form, resetFields, assignFields } = useFormData<Design>({
   buyUrl: '',
   demoUrl: '',
   account: '',
-  docUrl: ''
+  docUrl: '',
-
+  merchantId: undefined
 });
 
 const editorRef = ref<InstanceType<typeof TinymceEditor> | null>(null);
@@ -443,6 +443,7 @@ const save = () => {
         ...form,
         layout: JSON.stringify(form),
         categoryId: props.categoryId,
+        merchantId: getMerchantId(),
         content: content.value,
       };
       console.log(formData);

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

@@ -162,7 +162,7 @@
   import { removeSiteInfoCache } from '@/api/cms/website';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { FileRecord } from '@/api/system/file/model';
-  import { uuid } from '@/components/TinymceEditor/util';
+  import { getMerchantId } from '@/utils/common';
 
   // 是否开启响应式布局
   const themeStore = useThemeStore();
@@ -221,7 +221,8 @@
     articleCategoryId: 0,
     articleId: 0,
     pageName: '',
-    isMpWeixin: false
+    isMpWeixin: false,
+    merchantId: undefined
   });
 
   // 表单验证规则
@@ -373,7 +374,8 @@
       .then(() => {
         const navigationForm = {
           ...form,
-          parentId: form.parentId || 0
+          parentId: form.parentId || 0,
+          merchantId: getMerchantId()
         };
         const saveOrUpdate = isUpdate.value ? updateNavigation : addNavigation;
         saveOrUpdate(navigationForm)

src/views/cms/navigation/index.vue

@@ -19,12 +19,7 @@
       >
         <template #toolbar>
           <a-space>
-            <a-button
+            <a-button type="primary" class="ele-btn-icon" @click="openEdit()">
-              v-if="!merchantId"
-              type="primary"
-              class="ele-btn-icon"
-              @click="openEdit()"
-            >
               <template #icon>
                 <plus-outlined />
               </template>
@@ -140,7 +135,7 @@
             >
           </template>
           <template v-else-if="column.key === 'action'">
-            <a-space v-if="!merchantId">
+            <a-space>
               <a-tooltip :title="`配置SEO及页面内容`">
                 <a class="text-fuchsia-300" @click="openDesign(record)">设计</a>
               </a-tooltip>
@@ -217,6 +212,7 @@
   import { Design } from '@/api/cms/design/model';
   import { getMerchantId } from '@/utils/merchant';
   import { removeSiteInfoCache } from '@/api/cms/website';
+  import { getMerchant } from "@/api/shop/merchant";
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -358,6 +354,7 @@
       where.bottom = undefined;
     }
     where.isMpWeixin = false;
+    where.merchantId = getMerchantId();
     return listNavigation({ ...where });
   };