From 1399205cf6dfde309cce67823467298556dfa50f Mon Sep 17 00:00:00 2001
From: 边 <2879594283@qq.com>
Date: Mon, 10 Apr 2023 11:59:30 +0800
Subject: [PATCH] feat：研学成果改版

---
 src/assets/Travel/cardBox.png        | Bin 0 -> 175664 bytes
 src/assets/Travel/dz.png             | Bin 0 -> 1015 bytes
 src/assets/Travel/ll.png             | Bin 0 -> 1162 bytes
 src/assets/Travel/schoolBox.png      | Bin 0 -> 4654 bytes
 src/assets/changeSchool.png          | Bin 32997 -> 0 bytes
 src/assets/changeSchool1.png         | Bin 0 -> 32997 bytes
 src/router/index.js                  |   1 +
 src/store/index.js                   |   3 +--
 src/views/Yanxue/achievementsOne.vue | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 src/views/Yanxue/chooseSchoolOne.vue | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
 10 files changed, 189 insertions(+), 134 deletions(-)
 create mode 100644 src/assets/Travel/cardBox.png
 create mode 100644 src/assets/Travel/dz.png
 create mode 100644 src/assets/Travel/ll.png
 create mode 100644 src/assets/Travel/schoolBox.png
 create mode 100644 src/assets/changeSchool1.png

diff --git a/src/assets/Travel/cardBox.png b/src/assets/Travel/cardBox.png
new file mode 100644
index 0000000..1728f27
Binary files /dev/null and b/src/assets/Travel/cardBox.png differ
diff --git a/src/assets/Travel/dz.png b/src/assets/Travel/dz.png
new file mode 100644
index 0000000..a7a931c
Binary files /dev/null and b/src/assets/Travel/dz.png differ
diff --git a/src/assets/Travel/ll.png b/src/assets/Travel/ll.png
new file mode 100644
index 0000000..22054a5
Binary files /dev/null and b/src/assets/Travel/ll.png differ
diff --git a/src/assets/Travel/schoolBox.png b/src/assets/Travel/schoolBox.png
new file mode 100644
index 0000000..268d8bf
Binary files /dev/null and b/src/assets/Travel/schoolBox.png differ
diff --git a/src/assets/changeSchool.png b/src/assets/changeSchool.png
index ff4e686..1c85402 100644
Binary files a/src/assets/changeSchool.png and b/src/assets/changeSchool.png differ
diff --git a/src/assets/changeSchool1.png b/src/assets/changeSchool1.png
new file mode 100644
index 0000000..ff4e686
Binary files /dev/null and b/src/assets/changeSchool1.png differ
diff --git a/src/router/index.js b/src/router/index.js
index e074f44..28edfd1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,6 +43,7 @@ import dayStudy from '@/views/dayStudy/dayStudy.vue' //每日一习主页面
 import studyList from '@/views/dayStudy/studyList.vue' //每日一习主页面
 import ans_question from '@/views/answerRank/ans_question.vue' //答题
 import switchUser from '@/views/answerRank/switchUser.vue' //切换
+import store from '../store'
 
 Vue.use(VueRouter)
 const [routerPush, routerReplace] = [VueRouter.prototype.push, VueRouter.prototype.replace];
diff --git a/src/store/index.js b/src/store/index.js
index 9ee33f0..18ef992 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,8 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
     state: {
-        schoolName: []
-
+        schoolName: ''
     },
     mutations: {
         changeSchool(state, params) {
diff --git a/src/views/Yanxue/achievementsOne.vue b/src/views/Yanxue/achievementsOne.vue
index 50d46a7..59995a5 100644
--- a/src/views/Yanxue/achievementsOne.vue
+++ b/src/views/Yanxue/achievementsOne.vue
@@ -1,11 +1,5 @@
 <template>
     <div class="cardBox">
-        <!-- <van-tabs v-model="tabsName">
-      <van-tab title="红色教育"></van-tab>
-      <van-tab title="劳动教育"></van-tab>
-      <van-tab title="课外实践"></van-tab>
-      <van-tab title="研学旅行"></van-tab>
-    </van-tabs> -->
         <van-tabs v-model="sort" @click="tabsClick">
             <van-tab title="发布时间">发布时间</van-tab>
             <van-tab title="点赞量">点赞量</van-tab>
@@ -15,30 +9,9 @@
             <van-list
                 v-model="loading"
                 :finished="finished"
-                finished-text="没有更多了"
+                :finished-text="finishedText"
                 @load="getData"
             >
-                <!-- <div
-                    class="art_card_pic"
-                    v-for="(v, i) in newsList"
-                    :key="i"
-                    @click="toDetails(v)"
-                >
-                    <div class="art_context">
-                        <div class="art_title">{{ v.titleDesc }}</div>
-                        <div class="art_bot">
-                            <div class="greyTime">
-                                点赞量 {{ v.likeNumber }}
-                            </div>
-                            <div class="greyFont">
-                                浏览量 {{ v.readNumber }}
-                            </div>
-                        </div>
-                    </div>
-                    <div class="art_pic">
-                        <img :src="v.imgUrl" />
-                    </div>
-                </div> -->
                 <div
                     class="new_card"
                     v-for="(v, i) in newsList"
@@ -50,24 +23,26 @@
                     </div>
                     <div class="new_card_title">{{ v.titleDesc }}</div>
                     <div class="new_card_bot">
-                        <div class="card_bot_L"></div>
+                        <div class="card_bot_L">{{ v.schoolName }}</div>
                         <div class="card_bot_R">
                             <div class="greyTime">
-                                点赞量 {{ v.likeNumber }}
+                                <img src="@/assets/Travel/dz.png" /> {{ v.likeNumber }}
                             </div>
                             <div class="greyFont">
-                                浏览量 {{ v.readNumber }}
+                                <img src="@/assets/Travel/ll.png" /> {{ v.readNumber }}
                             </div>
                         </div>
                     </div>
                 </div>
             </van-list>
-            <div class="orgBtn" @click="toChoose" v-if="!schoolId">点击查看更多研学成果</div>
+            <div class="orgBtn" @click="toChoose" v-if="!schoolId">
+                点击查看更多研学成果
+            </div>
         </div>
 
         <van-empty description="暂无数据" v-else />
 
-        <div class="imgPic" @click="toChoose" v-if="schoolId">
+        <div class="imgPic" @click="toQueryNull" v-if="schoolId">
             <img src="@/assets/changeSchool.png" />
         </div>
 
@@ -81,7 +56,6 @@ export default {
     components: { Tabbar4 },
     data() {
         return {
-            tabsName: 1,
             newsList: [],
             pageNum: 1,
             pageSize: 10,
@@ -91,9 +65,12 @@ export default {
         };
     },
     computed: {
-      schoolId() {
-        return this.$route.query.schoolId ? this.$route.query.schoolId : ''
-      }
+        schoolId() {
+            return this.$route.query.schoolId ? this.$route.query.schoolId : "";
+        },
+        finishedText() {
+            return this.$route.query.schoolId ? '没有更多数据了': "";
+        }
     },
     methods: {
         //详情新闻
@@ -107,6 +84,11 @@ export default {
         toChoose() {
             this.$router.push({ name: "chooseSchoolOne" });
         },
+        //选择
+        toQueryNull() {
+            this.$router.push({ name: "achievementsOne" });
+            location.reload()
+        },
         tabsClick() {
             this.newsList = [];
             this.pageNum = 1;
@@ -118,11 +100,11 @@ export default {
             // let schoolId = this.$route.query.schoolId
             //     ? this.$route.query.schoolId
             //     : "";
-            let pageSize = this.pageSize
-            let pageNum = this.pageNum
-            if(!this.schoolId){
-              pageSize = 10
-              pageNum = 1
+            let pageSize = this.pageSize;
+            let pageNum = this.pageNum;
+            if (!this.schoolId) {
+                pageSize = 10;
+                pageNum = 1;
             }
             this.yxAxios
                 .get(
@@ -133,18 +115,17 @@ export default {
                 )
                 .then((res) => {
                     if (res.data.code == 200) {
-                        if(!this.schoolId) {
-                          this.loading = false;
-                          this.newsList = res.data.data.list
-                          this.finished = true;
-                          return
+                        if (!this.schoolId) {
+                            this.loading = false;
+                            this.newsList = res.data.data.list;
+                            this.finished = true;
+                            return;
                         }
 
                         this.newsList = this.newsList.concat(
                             res.data.data.list
                         );
                         this.loading = false;
-                        
 
                         if (
                             this.pageSize * this.pageNum >=
@@ -174,7 +155,7 @@ export default {
 .cardBox {
     padding: 2vw 0;
     box-sizing: border-box;
-    background-color: #FEFEFE;
+    background-color: #fefefe;
 
     .contextBox {
         margin-top: 20px;
@@ -332,29 +313,53 @@ export default {
                         color: #999;
                         font-size: 24px;
                         margin: 0;
+                        max-width: 20vw;
+                        white-space: nowrap; //文本强制不换行；
+                        text-overflow: ellipsis; //文本溢出显示省略号；
+                        overflow: hidden; //溢出的部分隐藏；
+                        -webkit-line-clamp: 2;
+                        display: flex;
+                        align-items: center;
+
+                        img {
+                            width: 24px;
+                            margin-right: 7px;
+                        }
                     }
 
                     .greyFont {
                         color: #999;
                         font-size: 24px;
                         margin-left: 20px;
+                        max-width: 20vw;
+                        white-space: nowrap; //文本强制不换行；
+                        text-overflow: ellipsis; //文本溢出显示省略号；
+                        overflow: hidden; //溢出的部分隐藏；
+                        -webkit-line-clamp: 2;
+                        display: flex;
+                        align-items: center;
+
+                        img {
+                            width: 25px;
+                            margin-right: 7px;
+                        }
                     }
                 }
             }
         }
         .orgBtn {
-          width: 80vw;
-          height: 80px;
-          margin-left: 10vw;
-          font-size: 33px;
-          background-color: #ff4444;
-          background: linear-gradient(to right,#FF3737,#FF6825);
-          color: #Fff;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          border-radius: 40px;
-          margin-bottom: 20px;
+            width: 80vw;
+            height: 80px;
+            margin-left: 10vw;
+            font-size: 33px;
+            background-color: #ff4444;
+            background: linear-gradient(to right, #ff3737, #ff6825);
+            color: #fff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-radius: 40px;
+            margin-bottom: 20px;
         }
     }
     .imgPic {
diff --git a/src/views/Yanxue/chooseSchoolOne.vue b/src/views/Yanxue/chooseSchoolOne.vue
index fa291dc..f867f6d 100644
--- a/src/views/Yanxue/chooseSchoolOne.vue
+++ b/src/views/Yanxue/chooseSchoolOne.vue
@@ -1,94 +1,144 @@
 <template>
-  <div class="cardBox">
-    <van-tabs v-model="tabsName" @change="tabsChange">
+    <div class="cardBox">
+        <!-- <van-tabs v-model="tabsName" @change="tabsChange">
       <van-tab title="小学"></van-tab>
       <van-tab title="初中"></van-tab>
       <van-tab title="高中"></van-tab>
-    </van-tabs>
+    </van-tabs> -->
+        <div class="card">
+            <div
+                :class="
+                    [
+                        'card_item',
+                        tabsName == v.value ? 'item_check' : 'item_nocheck',
+                    ].join(' ')
+                "
+                v-for="(v, i) in typelist"
+                :key="i"
+                @click="tabsChange(v)"
+            >
+                {{ v.label }}
+            </div>
+        </div>
+        <div class="line"></div>
 
-    <div class="schoolCss">
-      <div
-        class="school-one"
-        v-for="(v, i) in schoolList"
-        :key="i"
-        @click="toActive(v)"
-      >
-        {{ v.name }}
-      </div>
+        <div  :class="[schoolList.length != 0 ? 'schoolCss' : '']">
+            <div
+                class="school-one"
+                v-for="(v, i) in schoolList"
+                :key="i"
+                @click="toActive(v)"
+            >
+                {{ v.name }}
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-      tabsName: 0,
-      schoolList: [],
-    };
-  },
-  watch: {
-    tabsName(val) {
-      this.schoolList = [];
-      this.getList();
+    data() {
+        return {
+            tabsName: 1,
+            schoolList: [],
+            typelist: [
+                { label: "幼儿园", value: 0 },
+                { label: "小学", value: 1 },
+                { label: "初中", value: 2 },
+                { label: "高中", value: 3 },
+            ],
+        };
     },
-  },
-  methods: {
-    toActive(v) {
-      this.$router.push({
-        name: "achievementsOne",
-        query: { schoolId: v.num },
-      });
+    watch: {
+        tabsName(val) {
+            this.schoolList = [];
+            this.getList();
+        },
     },
-    //切换
-    tabsChange() {},
-    getList() {
-      this.yxAxios
-        .get(`${this.kqUrl}/schoolConsult/schoolList?schoolType=`+ (this.tabsName +1))
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.schoolList = res.data.data;
-            console.log(this.schoolList)
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        });
-      // this.yxAxios
-      //   .post(`${this.dataUrl}/sys/yx/schoolList`, {
-      //     page: 1,
-      //     pageSize: 999,
-      //     schoolType: this.tabsName +1
-      //   })
-      //   .then((res) => {
-      //     if (res.data.success) {
-      //       this.schoolList = res.data.data.list;
-      //     } else {
-      //       this.$toast.fail(res.data.message);
-      //     }
-      //   });
+    methods: {
+        toActive(v) {
+            this.$router.push({
+                name: "achievementsOne",
+                query: { schoolId: v.num },
+            });
+        },
+        //切换
+        tabsChange(v) {
+            this.tabsName = v.value;
+        },
+        getList() {
+            this.yxAxios
+                .get(
+                    `${this.kqUrl}/schoolConsult/schoolList?schoolType=` +
+                        this.tabsName
+                )
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        this.schoolList = res.data.data;
+                        console.log(this.schoolList);
+                    } else {
+                        this.$toast.fail(res.data.message);
+                    }
+                });
+        },
+    },
+    mounted() {
+        this.getList();
     },
-  },
-  mounted() {
-    this.getList();
-  },
 };
 </script>
 
 <style lang="scss" scoped>
 .cardBox {
-  padding: 2vw 0;
-  box-sizing: border-box;
+    padding: 2vw 0;
+    box-sizing: border-box;
+    background: url("~@/assets/Travel/cardBox.png");
+    min-height: 100vh;
+
+    .card {
+        display: flex;
+        justify-content: space-between;
+        padding: 10px 5vw 20px;
+        box-sizing: border-box;
+
+        .card_item {
+            font-size: 4.3vw;
+        }
+        .item_check {
+            font-size: 4.4vw;
+            color: #fff;
+        }
+        .item_nocheck {
+            opacity: 0.5;
+            color: #fff;
+        }
+    }
+    .line {
+        width: 90vw;
+        border-bottom: 1px dashed #fff;
+        margin: 20px 5vw;
+    }
 
-  .schoolCss {
-    font-size: 4.5vw;
-    margin: 5vw;
+    .schoolCss {
+        font-size: 4.5vw;
+        margin: 5vw;
+        padding: 0.5vw 4vw;
+        box-sizing: border-box;
+        border-radius: 20px;
+        background-color: #fff;
 
-    .school-one {
-      margin: 4vw 0;
-      letter-spacing: 0.3vw;
-      color: #666;
-      font-size: 4.3vw;
+        .school-one {
+            width: 100%;
+            margin: 6vw 0;
+            padding: 22px 0 22px 60px;
+            box-sizing: border-box;
+            letter-spacing: 0.3vw;
+            color: #666;
+            font-size: 4.3vw;
+            background: url("~@/assets/Travel/schoolBox.png");
+            -moz-background-size: 100% 100%;
+            background-size: 100% 100%;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.0