SxhGroup / sxhPersonalCenterZLB

Download as
Browse Code »

Commit 3b415d6c2be57e6a62ab1e712ef7f8720f155cf3

Authored by 边
1 parent 5f193f92
Exists in master

fix：红色网上游

Showing 2 changed files with 120 additions and 0 deletions   Show diff stats
src/views/Yanxue/achievementsOne.vue
  Diff comments   View file @3b415d6
@@ -17,13 +17,27 @@ @@ -17,13 +17,27 @@
17 </div> 17 </div>
18 </div> --> 18 </div> -->
19 19
  20 +<<<<<<< Updated upstream
20 <div class="art_card_pic" v-for="(v, i) in newsList" :key="i" @click="toDetails(v.videopic)"> 21 <div class="art_card_pic" v-for="(v, i) in newsList" :key="i" @click="toDetails(v.videopic)">
21 <div class="art_context" > 22 <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
22 <div class="art_title">{{ v.titleName }}</div> 32 <div class="art_title">{{ v.titleName }}</div>
23 <div class="art_bot"> 33 <div class="art_bot">
24 <div class="redSticky" v-if="v.liul > 1000">置顶</div> 34 <div class="redSticky" v-if="v.liul > 1000">置顶</div>
25 <div class="greyTime">发布于2022.7.4</div> 35 <div class="greyTime">发布于2022.7.4</div>
  36 +<<<<<<< Updated upstream
26 <div class="greyFont">浏览量 {{v.liul}}</div> 37 <div class="greyFont">浏览量 {{v.liul}}</div>
  38 +=======
  39 + <div class="greyFont">浏览量 {{ v.liul }}</div>
  40 +>>>>>>> Stashed changes
27 </div> 41 </div>
28 </div> 42 </div>
29 <div class="art_pic"> 43 <div class="art_pic">
@@ -42,12 +56,47 @@ @@ -42,12 +56,47 @@
42 56
43 <script> 57 <script>
44 import Tabbar4 from "@/component/Tabbar4"; 58 import Tabbar4 from "@/component/Tabbar4";
  59 +<<<<<<< Updated upstream
45 export default { 60 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
46 components: { Tabbar4 }, 91 components: { Tabbar4 },
47 data() { 92 data() {
48 return { 93 return {
49 tabsName: 1, 94 tabsName: 1,
  95 +<<<<<<< Updated upstream
50 newsList: [ 96 newsList: [
  97 +=======
  98 + list1: [
  99 +>>>>>>> Stashed changes
51 { 100 {
52 titleName: "假日红色研学——酱文化篇", 101 titleName: "假日红色研学——酱文化篇",
53 liul: 2022, 102 liul: 2022,
@@ -121,6 +170,7 @@ export default { @@ -121,6 +170,7 @@ export default {
121 "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/cb82b2ed-1f80-48e5-9c39-ef2b0a388aa4.mp4", 170 "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/cb82b2ed-1f80-48e5-9c39-ef2b0a388aa4.mp4",
122 }, 171 },
123 ], 172 ],
  173 +<<<<<<< Updated upstream
124 }; 174 };
125 }, 175 },
126 methods: { 176 methods: {
@@ -128,6 +178,59 @@ export default { @@ -128,6 +178,59 @@ export default {
128 toDetails(v) { 178 toDetails(v) {
129 // sessionStorage.setItem('videopic',v) 179 // sessionStorage.setItem('videopic',v)
130 window.open(v) 180 window.open(v)
  181 +=======
  182 + list2: [
  183 + {
  184 + titleName: "红馆听老兵爷爷讲故事",
  185 + liul: 1684,
  186 + imgpic:
  187 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/c722b105-9e17-4cc9-8cfd-2c98af72f9ec.png",
  188 + videopic:
  189 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/84a71b3e-3f43-425b-bea3-0a75bbffed1d.mp4",
  190 + },
  191 + {
  192 + titleName: "雏鹰小队红色研学",
  193 + liul: 450,
  194 + imgpic:
  195 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/95cf5713-194f-49ba-8487-7625e2a705fe.png",
  196 + videopic:
  197 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/43fb6927-e059-4f59-a3c9-0b1b70d2f10a.mp4",
  198 + },
  199 + {
  200 + titleName: "英才素质拓展训练营",
  201 + liul: 655,
  202 + imgpic:
  203 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/59876663-e69f-4f54-abd4-901687192a94.png",
  204 + videopic:
  205 + "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/null/6ac9d056-8d59-4bbc-ac99-d44f35557c03.mp4",
  206 + },
  207 + ],
  208 + newsList: [],
  209 + };
  210 + },
  211 + computed: {
  212 + schoolName() {
  213 + return this.$route.query.schoolName;
  214 + },
  215 + },
  216 + watch: {
  217 + schoolName: {
  218 + handler: function (v, k) {
  219 + if (v == "柯桥区中国轻纺城小学") {
  220 + this.newsList = JSON.parse(JSON.stringify(this.list2));
  221 + } else {
  222 + this.newsList = JSON.parse(JSON.stringify(this.list1));
  223 + }
  224 + },
  225 + immediate: true,
  226 + },
  227 + },
  228 + methods: {
  229 + //详情新闻
  230 + toDetails(v) {
  231 + console.log(this.schoolName);
  232 + window.open(v);
  233 +>>>>>>> Stashed changes
131 // this.$router.push({ name: "pageDetails" }); 234 // this.$router.push({ name: "pageDetails" });
132 }, 235 },
133 //选择 236 //选择
src/views/Yanxue/chooseSchoolOne.vue
  Diff comments   View file @3b415d6
@@ -11,7 +11,11 @@ @@ -11,7 +11,11 @@
11 class="school-one" 11 class="school-one"
12 v-for="(v, i) in schoolList" 12 v-for="(v, i) in schoolList"
13 :key="i" 13 :key="i"
  14 +<<<<<<< Updated upstream
14 @click="toActive" 15 @click="toActive"
  16 +=======
  17 + @click="toActive(v)"
  18 +>>>>>>> Stashed changes
15 > 19 >
16 {{ v.schoolName }} 20 {{ v.schoolName }}
17 </div> 21 </div>
@@ -26,6 +30,10 @@ export default { @@ -26,6 +30,10 @@ export default {
26 tabsName: 0, 30 tabsName: 0,
27 schoolList: [ 31 schoolList: [
28 { schoolName: "柯桥区实验小学" }, 32 { schoolName: "柯桥区实验小学" },
  33 +<<<<<<< Updated upstream
  34 +=======
  35 + { schoolName: "柯桥区中国轻纺城小学" },
  36 +>>>>>>> Stashed changes
29 ], 37 ],
30 }; 38 };
31 }, 39 },
@@ -42,18 +50,27 @@ export default { @@ -42,18 +50,27 @@ export default {
42 }, 50 },
43 }, 51 },
44 methods: { 52 methods: {
  53 +<<<<<<< Updated upstream
45 //详情新闻 54 //详情新闻
46 toDetails() { 55 toDetails() {
47 this.$router.push({ name: "pageDetails" }); 56 this.$router.push({ name: "pageDetails" });
48 }, 57 },
49 toActive() { 58 toActive() {
50 this.$router.push({ name: "achievementsOne" }); 59 this.$router.push({ name: "achievementsOne" });
  60 +=======
  61 + toActive(v) {
  62 + this.$router.push({ name: "achievementsOne" ,query: {schoolName: v.schoolName}});
  63 +>>>>>>> Stashed changes
51 }, 64 },
52 //切换 65 //切换
53 tabsChange() {}, 66 tabsChange() {},
54 getList() { 67 getList() {
55 this.schoolList = [ 68 this.schoolList = [
56 { schoolName: "柯桥区实验小学" }, 69 { schoolName: "柯桥区实验小学" },
  70 +<<<<<<< Updated upstream
  71 +=======
  72 + { schoolName: "柯桥区中国轻纺城小学" },
  73 +>>>>>>> Stashed changes
57 ]; 74 ];
58 }, 75 },
59 }, 76 },