Merge remote-tracking branch 'origin/yingdi2.0' into yingdi2.0

src/components/Header.vue

@@ -91,7 +91,7 @@
       },
       // 去个人中心
       toCenter() {
-        this.$router.replace("/myInfo/signUpList");
+        this.$router.push("/myInfo/signUpList");
       },
       // 立即报名
       toSignUp() {
@@ -171,7 +171,7 @@
       toRecruit() {
         // 清除本地缓存除了大学logo
         let code = this.$store.state.indexIdentity;
-        this.$router.replace("/" + code);
+        this.$router.push("/" + code);
       },
     },
     watch: {

src/request/network.js

@@ -174,8 +174,7 @@ export function request(config) {
     (res) => {
       if (res.data.code == 400034 ||
         res.data.code == 400035 ||
-        res.data.code == 400002 ||
-        res.data.code == 400003) {
+        res.data.code == 400002) {
         router.push({
           path: '/' + store.state.indexIdentity,
         })
@@ -214,6 +213,7 @@ export function request(config) {
       return res;
     },
     (error) => {
+      console.log(error)
       Message.closeAll();
       if (error.msg == '请登录！') {
         router.push({

src/views/base/active/Active.vue

@@ -110,7 +110,6 @@
             <div class="active-list-item-cont-txt2">{{formatYMD(item.activityStartTime)}} （共{{item.activityTime}}天）
             </div>
             <div class="active-list-item-cont-txt3">报名截止时间：{{formatYMDChina(item.bmEndTime)}}</div>
-
           </div>
           <div class="active-list-item-bottom" @click="$router.push('/active/'+item.id)">
             <div>查看详情</div>
@@ -197,9 +196,7 @@
         let timer = ''
         return function (func, wait) {
           let context = this;
-          if (timer) {
-            clearTimeout(timer);
-          }
+          timer && clearTimeout(timer);
           timer = setTimeout(() => {
             func.apply(context);
           }, wait)
@@ -230,7 +227,8 @@
         let windowHeight = window.innerHeight;
         //获取页面内容总高度
         let scrollHeight = document.querySelector('.active-container').scrollHeight;
-        if (scrollTop + windowHeight + 100 >= scrollHeight) {
+        // 滚动到指定位置 并且当前显示的数量小于总数
+        if ((scrollTop + windowHeight + 100 >= scrollHeight) && (this.pageSize < this.activeList.length)) {
           this.pageSize += this.baseSize;
           this.loadData()
         }
@@ -480,6 +478,7 @@
 
           .btn-area {
             display: inline-block;
+
             .el-button {
               height: 36px;
               color: #333333;