Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/resultShow/resultShowDetail.vue

@@ -546,7 +546,7 @@
             document.querySelector(".rs1apply").addEventListener("scroll",(e)=>{
                 let scrollTop = e.target.scrollTop;
                 if(scrollTop>=200){
-                    Nav.style = `width:100%;padding:0 20%;box-sizing: border-box;border-radius:0;display:flex;justify-content: space-around;position: fixed;top:calc(60px - 20px);z-index:99;align-items: center;box-shadow: 0 0 5px gray;`
+                    Nav.style = `width:100%;padding:0 20%;box-sizing: border-box;border-radius:0;display:flex;justify-content: space-around;position: fixed;top:calc(70px - 20px);z-index:99;align-items: center;box-shadow: 0 0 5px gray;`
                 }else if(scrollTop<=100){
                     Nav.style = ``
                 }
@@ -625,6 +625,8 @@
         }
     }
     #Nav{
+        box-sizing: border-box;
+        padding: 0 80px 0 70px;
         width: 60%;
         min-height: 50px;
         background-color: white;