修复bug

src/components/scroll/scroll.vue

@@ -53,7 +53,7 @@ export default {
   },
   watch: {
     pullup(val) {
-      console.log('状态改变')
+      console.log('状态改变',val)
       this.pullupUp = val
     }
   },
@@ -74,7 +74,6 @@ export default {
 
         // 监听下拉刷新事件
         this.bs.on('pullingDown', (pos) => {
-          console.log(pos,'pos')
           if(this.pullupDown) {
             this.isRefreshing = true;
             //this.refreshText = '正在刷新';
@@ -84,6 +83,10 @@ export default {
             setTimeout(() => {
               this.refreshFinish();
             }, 300);
+          }else {
+            setTimeout(() => {
+              this.refreshFinish();
+            }, 300);
           }
         });
         console.log(this.pullupUp,'pullingUp1')
@@ -99,6 +102,10 @@ export default {
             setTimeout(() => {
               this.loadMoreFinish();
             }, 500);
+          }else {
+            setTimeout(() => {
+              this.loadMoreFinish();
+            }, 500);
           }
         });
       // better-scroll 初始化完成后，刷新 scroll

src/store/modules/app.js

@@ -1,4 +1,4 @@
-import { userAndOrgTree, handsheDeptTreeSelect,getDict } from '@/api/public'
+import {deptTreeSelect, handsheDeptTreeSelect, getDict, userAndOrgTree} from '@/api/public'
 export default {
   state: {
     //用户名

src/views/menu/message/index.vue

@@ -116,10 +116,10 @@ export default {
       this.show = true;
     },
     refreshData(){
+      this.pullup = true;
       this.query.pageNum = 1;
       this.total = 0;
       this.dataList = [];
-      this.pullup = true;
       this.getDataList();
     },
     getDataList(){