From a6412221b0c62880e83ae491d2301311d34151e2 Mon Sep 17 00:00:00 2001
From: wangxi <982339955@qq.com>
Date: Wed, 8 May 2024 14:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90add=E3=80=91=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xztszzy/views/home.html        |  3 +++
 xztszzy/views/school/item.html | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/xztszzy/views/home.html b/xztszzy/views/home.html
index a79cd3b..9ef365b 100644
--- a/xztszzy/views/home.html
+++ b/xztszzy/views/home.html
@@ -154,6 +154,9 @@
                             parent.userName=$.cookie("person_name");
                             parent.isShow=false;
 //                            document.cookie("person_id", data.person_id, {path:"/"})
+                        }else {
+                            parent.info=response.info;
+
                         }
                     });
                 }
diff --git a/xztszzy/views/school/item.html b/xztszzy/views/school/item.html
index 57342cd..37b0214 100644
--- a/xztszzy/views/school/item.html
+++ b/xztszzy/views/school/item.html
@@ -20,7 +20,7 @@
 
                         </div>
                         <span v-for="(tag,index) in getTags()"
-                              :style="'vertical-align:middle;border-radius:1vh;padding:0 1vh;border:.1vh solid '+tag.color+';color:'+tag.color+';margin:0 .5vh;' ">
+                              :style="'vertical-align:middle;border-radius:5px;padding:0 1vh;border:.1vh solid '+tag.color+';color:'+tag.color+';margin:0 .5vh;' ">
                             {{tag.name}}
                         </span>
                         <div class="c-tab" style="position: absolute;top: 0;right: 1vh;">
@@ -118,8 +118,8 @@
                                 </div>
                             </div>
                             <div class="c-p" @click="show"
-                                 style=" cursor:pointer;box-sizing: border-box; width: 100%; height: 20vh; text-indent:2em;"
-                                 v-html="model.university_desc_unformat">
+                                 style=" cursor:pointer;box-sizing: border-box; width: 100%; height: 20vh; text-indent:2em;-webkit-line-clamp:3"
+                                 v-html="model.university_desc">
                             </div>
                         </div>
                     </div>
@@ -355,7 +355,6 @@
                         <h3 style="text-align:center;margin:1rem 0;" v-if="item.department!==null">
                             {{item.department}}</h3>
                         <div class="c-flex" style="justify-content: flex-start;">
-                          <img/>
                             <div style="box-sizing:border-box; width: 22%; text-align: center; border: 1px solid #B3DBFF;border-radius:5px;margin:3vh 1.5%;padding:2vh;overflow:hidden;"
                                  v-for="i in item.faculty_list">
                                 <h5 v-if="i.faculty!==null" class="c-ellipsis"
@@ -1003,7 +1002,7 @@
                             case '教育部直属':
                                 return arr.push({name: i.detail, color: '#87e997'});
                             case '研究生院':
-                                return arr.push({name: i.detail, color: '#F6A69B'});
+                                return arr.push({name: i.detail, color: '#f6c953'});
                             case '示范性高职':
                                 return arr.push({name: i.detail, color: '#f793d8'});
                             case '骨干高职':
@@ -1096,7 +1095,7 @@
 
             more() {
                 this.close();
-                this.tab.current = 2;
+                this.tab.current = 4;
             },
             isVideo(src) {
                 return src.endsWith('.mp4') || src.endsWith('.webm');