From c0b25894cbc85ba21f41478deca967a366da7928 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 20 Aug 2024 16:28:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=93=BE=E6=8E=A5=E6=8E=A5=E5=8F=A3=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=20sws=202024-08-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/url-value/index.vue     |  4 +--
 .../common/url-value/url-value-dialog.vue     | 13 ++++++++--
 .../model-article-tabs-content.vue            | 25 ++++++++++++-------
 .../components/main/default/article-tabs.ts   | 12 ++++-----
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/components/common/url-value/index.vue b/src/components/common/url-value/index.vue
index 0e994acc..f1c36e98 100644
--- a/src/components/common/url-value/index.vue
+++ b/src/components/common/url-value/index.vue
@@ -1,4 +1,4 @@
-<!-- 上传组件 -->
+<!-- 链接组件 -->
 <template>
     <div class="flex-row align-c gap-10 br-d radius-sm plr-11 url-value-input" @click="dialogVisible = true">
         <div class="flex-1 flex-width size-12 text-line-1">
@@ -40,7 +40,7 @@ const props = defineProps({
     },
 });
 const modelValue = defineModel({ type: Object, default: {} });
-const dialogVisible = defineModel('visibleDialog', { type: Boolean, default: false });
+const dialogVisible = defineModel('dialogVisible', { type: Boolean, default: false });
 //#endregion 链接清空-------------------------------------------------start
 const clear_model_value = () => {
     modelValue.value = {};
diff --git a/src/components/common/url-value/url-value-dialog.vue b/src/components/common/url-value/url-value-dialog.vue
index f7eabdbf..0afe1cb8 100644
--- a/src/components/common/url-value/url-value-dialog.vue
+++ b/src/components/common/url-value/url-value-dialog.vue
@@ -93,8 +93,13 @@ const init = () => {
                 init_data.value = res.data;
                 base_data.value = res.data.page_link_list;
                 if (res.data.page_link_list.length > 0) {
-                    link_select.value = res.data.page_link_list[0].type;
+                    if (props.type.length == 0) {
+                        link_select.value = res.data.page_link_list[0].type;
+                    } else {
+                        link_select.value = props.type[0];
+                    }
                 }
+                console.log(link_select.value);
                 url_value_store.set_url_value(res.data);
             })
             .catch(() => {
@@ -104,7 +109,11 @@ const init = () => {
         init_data.value = url_value_store.url_value;
         base_data.value = url_value_store.url_value.page_link_list;
         if (url_value_store.url_value.page_link_list.length > 0) {
-            link_select.value = url_value_store.url_value.page_link_list[0].type || '';
+            if (props.type.length == 0) {
+                link_select.value = url_value_store.url_value.page_link_list[0].type || '';
+            } else {
+                link_select.value = props.type[0];
+            }
         }
     }
 };
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 3e733317..fac6e54e 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -40,16 +40,14 @@
                                             <drag :data="row.article_list" :space-col="20" @remove="article_list_remove" @on-sort="article_list_sort">
                                                 <template #default="scoped">
                                                     <upload v-model="scoped.row.new_url" :limit="1" size="40" styles="2"></upload>
-                                                    <el-image :src="scoped.row.url" fit="contain" class="img">
+                                                    <el-image :src="scoped.row.link.cover" fit="contain" class="img">
                                                         <template #error>
                                                             <div class="bg-f5 flex-row jc-c align-c radius h w">
                                                                 <icon name="error-img" size="16" color="9"></icon>
                                                             </div>
                                                         </template>
                                                     </el-image>
-                                                    <div class="flex-1 flex-width">
-                                                        <url-value v-model="scoped.row.link"></url-value>
-                                                    </div>
+                                                    <div class="flex-1 flex-width text-line-2 size-12 self-s">{{ scoped.row.link.title }}</div>
                                                 </template>
                                             </drag>
                                             <el-button class="mtb-20 w" @click="article_add(index)">+添加</el-button>
@@ -62,7 +60,7 @@
                                             </el-select>
                                         </el-form-item>
                                         <el-form-item label="显示数量">
-                                            <el-input v-model="row.number" placeholder="请输入显示数量" clearable />
+                                            <el-input v-model="row.number" type="number" placeholder="请输入显示数量" clearable />
                                         </el-form-item>
                                         <el-form-item label="排序类型">
                                             <el-radio-group v-model="row.sort">
@@ -94,6 +92,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <url-value-dialog v-model:dialog-visible="urlValueDialogVisible" :is-url-oprate="false" :type="['article']" @update:model-value="url_value_dialog_call_back"></url-value-dialog>
     </div>
 </template>
 <script setup lang="ts">
@@ -141,6 +140,8 @@ const base_list = reactive({
         { name: '浏览量', value: '1' },
     ],
 });
+// 开启关闭链接
+const urlValueDialogVisible = ref(false);
 const active_index = ref(0);
 const tabs_list_click = (item: any, index: number) => {
     active_index.value = index;
@@ -158,7 +159,7 @@ const tabs_add = () => {
         id: get_math(),
         title: '',
         desc: '',
-        article_check: '1',
+        article_check: '0',
         article_type: [],
         number: 4,
         sort: '0',
@@ -176,13 +177,19 @@ const article_list_remove = (index: number) => {
 const article_list_sort = (item: any) => {
     // emit('update:value', item);
 };
+
+const article_index = ref(0);
 const article_add = (index: number) => {
-    console.log(index);
-    form.tabs_list[index].article_list.push({
+    urlValueDialogVisible.value = true;
+    article_index.value = index;
+};
+const url_value_dialog_call_back = (item: any) => {
+    console.log(item);
+    form.tabs_list[article_index.value].article_list.push({
         id: get_math(),
         src: 'carousel',
         new_url: [],
-        link: {},
+        link: item,
     });
 };
 </script>
diff --git a/src/layout/components/main/default/article-tabs.ts b/src/layout/components/main/default/article-tabs.ts
index 98e2218d..9c8316f1 100644
--- a/src/layout/components/main/default/article-tabs.ts
+++ b/src/layout/components/main/default/article-tabs.ts
@@ -58,12 +58,12 @@ const defaultArticleTabs: DefaultArticleTabs = {
         tabs_top_up: true,
         article_style: '0',
         tabs_list: [
-            { id: '1', title: '热门推荐', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '2', title: '测试一', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '3', title: '测试二', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '4', title: '测试三', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '5', title: '测试四', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
-            { id: '6', title: '测试五', desc: '简介', article_check: '1', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '1', title: '热门推荐', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '2', title: '测试一', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '3', title: '测试二', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '4', title: '测试三', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '5', title: '测试四', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
+            { id: '6', title: '测试五', desc: '简介', article_check: '0', article_type: [], number: 4, sort: '0', sort_rules: '0', is_img_show: true, article_list: [] },
         ],
         is_show: ['0', '1'],
     },