Merge branch 'mergeBranch' into redUrgent

src/components/normal-basic-layout/details/index.vue

@@ -181,7 +181,6 @@ export default {
     //   this.refresh()
     // },
     async nextData(param,fn) {
-      console.log('执行')
       this.rowStatus = null
       const res = await this.$api.requested(param)
       this.$store.dispatch('saveListData',{listData:res.data,param:param,pageTotal:res.pageTotal})
@@ -213,12 +212,9 @@ export default {
       })
     },
     async next () {
-      console.log('翻页了')
       if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
-        console.log('执行1')
         this.nextOld()
       }else {
-        console.log('执行22')
         let listqueryid = sessionStorage.getItem('listqueryid')
         if (this.time !== null) {
           clearTimeout(this.time)
@@ -331,7 +327,6 @@ export default {
         }
       })
       if (res.data.data) {
-        console.log(listqueryid,'listqueryid数据获取了嘛')
         this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
         this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
       } else {

src/components/normal-basic-layout/index.vue

@@ -169,7 +169,6 @@ export default {
       // 保存一下列表数据用于翻页
       let isGo = sessionStorage.getItem('isGo')
       sessionStorage.setItem('total',res.total)
-      console.log('执行了嘛数据1111')
       if (isGo == 1){
       }else {
         sessionStorage.setItem('listqueryid',res.listqueryid)