diff --git a/pages.json b/pages.json
index 26bd03b5dbe34404bb806878e091fa8853503474..6b29a371f7c78246222e5c9ff63b5703427adc85 100644
--- a/pages.json
+++ b/pages.json
@@ -1172,6 +1172,14 @@
"navigationBarTitleText": "权限申请监听",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/component/list-view/list-view-multiplex-input",
+ "style" :
+ {
+ "navigationBarTitleText" : "list-view复用input",
+ "enablePullDownRefresh" : false
+ }
}
// #endif
],
diff --git a/pages/API/download-file/download-file.test.js b/pages/API/download-file/download-file.test.js
index afe512d0c887e490a2abf71a8f977f2f55db6472..adc8848de2b03f3110d72918788f5d7a805f6fb5 100644
--- a/pages/API/download-file/download-file.test.js
+++ b/pages/API/download-file/download-file.test.js
@@ -8,7 +8,7 @@ describe('ExtApi-DownloadFile', () => {
page = await program.reLaunch(PAGE_PATH)
await page.waitFor(600);
await page.callMethod('jest_downloadFile');
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
});
@@ -37,7 +37,7 @@ describe('ExtApi-DownloadFile', () => {
return
}
res = await page.callMethod('jest_set_cookie')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
});
@@ -46,7 +46,7 @@ describe('ExtApi-DownloadFile', () => {
return
}
res = await page.callMethod('jest_delete_cookie')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
});
diff --git a/pages/API/get-app-base-info/get-app-base-info.uvue b/pages/API/get-app-base-info/get-app-base-info.uvue
index e8f7b2111b1d4964a8579c0b42fef61322f1acaa..c924e277df5ed8a987de7cbb69da953ed67ac90c 100644
--- a/pages/API/get-app-base-info/get-app-base-info.uvue
+++ b/pages/API/get-app-base-info/get-app-base-info.uvue
@@ -7,7 +7,7 @@
{{item.label}}
-
+
diff --git a/pages/API/get-device-info/get-device-info.uvue b/pages/API/get-device-info/get-device-info.uvue
index 1ef2f2df3a6298820289ed3eb8d22a78d0748174..1d575a4eaa1bb92ca1101069a2dc0d95b61ce7a4 100644
--- a/pages/API/get-device-info/get-device-info.uvue
+++ b/pages/API/get-device-info/get-device-info.uvue
@@ -14,7 +14,7 @@
}}
-
+
diff --git a/pages/API/get-system-info/get-system-info.uvue b/pages/API/get-system-info/get-system-info.uvue
index 2a1024dadabe27223155a8801c01e31961476b4a..93ab1c83ba7fe24509c2c94b583f0d9a17dbc283 100644
--- a/pages/API/get-system-info/get-system-info.uvue
+++ b/pages/API/get-system-info/get-system-info.uvue
@@ -13,7 +13,7 @@
}}
-
+
diff --git a/pages/API/get-window-info/get-window-info.uvue b/pages/API/get-window-info/get-window-info.uvue
index 6c14f07125a0e4c050c0b1f950039138c0a0694b..464f473b95c1175d0f69d5b099bd3281ccf7d0b0 100644
--- a/pages/API/get-window-info/get-window-info.uvue
+++ b/pages/API/get-window-info/get-window-info.uvue
@@ -7,7 +7,7 @@
{{ item.label }}
-
+
diff --git a/pages/API/request/request.test.js b/pages/API/request/request.test.js
index 7aa00f44fc9a097b5131bf668f7280a09f50cec0..0e1d3788a703931e93d9670af51b09ee54a836c6 100644
--- a/pages/API/request/request.test.js
+++ b/pages/API/request/request.test.js
@@ -22,7 +22,7 @@ async function request(page, method, header, data, url) {
header: header
})
res = await page.callMethod('jest_request')
- await page.waitFor(500);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
@@ -87,7 +87,7 @@ describe('ExtApi-Request', () => {
version = version.split(" ")[1]
if(version > 9){
res = await page.callMethod('jest_set_cookie')
- await page.waitFor(500);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
@@ -99,7 +99,7 @@ describe('ExtApi-Request', () => {
version = version.split(" ")[1]
if(version > 9){
res = await page.callMethod('jest_delete_cookie')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
diff --git a/pages/API/upload-file/upload-file.test.js b/pages/API/upload-file/upload-file.test.js
index 91ca911c9774f8dbaae6222999b48e8041a443f5..5c234efc2a0729ef28352ab58347ccd40d7ad906 100644
--- a/pages/API/upload-file/upload-file.test.js
+++ b/pages/API/upload-file/upload-file.test.js
@@ -15,7 +15,7 @@ describe('ExtApi-UploadFile', () => {
page = await program.reLaunch(PAGE_PATH)
await page.waitFor(600);
await page.callMethod('jest_uploadFile');
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
});
@@ -35,7 +35,7 @@ describe('ExtApi-UploadFile', () => {
version = version.split(" ")[1]
if(version > 9){
res = await page.callMethod('jest_set_cookie')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
@@ -47,7 +47,7 @@ describe('ExtApi-UploadFile', () => {
version = version.split(" ")[1]
if(version > 9){
res = await page.callMethod('jest_delete_cookie')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
}
@@ -55,7 +55,7 @@ describe('ExtApi-UploadFile', () => {
});
it('Check files upload', async () => {
res = await page.callMethod('jest_files_upload')
- await page.waitFor(1000);
+ await page.waitFor(2000);
res = await page.data('jest_result');
expect(res).toBe(true)
});
diff --git a/pages/component/list-view/list-view-multiplex-input.uvue b/pages/component/list-view/list-view-multiplex-input.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..b23d7703419081102389ea51c5eb6e6826e4c62c
--- /dev/null
+++ b/pages/component/list-view/list-view-multiplex-input.uvue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+ item-------{{index}}
+
+
+
+
+
+
+
+
diff --git a/pages/component/list-view/list-view.uvue b/pages/component/list-view/list-view.uvue
index 7ee807cc5226d34bd3cd24fa1c3ffdbcdf499613..57d3d1e921ab7057d8c320e8d3df88298f861b3d 100644
--- a/pages/component/list-view/list-view.uvue
+++ b/pages/component/list-view/list-view.uvue
@@ -188,6 +188,11 @@
list-view 对list-item复用测试
+
+
+
diff --git a/pages/template/drop-card/card/card.uvue b/pages/template/drop-card/card/card.uvue
index 42cc8b08834c7d8260a2db9184db87b9cbe070c5..ff118bddfa9c093da04b54695c35dfa093a3815e 100644
--- a/pages/template/drop-card/card/card.uvue
+++ b/pages/template/drop-card/card/card.uvue
@@ -204,11 +204,11 @@
\ No newline at end of file
+
diff --git a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
index 17f15126fcd90641d9643312dba56f544280365a..cf0fff7d9da1eec5078d0249f7cc8f34efbc0c81 100644
--- a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
+++ b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
@@ -1,15 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -23,197 +14,161 @@
-
-
- DCloud 为开发者而生
-
-
-
-
-
-
-
- 请输入你要搜索的内容
+
+
+
+
- 搜索
+ DCloud 为开发者而生
-
-
-
-
-
+
+
+ 请输入你要搜索的内容
+ 搜索
+
+
+
+
+
-
+ }
+ }
+ }
+
+
+.page {
+ flex: 1;
+ background-color: #f5f5f5;
+}
+.navigatorbar {
+ position: fixed;
+/* #ifdef APP */
+ padding-top: 35px;
+ height: 124px;
+/* #endif */
+/* #ifdef WEB */
+ height: 88px;
+/* #endif */
+ border-bottom: 1px solid #efefef;
+ width: 100%;
+ background-color: #f5f5f5;
+}
+.titlebar {
+ flex-direction: row;
+ align-items: center;
+ height: 44px;
+}
+.backview {
+ width: 44px;
+ height: 44px;
+ justify-content: center;
+ align-items: center;
+}
+.back {
+ width: 20px;
+}
+.title {
+ margin: 0px 2px;
+}
+.searchbar {
+ position: absolute;
+ bottom: 2px;
+ left: 0px;
+ right: 0px;
+ background-color: #FFFFFF;
+ border: 1px solid #fbdf0d;
+ height: 32px;
+ border-radius: 100px;
+ margin: 6px 12px;
+ padding: 8px;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+}
+.searchimg {
+ width: 15px;
+}
+.searchinput {
+ flex-grow: 1;
+ font-size: 12px;
+ color: #666;
+}
+.searchbutton {
+ font-size: 12px;
+ background-color: #ff6900;
+ color: #FFF;
+ padding: 5px 8px;
+ border-radius: 100px;
+}
+.seatbar {
+/* #ifdef APP */
+ height: 124px;
+/* #endif */
+/* #ifdef WEB */
+ height: 88px;
+/* #endif */
+}
+.content {
+ padding: 5px 15px;
+}
+.content-item {
+ padding: 15px;
+ margin: 5px 0;
+ background-color: #fff;
+ border-radius: 5px;
+}
+.text {
+ font-size: 14px;
+ color: #666;
+ line-height: 20px;
+}
+
+
diff --git a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
index 8f6366b6858347b843e8b44b3d8bdbfba9b6b496..f087d09acaa2f224f81b07c256f91eadb9de79ce 100644
--- a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
+++ b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
@@ -1,6 +1,6 @@
-
+