修改冲突

src/views/knowledge/knowledge/index.vue

@@ -3,8 +3,8 @@ import { useUserStore } from "@/store/modules/user"
 import { ref } from 'vue'
 import { getUserDetail, getZxxyNavis, getTuijian, getCarousel } from '@/api/knowledge/index'
 import Archivestype from '@/views/knowledge/knowledge/components/archivestype.vue'
-import Navili from './components/Navili.vue'
+import Navili from '@/views/knowledge/knowledge/components/Navili.vue'
-import KnowledgeContent from './components/KnowledgeContent.vue'
+import KnowledgeContent from '@/views/knowledge/knowledge/components/KnowledgeContent.vue'
 import { UserQuery, UserDetail, NaviQuery, Navi, Graphicform, PageParam } from '@/api/knowledge/types'
 import { onScroll, scrollTo, formatDate } from '@/api/knowledge/scroll'
 import { useRouter } from 'vue-router'
@@ -195,13 +195,13 @@ function showContentDialog(item:any){
           </div>
 
         </div>
-        <el-pagination class="pagi" v-model:current-page="pageParamTuijian.page" v-if="pageParamTuijian.total > 0"
+        <el-pagination
-          v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total"
+v-if="pageParamTuijian.total > 0" v-model:current-page="pageParamTuijian.page"
+          v-model:page-size="pageParamTuijian.pagesize" layout="prev, pager, next, jumper" :total="pageParamTuijian.total"  class="pagi"
           @current-change="handleCurrentChange" />
       </div>
       <!-- 各知识/新闻分区 -->
-      <Archivestype v-for="(item, index) in naviList" :liContent=item :index=(index) :fatherisReady="fatherisReady"
+      <Archivestype  v-for="(item, index) in naviList" :key="index"   :fatherisReady="fatherisReady" :liContent=item :index=(index) :routerUrl="routerUrl">
-        :routerUrl="routerUrl" >
       </Archivestype>
 
 
@@ -213,7 +213,7 @@ function showContentDialog(item:any){
       <li :class="{ active: active === 0 }" @click="scrollTo(0)">
         推荐
       </li>
-      <Navili v-for="(item, index) in naviList" :class="{ active: active === index+1 }" :oneli=item :index=(index+1)
+      <Navili v-for="(item, index) in naviList" :key="index" :class="{ active: active === index+1 }" :oneli=item :index=(index+1)
         :active=active @click="scrollTo(index+1)"></Navili>
 
     </ul>