修复错误

修复错误

src/layout/components/template/pages/class/sector.vue

@@ -231,7 +231,6 @@
             </div>
             <div class="sectorItemTitle">新闻图文组合3</div>
         </div> -->
-<<<<<<< HEAD
 
 
 
@@ -249,20 +248,6 @@
                 <img :src="this.$store.state.template.sectorList.newsTextTabsImgSectorClass.sectorImg"/>
             </div>
             <div class="sectorItemTitle">{{this.$store.state.template.sectorList.newsTextTabsImgSectorClass.sectorName}}</div>
-=======
-        <!-- 频道页-皮肤7-通栏版式-带选项卡图文组合 newsTextTabsImgSector-->
-        <div v-if="this.$store.state.template.sectorList.newsTextTabsImgSector" class="sectorItemBox"
-            @click="addModule('newsTextTabsImgSector', 118, newsTextTabsImgSector)"
-            @drag="drag('newsTextTabsImgSector', 118, newsTextTabsImgSector)"
-            @dragend="dragend('newsTextTabsImgSector', 118, newsTextTabsImgSector)"
-            @mouseenter="componentPreviewStatus(true, $store.state.template.sectorList.newsTextTabsImgSector.sectorImg)"
-            @mouseleave="componentPreviewStatus(false, '')">
-            <div class="sectorItem">
-                <img :src="this.$store.state.template.sectorList.newsTextTabsImgSector.sectorImg" />
-            </div>
-            <div class="sectorItemTitle">{{ this.$store.state.template.sectorList.newsTextTabsImgSector.sectorName }}
-            </div>
->>>>>>> 2026_1_19_admin_skin_pre
         </div>
         <!-- 14 皮肤7-----热点关注 -->
         <div v-if="this.$store.state.template.sectorList.skinSevenNewsHyjjSector" class="sectorItemBox"
@@ -1136,17 +1121,11 @@ export default {
                 ]
             },
             //模块13 皮肤6不带标题图文组合2 end---------------------------------------->
-<<<<<<< HEAD
 
             
             //选项卡-新闻图文组合4-皮肤7 start-行业聚焦--------------------------------------->
             newsTextTabsImgSectorClass: {
                 "sectorName": "newsTextTabsImgSectorClass",//板块名称
-=======
-            //选项卡-新闻图文组合4-皮肤7 start-   行业聚焦--------------------------------------->
-            newsTextTabsImgSector: {
-                "sectorName": "newsTextTabsImgSector",//板块名称
->>>>>>> 2026_1_19_admin_skin_pre
                 "componentList": [
                     {
                         "component_type": 1,
@@ -1164,7 +1143,6 @@ export default {
                                 "imgSize": "",
                                 "textSize": ""
                             },
-<<<<<<< HEAD
                             "listType": [
                                 "id",
                                 "title",
@@ -1180,15 +1158,11 @@ export default {
                                 "pinyin"
                             ],
                         }
-=======
-                        ]
->>>>>>> 2026_1_19_admin_skin_pre
                     },
                     {
                         "component_type": 1,
                         "component_style": 1,
                         "sort": 2,
-<<<<<<< HEAD
                         "componentData": {
                             "category_id":"",
                             "category_arr":"",
@@ -1218,39 +1192,6 @@ export default {
                         }
                     },
                     {
-=======
-                        "componentData": [
-                            {
-                                "category_id": "",
-                                "category_arr": "",
-                                "name": "自动生成",
-                                "level": "",
-                                "imgSize": 0,
-                                "textSize": 5,
-                                "child": {
-                                    "id": "",
-                                    "imgSize": "",
-                                    "textSize": ""
-                                },
-                                "listType": [
-                                    "id",
-                                    "title",
-                                    "imgurl",
-                                    "author",
-                                    "updated_at",
-                                    "introduce",
-                                    "islink",
-                                    "linkurl",
-                                    "copyfrom",
-                                    "cat_arr_id",
-                                    "catid",
-                                    "pinyin"
-                                ],
-                            },
-                        ]
-                    },
-                    {//选项卡-皮肤7
->>>>>>> 2026_1_19_admin_skin_pre
                         "component_type": 1,
                         "component_style": 1,
                         "sort": 3,
@@ -1266,7 +1207,6 @@ export default {
                                 "imgSize": "",
                                 "textSize": ""
                             },
-<<<<<<< HEAD
                             "listType": [
                                 "id",
                                 "title",
@@ -1282,36 +1222,6 @@ export default {
                                 "pinyin"
                             ],
                         }
-=======
-                            {
-                                "category_id": "",
-                                "category_arr": "",
-                                "name": "自动生成",
-                                "level": "",
-                                "imgSize": 3,
-                                "textSize": 10,
-                                "child": {
-                                    "id": "",
-                                    "imgSize": "",
-                                    "textSize": ""
-                                },
-                                "listType": [
-                                    "id",
-                                    "title",
-                                    "imgurl",
-                                    "author",
-                                    "updated_at",
-                                    "introduce",
-                                    "islink",
-                                    "linkurl",
-                                    "copyfrom",
-                                    "cat_arr_id",
-                                    "catid",
-                                    "pinyin"
-                                ],
-                            }
-                        ]
->>>>>>> 2026_1_19_admin_skin_pre
                     },
                     {
                         "component_type": 1,
@@ -1329,7 +1239,6 @@ export default {
                                 "imgSize": "",
                                 "textSize": ""
                             },
-<<<<<<< HEAD
                             "listType": [
                                 "id",
                                 "title",
@@ -1346,10 +1255,6 @@ export default {
                             ],
                         }
                     }
-=======
-                        ]
-                    },
->>>>>>> 2026_1_19_admin_skin_pre
                 ]
             },
             // 皮肤7-热点关注

src/views/template/page/pageClass.vue

@@ -163,11 +163,7 @@ import ChannelNewsPhoto from '../style/sector/body/index/list/1200x400/6.vue';
 import ChannelNewsAndPhoto from '../style/sector/body/index/list/1200x480/6_2.vue';
 //新闻图文组合4-皮肤7-带选项卡图文组合 行业聚焦
 // import newsTextTabsImgSector from '../style/sector/body/index/list/1200x480/6_2.vue';
-<<<<<<< HEAD
 import newsTextTabsImgSectorClass from '../style/sector/body/class/list/1200x1150/7/1.vue';
-=======
-import newsTextTabsImgSector from '../style/sector/body/index/list/1200x1150/7/2.vue';
->>>>>>> 2026_1_19_admin_skin_pre
 //14 皮肤7-------------------------------------------------------------热点关注>
 import skinSevenNewsHyjjSector from '../style/sector/body/index/list/1200x720/7/2.vue';
 //   皮肤7-合并为一个组件的焦点图通栏  轮播图
@@ -199,11 +195,7 @@ export default {
         ChannelNewsSector,// 皮肤6 不带标题图文组合1
         ChannelNewsPhoto,// 皮肤6 带标题图文组合2
         ChannelNewsAndPhoto,// 皮肤6 不带标题图文组合2
-<<<<<<< HEAD
         newsTextTabsImgSectorClass,//新闻图文组合-频道页专用   行业聚焦
-=======
-        newsTextTabsImgSector,//新闻图文组合4-皮肤7-通栏版式-带选项卡图文组合   行业聚焦
->>>>>>> 2026_1_19_admin_skin_pre
         skinSevenNewsHyjjSector,//14 皮肤7-----热点关注>
         scrollTextImgSevenSkinchannelSector,//14 皮肤7-合并为一个组件的焦点图通栏  轮播图
         channelNavigationSector,//14 皮肤7-合并为一个组件的频道菜单-子导航菜单
@@ -311,11 +303,7 @@ export default {
     //margin-bottom: 20px;
     //border: 2px dashed #eee;
 }
-<<<<<<< HEAD
 .fixedBg{
-=======
-.fixedBg {
->>>>>>> 2026_1_19_admin_skin_pre
     width: 100%;
     height: 720px;
     position: absolute;
@@ -419,9 +407,5 @@ export default {
 ::v-deep .shadowBox .el-button--mini.is-circle {
     border-radius: 50% !important;
 }
-<<<<<<< HEAD
 //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
 </style>
-=======
-//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>
->>>>>>> 2026_1_19_admin_skin_pre