From 747d9e613923beeb67ae0f031ff628a3ec66fd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 23 Jul 2024 11:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cms/mpField/model/index.ts            |  4 ++++
 src/views/cms/mpDesign/index.vue              |  6 ++++-
 .../cms/mpField/components/mp-field-edit.vue  | 24 ++++++++++++-------
 src/views/cms/mpField/index.vue               | 15 ++++++++++++
 src/views/cms/mpPages/index.vue               | 10 ++++----
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/api/cms/mpField/model/index.ts b/src/api/cms/mpField/model/index.ts
index 91ebdff..3738592 100644
--- a/src/api/cms/mpField/model/index.ts
+++ b/src/api/cms/mpField/model/index.ts
@@ -14,6 +14,10 @@ export interface MpField {
   comments?: string;
   // 名称
   value?: string;
+  // 页面ID
+  pageId?: number;
+  // 页面名称
+  pageName?: string;
   // 排序(数字越小越靠前)
   sortNumber?: number;
   // 是否删除, 0否, 1是
diff --git a/src/views/cms/mpDesign/index.vue b/src/views/cms/mpDesign/index.vue
index e93c781..c94039f 100644
--- a/src/views/cms/mpDesign/index.vue
+++ b/src/views/cms/mpDesign/index.vue
@@ -33,7 +33,11 @@
                   target="_blank"
                   >阿里巴巴矢量图标库</a
                 >，修改完后需要<a @click="clearSiteInfoCache">清除缓存</a
-                >才会生效</div
+                >才会生效，更精细的设计需求请<a
+                  href="http://git.gxwebsoft.com/gxwebsoft/websoft-uniapp.git"
+                  target="_blank"
+                  >下载源代码</a
+                >进行修改。</div
               >
             </template>
             <template #bodyCell="{ column, record }">
diff --git a/src/views/cms/mpField/components/mp-field-edit.vue b/src/views/cms/mpField/components/mp-field-edit.vue
index 8622929..07639cf 100644
--- a/src/views/cms/mpField/components/mp-field-edit.vue
+++ b/src/views/cms/mpField/components/mp-field-edit.vue
@@ -27,6 +27,13 @@
       <a-form-item label="值" name="value">
         <a-input allow-clear placeholder="淘宝网" v-model:value="form.value" />
       </a-form-item>
+      <a-form-item label="描述" name="comments">
+        <a-input
+          allow-clear
+          placeholder="网站名称"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
       <a-form-item
         label="位置"
         name="pageId"
@@ -55,13 +62,6 @@
           v-model:value="form.sortNumber"
         />
       </a-form-item>
-      <a-form-item label="描述" name="comments">
-        <a-input
-          allow-clear
-          placeholder="网站名称"
-          v-model:value="form.comments"
-        />
-      </a-form-item>
     </a-form>
   </ele-modal>
 </template>
@@ -77,6 +77,8 @@
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
   import { FileRecord } from '@/api/system/file/model';
   import { uuid } from 'ele-admin-pro';
+  import { Design } from "@/api/cms/design/model";
+  import { MpPages } from "@/api/cms/mpPages/model";
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -104,8 +106,9 @@
     type: 0,
     name: undefined,
     value: undefined,
+    pageId: 0,
+    pageName: undefined,
     comments: '',
-    status: 0,
     sortNumber: 100
   });
 
@@ -154,6 +157,11 @@
     form.type = 0;
   };
 
+  const choosePageId = (data: MpPages) => {
+    form.pageName = data.title;
+    form.pageId = data.id;
+  };
+
   /* 保存编辑 */
   const save = () => {
     if (!formRef.value) {
diff --git a/src/views/cms/mpField/index.vue b/src/views/cms/mpField/index.vue
index a95cd58..529f407 100644
--- a/src/views/cms/mpField/index.vue
+++ b/src/views/cms/mpField/index.vue
@@ -20,6 +20,14 @@
               <div class="ele-text-heading">{{ record.name }}</div>
               <span class="ele-text-placeholder">{{ record.comments }}</span>
             </template>
+            <template v-if="column.key === 'pageId'">
+              <span v-if="record.pageId === 0" class="ele-text-placeholder"
+                >全局</span
+              >
+              <span v-else class="ele-text-placeholder">{{
+                record.pageName
+              }}</span>
+            </template>
             <template v-if="column.key === 'value'">
               <a-image
                 v-if="record.type === 1"
@@ -129,6 +137,13 @@
       dataIndex: 'value',
       key: 'value'
     },
+    {
+      title: '位置',
+      dataIndex: 'pageId',
+      key: 'pageId',
+      width: 180,
+      align: 'center'
+    },
     {
       title: '排序',
       dataIndex: 'sortNumber',
diff --git a/src/views/cms/mpPages/index.vue b/src/views/cms/mpPages/index.vue
index 4ee73ea..b8de018 100644
--- a/src/views/cms/mpPages/index.vue
+++ b/src/views/cms/mpPages/index.vue
@@ -57,11 +57,11 @@
               </a-space>
             </template>
           </template>
-          <template #footer>
-            <div class="ele-text-secondary"
-              >仓库地址：http://git.gxwebsoft.com/websoft/nbg-uniapp.git</div
-            >
-          </template>
+<!--          <template #footer>-->
+<!--            <div class="ele-text-secondary"-->
+<!--              >页面设计：可以替换图标和文字。，仓库地址：http://git.gxwebsoft.com/websoft/nbg-uniapp.git</div-->
+<!--            >-->
+<!--          </template>-->
         </ele-pro-table>
       </a-card>