Merge branch 'dev_1.1.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.2

src/view/iframe/tab-group/tab-group.vue

@@ -158,7 +158,9 @@ const innerPageNext = (data) => {
         if(dataLength) {
             listReqParams.params.preTimestamp = listData.value[dataLength - 1]['createTimestamp'];
         }
-        getListData();
+        if(listReqParams.params.preTimestamp) {
+            getListData();
+        }
     }
 }
 
@@ -197,7 +199,7 @@ const getListData = () => {
                 if (!listReqParams.params.preTimestamp) {
                     listData.value = resData;
                 } else {
-                    let data = dataList.value;
+                    let data = listData.value;
                     data = data.concat(resData);
                     listData.value = data;
                 }