SxhGroup / sxhPersonalCenterZLB

Download as
Browse Code »

Commit bbebd180c32a91ff11c5868771cc4b18cfad7f62

Authored by 边
1 parent 3b415d6c
Exists in master

fix：冲突合并

Showing 2 changed files with 0 additions and 78 deletions   Show diff stats
src/views/Yanxue/achievementsOne.vue
  Diff comments   View file @bbebd18
... ... @@ -17,27 +17,13 @@
17 17 </div>
18 18 </div> -->
19 19  
20   -<<<<<<< Updated upstream
21 20 <div class="art_card_pic" v-for="(v, i) in newsList" :key="i" @click="toDetails(v.videopic)">
22 21 <div class="art_context" >
23   -=======
24   - <div
25   - class="art_card_pic"
26   - v-for="(v, i) in newsList"
27   - :key="i"
28   - @click="toDetails(v.videopic)"
29   - >
30   - <div class="art_context">
31   ->>>>>>> Stashed changes
32 22 <div class="art_title">{{ v.titleName }}</div>
33 23 <div class="art_bot">
34 24 <div class="redSticky" v-if="v.liul > 1000">置顶</div>
35 25 <div class="greyTime">发布于2022.7.4</div>
36   -<<<<<<< Updated upstream
37 26 <div class="greyFont">浏览量 {{v.liul}}</div>
38   -=======
39   - <div class="greyFont">浏览量 {{ v.liul }}</div>
40   ->>>>>>> Stashed changes
41 27 </div>
42 28 </div>
43 29 <div class="art_pic">
... ... @@ -56,47 +42,12 @@
56 42  
57 43 <script>
58 44 import Tabbar4 from "@/component/Tabbar4";
59   -<<<<<<< Updated upstream
60 45 export default {
61   -=======
62   -
63   -export default {
64   - dataList: [
65   - {
66   - titleName: "红馆听老兵爷爷讲故事",
67   - liul: 2022,
68   - imgpic:
69   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/c722b105-9e17-4cc9-8cfd-2c98af72f9ec.png",
70   - videopic:
71   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/84a71b3e-3f43-425b-bea3-0a75bbffed1d.mp4",
72   - },
73   - {
74   - titleName: "雏鹰小队红色研学",
75   - liul: 1120,
76   - imgpic:
77   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/95cf5713-194f-49ba-8487-7625e2a705fe.png",
78   - videopic:
79   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/43fb6927-e059-4f59-a3c9-0b1b70d2f10a.mp4",
80   - },
81   - {
82   - titleName: "英才素质拓展训练营",
83   - liul: 1120,
84   - imgpic:
85   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/59876663-e69f-4f54-abd4-901687192a94.png",
86   - videopic:
87   - "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/6ac9d056-8d59-4bbc-ac99-d44f35557c03.mp4",
88   - },
89   - ],
90   ->>>>>>> Stashed changes
91 46 components: { Tabbar4 },
92 47 data() {
93 48 return {
94 49 tabsName: 1,
95   -<<<<<<< Updated upstream
96   - newsList: [
97   -=======
98 50 list1: [
99   ->>>>>>> Stashed changes
100 51 {
101 52 titleName: "假日红色研学——酱文化篇",
102 53 liul: 2022,
... ... @@ -170,15 +121,6 @@ export default {
170 121 "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/cb82b2ed-1f80-48e5-9c39-ef2b0a388aa4.mp4",
171 122 },
172 123 ],
173   -<<<<<<< Updated upstream
174   - };
175   - },
176   - methods: {
177   - //详情新闻
178   - toDetails(v) {
179   - // sessionStorage.setItem('videopic',v)
180   - window.open(v)
181   -=======
182 124 list2: [
183 125 {
184 126 titleName: "红馆听老兵爷爷讲故事",
... ... @@ -230,7 +172,6 @@ export default {
230 172 toDetails(v) {
231 173 console.log(this.schoolName);
232 174 window.open(v);
233   ->>>>>>> Stashed changes
234 175 // this.$router.push({ name: "pageDetails" });
235 176 },
236 177 //选择
... ...
src/views/Yanxue/chooseSchoolOne.vue
  Diff comments   View file @bbebd18
... ... @@ -11,11 +11,7 @@
11 11 class="school-one"
12 12 v-for="(v, i) in schoolList"
13 13 :key="i"
14   -<<<<<<< Updated upstream
15   - @click="toActive"
16   -=======
17 14 @click="toActive(v)"
18   ->>>>>>> Stashed changes
19 15 >
20 16 {{ v.schoolName }}
21 17 </div>
... ... @@ -30,10 +26,7 @@ export default {
30 26 tabsName: 0,
31 27 schoolList: [
32 28 { schoolName: "柯桥区实验小学" },
33   -<<<<<<< Updated upstream
34   -=======
35 29 { schoolName: "柯桥区中国轻纺城小学" },
36   ->>>>>>> Stashed changes
37 30 ],
38 31 };
39 32 },
... ... @@ -50,27 +43,15 @@ export default {
50 43 },
51 44 },
52 45 methods: {
53   -<<<<<<< Updated upstream
54   - //详情新闻
55   - toDetails() {
56   - this.$router.push({ name: "pageDetails" });
57   - },
58   - toActive() {
59   - this.$router.push({ name: "achievementsOne" });
60   -=======
61 46 toActive(v) {
62 47 this.$router.push({ name: "achievementsOne" ,query: {schoolName: v.schoolName}});
63   ->>>>>>> Stashed changes
64 48 },
65 49 //切换
66 50 tabsChange() {},
67 51 getList() {
68 52 this.schoolList = [
69 53 { schoolName: "柯桥区实验小学" },
70   -<<<<<<< Updated upstream
71   -=======
72 54 { schoolName: "柯桥区中国轻纺城小学" },
73   ->>>>>>> Stashed changes
74 55 ];
75 56 },
76 57 },
... ...