合并代码

.hbuilderx/launch.json

@@ -1,16 +1,20 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+{
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-    "version": "0.0",
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "configurations": [{
+    "version" : "0.0",
-     	"default" : 
+    "configurations" : [
-     	{
+        {
-     		"launchtype" : "local"
+            "default" : {
-     	},
+                "launchtype" : "local"
-     	"mp-weixin" : 
+            },
-     	{
+            "mp-weixin" : {
-     		"launchtype" : "local"
+                "launchtype" : "local"
-     	},
+            },
-     	"type" : "uniCloud"
+            "type" : "uniCloud"
-     }
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

pages/workHourManagementOne/workHourManagementOne.vue

@@ -63,7 +63,7 @@
 
     let postData = {
       idx: dataInfo.idx,
-      sum: 20,
+      sum: 9999,
       workHourManagement: {
         treeLevel: 1,
       }
@@ -74,12 +74,13 @@
       uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
-        if(list.length){
+				dataInfo.list = list
-          dataInfo.hasMore = true;
+        // if(list.length){
-          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        //   dataInfo.hasMore = true;
-        }else{
+        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
-          dataInfo.hasMore = false;
+        // }else{
-        }
+        //   dataInfo.hasMore = false;
+        // }
       }else{
         uni.showToast({
           icon: 'none',
@@ -100,10 +101,10 @@
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
+    // dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
+    // if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
+    //   getList(); // 当触底时加载更多数据
-    }
+    // }
   })
 </script>
 

pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -130,7 +130,7 @@
 
     let postData = {
       idx: dataInfo.idx,
-      sum: 20,
+      sum: 9999,
       workHourManagement: {
         parent: {
           id: dataInfo.parentId,
@@ -143,12 +143,13 @@
       uni.stopPullDownRefresh();
       if(res.status == 200){
         let list = res.list || [];
-        if(list.length){
+				dataInfo.list = list
-          dataInfo.hasMore = true;
+        // if(list.length){
-          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        //   dataInfo.hasMore = true;
-        }else{
+        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
-          dataInfo.hasMore = false;
+        // }else{
-        }
+        //   dataInfo.hasMore = false;
+        // }
       }else{
         uni.showToast({
           icon: 'none',
@@ -171,10 +172,10 @@
   })
   
   onReachBottom(() => {
-    dataInfo.idx += 1;
+    // dataInfo.idx += 1;
-    if (dataInfo.hasMore) {
+    // if (dataInfo.hasMore) {
-      getList(); // 当触底时加载更多数据
+    //   getList(); // 当触底时加载更多数据
-    }
+    // }
   })
 </script>
 

readme.md

@@ -9,3 +9,5 @@
 - filters      存放过滤器
 
 # uni-ui源码修改记录
+- uni_modules\uni-data-picker\components\uni-data-picker 添加 @touchmove.stop.prevent 
+- uni_modules\uni-data-picker\components\uni-data-pickerview 添加 @touchmove.stop.prevent