From bbebd180c32a91ff11c5868771cc4b18cfad7f62 Mon Sep 17 00:00:00 2001
From: 边少东 <2879594283@qq.com>
Date: Mon, 11 Jul 2022 11:17:22 +0800
Subject: [PATCH] fix：冲突合并

---
 src/views/Yanxue/achievementsOne.vue | 59 -----------------------------------------------------------
 src/views/Yanxue/chooseSchoolOne.vue | 19 -------------------
 2 files changed, 0 insertions(+), 78 deletions(-)

diff --git a/src/views/Yanxue/achievementsOne.vue b/src/views/Yanxue/achievementsOne.vue
index d44a9dc..c0b75c6 100644
--- a/src/views/Yanxue/achievementsOne.vue
+++ b/src/views/Yanxue/achievementsOne.vue
@@ -17,27 +17,13 @@
         </div>
       </div> -->
 
-<<<<<<< Updated upstream
       <div class="art_card_pic" v-for="(v, i) in newsList" :key="i" @click="toDetails(v.videopic)">
         <div class="art_context" >
-=======
-      <div
-        class="art_card_pic"
-        v-for="(v, i) in newsList"
-        :key="i"
-        @click="toDetails(v.videopic)"
-      >
-        <div class="art_context">
->>>>>>> Stashed changes
           <div class="art_title">{{ v.titleName }}</div>
           <div class="art_bot">
             <div class="redSticky" v-if="v.liul > 1000">置顶</div>
             <div class="greyTime">发布于2022.7.4</div>
-<<<<<<< Updated upstream
             <div class="greyFont">浏览量 {{v.liul}}</div>
-=======
-            <div class="greyFont">浏览量 {{ v.liul }}</div>
->>>>>>> Stashed changes
           </div>
         </div>
         <div class="art_pic">
@@ -56,47 +42,12 @@
 
 <script>
 import Tabbar4 from "@/component/Tabbar4";
-<<<<<<< Updated upstream
 export default {
-=======
-
-export default {
-  dataList: [
-    {
-      titleName: "红馆听老兵爷爷讲故事",
-      liul: 2022,
-      imgpic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/c722b105-9e17-4cc9-8cfd-2c98af72f9ec.png",
-      videopic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/84a71b3e-3f43-425b-bea3-0a75bbffed1d.mp4",
-    },
-    {
-      titleName: "雏鹰小队红色研学",
-      liul: 1120,
-      imgpic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/95cf5713-194f-49ba-8487-7625e2a705fe.png",
-      videopic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/43fb6927-e059-4f59-a3c9-0b1b70d2f10a.mp4",
-    },
-    {
-      titleName: "英才素质拓展训练营",
-      liul: 1120,
-      imgpic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/59876663-e69f-4f54-abd4-901687192a94.png",
-      videopic:
-        "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/6ac9d056-8d59-4bbc-ac99-d44f35557c03.mp4",
-    },
-  ],
->>>>>>> Stashed changes
   components: { Tabbar4 },
   data() {
     return {
       tabsName: 1,
-<<<<<<< Updated upstream
-      newsList: [
-=======
       list1: [
->>>>>>> Stashed changes
         {
           titleName: "假日红色研学——酱文化篇",
           liul: 2022,
@@ -170,15 +121,6 @@ export default {
             "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/cb82b2ed-1f80-48e5-9c39-ef2b0a388aa4.mp4",
         },
       ],
-<<<<<<< Updated upstream
-    };
-  },
-  methods: {
-    //详情新闻
-    toDetails(v) {
-      // sessionStorage.setItem('videopic',v)
-      window.open(v)
-=======
       list2: [
         {
           titleName: "红馆听老兵爷爷讲故事",
@@ -230,7 +172,6 @@ export default {
     toDetails(v) {
       console.log(this.schoolName);
       window.open(v);
->>>>>>> Stashed changes
       // this.$router.push({ name: "pageDetails" });
     },
     //选择
diff --git a/src/views/Yanxue/chooseSchoolOne.vue b/src/views/Yanxue/chooseSchoolOne.vue
index c5bc4e8..52da85c 100644
--- a/src/views/Yanxue/chooseSchoolOne.vue
+++ b/src/views/Yanxue/chooseSchoolOne.vue
@@ -11,11 +11,7 @@
         class="school-one"
         v-for="(v, i) in schoolList"
         :key="i"
-<<<<<<< Updated upstream
-        @click="toActive"
-=======
         @click="toActive(v)"
->>>>>>> Stashed changes
       >
         {{ v.schoolName }}
       </div>
@@ -30,10 +26,7 @@ export default {
       tabsName: 0,
       schoolList: [
         { schoolName: "柯桥区实验小学" },
-<<<<<<< Updated upstream
-=======
         { schoolName: "柯桥区中国轻纺城小学" },
->>>>>>> Stashed changes
       ],
     };
   },
@@ -50,27 +43,15 @@ export default {
     },
   },
   methods: {
-<<<<<<< Updated upstream
-    //详情新闻
-    toDetails() {
-      this.$router.push({ name: "pageDetails" });
-    },
-    toActive() {
-      this.$router.push({ name: "achievementsOne" });
-=======
     toActive(v) {
       this.$router.push({ name: "achievementsOne" ,query: {schoolName: v.schoolName}});
->>>>>>> Stashed changes
     },
     //切换
     tabsChange() {},
     getList() {
       this.schoolList = [
         { schoolName: "柯桥区实验小学" },
-<<<<<<< Updated upstream
-=======
         { schoolName: "柯桥区中国轻纺城小学" },
->>>>>>> Stashed changes
       ];
     },
   },
--
libgit2 0.21.0