浏览代码

合并代码

seimin 8 月之前
父节点
当前提交
f04f9a92e4

+ 18 - 14
.hbuilderx/launch.json

@@ -1,16 +1,20 @@
1
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
2
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
3
-    "version": "0.0",
4
-    "configurations": [{
5
-     	"default" : 
6
-     	{
7
-     		"launchtype" : "local"
8
-     	},
9
-     	"mp-weixin" : 
10
-     	{
11
-     		"launchtype" : "local"
12
-     	},
13
-     	"type" : "uniCloud"
14
-     }
1
+{
2
+    // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
3
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
4
+    "version" : "0.0",
5
+    "configurations" : [
6
+        {
7
+            "default" : {
8
+                "launchtype" : "local"
9
+            },
10
+            "mp-weixin" : {
11
+                "launchtype" : "local"
12
+            },
13
+            "type" : "uniCloud"
14
+        },
15
+        {
16
+            "playground" : "standard",
17
+            "type" : "uni-app:app-android"
18
+        }
15 19
     ]
16 20
 }

+ 12 - 11
pages/workHourManagementOne/workHourManagementOne.vue

@@ -63,7 +63,7 @@
63 63
 
64 64
     let postData = {
65 65
       idx: dataInfo.idx,
66
-      sum: 20,
66
+      sum: 9999,
67 67
       workHourManagement: {
68 68
         treeLevel: 1,
69 69
       }
@@ -74,12 +74,13 @@
74 74
       uni.stopPullDownRefresh();
75 75
       if(res.status == 200){
76 76
         let list = res.list || [];
77
-        if(list.length){
78
-          dataInfo.hasMore = true;
79
-          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
80
-        }else{
81
-          dataInfo.hasMore = false;
82
-        }
77
+				dataInfo.list = list
78
+        // if(list.length){
79
+        //   dataInfo.hasMore = true;
80
+        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
81
+        // }else{
82
+        //   dataInfo.hasMore = false;
83
+        // }
83 84
       }else{
84 85
         uni.showToast({
85 86
           icon: 'none',
@@ -100,10 +101,10 @@
100 101
   })
101 102
   
102 103
   onReachBottom(() => {
103
-    dataInfo.idx += 1;
104
-    if (dataInfo.hasMore) {
105
-      getList(); // 当触底时加载更多数据
106
-    }
104
+    // dataInfo.idx += 1;
105
+    // if (dataInfo.hasMore) {
106
+    //   getList(); // 当触底时加载更多数据
107
+    // }
107 108
   })
108 109
 </script>
109 110
 

+ 12 - 11
pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -130,7 +130,7 @@
130 130
 
131 131
     let postData = {
132 132
       idx: dataInfo.idx,
133
-      sum: 20,
133
+      sum: 9999,
134 134
       workHourManagement: {
135 135
         parent: {
136 136
           id: dataInfo.parentId,
@@ -143,12 +143,13 @@
143 143
       uni.stopPullDownRefresh();
144 144
       if(res.status == 200){
145 145
         let list = res.list || [];
146
-        if(list.length){
147
-          dataInfo.hasMore = true;
148
-          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
149
-        }else{
150
-          dataInfo.hasMore = false;
151
-        }
146
+				dataInfo.list = list
147
+        // if(list.length){
148
+        //   dataInfo.hasMore = true;
149
+        //   dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
150
+        // }else{
151
+        //   dataInfo.hasMore = false;
152
+        // }
152 153
       }else{
153 154
         uni.showToast({
154 155
           icon: 'none',
@@ -171,10 +172,10 @@
171 172
   })
172 173
   
173 174
   onReachBottom(() => {
174
-    dataInfo.idx += 1;
175
-    if (dataInfo.hasMore) {
176
-      getList(); // 当触底时加载更多数据
177
-    }
175
+    // dataInfo.idx += 1;
176
+    // if (dataInfo.hasMore) {
177
+    //   getList(); // 当触底时加载更多数据
178
+    // }
178 179
   })
179 180
 </script>
180 181
 

+ 2 - 0
readme.md

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