Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/resources/static/impression/css/imperssion.css

@@ -81,6 +81,7 @@ a {
     border: 0;
     padding-left: 10px;
 }
+
 .headSearch_left>input::-webkit-input-placeholder {
     color: #E3E2E2;
 }
@@ -120,12 +121,14 @@ a {
     height: 29px;
     margin-top: 10px;
 }
-.navigation{
+
+.navigation {
     position: absolute;
     width: 100%;
     background: rgba(255, 255, 255, 0.5);
     z-index: 20;
 }
+
 .navigation>ul {
     width: 48%;
     height: 45px;
@@ -198,7 +201,7 @@ a {
     top: 8vh;
     left: -3vh;
     font-size: 24px;
-    background: rgba(50,44,38, 0.64);
+    background: rgba(50, 44, 38, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -211,7 +214,7 @@ a {
     top: 8vh;
     left: -7vh;
     font-size: 24px;
-    background: rgba(50,44,38, 0.64);
+    background: rgba(50, 44, 38, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -224,7 +227,7 @@ a {
     left: 3vh;
     top: 0vh;
     font-size: 24px;
-    background: rgba(50,44,38, 0.64);
+    background: rgba(50, 44, 38, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -241,9 +244,11 @@ a {
     left: 0.3%;
 
 }
+
 .block .el-timeline-item:first-child .synopsis {
     height: 0;
 }
+
 .el-timeline-item:nth-child(odd) .transverse {
     width: 200px;
     height: 0;
@@ -306,12 +311,14 @@ a {
     margin-top: -92px;
     color: #47413B;
 }
-.contents img{
+
+.contents img {
     max-width: 500px;
     cursor: pointer;
     border: 10px solid #fff;
     max-height: 350px;
 }
+
 .contents>p {
     text-decoration: overline;
     border-bottom: 1px solid #47413B;
@@ -335,9 +342,11 @@ a {
     font-size: 20px;
     line-height: 10px;
 }
-.popup{
+
+.popup {
     width: 1000px;
 }
+
 .synopsis {
     width: 51%;
     color: #47413B;
@@ -362,12 +371,15 @@ a {
     width: 0;
     height: 0;
 }
-.el-timeline>.el-timeline-item:first-child img{
+
+.el-timeline>.el-timeline-item:first-child img {
     border: 0;
 }
-.el-timeline>.el-timeline-item:last-child img{
+
+.el-timeline>.el-timeline-item:last-child img {
     border: 0;
 }
+
 .footer {
     width: 100%;
     height: 300px;
@@ -427,6 +439,7 @@ a {
     background-repeat: no-repeat;
     background-color: #CBE4EC;
 }
+
 .block .synopsis {
     color: #000;
     width: 27%;
@@ -437,6 +450,7 @@ a {
     overflow: hidden;
     -webkit-line-clamp: 9;
 }
+
 .middle_nav1>ul {
     width: 62%;
     display: flex;
@@ -457,7 +471,7 @@ a {
     top: 7.5vh;
     left: -2vh;
     font-size: 24px;
-    background: rgba(149,61,23, 0.64);
+    background: rgba(149, 61, 23, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -479,7 +493,7 @@ a {
     top: 8vh;
     left: -4vh;
     font-size: 24px;
-    background: rgba(149,61,23, 0.64);
+    background: rgba(149, 61, 23, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -491,7 +505,7 @@ a {
     left: 5vh;
     font-size: 24px;
     top: 0vh;
-    background: rgba(149,61,23, 0.64);
+    background: rgba(149, 61, 23, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -502,7 +516,7 @@ a {
 .middle_nav1>img {
     width: 100%;
     position: relative;
-    z-index:8;
+    z-index: 8;
 }
 
 .block1 {
@@ -522,6 +536,7 @@ a {
 .block1 .el-timeline-item:first-child .synopsis {
     height: 0;
 }
+
 .block1 .el-timeline-item__node--normal {
     left: -8px;
     width: 20px;
@@ -567,7 +582,7 @@ a {
     background: url(../img/bg4.png);
     background-size: 100%;
     background-repeat: no-repeat;
-   background-color:#CCE8F7;
+    background-color: #CCE8F7;
 }
 
 .middle_nav3 {
@@ -596,7 +611,7 @@ a {
     top: 10vh;
     left: -11px;
     font-size: 24px;
-    background: rgba(27,58,123, 0.64);
+    background: rgba(27, 58, 123, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -608,7 +623,7 @@ a {
     top: 10vh;
     left: -1.8vh;
     font-size: 24px;
-    background: rgba(27,58,123, 0.64);
+    background: rgba(27, 58, 123, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -620,7 +635,7 @@ a {
     top: 10.5vh;
     left: -5vh;
     font-size: 24px;
-    background: rgba(27,58,123, 0.64);
+    background: rgba(27, 58, 123, 0.64);
     padding: 10px;
     height: 30px;
     padding-left: 22px;
@@ -654,10 +669,12 @@ a {
     left: 56.4%;
     z-index: 7;
 }
+
 .block2 .el-timeline-item__tail {
     border-left: 5px solid #1B3A7B;
     height: 111.9%;
 }
+
 @media screen and (max-width: 1700px) {
     .block2 {
         width: 64%;
@@ -667,11 +684,13 @@ a {
         left: 56.3%;
         z-index: 1;
     }
+
     .block2 .el-timeline-item__tail {
         height: 111%;
     }
 }
-.block2 .contents>div{
+
+.block2 .contents>div {
     text-align: end;
     /* display: flex;
     flex-direction: row-reverse; */
@@ -747,6 +766,7 @@ a {
 .block2 .el-timeline-item:first-child .synopsis {
     height: 0;
 }
+
 .block2 .el-timeline-item:nth-child(odd) .synopsis {
     padding-left: 10px;
     position: relative;
@@ -760,6 +780,7 @@ a {
     text-align: end;
     left: -1%;
 }
+
 /* end */
 
 
@@ -770,9 +791,11 @@ a {
     background-repeat: no-repeat;
     background-color: #327ACD;
 }
-.eightyYears .middle_title>img{
+
+.eightyYears .middle_title>img {
     padding-bottom: 17px;
 }
+
 .middle_nav4 {
     width: 100%;
     position: relative;
@@ -799,7 +822,7 @@ a {
     top: 9vh;
     left: -2vh;
     font-size: 24px;
-    background: rgba(255,125,19,0.64);
+    background: rgba(255, 125, 19, 0.64);
     height: 34px;
     padding-left: 16px;
     padding-right: 18px;
@@ -810,7 +833,7 @@ a {
     top: 9vh;
     left: -2vh;
     font-size: 24px;
-    background: rgba(255,125,19,0.64);
+    background: rgba(255, 125, 19, 0.64);
     height: 34px;
     padding-left: 16px;
     padding-right: 18px;
@@ -832,7 +855,7 @@ a {
     left: 2vh;
     top: 2vh;
     font-size: 24px;
-    background: rgba(255,125,19,0.64);
+    background: rgba(255, 125, 19, 0.64);
     height: 34px;
     padding-left: 16px;
     padding-right: 18px;
@@ -852,10 +875,12 @@ a {
     top: -35px;
     left: 30.8%;
     z-index: 7;
-} 
-.block3 .el-timeline>.el-timeline-item:nth-child(1){
+}
+
+.block3 .el-timeline>.el-timeline-item:nth-child(1) {
     padding-bottom: 0px;
 }
+
 .block3 .el-timeline-item .transverse {
     width: 100px;
     height: 0;
@@ -864,31 +889,39 @@ a {
     background: #FF7D13;
 
 }
-.block3 .el-timeline>.el-timeline-item:nth-child(1) .synopsis{
+
+.block3 .el-timeline>.el-timeline-item:nth-child(1) .synopsis {
     height: 202px;
 }
-.block3 .el-timeline>.el-timeline-item{
+
+.block3 .el-timeline>.el-timeline-item {
     padding-bottom: 71px;
 }
-.block3 .synopsis{
+
+.block3 .synopsis {
     color: #FFFFFF;
     width: 100%;
     padding: 0;
     /* height: 202px; */
 }
-.block3 .synopsis>div{
+
+.block3 .synopsis>div {
     text-align: left;
 }
+
 .block3 .contents {
     color: #FFFFFF;
     width: 520px;
 }
+
 .block3 .el-timeline-item:first-child .synopsis {
     height: 0;
 }
-.block3 .el-timeline-item:nth-child(odd) .contents>div{
+
+.block3 .el-timeline-item:nth-child(odd) .contents>div {
     text-align: end;
 }
+
 .block3 .contents>p {
     border-bottom: 1px solid #FFFFFF;
 }
@@ -896,6 +929,7 @@ a {
 .block3 .el-timeline-item:nth-child(odd) .el-timeline-item__wrapper {
     left: -55%;
 }
+
 .block3 .transverse {
     color: #FF7D13;
     background-color: #FF7D13;
@@ -923,14 +957,16 @@ a {
 .zj {
     height: 100%;
 }
-.contribute{
+
+.contribute {
     width: 100%;
     height: 100%;
     position: absolute;
     z-index: 99;
     display: none;
 }
-.contribute_content{
+
+.contribute_content {
     width: 43%;
     background: #FFFFFF;
     position: fixed;
@@ -939,7 +975,8 @@ a {
     margin: -21% 0 0 -23%;
     z-index: 10;
 }
-.contribute_content>.contribute_content_title{
+
+.contribute_content>.contribute_content_title {
     width: 80%;
     margin: 2% auto;
     display: flex;
@@ -948,13 +985,15 @@ a {
     align-items: flex-end;
 
 }
-.contribute_content>.contribute_content_title>p{
-    font-size:26px;
+
+.contribute_content>.contribute_content_title>p {
+    font-size: 26px;
     color: #333;
     font-weight: bold;
     line-height: 10px;
 }
-.contribute_content>.contribute_content_title>p>img{
+
+.contribute_content>.contribute_content_title>p>img {
     width: 119px;
     height: 17px;
     display: block;
@@ -962,39 +1001,46 @@ a {
     left: 9.5%;
     z-index: -1;
 }
-.contribute_content>.contribute_content_updata>p{
+
+.contribute_content>.contribute_content_updata>p {
     width: 110px;
     color: red;
 }
-.contribute_content>.contribute_content_updata>p>span{
+
+.contribute_content>.contribute_content_updata>p>span {
     color: #333333;
     font-weight: bold;
     font-size: 0.9vw;
 }
-.contribute_content_updata{
+
+.contribute_content_updata {
     width: 73%;
     display: flex;
     margin-left: 10%;
     padding-top: 3%;
     align-items: center;
 }
-.contribute_content_updata>div{
+
+.contribute_content_updata>div {
     width: 80%;
     height: 30%;
     border: 1px solid #D5D5D5;
     border-radius: 5px;
 }
-.el-upload{
+
+.el-upload {
     width: 99%;
     margin-left: 3px;
     margin-top: 8px;
 }
-.el-upload-dragger{
+
+.el-upload-dragger {
     width: 100%;
     height: 16vh;
     background: #EAEAEA;
 }
-.upPhotograph{
+
+.upPhotograph {
     width: 10vw;
     height: 2vw;
     line-height: 2vw;
@@ -1003,17 +1049,20 @@ a {
     margin: 0 auto;
     margin-top: 5%;
 }
-.el-upload__text{
+
+.el-upload__text {
     padding-top: 10px;
     color: #666 !important;
     font-size: 1vw !important;
 }
-.astrict{
+
+.astrict {
     font-size: 12px !important;
     margin: auto;
     padding-bottom: 30px;
 }
-.contribute_content_updata>textarea{ 
+
+.contribute_content_updata>textarea {
     outline: none;
     padding-left: 10px;
     padding-top: 5px;
@@ -1024,7 +1073,8 @@ a {
     border: 1px solid #D5D5D5;
     border-radius: 5px;
 }
-.notarize{
+
+.notarize {
     width: 219px;
     height: 49px;
     background: #004A93;
@@ -1035,7 +1085,7 @@ a {
     cursor: pointer;
 }
 
-.succee{
+.succee {
     width: 100%;
     margin: 0 auto;
     text-align: center;
@@ -1044,16 +1094,19 @@ a {
     top: 8vh;
     z-index: -1;
 }
-.succee>img{
+
+.succee>img {
     width: 120px;
 }
-.pontoon{
+
+.pontoon {
     position: fixed;
     z-index: 20;
     right: 0;
-    top:50%;
+    top: 50%;
 }
-.pontoon>p{
+
+.pontoon>p {
     width: 110px;
     height: 73px;
     line-height: 73px;
@@ -1067,51 +1120,62 @@ a {
     margin-top: 20px;
     cursor: pointer;
 }
-.contribute_content_updata>.el-input>input{
-    height:3vh;
+
+.contribute_content_updata>.el-input>input {
+    height: 3vh;
     line-height: 3vh;
     border: 0;
 }
-.tel>.el-input{
+
+.tel>.el-input {
     width: 50%;
 }
+
 @media screen and (max-width: 1700px) {
-    .tel>.el-input{
+    .tel>.el-input {
         width: 42%;
     }
 }
+
 @media screen and (max-width: 1360px) {
-    .tel>.el-input{
+    .tel>.el-input {
         width: 42%;
         margin-left: 6px;
     }
+
     .el-radio {
         margin-right: 17px;
     }
 }
-.radioSelect{
+
+.radioSelect {
     border: 0 !important;
     display: flex;
     width: 177px !important;
     justify-content: flex-end;
 }
-.el-checkbox{
+
+.el-checkbox {
     margin-left: 19px;
 }
-.content{
+
+.content {
     display: flex;
     background-color: #fff;
 }
-.content_img>div:nth-child(1)>img{
+
+.content_img>div:nth-child(1)>img {
     max-width: 500px;
     border: 5px solid #EAEAEA;
     max-height: 500px;
 }
-.content_introduce{
+
+.content_introduce {
     margin-left: 20px;
     margin-top: 30px;
 }
-.author{
+
+.author {
     display: flex;
     justify-content: space-evenly;
     float: right;
@@ -1119,43 +1183,54 @@ a {
     margin-right: 4px;
     margin-top: 15px;
 }
-.author>p{
+
+.author>p {
     margin: 0 10px;
 }
-.close{
+
+.close {
     height: 25px;
     position: absolute;
 }
-.close>img{
+
+.close>img {
     position: relative;
     top: -65px;
     left: 1560%;
 }
-.el-date-editor.el-input{
+
+.el-date-editor.el-input {
     width: 100%;
     height: 3vh;
 }
-.el-date-editor .el-input__inner{
+
+.el-date-editor .el-input__inner {
     height: 3vh;
     line-height: 3vh;
 }
-.el-select{
+
+.el-select {
     width: 100%;
 }
-.el-date-editor .el-input__icon{
+
+.el-date-editor .el-input__icon {
     line-height: 1vh;
 }
-.el-select .el-input--suffix input{
+
+.el-select .el-input--suffix input {
     height: 3vh;
     line-height: 3vh;
-} 
-.el-select  .el-input__icon{
+}
+
+.el-select .el-input__icon {
     line-height: 1vh;
 }
+
 .el-message-box__wrapper~.v-modal {
     opacity: 0 !important;
 }
-.el-backtop{
+
+.el-backtop {
     bottom: 320px !important;
     z-index: 999;
 }

nngkxxdp/src/main/resources/static/impression/impression.html

@@ -12,10 +12,8 @@
 
 <body>
     <div class="box" id="app" style="display: none;">
-        <el-button style="display: none;"
-          type="primary"
-          @click="openFullScreen1"
-          v-loading.fullscreen.lock="fullscreenLoading">
+        <el-button style="display: none;" type="primary" @click="openFullScreen1"
+            v-loading.fullscreen.lock="fullscreenLoading">
         </el-button>
         <div class="head">
             <div class="headNav">
@@ -81,16 +79,17 @@
                         <p>我要投稿
                             <img src="img/tiao.png" alt="">
                         </p>
-                        <img src="img/cha.png" alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;width: 19px;"
+                        <img src="img/cha.png" alt=""
+                            style="cursor: pointer;position: relative;left: 8%;top: -47%;width: 19px;"
                             @click="closeContribute">
                     </div>
                     <div class="contribute_content_updata  tel">
                         <p>* <span>作者电话</span></p>
-                        <el-input v-model.number="form.tel"  maxlength="11"  placeholder="请输入电话"></el-input>
+                        <el-input v-model.number="form.tel" maxlength="11" placeholder="请输入电话"></el-input>
                         <div class="radioSelect">
                             <el-radio v-model="radio" label="1">公开</el-radio>
                             <el-radio v-model="radio" label="0">不公开</el-radio>
-                        </div> 
+                        </div>
                     </div>
                     <div class="contribute_content_updata">
                         <p>* <span>作品名称</span></p>
@@ -102,12 +101,13 @@
                         <div class="radioSelect">
                             <el-radio v-model="authors" label="1">匿名</el-radio>
                             <el-radio v-model="authors" label="0">不匿名</el-radio>
-                        </div> 
+                        </div>
                     </div>
                     <div class="contribute_content_updata">
                         <p>* <span>归属日期</span></p>
                         <div style="border: 0;">
-                            <el-date-picker  v-model="form.time" value-format="yyyy-MM-dd" :picker-options="pickerOptions"  placeholder="请选择归属日期" >
+                            <el-date-picker v-model="form.time" value-format="yyyy-MM-dd"
+                                :picker-options="pickerOptions" placeholder="请选择归属日期">
                             </el-date-picker>
                         </div>
                     </div>
@@ -115,11 +115,8 @@
                         <p>* <span>作品年代</span></p>
                         <div style="border: 0;">
                             <el-select v-model="form.years" placeholder="请选择作品年代">
-                                <el-option
-                                  v-for="item in options"
-                                  :key="item.value"
-                                  :label="item.label"
-                                  :value="item.value">
+                                <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
                         </div>
@@ -127,8 +124,8 @@
                     <div class="contribute_content_updata" style="align-items: start;">
                         <p>* <span>我的作品</span></p>
                         <div>
-                            <el-upload :before-remove="beforeRemove" :on-exceed="onExceed" limit=1 class="upload-demo" drag action="/yxnn/uploadDocumet"
-                                :http-request="upRequest">
+                            <el-upload :before-remove="beforeRemove" :on-exceed="onExceed" limit=1 class="upload-demo"
+                                drag action="/yxnn/uploadDocumet" :http-request="upRequest">
                                 <div class="upPhotograph">上传图片</div>
                                 <div class="el-upload__text">点击 / 拖拽一个文件到这里上传</div>
                                 <div class="el-upload__text astrict">支持jpg、png格式，大小在5M以下</div>
@@ -146,7 +143,7 @@
                         <p>我要投稿
                             <img src="img/tiao.png" alt="">
                         </p>
-                        <img src="img/cha.png"  alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;"
+                        <img src="img/cha.png" alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;"
                             @click="closeContribute">
                     </div>
                     <div class="succee">
@@ -169,16 +166,15 @@
                     </ul>
                     <img src="img/time.png" alt="">
                     <div class="block">
-                        <el-timeline >
+                        <el-timeline>
                             <el-timeline-item v-for="(activity, index) in activities" :key="index"
                                 :timestamp="activity.timestamp">
                                 <div class="branch">
                                     <div class="transverse"></div>
                                     <div class="contents">
-                                        <p >{{activity.content}}</p>
+                                        <p>{{activity.content}}</p>
                                         <span>{{activity.time}}</span>
                                         <span>{{activity.author}}</span>
-                                        
                                         <div>
                                             <img :src="activity.img" alt="" @click="openDetails(activity.id)">
                                         </div>
@@ -221,7 +217,6 @@
                                     <div class="synopsis">
                                         <div>{{activity.synopsis}}</div>
                                     </div>
-
                                 </div>
                             </el-timeline-item>
                         </el-timeline>
@@ -258,9 +253,7 @@
                                                 <div>{{activity.synopsis}}</div>
                                             </div>
                                         </div>
-
                                     </div>
-
                                 </div>
                             </el-timeline-item>
                         </el-timeline>
@@ -280,7 +273,7 @@
                     </ul>
                     <img src="img/time3.png" alt="">
                     <div class="block2">
-                        <el-timeline >
+                        <el-timeline>
                             <el-timeline-item v-for="(activity, index) in activities" :key="index"
                                 :timestamp="activity.timestamp">
                                 <div class="transverse"></div>
@@ -295,17 +288,13 @@
                                         <div>
                                             <img :src="activity.img" alt="" @click="openDetails(activity.id)">
                                         </div>
-                                       
                                     </div>
                                 </div>
-                               
                             </el-timeline-item>
                         </el-timeline>
                     </div>
                 </div>
-                
             </div>
-            
         </div>
         <el-backtop></el-backtop>
         <div class="footer">
@@ -332,15 +321,11 @@
                 <img src="./img/tu.png" alt="" style="margin-top: 20px;">
             </div>
         </div>
-
-
-            
     </div>
-   
     <script src="../page/js/constans.js"></script>
     <script src="js/jquery-3.5.1.min.js"></script>
     <script src="js/activejF.js"></script>
-    <script src="js/vuemin.js"></script> 
+    <script src="js/vuemin.js"></script>
     <script src="js/index.js"></script>
     <script src="js/inperssion.js"></script>
     <script>

nngkxxdp/src/main/resources/static/impression/js/inperssion.js

@@ -50,7 +50,6 @@ new Vue({
     created: function () {
         this.openFullScreen1();
         this.getajax();
-        
     },
     methods: {
         beforeLiberation: function () {
@@ -69,7 +68,7 @@ new Vue({
             $('.beforeLiberation').show(2000, function () {
                 $('.middle_nav').fadeIn();
                 $('.beforeLiberation').css("height", "100%");
-            })
+            });
         },
         afterLiberation: function () {
             this.parent.pictureType = 1;
@@ -88,7 +87,6 @@ new Vue({
                 $('.middle_nav1').fadeIn();
                 $('.afterLiberation').css("height", "100%");
             });
-
         },
         eightyYears: function () {
             this.parent.pictureType = 2;
@@ -107,7 +105,6 @@ new Vue({
                 $('.middle_nav4').fadeIn();
                 $('.eightyYears').css("height", "100%");
             });
-
         },
         newCentury: function () {
             this.parent.pictureType = 3;
@@ -132,7 +129,7 @@ new Vue({
             this.isshow = true;
             this.isshows = false;
             $('.contribute').show();
-            $(".contribute_content").css("margin-top", "-21%")
+            $(".contribute_content").css("margin-top", "-21%");
         },
         closeContribute: function () {
             $('.contribute').hide();
@@ -261,7 +258,6 @@ new Vue({
                     } else {
                         _this.$message(json.data);
                     }
-
                 },
                 error: function (err) {
                 }
@@ -294,7 +290,7 @@ new Vue({
                 data: _this.parent,
                 success: function (json) {
                     var content = json.data.data;
-                    _this.count = json.data.count
+                    _this.count = json.data.count;
                     if (content && content.length > 0) {
                         var obj = [];
                         if (_this.parent.page == 1) {
@@ -328,11 +324,9 @@ new Vue({
                                 synopsis: content[i].pictureDescription,
                                 id: content[i].id
                             })
-                            
                         }
                         obj.push([]);
-                        _this.activities.push.apply(_this.activities, obj)
-                       
+                        _this.activities.push.apply(_this.activities, obj);
                     } else {
                         _this.activities = [];
                     }
@@ -353,13 +347,13 @@ new Vue({
             });
         },
         openDetails: function (index) {
-            var _this = this
+            var _this = this;
             $.ajax({
                 type: 'get',
                 url: PATH + '/yxnn/getDocumentByIdFront/' + index,
                 success: function (json) {
                     if (json.data.isAnonymous == 1) {
-                        json.data.pictureAuthor = '佚名'
+                        json.data.pictureAuthor = '佚名';
                     }
                     // var html = `<div class="close " >
                     // <img src="./img/close.png" alt="" >
@@ -394,18 +388,18 @@ new Vue({
                 error: function (err) {
                     _this.loading.close();
                 }
-            })
+            });
         },
         handleScroll() {
             this.scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
             headHeight = $('.head').innerHeight();
             navHeight = $('.nav').innerHeight();
-            var windowHeight = document.documentElement.clientHeight || document.body.clientHeight
+            var windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
             var scrolHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
             var allLimit = Math.ceil(this.count / this.parent.limit)
             if (this.scrollTop + windowHeight >= scrolHeight - headHeight - navHeight) {
                 if (this.parent.page < allLimit) {
-                    this.activities.splice(-1,1),
+                    this.activities.splice(-1, 1);
                     this.parent.page++;
                     this.getajax();
                 }
@@ -413,6 +407,7 @@ new Vue({
         },
     },
     mounted() {
-        window.addEventListener('scroll', this.handleScroll)
+        window.addEventListener('scroll', this.handleScroll);
+        $('html ,body').animate({ scrollTop: 0 });
     },
 })