Merge remote-tracking branch 'origin/master'

src/views/conmanagementpage/contentdetail.vue

@@ -456,7 +456,7 @@
                 if(scroll>200){
                     this.positions = true;
                     if(this.isaxios == true){
-                        this.getselectContentCommentsList();
+                        // this.getselectContentCommentsList();
                     }
                 }else{
                     this.positions = false;
@@ -512,6 +512,7 @@
             if(this.publicFun.getCookie("userInfo")){
                 this.getselectByEmpId();
             }
+            this.getselectContentCommentsList();
             api.selectBasicParams().then(response => {
                 if(response.code == 0) {
                     this.urltext = response.result.websitePrefix+'#/articleDetail?id=';