diff --git a/common/uni.css b/common/uni.css
index 6a8221132b534dc2d8c584fd72e2299e744a512a..cc196f2c516783147c43150bc83124d5fa82c731 100644
--- a/common/uni.css
+++ b/common/uni.css
@@ -83,7 +83,7 @@
 .uni-input {
   height: 50rpx;
   padding: 15rpx 25rpx;
-  line-height: 50rpx;
+  /* line-height: 50rpx; */
   font-size: 28rpx;
   background: #FFF;
   flex: 1;
diff --git a/components/enum-data/enum-data.vue b/components/enum-data/enum-data.vue
index 85b1f50ad69c4070f34a16e7e1f15c227d34e806..61243fe4ec55da34ff1303ef87d991ad496f539e 100644
--- a/components/enum-data/enum-data.vue
+++ b/components/enum-data/enum-data.vue
@@ -1,4 +1,6 @@
 <script lang="uts">
+  import {type PropType} from 'vue'
+
   export type ItemType = { value : number; name : string }
 
   export default {
@@ -22,7 +24,7 @@
       _change(e : RadioGroupChangeEvent) {
         const selected = this.items.find((item: ItemType) : boolean => {
           return item.name === e.detail.value
-        }) as ItemType | null
+        })
         if (selected !== null) {
           this.current = selected.value
           this.$emit('change', this.current)
diff --git a/components/page-head/page-head.vue b/components/page-head/page-head.vue
index 2fadfd3f89254f827a32c4b21644540a7e904ab4..3db49e31edbbb1b4cec40b16fc6a95a40679a63a 100644
--- a/components/page-head/page-head.vue
+++ b/components/page-head/page-head.vue
@@ -1,37 +1,37 @@
 <template name="page-head">
-    <view class="common-page-head">
-        <view class="common-page-head-title-box">
-            <text class="common-page-head-title">{{title}}</text>
-        </view>
+  <view class="common-page-head">
+    <view class="common-page-head-title-box">
+      <text class="common-page-head-title">{{title}}</text>
     </view>
+  </view>
 </template>
-<script>
-    export default {
-        name: "page-head",
-        props: {
-            title: {
-                type: String,
-                default: ""
-            }
-        }
+<script lang="uts">
+  export default {
+    name: "page-head",
+    props: {
+      title: {
+        type: String,
+        default: ""
+      }
     }
+  }
 </script>
 <style>
-    .common-page-head {
-        padding: 35rpx;
-        flex-direction: row;
-        justify-content: center;
-    }
+  .common-page-head {
+    padding: 35rpx;
+    flex-direction: row;
+    justify-content: center;
+  }
 
-    .common-page-head-title-box {
-        padding: 0 40rpx;
-        height: 88rpx;
-        border-bottom: 2rpx solid #D8D8D8;
-    }
+  .common-page-head-title-box {
+    padding: 0 40rpx;
+    height: 88rpx;
+    border-bottom: 2rpx solid #D8D8D8;
+  }
 
-    .common-page-head-title {
-        line-height: 88rpx;
-        font-size: 30rpx;
-        color: #BEBEBE;
-    }
+  .common-page-head-title {
+    line-height: 88rpx;
+    font-size: 30rpx;
+    color: #BEBEBE;
+  }
 </style>
\ No newline at end of file
diff --git a/components/u-link/u-link.vue b/components/u-link/u-link.vue
index 247030dc899e73ccfc86b7dfaa6322fe39886de0..045ded60ba0c454c3a49e80314e33003173eafc8 100644
--- a/components/u-link/u-link.vue
+++ b/components/u-link/u-link.vue
@@ -4,7 +4,7 @@
     </view>
 </template>
 
-<script>
+<script lang="uts">
 	/**
 	 * @description u-link是一个外部网页超链接组件，在小程序内打开内部web-view组件或复制url，在app内打开外部浏览器，在h5端打开新网页
 	 * @property {String} href 点击后打开的外部网页url，小程序中必须以https://开头
diff --git a/components/uni-collapse-item/uni-collapse-item.vue b/components/uni-collapse-item/uni-collapse-item.vue
index 45ed4713f7c77804a7b6a88aa620af725aae8065..e79e80a1b15daaa933150b3343c4ccb2ff5e16f5 100644
--- a/components/uni-collapse-item/uni-collapse-item.vue
+++ b/components/uni-collapse-item/uni-collapse-item.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="uni-collapse-item">
-		<view class="uni-collapse-item__title" @click="openCollapse(!this.is_open)">
+		<view class="uni-collapse-item__title" @click="openCollapse(!is_open)">
 			<text class="uni-collapse-item__title-text" :class="{'is-disabled':disabled,'open--active':is_open}">{{title}}</text>
 			<view class="down_arrow" :class="{'down_arrow--active': is_open}"></view>
 		</view>
@@ -12,7 +12,7 @@
 	</view>
 </template>
 
-<script>
+<script lang="uts">
 	import { $dispatch } from './util.uts'
 	export default {
 		name: "UniCollapseItem",
@@ -35,8 +35,8 @@
 			return {
 				height: 0,
 				is_open: this.open as boolean,
-				boxNode: null as INode | null,
-				contentNode: null as INode | null,
+				boxNode: null as Element | null,
+				contentNode: null as Element | null,
 			};
 		},
 		watch: {
@@ -51,8 +51,8 @@
 			$dispatch(this, 'UniCollapse', 'init', this)
 		},
 		mounted() {
-			this.boxNode = this.$refs['boxRef'] as INode;
-			this.contentNode = this.$refs['contentRef'] as INode;
+			this.boxNode = this.$refs['boxRef'] as Element;
+			this.contentNode = this.$refs['contentRef'] as Element;
 			// this.openCollapse(this.open)
 		},
 		methods: {
diff --git a/components/uni-collapse-item/util.uts b/components/uni-collapse-item/util.uts
index 49e6c164dff18040317786d0252384fc8a4eced7..d505c0cb34f033d85591ce708bca1a9aac15f586 100644
--- a/components/uni-collapse-item/util.uts
+++ b/components/uni-collapse-item/util.uts
@@ -1,4 +1,4 @@
-// import { ComponentPublicInstance } from 'vue'
+import { ComponentPublicInstance } from 'vue'
 
 // 查找父组件实例
 export function $dispatch(
diff --git a/components/uni-collapse/uni-collapse.vue b/components/uni-collapse/uni-collapse.vue
index 9f071d9cf6e8f6d88318f155dd8dc52e336b1ffe..a312b4e6d9d9fdad2a6b4cb2de2091f1508bd171 100644
--- a/components/uni-collapse/uni-collapse.vue
+++ b/components/uni-collapse/uni-collapse.vue
@@ -5,8 +5,8 @@
 	</view>
 </template>
 
-<script>
-	// import { ComponentPublicInstance } from 'vue'
+<script lang="uts">
+	import { ComponentPublicInstance } from 'vue'
 	export default {
 		name: "UniCollapse",
 		props: {
diff --git a/components/uni-navbar-lite/uni-icons.css b/components/uni-navbar-lite/uni-icons.css
new file mode 100644
index 0000000000000000000000000000000000000000..22c98b6163d384124ceabe7b42e9ce6ceab4a06d
--- /dev/null
+++ b/components/uni-navbar-lite/uni-icons.css
@@ -0,0 +1,17 @@
+@font-face {
+  font-family: "UniIconsLight"; 
+  src: url('./uniicons.ttf') format('truetype');
+}
+
+.uni-icons {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.uniui-back:before {
+  content: "\e600";
+}
+
diff --git a/components/uni-navbar-lite/uni-navbar-lite.uvue b/components/uni-navbar-lite/uni-navbar-lite.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..797e33649a7922f935d27009412f8d06256c1a9f
--- /dev/null
+++ b/components/uni-navbar-lite/uni-navbar-lite.uvue
@@ -0,0 +1,118 @@
+<template>
+    <view class="uni-navbar">
+        <view class="uni-navbar-inner" :style="navbarStyle">
+            <view class="left-content" @click="back">
+                <text class="uni-icons">{{unicode}}</text>
+            </view>
+            <view class="uni-navbar-content" :class="{'is-left':isLeft}">
+                <slot>{{title}}</slot>
+            </view>
+            <view class="right-content">
+                <slot name="right"></slot>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import iconpath from './uniicons.ttf'
+    export default {
+        name: "uni-navbar",
+        props: {
+        	title: {
+        		type: String,
+        		default: ''
+        	},
+        	isLeft: {
+        		type: Boolean,
+        		default: false
+        	}
+        },
+        data() {
+            return {
+                statusBarHeight: 0
+            };
+        },
+        computed: {
+            navbarStyle() : string {
+                return `margin-top:${this.statusBarHeight}px`
+            },
+            unicode() : string {
+                return '\ue600'
+            }
+        },
+        created() {
+            uni.loadFontFace({
+                global: false,
+                family: 'UniIconsFontFamily',
+                source: iconpath,
+                success() { },
+                fail(err) {
+                    console.log(err);
+                },
+            })
+            const sys = uni.getSystemInfoSync()
+            const statusBarHeight = sys.statusBarHeight
+            this.statusBarHeight = statusBarHeight
+        },
+        mounted() {
+          // TODO 暂时加定时器，否则不生效
+          setTimeout(() => {
+            uni.setNavigationBarColor({
+                frontColor: '#000000',
+                backgroundColor: '#ffffff'
+            })
+          }, 100)
+        },
+        methods: {
+            back() {
+                uni.navigateBack({})
+            }
+        },
+    }
+</script>
+
+<style>
+    .uni-icons {
+        font-family: "UniIconsFontFamily" !important;
+        font-size: 22px;
+        font-style: normal;
+        color: #333;
+    }
+    .uni-navbar {
+        border: 1px #eee solid;
+        background-color: #fff;
+    }
+    .uni-navbar-inner {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        height: 45px;
+    }
+
+    .left-content,
+    .right-content {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 45px;
+        height: 100%;
+    }
+
+    .uni-navbar-content {
+        position: absolute;
+        height: 100%;
+        top: 0;
+        bottom: 0;
+        left: 45px;
+        right: 45px;
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+    }
+    .is-left {
+      justify-content: flex-start;
+    }
+</style>
diff --git a/components/uni-navbar-lite/uni-navbar-lite.vue b/components/uni-navbar-lite/uni-navbar-lite.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5efd192fa33fe8ff82e9e66fb13827a593ff9211
--- /dev/null
+++ b/components/uni-navbar-lite/uni-navbar-lite.vue
@@ -0,0 +1,94 @@
+<template>
+    <view class="uni-navbar">
+        <view class="uni-navbar-inner" :style="navbarStyle">
+            <view class="left-content" @click="back">
+                <text class="uni-icons uniui-back"></text>
+            </view>
+            <view class="uni-navbar-content">
+                <slot>{{title}}</slot>
+            </view>
+            <view class="right-content">
+                <slot name="right"></slot>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: "uni-navbar",
+        props: {
+            title: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                statusBarHeight: 0
+            };
+        },
+        computed: {
+            navbarStyle() {
+                return `margin-top:${this.statusBarHeight}px`
+            },
+        },
+        created() {
+            const sys = uni.getSystemInfoSync()
+            const statusBarHeight = sys.statusBarHeight
+            this.statusBarHeight = statusBarHeight
+        },
+        methods: {
+            back() {
+                uni.navigateBack({})
+            }
+        },
+    }
+</script>
+
+<style>
+    @import './uni-icons.css';
+
+    .uni-icons {
+        font-family: UniIconsLight;
+        text-decoration: none;
+        text-align: center;
+        font-size: 22px;
+        font-style: normal;
+        color: #333;
+    }
+
+    .uni-navbar {
+        border: 1px #eee solid;
+        background-color: #fff;
+    }
+
+    .uni-navbar-inner {
+        position: relative;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        height: 45px;
+    }
+
+    .left-content,
+    .right-content {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 45px;
+        height: 100%;
+    }
+
+    .uni-navbar-content {
+        position: absolute;
+        height: 100%;
+        top: 0;
+        bottom: 0;
+        left: 45px;
+        right: 45px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+</style>
diff --git a/components/uni-navbar-lite/uniicons.ttf b/components/uni-navbar-lite/uniicons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e370efe839a69693e9ee79483f7bbca34f49dcfd
Binary files /dev/null and b/components/uni-navbar-lite/uniicons.ttf differ
diff --git a/hello-uniapp-x.apk b/hello-uniapp-x.apk
index 34d4669de39cc3e77920ad46e63757b15a47bd4c..aef6105e1b7396f9cfb32182e8418b8fe113845c 100644
Binary files a/hello-uniapp-x.apk and b/hello-uniapp-x.apk differ
diff --git a/jest-setup.js b/jest-setup.js
index 8ddb4e3dcc2ab8cec2a57e4b4696418e07e6ea10..0864a9dead1eb066c6899d7df57909b744e534f6 100644
--- a/jest-setup.js
+++ b/jest-setup.js
@@ -6,13 +6,14 @@ const {
 const hbuilderx_version = process.env.HX_Version
 const uniTestPlatformInfo = process.env.uniTestPlatformInfo ? process.env.uniTestPlatformInfo.replace(/\s/g,'_') : ''
 const folderName = `__image_snapshots__/${hbuilderx_version}/__${uniTestPlatformInfo}__`
+const baseFolderName = `__image_snapshots__/base`
 
 expect.extend({
 	toMatchImageSnapshot: configureToMatchImageSnapshot({
 		customSnapshotIdentifier(args) {
 			return args.currentTestName.replace(/\//g, '-').replace(' ', '-');
 		},
-		customSnapshotsDir: path.join(__dirname, folderName),
+		customSnapshotsDir: path.join(__dirname, baseFolderName),
 		customDiffDir: path.join(__dirname, `${folderName}/`, 'diff'),
 	}),
 });
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index f3dd67c9d447ee3bd768582a2f7e79c1c68b5f9a..1ce69aa8cf578672d1fc77048cc5e05eed9e6e29 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,10 +1,10 @@
 module.exports = {
-  testTimeout: 10000,
+  testTimeout: 30000,
   reporters: ['default'],
   watchPathIgnorePatterns: ['/node_modules/', '/dist/', '/.git/'],
   moduleFileExtensions: ['js', 'json'],
   rootDir: __dirname,
-  testMatch: ["<rootDir>/pages/**/*test.[jt]s?(x)"],
+  testMatch: ["<rootDir>/pages/API/storage/storage.test.js"],
   testPathIgnorePatterns: ['/node_modules/'],
   setupFilesAfterEnv: ['<rootDir>/jest-setup.js'],
 }
diff --git a/manifest.json b/manifest.json
index e309c620b13199348ba00591d8443559b7223beb..5644e684dc448688844ffce447f98ee01fc7bc00 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "hello-uniapp x",
     "appid" : "__UNI__3584C99",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 105,
+    "versionName" : "1.0.10",
+    "versionCode" : 10010,
     "uni-app-x" : {},
     /* 快应用特有相关 */
     "quickapp" : {},
@@ -27,5 +27,10 @@
     "uniStatistics" : {
         "enable" : false
     },
+    "app": {
+      "duts": [
+        "uni-facialRecognitionVerify"
+      ]
+    },
     "vueVersion" : "3"
 }
diff --git a/pages.json b/pages.json
index 910a1da3516257a79ba57a51def55acb8d0f5544..4a17638b235d867452a0cbac19d49722a5966551 100644
--- a/pages.json
+++ b/pages.json
@@ -243,6 +243,13 @@
         "navigationBarTitleText": "设置导航条颜色"
       }
     },
+    {
+      "path": "pages/API/set-navigation-bar-color/set-custom-navigation-bar-color",
+      "style": {
+        "navigationBarTitleText": "设置自定义导航栏颜色",
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/API/navigator/new-page/new-page-1",
       "style": {
@@ -263,6 +270,12 @@
         "enablePullDownRefresh": true
       }
     },
+    {
+      "path": "pages/API/get-element-by-id/get-element-by-id",
+      "style": {
+        "navigationBarTitleText": "获取节点"
+      }
+    },
     {
       "path": "pages/API/nodes-info/nodes-info",
       "style": {
@@ -288,7 +301,7 @@
       }
     },
     {
-      "path": "pages/API/show-loading/show-loading",
+      "path": "pages/API/loading/loading",
       "style": {
         "navigationBarTitleText": "加载提示框"
       }
@@ -336,24 +349,48 @@
         "navigationBarTitleText": "background-image"
       }
     },
+    {
+      "path": "pages/CSS/border/border-bottom",
+      "style": {
+        "navigationBarTitleText": "border-bottom"
+      }
+    },
     {
       "path": "pages/CSS/border/border-color",
       "style": {
         "navigationBarTitleText": "border-color"
       }
     },
+    {
+      "path": "pages/CSS/border/border-left",
+      "style": {
+        "navigationBarTitleText": "border-left"
+      }
+    },
     {
       "path": "pages/CSS/border/border-radius",
       "style": {
         "navigationBarTitleText": "border-radius"
       }
     },
+    {
+      "path": "pages/CSS/border/border-right",
+      "style": {
+        "navigationBarTitleText": "border-right"
+      }
+    },
     {
       "path": "pages/CSS/border/border-style",
       "style": {
         "navigationBarTitleText": "border-style"
       }
     },
+    {
+      "path": "pages/CSS/border/border-top",
+      "style": {
+        "navigationBarTitleText": "border-top"
+      }
+    },
     {
       "path": "pages/CSS/border/border-width",
       "style": {
@@ -479,12 +516,12 @@
       "style": {
         "navigationBarTitleText": "width"
       }
-    },
-    {
-      "path": "pages/CSS/layout/z-index",
-      "style": {
-        "navigationBarTitleText": "z-index"
-      }
+    },
+    {
+      "path": "pages/CSS/layout/z-index",
+      "style": {
+        "navigationBarTitleText": "z-index"
+      }
     },
     {
       "path": "pages/CSS/layout/visibility",
@@ -667,7 +704,13 @@
       }
     },
     {
-      "path": "pages/API/call-function/call-function",
+      "path": "pages/API/unicloud-call-function/unicloud-call-function",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/API/unicloud-import-object/unicloud-import-object",
       "style": {
         "navigationBarTitleText": ""
       }
@@ -709,11 +752,17 @@
       }
     },
     {
-      "path": "pages/API/save-image-to-album/save-image-to-album",
+      "path": "pages/API/save-image-to-photos-album/save-image-to-photos-album",
       "style": {
         "navigationBarTitleText": "保存图片到相册"
       }
     },
+    {
+      "path": "pages/API/choose-image/choose-image",
+      "style": {
+        "navigationBarTitleText": "图片"
+      }
+    },
     {
       "path": "pages/component/scroll-view/scroll-view-refresher",
       "style": {
@@ -762,18 +811,6 @@
         "navigationBarTitleText": "模板"
       }
     },
-    {
-      "path": "pages/component/long-list/long-list",
-      "style": {
-        "navigationBarTitleText": "长列表示例"
-      }
-    },
-    {
-      "path": "pages/component/long-list/detail/detail",
-      "style": {
-        "navigationBarTitleText": "详情示例"
-      }
-    },
     {
       "path": "pages/template/swiper-list/swiper-list",
       "style": {
@@ -875,9 +912,40 @@
     {
       "path": "pages/template/pull-zoom-image/pull-zoom-image",
       "style": {
-        "enablePullDownRefresh": false,
         "navigationStyle": "custom"
       }
+    },
+    {
+      "path": "pages/API/unicloud-file-api/unicloud-file-api",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/API/unicloud-database/unicloud-database",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/template/navbar-lite/navbar-lite",
+      "style": {
+        "navigationBarTitleText": "自定义导航栏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/template/custom-tab-bar/custom-tab-bar",
+      "style": {
+        "navigationBarTitleText": "自定义TabBar"
+      }
+    }, {
+      "path": "pages/API/facial-recognition-verify/facial-recognition-verify",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
+      }
+
     }
   ],
   "globalStyle": {
@@ -929,4 +997,4 @@
       "query": "" //启动参数，在页面的onLoad函数里面得到
     }]
   }
-}
+}
\ No newline at end of file
diff --git a/pages/API/action-sheet/action-sheet.uvue b/pages/API/action-sheet/action-sheet.uvue
index 60e8adc88ee0c1e617c488d0ca8878c0b13ce17d..a16c30bde2a2acf73ca8ec9585402a9a5937500b 100644
--- a/pages/API/action-sheet/action-sheet.uvue
+++ b/pages/API/action-sheet/action-sheet.uvue
@@ -82,9 +82,11 @@
 
         if (this.itemContentLarge) {
           itemInfo = ['两个黄鹂鸣翠柳，一行白鹭上青天。窗含西岭千秋雪，门泊东吴万里船', '水光潋滟晴方好,山色空蒙雨亦奇。 欲把西湖比西子,淡妆浓抹总相宜', '']
-        } else if (this.itemNumLargeSelect) {
+        } 
+        
+        if (this.itemNumLargeSelect) {
           // 大量选项测试,不能超过6个元素 https://uniapp.dcloud.net.cn/api/ui/prompt.html#showactionsheet
-          itemInfo = []
+          itemInfo = []
           for (var i = 1; i <= 10; i++) {
             itemInfo.push('两个黄鹂鸣翠柳，一行白鹭上青天');
           }
diff --git a/pages/API/choose-image/choose-image.uvue b/pages/API/choose-image/choose-image.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..87806047bdd028a94e9cba64f02646312d4103b5
--- /dev/null
+++ b/pages/API/choose-image/choose-image.uvue
@@ -0,0 +1,292 @@
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex:1">
+  <!-- #endif -->
+    <view>
+      <page-head :title="title"></page-head>
+      <view class="uni-common-mt">
+        <view class="uni-list">
+          <view class="uni-list-cell cell-pd">
+            <view class="uni-list-cell-left uni-label">
+              图片来源
+            </view>
+            <view class="uni-list-cell-right" @click="chooseImageSource">
+              <text class="click-t">{{sourceType[sourceTypeIndex]}}</text>
+            </view>
+          </view>
+
+          <view class="uni-list-cell cell-pd">
+            <view class="uni-list-cell-left uni-label">
+              图片质量
+            </view>
+            <view class="uni-list-cell-right" @click="chooseImageType">
+              <text class="click-t">{{sizeType[sizeTypeIndex]}}</text>
+            </view>
+          </view>
+
+          <view class="uni-list-cell cell-pd">
+            <view class="uni-list-cell-left uni-label">
+              数量限制
+            </view>
+            <view class="uni-list-cell-right">
+              <input class="click-t" :value="countIndex+1" type="number" :maxlength="1" @confirm="chooseImageCount" confirm-type="done" />
+            </view>
+          </view>
+          <view class="uni-list-cell cell-pd">
+            <view class="uni-list-cell-left uni-label">
+              图像裁剪
+            </view>
+            <view class="uni-list-cell-right">
+              <switch :checked="isCrop" @change="switchCrop"></switch>
+            </view>
+          </view>
+          <view ref="cropOptionNode" class="crop-option" :style="{'height':isCrop?'200px':'0px'}">
+            <view class="uni-list-cell cell-pd">
+              <view class="uni-list-cell-left item_width">
+                图片质量(%)
+              </view>
+              <view class="uni-list-cell-right">
+                <input :value="cropPercent" @confirm="cropPercentConfim" type="number" />
+              </view>
+            </view>
+            <view class="uni-list-cell cell-pd">
+              <view class="uni-list-cell-left item_width">
+                裁剪宽度(px)
+              </view>
+              <view class="uni-list-cell-right">
+                <input :value="cropWidth" @confirm="cropWidthConfim" type="number" />
+              </view>
+            </view>
+            <view class="uni-list-cell cell-pd">
+              <view class="uni-list-cell-left item_width">
+                裁剪高度(px)
+              </view>
+              <view class="uni-list-cell-right">
+                <input :value="cropHeight" @confirm="cropHeightConfim" type="number" />
+              </view>
+            </view>
+            <view class="uni-list-cell cell-pd">
+              <view class="uni-list-cell-left item_width">
+                保留原宽高
+              </view>
+              <view class="uni-list-cell-right">
+                <switch :checked="cropResize" @change="cropResizeChange"></switch>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="uni-list list-pd" style="padding: 30rpx;">
+          <view class="uni-flex" style="margin-bottom: 20rpx;">
+            <view class="uni-list-cell-left">点击可预览选好的图片</view>
+            <view style="margin-left: auto;">
+              <text class="click-t">{{imageList.length}}/{{countIndex+1}}</text>
+            </view>
+          </view>
+          <view class="uni-flex" style="flex-wrap: wrap;">
+            <view v-for="(image,index) in imageList" :key="index" class="uni-uploader__input-box" style="border: 0rpx;">
+              <image style="width: 208rpx; height: 208rpx;" :src="image" :data-src="image" @tap="previewImage(index)"></image>
+              <image src="/static/plus.png" class="image-remove" @click="removeImage(index)"></image>
+            </view>
+            <image class="uni-uploader__input-box" @tap="chooseImage" src="/static/plus.png"></image>
+          </view>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<script>
+  var sourceTypeArray = [
+    ['camera'],
+    ['album'],
+    ['camera', 'album']
+  ]
+  var sizeTypeArray = [
+    ['compressed'],
+    ['original'],
+    ['compressed', 'original']
+  ]
+  export default {
+    data() {
+      return {
+        title: 'choose/previewImage',
+        imageList: [] as Array<string>,
+        sourceTypeIndex: 2,
+        sourceType: ['拍照', '相册', '拍照或相册'],
+        sizeTypeIndex: 2,
+        sizeType: ['压缩', '原图', '压缩或原图'],
+        countIndex: 8,
+        count: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+        isCrop: false,
+        cropPercent: 80,
+        cropWidth: 100,
+        cropHeight: 100,
+        cropResize: false
+      }
+    },
+    onUnload() {
+      this.imageList = [];
+      this.sourceTypeIndex = 2
+      this.sourceType = ['拍照', '相册', '拍照或相册']
+      this.sizeTypeIndex = 2
+      this.sizeType = ['压缩', '原图', '压缩或原图']
+      this.countIndex = 8
+    },
+    methods: {
+      cropHeightConfim(e : InputConfirmEvent) {
+        let value = parseInt(e.detail.value)
+        if (value > 0) {
+          this.cropHeight = value
+        } else {
+          uni.showToast({
+            position: "bottom",
+            title: "裁剪高度需要大于0"
+          })
+        }
+      },
+      cropWidthConfim(e : InputConfirmEvent) {
+        let value = parseInt(e.detail.value)
+        if (value > 0) {
+          this.cropWidth = value
+        } else {
+          uni.showToast({
+            position: "bottom",
+            title: "裁剪宽度需要大于0"
+          })
+        }
+      },
+      cropPercentConfim(e : InputConfirmEvent) {
+        let value = parseInt(e.detail.value)
+        if (value > 0 && value <= 100) {
+          this.cropPercent = value
+        } else {
+          uni.showToast({
+            position: "bottom",
+            title: "请输入0~100之间的值"
+          })
+        }
+      },
+      cropResizeChange(e : SwitchChangeEvent) {
+        this.cropResize = e.detail.value
+      },
+      switchCrop(e : SwitchChangeEvent) {
+        this.isCrop = e.detail.value
+      },
+      removeImage(index : number) {
+        this.imageList.splice(index, 1)
+      },
+      chooseImageSource() {
+        uni.showActionSheet({
+          itemList: ['拍照', '相册', '拍照或相册'],
+          success(e) {
+            this.sourceTypeIndex = e.tapIndex!
+          }
+        })
+      },
+      chooseImageType() {
+        uni.showActionSheet({
+          itemList: ['压缩', '原图', '压缩或原图'],
+          success(e) {
+            this.sizeTypeIndex = e.tapIndex!
+          }
+        })
+      },
+      chooseImageCount(event : InputConfirmEvent) {
+        let count = parseInt(event.detail.value) - 1
+        if (count < 0) {
+          uni.showToast({
+            position: "bottom",
+            title: "图片数量应该大于0"
+          })
+          return
+        }
+        this.countIndex = count
+      },
+      chooseImage: function () {
+        // var cropOption:ChooseImageCropOptions|null = this.isCrop ? null : new ChooseImageCropOptions(  )
+        if (this.imageList.length >= 9) {
+          uni.showToast({
+            position: "bottom",
+            title: "已经有9张图片了，请删除部分图片之后重新选择"
+          })
+          return
+        }
+        uni.chooseImage({
+          sourceType: sourceTypeArray[this.sourceTypeIndex],
+          sizeType: sizeTypeArray[this.sizeTypeIndex],
+          crop: this.isCrop ? { "quality": this.cropPercent, "width": this.cropWidth, "height": this.cropHeight, "resize": this.cropResize } as ChooseImageCropOptions : null,
+          count: this.imageList.length + this.count[this.countIndex] > 9 ? 9 - this.imageList.length : this.count[this.countIndex],
+          success: (res) => {
+            this.imageList = this.imageList.concat(res.tempFilePaths);
+          },
+          fail: (err) => {
+            console.log("err: ", JSON.stringify(err));
+          }
+        })
+      },
+      previewImage: function (index : number) {
+        uni.previewImage({
+          current: index,
+          urls: this.imageList
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  .cell-pd {
+    padding: 22rpx 30rpx;
+  }
+
+  .click-t {
+    color: darkgray;
+  }
+
+  .list-pd {
+    margin-top: 50rpx;
+  }
+
+  .uni-uploader__input-box {
+    margin: 10rpx;
+    width: 208rpx;
+    height: 208rpx;
+    border: 2rpx solid #D9D9D9;
+  }
+
+  .uni-uploader__input {
+    position: absolute;
+    z-index: 1;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+  }
+
+  .image-remove {
+    transform: rotate(45deg);
+    width: 50rpx;
+    height: 50rpx;
+    position: absolute;
+    top: 0;
+    right: 0;
+    border-radius: 25rpx;
+    background-color: rgba(200, 200, 200, 0.8);
+  }
+
+  .item_width {
+    width: 260rpx;
+  }
+
+  .crop-option {
+    border-top-color: lightgray;
+    border-width: 1rpx;
+    padding: 20rpx;
+    transition: height;
+    transition-duration: 300;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/API/download-file/download-file.test.js b/pages/API/download-file/download-file.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b41ee42097f2cf6240fd095bc47f1dafe551f33
--- /dev/null
+++ b/pages/API/download-file/download-file.test.js
@@ -0,0 +1,18 @@
+const PAGE_PATH = '/pages/API/download-file/download-file'
+
+describe('ExtApi-DownloadFile', () => {
+
+  let page;
+  let res;
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    await page.callMethod('jest_downloadFile');
+    await page.waitFor(500);
+    res = await page.data('jest_result');
+  });
+
+  it('Check ', async () => {
+    expect(res).toBe(true);
+  });
+});
diff --git a/pages/API/download-file/download-file.uvue b/pages/API/download-file/download-file.uvue
index e028784e245e9c2c4851fc9584eb22e5a4073f31..0b00386498952ed858f520c7b577357a0293853e 100644
--- a/pages/API/download-file/download-file.uvue
+++ b/pages/API/download-file/download-file.uvue
@@ -21,14 +21,15 @@
   <!-- #endif -->
 </template>
 <script>
-import DownloadTask from 'uts.sdk.modules.DCloudUniNetwork.DownloadTask';
 export default {
 	data() {
 		return {
 			title: 'downloadFile',
 			imageSrc: '',
 			task: null as DownloadTask | null,
-			pageVisible: false
+			pageVisible: false,
+      //自动化测试例专用
+      jest_result: false
 		}
 	},
 	onLoad() {
@@ -67,7 +68,19 @@ export default {
 					console.log("progress : ", update.progress);
 				}
 			})
-		}
+		},
+    //自动化测试例专用
+    jest_downloadFile(){
+      uni.downloadFile({
+      	url: "https://web-assets.dcloud.net.cn/unidoc/zh/uni-app.png",
+      	success() {
+          this.jest_result = true
+      	},
+      	fail: () => {
+          this.jest_result = false
+      	}
+      });
+    }
 	}
 }
 </script>
diff --git a/pages/API/facial-recognition-verify/facial-recognition-verify.uvue b/pages/API/facial-recognition-verify/facial-recognition-verify.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..b1bbd655554c33e5192407670306d094fa4173bb
--- /dev/null
+++ b/pages/API/facial-recognition-verify/facial-recognition-verify.uvue
@@ -0,0 +1,91 @@
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex:1">
+  <!-- #endif -->
+    <view>
+      <page-head :title="title"></page-head>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="uni-btn-v uni-common-mt">
+          <input class="uni-input uni-input-default" type="text" v-model="realName" name="real-name" id="real-name" placeholder="姓名" />
+        </view>
+        <view class="uni-btn-v uni-common-mt">
+          <input class="uni-input uni-input-default" type="text" v-model="idCard" name="id-card" id="id-card" placeholder="身份证号" />
+        </view>
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @click="facialRecognition">开始人脸识别</button>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: '实人认证',
+        realName: '',
+        idCard: ''
+      }
+    },
+    onReady() {
+      uni.showModal({
+        title: '提示',
+        content: '注意：目前uni-app x内使用实人认证功能需要打包自定义基座。',
+        showCancel: false
+      })
+    },
+    methods: {
+      facialRecognition() {
+        const realName = this.realName.trim()
+        const idCard = this.idCard.trim()
+        if (realName == '' || idCard == '') {
+          uni.showModal({
+            title: '错误',
+            content: '姓名和身份证号不可为空',
+            showCancel: false
+          })
+          return
+        }
+        const testFacialCo = uniCloud.importObject('facial-recognition-co')
+        const metaInfo = uni.getFacialRecognitionMetaInfo();
+        testFacialCo.getCertifyId({
+          realName,
+          idCard,
+          metaInfo
+        })
+          .then<string>((res : UTSJSONObject) : Promise<string> => {
+            const certifyId = res['certifyId'] as string
+            return new Promise((
+              resolve : (res : string) => void,
+              reject : (err : Error) => void
+            ) => {
+              uni.startFacialRecognitionVerify({
+                certifyId,
+                success() {
+                  resolve(certifyId)
+                },
+                fail(err) {
+                  reject(new Error(err.errMsg))
+                }
+              })
+            })
+          })
+          .then<UTSJSONObject>((certifyId : string) : Promise<UTSJSONObject> => {
+            return testFacialCo.getAuthResult(certifyId)
+          })
+          .then<void>((res : UTSJSONObject) => {
+            console.log('res', res)
+          })
+          .catch<void>((err : any | null) => {
+            console.error('error', err)
+          })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
diff --git a/pages/API/get-app-authorize-setting/get-app-authorize-setting.test.js b/pages/API/get-app-authorize-setting/get-app-authorize-setting.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..f182c9431135bc9321d0c6fbb2e1fae50245ead6
--- /dev/null
+++ b/pages/API/get-app-authorize-setting/get-app-authorize-setting.test.js
@@ -0,0 +1,34 @@
+const PAGE_PATH = '/pages/API/get-app-authorize-setting/get-app-authorize-setting'
+
+describe('ExtApi-GetAppAuthorizeSetting', () => {
+
+  let page;
+  let res;
+  let commonSupportList = [
+    'authorized', 'denied', 'not determined', 'config error'
+  ]
+  let locationAccuracySupportList = [
+    'reduced', 'full', 'unsupported'
+  ]
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await uni.getAppAuthorizeSetting();
+  });
+  it('Check cameraAuthorized', async () => {
+    expect(commonSupportList).toContain(res.cameraAuthorized)
+  });
+
+  it('Check locationAuthorized', async () => {
+    expect(commonSupportList).toContain(res.locationAuthorized)
+  });
+  it('Check locationAccuracy', async () => {
+    expect(locationAccuracySupportList).toContain(res.locationAccuracy)
+  });
+  it('Check microphoneAuthorized', async () => {
+    expect(commonSupportList).toContain(res.microphoneAuthorized)
+  });
+  it('Check notificationAuthorized', async () => {
+    expect(commonSupportList).toContain(res.notificationAuthorized)
+  });
+});
diff --git a/pages/API/get-app-base-info/get-app-base-info.test.js b/pages/API/get-app-base-info/get-app-base-info.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c61b7bfafed7d025d8eae7c882c4c567bb34d49
--- /dev/null
+++ b/pages/API/get-app-base-info/get-app-base-info.test.js
@@ -0,0 +1,33 @@
+const PAGE_PATH = '/pages/API/get-app-base-info/get-app-base-info'
+
+describe('ExtApi-GetAppBaseInfo', () => {
+
+  let page;
+  let res;
+  const stringProperties = [
+    'appId', 'appName', 'appVersion', 'appVersionCode', 'appLanguage',
+    'language', 'version', 'uniCompileVersion', 'uniPlatform', 'uniRuntimeVersion',
+  ]
+  const numberProperties = [
+    'uniCompileVersionCode', 'uniRuntimeVersionCode'
+  ]
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await uni.getAppBaseInfo();
+  });
+  it('Check properties', async () => {
+    for (const key in res) {
+      const value = res[key];
+      console.log("key :",key , "value :", value);
+      if (stringProperties.indexOf(key) != -1) {
+        expect(value).not.toBeNull();
+        expect(value).not.toBe("");
+      }
+      if (numberProperties.indexOf(key) != -1) {
+        expect(value).not.toBeNull();
+        expect(value).toBeGreaterThanOrEqual(3.90);
+      }
+    }
+  });
+});
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 4d603059b50b0226157bc3fa2a3a6b93997f9da7..43b159394ebd30e0c4f550368921cf7a8f427f95 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
@@ -37,17 +37,17 @@
 		methods: {
 			getAppBaseInfo: function () {
 				const res = uni.getAppBaseInfo();
-				//类型对象暂时不支持forin或Object.keys(), 临时通过字符串进行转化。
-				const json = JSON.stringify(res);
-				const result = JSON.parse<Map<string, any>>(json);
-				this.items = [] as Item[];
-				result?.forEach((value, key) => {
-					const item = {
-						label: key,
-						value: "" + value
-					} as Item;
-					this.items.push(item);
-				})
+        this.items = [] as Item[];
+        for(const key in res){
+          const value = res[key];
+          if(value != null){
+            const item = {
+            	label: key,
+            	value: "" + ((typeof value == "object")? JSON.stringify(value) : value)
+            } as Item;
+            this.items.push(item);
+          }
+        }
 			}
 		}
 	}
diff --git a/pages/API/get-battery-info/get-battery-info.test.js b/pages/API/get-battery-info/get-battery-info.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..30687272161f9653c97b39c43eed171339ecf647
--- /dev/null
+++ b/pages/API/get-battery-info/get-battery-info.test.js
@@ -0,0 +1,26 @@
+const PAGE_PATH = '/pages/API/get-battery-info/get-battery-info'
+
+describe('ExtApi-GetBatteryInfo', () => {
+
+  let page;
+  let res;
+ 
+  const numberProperties = [
+    'level'
+  ]
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await uni.getBatteryInfo();
+  });
+
+  it('Check properties', async () => {
+    for (const key in res) {
+      const value = res[key];
+      expect(value).not.toBeNull();
+      if (numberProperties.indexOf(key) != -1) {
+        expect(value).toBeGreaterThanOrEqual(0.1);
+      }
+    }
+  });
+});
diff --git a/pages/API/get-device-info/get-device-info.test.js b/pages/API/get-device-info/get-device-info.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..d0027337dc8c0ca9d760314ea6abf8796dd6ac1b
--- /dev/null
+++ b/pages/API/get-device-info/get-device-info.test.js
@@ -0,0 +1,30 @@
+const PAGE_PATH = '/pages/API/get-device-info/get-device-info'
+
+describe('ExtApi-GetDeviceInfo', () => {
+
+  let page;
+  let res;
+  const stringProperties = [
+    'brand', 'deviceBrand', 'deviceId', 'model', 'deviceModel',
+    'deviceType', 'devicePixelRatio', 'system', 'platform', 'uniRuntimeVersion',
+  ]
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await uni.getDeviceInfo();
+  });
+  it('Check properties', async () => {
+    for (const key in res) {
+      const value = res[key];
+      console.log("key :",key , "value :", value);
+      if (stringProperties.indexOf(key) != -1) {
+        expect(value).not.toBeNull();
+        expect(value).not.toBe("");
+      }
+      if (key == 'deviceOrientation') {
+        expect(value).not.toBeNull();
+        expect(['portrait', 'landscape']).toContain(value);
+      }
+    }
+  });
+});
diff --git a/pages/API/get-device-info/get-device-info.uvue b/pages/API/get-device-info/get-device-info.uvue
index 69f3bdbc45b96a252dc9dfbb1fafd86785094a6c..788ec9b2c11f39c8aa07126ac348acdf586c5488 100644
--- a/pages/API/get-device-info/get-device-info.uvue
+++ b/pages/API/get-device-info/get-device-info.uvue
@@ -55,18 +55,18 @@ export default {
 	},
 	methods: {
 		getDeviceInfo: function () {
-			const res = uni.getDeviceInfo();
-			//类型对象暂时不支持forin或Object.keys(), 临时通过字符串进行转化。
-			const json = JSON.stringify(res);
-			const result = JSON.parse<Map<string, any>>(json);
-			this.items = [] as Item[];
-			result?.forEach((value, key) => {
-				const item = {
-					label: key,
-					value: "" + value
-				} as Item;
-				this.items.push(item);
-			})
+			const res = uni.getDeviceInfo();
+      this.items = [] as Item[];
+      for(const key in res){
+        const value = res[key];
+        if(value != null){
+          const item = {
+          	label: key,
+          	value: "" + ((typeof value == "object")? JSON.stringify(value) : value)
+          } as Item;
+          this.items.push(item);
+        }
+      }
 		}
 	}
 }
diff --git a/pages/API/get-element-by-id/get-element-by-id.test.js b/pages/API/get-element-by-id/get-element-by-id.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..34cd75ede394262db4f4eca5e5921d75e472b8c2
--- /dev/null
+++ b/pages/API/get-element-by-id/get-element-by-id.test.js
@@ -0,0 +1,20 @@
+const PAGE_PATH = "/pages/API/get-element-by-id/get-element-by-id";
+let page;
+
+describe("getElementById", () => {
+  beforeAll(async () => {
+    page = await program.navigateTo(PAGE_PATH);
+    await page.waitFor(1000);
+  });
+  it("getElementByNotExistId", async () => {
+    const res = await page.callMethod("getElementByNotExistId");
+    expect(!!res).toBe(false);
+  });
+  it("changeStyle", async () => {
+    await page.callMethod("changePageHeadBackgroundColor");
+    await page.callMethod("changeTextColor");
+    await page.callMethod("changeViewStyle");
+    const image = await program.screenshot();
+    expect(image).toMatchImageSnapshot();
+  });
+});
diff --git a/pages/API/get-element-by-id/get-element-by-id.uvue b/pages/API/get-element-by-id/get-element-by-id.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..6975757b1f4ca33586de1ea15435359eac03b1c7
--- /dev/null
+++ b/pages/API/get-element-by-id/get-element-by-id.uvue
@@ -0,0 +1,51 @@
+<template>
+  <view>
+    <page-head id="page-head" title="getElementById"></page-head>
+    <view class="uni-padding-wrap">
+      <text id="text">this is text</text>
+      <view id="view" class="uni-common-mt" style="border: 1px solid red"
+        >this is view</view
+      >
+      <button class="uni-btn" @click="changePageHeadBackgroundColor">
+        修改 page-head 背景色
+      </button>
+      <button class="uni-btn" @click="changeTextColor">
+        修改 text 字体颜色
+      </button>
+      <button class="uni-btn" @click="changeViewStyle">
+        修改 view 宽高及背景色
+      </button>
+    </view>
+  </view>
+</template>
+
+<script lang="uts">
+export default {
+  data() {
+    return {
+      checked: false,
+      homePagePath: '/pages/tabBar/component',
+      launchOptionsPath: '',
+    }
+  },
+  methods: {
+    getElementByNotExistId(): Element | null {
+      return uni.getElementById('not-exist-id')
+    },
+    changePageHeadBackgroundColor(){
+      const pageHead = uni.getElementById('page-head')!
+      pageHead.style.setProperty('backgroundColor', 'red')
+    },
+    changeTextColor(){
+      const text = uni.getElementById('text')!
+      text.style.setProperty('color', 'red')
+    },
+    changeViewStyle(){
+      const view = uni.getElementById('view')!
+      view.style.setProperty('width', '90%')
+      view.style.setProperty('height', '50px')
+      view.style.setProperty('backgroundColor', '#007AFF')
+    }
+  }
+}
+</script>
diff --git a/pages/API/get-launch-options-sync/get-launch-options-sync.uvue b/pages/API/get-launch-options-sync/get-launch-options-sync.uvue
index b4e550e6a3455bdf3e88e3e913320986dc975b77..0e1ce6975d4921c357846563a33841bfc1c17c56 100644
--- a/pages/API/get-launch-options-sync/get-launch-options-sync.uvue
+++ b/pages/API/get-launch-options-sync/get-launch-options-sync.uvue
@@ -1,13 +1,12 @@
 <template>
   <view>
     <page-head title="getLaunchOptionsSync"></page-head>
-    <button @click="getLaunchOptionsSync">getLaunchOptionsSync</button>
-    <view
-      v-if="launchOptionsPath.length > 0"
-      class="uni-common-pl uni-common-mt"
-    >
-      <text>应用启动路径：</text>
-      <text style="margin-top: 5px">{{ launchOptionsPath }}</text>
+    <view class="uni-padding-wrap">
+      <button @click="getLaunchOptionsSync">getLaunchOptionsSync</button>
+      <view v-if="launchOptionsPath.length > 0" class="uni-common-mt">
+        <text>应用启动路径：</text>
+        <text style="margin-top: 5px">{{ launchOptionsPath }}</text>
+      </view>
     </view>
   </view>
 </template>
@@ -22,7 +21,7 @@ export default {
     }
   },
   methods: {
-    getLaunchOptionsSync: function () {
+    getLaunchOptionsSync() {
       const launchOptions = uni.getLaunchOptionsSync()
       this.launchOptionsPath = launchOptions.path
       if (launchOptions.path == this.homePagePath) {
diff --git a/pages/API/get-location/get-location.uvue b/pages/API/get-location/get-location.uvue
index e7d2c5631a3368e29fe31b882241cea078eafa66..533bb80066895ae27b2012d888c4b29e39054e3f 100644
--- a/pages/API/get-location/get-location.uvue
+++ b/pages/API/get-location/get-location.uvue
@@ -6,7 +6,7 @@
         真机运行标准基座仅包含系统定位，即system。\n
         部分手机因gms兼容不好可能导致无法定位。\n
         gcj国标、逆地理信息等功能需三方sdk定位。如果需要类似能力可以下载腾讯定位插件，打包自定义基座。参考示例：</text>
-    	<u-link :href="'https://gitcode.net/dcloud/uni-api/'" :text="'https://gitcode.net/dcloud/uni-api/'" :inWhiteList="true"></u-link>
+    	<u-link :href="'https://ext.dcloud.net.cn/plugin?id=14569'" :text="'https://ext.dcloud.net.cn/plugin?id=14569'" :inWhiteList="true"></u-link>
     </view>
 
     <view class="uni-padding-wrap uni-common-mt">
diff --git a/pages/API/get-network-type/get-network-type.test.js b/pages/API/get-network-type/get-network-type.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e7cb59470a75f9b5ff31a7ab1c5da811b920f6c
--- /dev/null
+++ b/pages/API/get-network-type/get-network-type.test.js
@@ -0,0 +1,18 @@
+const PAGE_PATH = '/pages/API/get-network-type/get-network-type'
+
+describe('ExtApi-GetNetworkType', () => {
+
+  let page;
+  let res;
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    await page.callMethod('jest_getNetworkType');
+    await page.waitFor(200);
+    res = await page.data('jest_result');
+  });
+
+  it('Check ', async () => {
+    expect(res).toBe(true);
+  });
+});
diff --git a/pages/API/get-network-type/get-network-type.uvue b/pages/API/get-network-type/get-network-type.uvue
index aef82001acfa33b898a8432bc3341bca58cc6916..dcae67e586dbe9c737135e900e9e30e4c13e33b7 100644
--- a/pages/API/get-network-type/get-network-type.uvue
+++ b/pages/API/get-network-type/get-network-type.uvue
@@ -3,10 +3,10 @@
 		<page-head :title="title"></page-head>
 		<view class="uni-padding-wrap uni-common-mt">
 			<view style="background:#FFFFFF; padding:40rpx;">
-				<view class="uni-hello-text uni-center">网络状态</view>
+				<view class="uni-center">网络状态</view>
 				<view v-if="hasNetworkType == false">
 					<view class="uni-h2 uni-center uni-common-mt">未获取</view>
-					<view class="uni-hello-text uni-center uni-common-mt">请点击下面按钮获取网络状态</view>
+					<view class="uni-center uni-common-mt">请点击下面按钮获取网络状态</view>
 				</view>
 				<view v-if="hasNetworkType == true">
 					<view class="uni-h2 uni-center uni-common-mt">{{networkType}}</view>
@@ -27,7 +27,9 @@
 				hasNetworkType: false,
 				networkType: '',
 				connectedWifi: '',
-				pageVisible: false
+				pageVisible: false,
+        //自动化测试例专用
+        jest_result:false,
 			}
 		},
 		onLoad() {
@@ -60,11 +62,22 @@
 				this.hasNetworkType = false;
 				this.networkType = '';
 				this.connectedWifi = '';
-			},
+			},
+      //自动化测试例专用
+      jest_getNetworkType(){
+        uni.getNetworkType({
+        	success: () => {
+            this.jest_result = true;
+        	},
+        	fail: () => {
+            this.jest_result = false;
+        	}
+        })
+      }
 		}
 	}
 </script>
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/API/get-system-info/get-system-info.test.js b/pages/API/get-system-info/get-system-info.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a614780afe15fe8a0b92e7dddf241f0b42d883d
--- /dev/null
+++ b/pages/API/get-system-info/get-system-info.test.js
@@ -0,0 +1,42 @@
+const PAGE_PATH = '/pages/API/get-system-info/get-system-info'
+
+describe('ExtApi-GetSystemInfo', () => {
+
+  let page;
+  let res;
+  const stringProperties = [
+    'appId', 'appLanguage', 'appName', 'appVersion', 'appVersionCode',
+    'brand', 'deviceId', 'deviceBrand', 'deviceModel', 'deviceType', 'language',
+    'model', 'version', 'osName', 'osVersion', 'osLanguage', 'platform', 'system', 'ua', 'uniCompileVersion',
+    'uniPlatform', 'uniRuntimeVersion', 'romName', 'romVersion',
+  ]
+  const numberProperties = [
+    'osAndroidAPILevel', 'devicePixelRatio', 'pixelRatio', 'screenWidth', 'screenHeight', 'statusBarHeight',
+    'windowWidth',
+    'windowHeight', 'windowTop', 'windowBottom', 'screenTop',
+    'uniCompileVersionCode', 'uniRuntimeVersionCode'
+  ]
+
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await page.callMethod('jest_getSystemInfo')
+  });
+  it('Check GetSystemInfoSync', async () => {
+    for (const key in res) {
+      const value = res[key];
+      console.log("key :",key , "value :", value);
+      if (stringProperties.indexOf(key) != -1) {
+        expect(value).not.toBeNull();
+        expect(value).not.toBe("");
+      }
+      if (numberProperties.indexOf(key) != -1) {
+        expect(value).not.toBeNull();
+        expect(value).toBeGreaterThanOrEqual(0);
+      }
+      if (key == 'deviceOrientation') {
+        expect(['portrait', 'landscape']).toContain(value);
+      }
+    }
+  });
+});
diff --git a/pages/API/get-system-info/get-system-info.uvue b/pages/API/get-system-info/get-system-info.uvue
index 7acbba04a8128614e2b278c5e914388579d32754..a97ac104f50d62cef94c2e488daa97bea651976c 100644
--- a/pages/API/get-system-info/get-system-info.uvue
+++ b/pages/API/get-system-info/get-system-info.uvue
@@ -28,8 +28,11 @@
         </view>
         <view class="uni-padding-wrap">
           <view class="uni-btn-v">
-            <button type="primary" @tap="getSystemInfo">
-              获取设备系统信息
+            <button type="primary" @tap="getSystemInfoSync">
+              同步获取设备系统信息
+            </button>
+            <button type="primary" @tap="getSystemInfo" style="margin-top: 20px;">
+              异步获取设备系统信息
             </button>
           </view>
         </view>
@@ -54,23 +57,41 @@ export default {
 	onUnload: function () {
 	},
 	methods: {
-		getSystemInfo: function () {
+		getSystemInfo: function () {
 			uni.getSystemInfo({
-				success: (res) => {
-					//类型对象暂时不支持forin或Object.keys(), 临时通过字符串进行转化。
-					const json = JSON.stringify(res);
-					const result = JSON.parse<Map<string, any>>(json);
-					this.items = [] as Item[];
-					result?.forEach((value, key) => {
-						const item = {
-							label: key,
-							value: "" + value
-						} as Item;
-						this.items.push(item);
-					})
+				success: (res) => {
+          this.items = [] as Item[];
+          for(const key in res){
+            const value = res[key];
+            if(value != null){
+              const item = {
+              	label: key,
+              	value: "" + ((typeof value == "object")? JSON.stringify(value) : value)
+              } as Item;
+              this.items.push(item);
+            }
+          }
 				},
 			})
-		}
+		},
+    getSystemInfoSync: function () {
+      this.items = [] as Item[];
+      const res = uni.getSystemInfoSync()
+    	for(const key in res){
+    	  const value = res[key];
+    	  if(value != null){
+    	    const item = {
+    	    	label: key,
+    	    	value: "" + ((typeof value == "object")? JSON.stringify(value) : value)
+    	    } as Item;
+    	    this.items.push(item);
+    	  }
+    	}
+    },
+    //自动化测试例专用
+    jest_getSystemInfo():GetSystemInfoResult{
+      return uni.getSystemInfoSync();
+    },
 	}
 }
 </script>
diff --git a/pages/API/get-system-setting/get-system-setting.test.js b/pages/API/get-system-setting/get-system-setting.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..851dd0764f3c772cee6bdc2af1e44a4469b82f84
--- /dev/null
+++ b/pages/API/get-system-setting/get-system-setting.test.js
@@ -0,0 +1,32 @@
+const PAGE_PATH = '/pages/API/get-system-setting/get-system-setting'
+
+describe('ExtApi-GetSystemSetting', () => {
+
+  let page;
+  let res;
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await uni.getSystemSetting()
+  });
+  it('Check GetSystemSetting', async () => {
+    for (const key in res) {
+      const value = res[key];
+      if (res['bluetoothEnabled'] == undefined) {
+        expect(res['bluetoothError']).not.toBe("")
+      } else {
+        expect(res['bluetoothError'] == undefined).toBe(true)
+      }
+
+      if (res['wifiEnabled'] == undefined) {
+        expect(res['wifiError']).not.toBe("")
+      } else {
+        expect(res['wifiError'] == undefined).toBe(true)
+      }
+
+      if (key == 'deviceOrientation') {
+        expect(['portrait', 'landscape']).toContain(value);
+      }
+    }
+  });
+});
diff --git a/pages/API/get-system-setting/get-system-setting.uvue b/pages/API/get-system-setting/get-system-setting.uvue
index b3d348ea06d603f19cedb5fea5b938fdb5110fa4..253d6e0d85df8513d29e46b707c998754719a701 100644
--- a/pages/API/get-system-setting/get-system-setting.uvue
+++ b/pages/API/get-system-setting/get-system-setting.uvue
@@ -61,9 +61,9 @@
 			getSystemSetting: function () {
 				const res = uni.getSystemSetting();
 				this.bluetoothEnabled = (res.bluetoothEnabled ?? false) ? "开启" : "关闭";
-				this.locationEnabled = (res.locationEnabled ?? false) ? "开启" : "关闭";
+				this.locationEnabled = res.locationEnabled ? "开启" : "关闭";
 				this.wifiEnabled = (res.wifiEnabled ?? false) ? "开启" : "关闭";
-				this.deviceOrientation = res.deviceOrientation ?? "";
+				this.deviceOrientation = res.deviceOrientation
 			}
 		}
 	}
diff --git a/pages/API/get-window-info/get-window-info.test.js b/pages/API/get-window-info/get-window-info.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6a636178c22548973017942059bbf4a719584df
--- /dev/null
+++ b/pages/API/get-window-info/get-window-info.test.js
@@ -0,0 +1,28 @@
+const PAGE_PATH = '/pages/API/get-window-info/get-window-info'
+
+describe('ExtApi-GetWindowInfo', () => {
+
+  let page;
+  let res;
+  const numberProperties = [
+    'pixelRatio', 'screenWidth', 'screenHeight', 'statusBarHeight',
+    'windowWidth',
+    'windowHeight', 'windowTop', 'windowBottom', 'screenTop'
+  ]
+
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    res = await page.callMethod('jest_getWindowInfo')
+  });
+
+  it('Check GetWindowInfo', async () => {
+    for (const key in res) {
+      const value = res[key];
+      expect(value).not.toBeNull();
+      if (numberProperties.indexOf(key) != -1) {
+        expect(value).toBeGreaterThanOrEqual(0);
+      }
+    }
+  });
+});
diff --git a/pages/API/get-window-info/get-window-info.uvue b/pages/API/get-window-info/get-window-info.uvue
index 42ffd05ddcde75bdf4b719759f61566fcba1e05f..2931fdb31078a874fe4c609b63500e9a96c7bc9f 100644
--- a/pages/API/get-window-info/get-window-info.uvue
+++ b/pages/API/get-window-info/get-window-info.uvue
@@ -37,18 +37,22 @@
 		methods: {
 			getWindowInfo: function () {
 				const res = uni.getWindowInfo();
-				//类型对象暂时不支持forin或Object.keys(), 临时通过字符串进行转化。
-				const json = JSON.stringify(res);
-				const result = JSON.parse<Map<string, any>>(json);
-				this.items = [] as Item[];
-				result?.forEach((value, key) => {
-					const item = {
-						label: key,
-						value: "" + value
-					} as Item;
-					this.items.push(item);
-				})
-			}
+        this.items = [] as Item[];
+				for(const key in res){
+				  const value = res[key];
+          if(value != null){
+            const item = {
+            	label: key,
+            	value: "" + ((typeof value == "object")? JSON.stringify(value) : value)
+            } as Item;
+            this.items.push(item);
+          }
+				}
+			},
+      //自动化测试例专用
+      jest_getWindowInfo():GetWindowInfoResult{
+        return uni.getWindowInfo();
+      },
 		}
 	}
 </script>
diff --git a/pages/API/loading/loading.uvue b/pages/API/loading/loading.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..47639cd8acd4c79666f466367e62fb0721d036cf
--- /dev/null
+++ b/pages/API/loading/loading.uvue
@@ -0,0 +1,113 @@
+<template>
+  <view>
+    <page-head :title="title"></page-head>
+    <view class="uni-list">
+      <view class="uni-list-cell uni-list-cell-pd">
+        <view class="uni-list-cell-db">是否显示透明蒙层-屏蔽点击事件</view>
+        <switch :checked="maskSelect" @change="maskChange" />
+      </view>
+      <view class="uni-padding-wrap">
+        <view class="uni-title uni-common-mt">
+          <text class="uni-title-text"> 设置标题 </text>
+        </view>
+      </view>
+      <view class="uni-list uni-common-pl">
+        <radio-group @change="radioChange" class="radio-group">
+          <radio class="uni-list-cell uni-list-cell-pd radio" v-for="(item, index) in items" :key="item.value"
+            :class="index < items.length - 1 ? 'uni-list-cell-line' : ''" :value="item.value"
+            :checked="index === current">
+            {{ item.name }}
+          </radio>
+        </radio-group>
+      </view>
+    </view>
+    <view class="uni-padding-wrap">
+      <view class="uni-btn-v">
+        <button class="uni-btn-v" type="primary" @click="showLoading">显示 loading 提示框</button>
+        <!-- #ifndef MP-ALIPAY -->
+        <button class="uni-btn-v" @click="hideLoading">隐藏 loading 提示框</button>
+        <!-- #endif -->
+      </view>
+    </view>
+  </view>
+</template>
+<script lang="uts">
+  type ItemType = {
+    value : string
+    name : string
+  }
+  export default {
+    data() {
+      return {
+        title: 'loading',
+        items: [
+          {
+            value: 'null',
+            name: '无标题',
+          },
+          {
+            value: '三秒后自动关闭',
+            name: '普通标题',
+          },
+          {
+            value: '超长文本内容，测试超出范围-超长文本内容，测试超出范围-三秒后自动关闭',
+            name: '长标题',
+          },
+        ] as ItemType[],
+        current: 0,
+        maskSelect: false,
+        titleSelect: "null"
+      }
+    },
+    methods: {
+
+      radioChange(e : RadioGroupChangeEvent) {
+        const selected = this.items.find((item) : boolean => {
+          return item.value == e.detail.value
+        })
+        if (selected != null) {
+          this.titleSelect = selected.value
+        }
+      },
+      maskChange: function (e : SwitchChangeEvent) {
+        this.maskSelect = e.detail.value
+      },
+      showLoading: function () {
+
+        console.log(this.titleSelect)
+        if (this.titleSelect == "null") {
+          uni.showLoading({
+            title: "",
+            mask: this.maskSelect
+          });
+        } else {
+          uni.showLoading({
+            title: this.titleSelect,
+            mask: this.maskSelect
+          });
+        }
+        // #ifdef MP-ALIPAY
+        this._showTimer && clearTimeout(this._showTimer);
+        this._showTimer = setTimeout(() => {
+          this.hideLoading();
+        }, 3000)
+        // #endif
+        // #ifdef APP-PLUS
+        setTimeout(function () {
+          this.hideLoading();
+        }, 3000);
+        // #endif
+      },
+      hideLoading: function () {
+        uni.hideLoading();
+      }
+    }
+    // #ifdef MP-ALIPAY
+    ,
+    onUnload() {
+      // 页面卸载的时候，手动关闭loading
+      this._showTimer && clearTimeout(this._showTimer);
+    }
+    // #endif
+  }
+</script>
\ No newline at end of file
diff --git a/pages/API/navigator/new-page/new-page-2.test.js b/pages/API/navigator/new-page/new-page-2.test.js
index e559e69963af0c15cfb2ac75bf409eeece5c5212..2ea7cadc05aaa00df4b62bb7280d8ed665b61755 100644
--- a/pages/API/navigator/new-page/new-page-2.test.js
+++ b/pages/API/navigator/new-page/new-page-2.test.js
@@ -1,3 +1,4 @@
+jest.setTimeout(30000)
 const PAGE_PATH = '/pages/API/navigator/new-page/new-page-2'
 const INTERMEDIATE_PAGE_PATH = '/pages/API/navigator/navigator'
 let page
diff --git a/pages/API/navigator/new-page/new-page-2.uvue b/pages/API/navigator/new-page/new-page-2.uvue
index b41bbc33bbb1ba9591045d2c13661bfa6b967764..661f8bfcbf0d77dafd52163931c3d5e6f100b42f 100644
--- a/pages/API/navigator/new-page/new-page-2.uvue
+++ b/pages/API/navigator/new-page/new-page-2.uvue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="uts">
-import { State, state, setLifeCycleNum } from '@/store/index.uts'
+import { state, setLifeCycleNum } from '@/store/index.uts'
 
 export default {
   data() {
@@ -20,7 +20,7 @@ export default {
       isScrolled: false,
     }
   },
-  onLoad(_ : OnLoadOptions) {
+  onLoad(_ : Map<string, string>) {
     // 自动化测试
     setLifeCycleNum(state.lifeCycleNum + 100)
   },
@@ -77,7 +77,7 @@ export default {
     },
     scrollToBottom() {
       uni.pageScrollTo({
-        scrollTop: 2000,
+        scrollTop: 2000
       })
     },
   },
diff --git a/pages/API/nodes-info/nodes-info.uvue b/pages/API/nodes-info/nodes-info.uvue
index b0df9542c1690bc92a504ea72d64fcb6c5e3fe20..c79f48c2cc01f424396701ad9999498d4d489751 100644
--- a/pages/API/nodes-info/nodes-info.uvue
+++ b/pages/API/nodes-info/nodes-info.uvue
@@ -39,24 +39,51 @@
 </template>
 
 <script>
+  type NodeInfoType = {
+    left : number | null,
+    top : number | null,
+    right : number | null,
+    bottom : number | null,
+    width : number | null,
+    height : number | null,
+  }
+
   export default {
     data() {
       return {
         title: 'createSelectorQuery',
-        nodeInfoList: [] as NodeInfo[],
+        nodeInfoList: [] as NodeInfoType[],
       }
     },
     methods: {
       getNodeInfo() {
         uni.createSelectorQuery().select('.rect1').boundingClientRect().exec((ret) => {
           this.nodeInfoList.length = 0
-          this.nodeInfoList.push(ret[0] as NodeInfo)
+          const i = ret[0] as NodeInfo
+          this.nodeInfoList.push({
+            left: i.left,
+            top: i.top,
+            right: i.right,
+            bottom: i.bottom,
+            width: i.width,
+            height: i.height,
+          } as NodeInfoType)
         })
       },
       getAllNodeInfo() {
         uni.createSelectorQuery().selectAll('.rect').boundingClientRect().exec((ret) => {
           this.nodeInfoList.length = 0
-          this.nodeInfoList.push(...(ret[0] as NodeInfo[]))
+          const array = ret[0] as NodeInfo[]
+          array.forEach((i) => {
+            this.nodeInfoList.push({
+              left: i.left,
+              top: i.top,
+              right: i.right,
+              bottom: i.bottom,
+              width: i.width,
+              height: i.height,
+            } as NodeInfoType)
+          })
         })
       }
     }
@@ -110,4 +137,4 @@
     font-weight: bold;
     line-height: 2;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/API/page-scroll-to/page-scroll-to.test.js b/pages/API/page-scroll-to/page-scroll-to.test.js
index 730fa5397b1dac0b0dfe5e61693c1c5ad3d5feca..5a3c1be8b35fa86eb0098927021eb7b788278ab7 100644
--- a/pages/API/page-scroll-to/page-scroll-to.test.js
+++ b/pages/API/page-scroll-to/page-scroll-to.test.js
@@ -6,22 +6,23 @@ describe('page-scroll-to', () => {
     page = await program.reLaunch(PAGE_PATH)
     await page.waitFor(500)
   })
-  // TODO
   it('scroll-to', async () => {
     const btnScrollTo = await page.$('.btn-scrollTo')
 
     await btnScrollTo.tap()
-    await page.waitFor(50)
-    // const scrollTop = await page.scrollTop()
-    // expect(scrollTop).toBe(100)
+    await page.waitFor(300)
+
+    const scrollTop = await page.scrollTop()
+    expect(scrollTop).toBe(100)
   })
-  // it('scroll-to-element', async () => {
-  //   const btnScrollTo = await page.$('.btn-scrollToElement')
-  //   const scrollToElement = await page.$('.custom-element')
+  it('scroll-to-element', async () => {
+    const btnScrollTo = await page.$('.btn-scrollToElement')
+    const scrollToElement = await page.$('.custom-element')
+
+    await btnScrollTo.tap()
+    await page.waitFor(300)
 
-  //   await btnScrollTo.tap()
-  //   await page.waitFor(50)
-  //   const offset = await scrollToElement.offset()
-  //   expect(offset.top).toBe(0)
-  // })
-})
\ No newline at end of file
+    const offset = await scrollToElement.offset()
+    expect(offset.top >= 1188).toBe(true)
+  })
+})
diff --git a/pages/API/page-scroll-to/page-scroll-to.uvue b/pages/API/page-scroll-to/page-scroll-to.uvue
index 5e89de99192769e3fdb917ca52d7157491f1353b..43b8ee329e748a168dfd0d92ed0267302a727f2f 100644
--- a/pages/API/page-scroll-to/page-scroll-to.uvue
+++ b/pages/API/page-scroll-to/page-scroll-to.uvue
@@ -27,7 +27,7 @@
   <!-- #endif -->
 </template>
 
-<script lang="uts">
+<script>
 export default {
   data() {
     return {
diff --git a/pages/API/request/request.test.js b/pages/API/request/request.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..58555dcb047e4b3aa77e7aec666793b2cf3dc543
--- /dev/null
+++ b/pages/API/request/request.test.js
@@ -0,0 +1,79 @@
+const PAGE_PATH = '/pages/API/request/request'
+
+
+const methodMap = {
+  "GET": "/api/http/method/get",
+  "POST": "/api/http/method/post",
+  "PUT": "/api/http/method/put",
+  "DELETE": "/api/http/method/delete",
+  "PATCH": "/api/http/method/patch",
+  "OPTIONS": "/api/http/method/options",
+  "HEAD": "/api/http/method/head"
+}
+
+async function request(page, method, header, data, url) {
+  if (url == null) {
+    url = methodMap[method]
+  }
+  await page.setData({
+    url: url,
+    method: method,
+    data: data,
+    header: header
+  })
+  res = await page.callMethod('jest_request')
+  await page.waitFor(200);
+  res = await page.data('jest_result');
+  expect(res).toBe(true)
+}
+
+describe('ExtApi-Request', () => {
+  let page;
+  let res;
+
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+  });
+
+
+  beforeEach(async () => {
+    await page.setData({
+      jest_result: false,
+      data: null,
+      header: null
+    })
+  });
+
+
+  it('Check GET', async () => {
+    await request(page, 'GET');
+  });
+  it('Check POST ContentType Json', async () => {
+    await request(page, 'POST', {
+      "Content-Type": "application/json"
+    }, {
+      "hello": "world"
+    }, "/api/http/contentType/json");
+  });
+  it('Check POST ContentType Form', async () => {
+    await request(page, 'POST', {
+      "Content-Type": "application/x-www-form-urlencoded"
+    }, "hello=world", "/api/http/contentType/xWwwFormUrlencoded");
+  });
+  it('Check PUT', async () => {
+    await request(page, 'PUT');
+  });
+  it('Check DELETE', async () => {
+    await request(page, 'DELETE');
+  });
+  it('Check PATCH', async () => {
+    await request(page, 'PATCH');
+  });
+  it('Check OPTIONS', async () => {
+    await request(page, 'OPTIONS');
+  });
+  it('Check HEAD', async () => {
+    await request(page, 'HEAD');
+  });
+});
diff --git a/pages/API/request/request.uvue b/pages/API/request/request.uvue
index 128ae395c85a53809d14390a3cfbd5c2359b7468..db5da0b871cc3a4b21e2b364a57589f84880610a 100644
--- a/pages/API/request/request.uvue
+++ b/pages/API/request/request.uvue
@@ -1,221 +1,242 @@
 <template>
-	<view style="flex: 1;">
-		<view class="uni-padding-wrap uni-common-mt">
-			<view class="uni-textarea uni-common-mt" style="border-width: 2rpx;border-radius: 4rpx;">
-				<textarea :value="res"></textarea>
-			</view>
-			<view>
-				<text>地址 : {{ host + url}}</text>
-				<text>请求方式 : {{method}}</text>
-			</view>
-			<view class="uni-btn-v uni-common-mt">
-				<button type="primary" @click="sendRequest">发起请求</button>
-			</view>
-		</view>
-		<scroll-view style="flex: 1;" show-scrollbar="true">
-			<view style="padding: 20rpx;">
-				<text>设置请求方式</text>
-				<view class="uni-common-pb"></view>
-				<view style="flex-direction: row;flex-wrap: wrap;">
-					<button style="padding: 5rpx; margin-right: 10rpx;" type="primary" size="mini"
-						@click="changeMethod('GET')">GET</button>
-					<button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
-						@click="changeMethod('POST')">POST</button>
-					<button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
-						@click="changeMethod('PUT')">PUT</button>
-					<button style="padding: 5rpx; margin-right: 10rpx;" type="primary" size="mini"
-						@click="changeMethod('DELETE')">DELETE</button>
-					<button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
-						@click="changeMethod('PATCH')">PATCH</button>
-					<button style="padding: 5rpx;margin-right: 10rpx;" type="primary" size="mini"
-						@click="changeMethod('OPTIONS')">OPTIONS</button>
-					<button style="padding: 5rpx;" type="primary" size="mini"
-						@click="changeMethod('HEAD')">HEAD</button>
-				</view>
-			</view>
-			<view style="padding: 20rpx;">
-				<text>请求返回错误码的接口（默认为GET）</text>
-				<view class="uni-common-pb"></view>
-				<view style="flex-direction: row;flex-wrap: wrap;">
-					<button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in errorCodeUrls"
-						:key="index" @click="changeUrl(item)">{{item}}</button>
-				</view>
-			</view>
-			<view style="padding: 20rpx;">
-				<text>请求不同header的接口（默认为GET）</text>
-				<view class="uni-common-pb"></view>
-				<view style="flex-direction: row;flex-wrap: wrap;">
-					<button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in headerUrls"
-						:key="index" @click="changeUrl(item)">{{item}}</button>
-				</view>
-			</view>
-			<view style="padding: 20rpx;">
-				<text>请求不同content-type的接口（默认为GET）</text>
-				<view class="uni-common-pb"></view>
-				<view style="flex-direction: row;flex-wrap: wrap;">
-					<button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in contentTypeUrls"
-						:key="index" @click="changeUrl(item)">{{item}}</button>
-				</view>
-			</view>
+  <view style="flex: 1;">
+    <view class="uni-padding-wrap uni-common-mt">
+      <view class="uni-common-mt" style="border-width: 2rpx;border-radius: 4rpx;">
+        <textarea :value="res" class="uni-textarea"></textarea>
+      </view>
+      <view>
+        <text>地址 : {{ host + url}}</text>
+        <text>请求方式 : {{method}}</text>
+      </view>
+      <view class="uni-btn-v uni-common-mt">
+        <button type="primary" @click="sendRequest">发起请求</button>
+      </view>
+    </view>
+    <scroll-view style="flex: 1;" show-scrollbar="true">
+      <view style="padding: 20rpx;">
+        <text>设置请求方式</text>
+        <view class="uni-common-pb"></view>
+        <view style="flex-direction: row;flex-wrap: wrap;">
+          <button style="padding: 5rpx; margin-right: 10rpx;" type="primary" size="mini"
+            @click="changeMethod('GET')">GET</button>
+          <button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
+            @click="changeMethod('POST')">POST</button>
+          <button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
+            @click="changeMethod('PUT')">PUT</button>
+          <button style="padding: 5rpx; margin-right: 10rpx;" type="primary" size="mini"
+            @click="changeMethod('DELETE')">DELETE</button>
+          <button style="padding: 5rpx; margin-right: 10rpx; " type="primary" size="mini"
+            @click="changeMethod('PATCH')">PATCH</button>
+          <button style="padding: 5rpx;margin-right: 10rpx;" type="primary" size="mini"
+            @click="changeMethod('OPTIONS')">OPTIONS</button>
+          <button style="padding: 5rpx;" type="primary" size="mini" @click="changeMethod('HEAD')">HEAD</button>
+        </view>
+      </view>
+      <view style="padding: 20rpx;">
+        <text>请求返回错误码的接口（默认为GET）</text>
+        <view class="uni-common-pb"></view>
+        <view style="flex-direction: row;flex-wrap: wrap;">
+          <button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in errorCodeUrls" :key="index"
+            @click="changeUrl(item)">{{item}}</button>
+        </view>
+      </view>
+      <view style="padding: 20rpx;">
+        <text>请求不同header的接口（默认为GET）</text>
+        <view class="uni-common-pb"></view>
+        <view style="flex-direction: row;flex-wrap: wrap;">
+          <button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in headerUrls" :key="index"
+            @click="changeUrl(item)">{{item}}</button>
+        </view>
+      </view>
+      <view style="padding: 20rpx;">
+        <text>请求不同content-type的接口（默认为GET）</text>
+        <view class="uni-common-pb"></view>
+        <view style="flex-direction: row;flex-wrap: wrap;">
+          <button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in contentTypeUrls"
+            :key="index" @click="changeUrl(item)">{{item}}</button>
+        </view>
+      </view>
 
-			<view style="padding: 20rpx;">
-				<text>POST请求(有body)</text>
-				<view class="uni-common-pb"></view>
-				<view style="flex-direction: row;flex-wrap: wrap;">
-					<button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in postUrls"
-						:key="index" @click="changeUrlFromPost(item)">{{item}}</button>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
+      <view style="padding: 20rpx;">
+        <text>POST请求(有body)</text>
+        <view class="uni-common-pb"></view>
+        <view style="flex-direction: row;flex-wrap: wrap;">
+          <button style="padding: 5rpx;" type="primary" size="mini" v-for="(item, index) in postUrls" :key="index"
+            @click="changeUrlFromPost(item)">{{item}}</button>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
 </template>
 <script>
-	import RequestTask from 'uts.sdk.modules.DCloudUniNetwork.RequestTask';
-	const duration = 2000
-	const methodMap = {
-		"GET": "/api/http/method/get",
-		"POST": "/api/http/method/post",
-		"PUT": "/api/http/method/put",
-		"DELETE": "/api/http/method/delete",
-		"PATCH": "/api/http/method/patch",
-		"OPTIONS": "/api/http/method/options",
-		"HEAD": "/api/http/method/head"
-	}
+  const duration = 2000
+  const methodMap = {
+    "GET": "/api/http/method/get",
+    "POST": "/api/http/method/post",
+    "PUT": "/api/http/method/put",
+    "DELETE": "/api/http/method/delete",
+    "PATCH": "/api/http/method/patch",
+    "OPTIONS": "/api/http/method/options",
+    "HEAD": "/api/http/method/head"
+  }
 
 
-	export default {
-		data() {
-			return {
-				title: 'request',
-				res: '',
-				task: null as RequestTask | null,
-				pageVisible: false,
-				host: "http://request.dcloud.net.cn",
-				url: "/api/http/method/get",
-				method: "GET",
-				data: null as any | null,
-				header: null as UTSJSONObject | null,
-				errorCodeUrls: [
-					"/api/http/statusCode/200",
-					"/api/http/statusCode/204",
-					"/api/http/statusCode/301",
-					"/api/http/statusCode/302",
-					"/api/http/statusCode/307",
-					"/api/http/statusCode/400",
-					"/api/http/statusCode/401",
-					"/api/http/statusCode/403",
-					"/api/http/statusCode/404",
-					"/api/http/statusCode/405",
-					"/api/http/statusCode/500",
-					"/api/http/statusCode/502",
-					"/api/http/statusCode/503",
-					"/api/http/statusCode/504",
-				],
-				headerUrls: [
-					"/api/http/header/ua",
-					"/api/http/header/referer",
-					"/api/http/header/requestCookie",
-					"/api/http/header/setCookie",
-					"/api/http/header/deleteCookie"
-				],
-				contentTypeUrls: [
-					"/api/http/contentType/text/plain",
-					"/api/http/contentType/text/html",
-					"/api/http/contentType/text/xml",
-					"/api/http/contentType/image/gif",
-					"/api/http/contentType/image/jpeg",
-					"/api/http/contentType/image/png",
-					"/api/http/contentType/application/json",
-					"/api/http/contentType/application/octetStream",
-				],
-				postUrls: [
-					"/api/http/contentType/json",
-					"/api/http/contentType/xWwwFormUrlencoded",
-				],
-			}
-		},
-		onLoad() {
-			this.pageVisible = true;
-		},
-		onUnload() {
-			this.pageVisible = false;
-			uni.hideLoading();
-			this.task?.abort();
-		},
-		methods: {
-			changeMethod(e : string) {
-				this.method = e;
-				this.url = methodMap[e] as string;
-				this.data = null;
-				this.header = null;
-			},
-			changeUrl(e : string) {
-				this.method = "GET";
-				this.url = e;
-				this.data = null;
-				this.header = null;
-			},
-			changeUrlFromPost(e : string) {
-				this.method = "POST";
-				this.url = e;
-				switch (e) {
-					case "/api/http/contentType/json":
-						this.header = {
-							"Content-Type": "application/json"
-						};
-						this.data = {
-							"hello": "world"
-						};
-						break;
-					case "/api/http/contentType/xWwwFormUrlencoded":
-						this.header = {
-							"Content-Type": "application/x-www-form-urlencoded"
-						};
-						this.data = "hello=world";
-						break;
-				}
-			},
-			sendRequest() {
-				uni.showLoading({
-					title: "请求中..."
-				})
-				this.task = uni.request({
-					url: this.host + this.url,
-					// dataType: "json",
-					// responseType: "json",
-					method: this.method,
-					data: this.data,
-					header: this.header,
-					timeout: 6000,
-					sslVerify: false,
-					withCredentials: false,
-					firstIpv4: false,
-					success(res) {
-						if (this.pageVisible) {
-							console.log('request success', JSON.stringify(res.data))
-							uni.showToast({
-								title: '请求成功',
-								icon: 'success',
-								mask: true,
-								duration: duration
-							});
-							this.res = '请求结果 : ' + JSON.stringify(res);
-						}
-					},
-					fail(err) {
-						if (this.pageVisible) {
-							console.log('request fail', err);
-							uni.showModal({
-								content: err.errMsg,
-								showCancel: false
-							});
-						}
-					},
-					complete() {
-						uni.hideLoading()
-					},
-				});
-			}
-		}
-	}
-</script>
\ No newline at end of file
+  export default {
+    data() {
+      return {
+        title: 'request',
+        res: '',
+        task: null as RequestTask | null,
+        pageVisible: false,
+        host: "http://request.dcloud.net.cn",
+        url: "/api/http/method/get",
+        method: "GET" as RequestMethod | null,
+        data: null as any | null,
+        header: null as UTSJSONObject | null,
+        errorCodeUrls: [
+          "/api/http/statusCode/200",
+          "/api/http/statusCode/204",
+          "/api/http/statusCode/301",
+          "/api/http/statusCode/302",
+          "/api/http/statusCode/307",
+          "/api/http/statusCode/400",
+          "/api/http/statusCode/401",
+          "/api/http/statusCode/403",
+          "/api/http/statusCode/404",
+          "/api/http/statusCode/405",
+          "/api/http/statusCode/500",
+          "/api/http/statusCode/502",
+          "/api/http/statusCode/503",
+          "/api/http/statusCode/504",
+        ],
+        headerUrls: [
+          "/api/http/header/ua",
+          "/api/http/header/referer",
+          "/api/http/header/requestCookie",
+          "/api/http/header/setCookie",
+          "/api/http/header/deleteCookie"
+        ],
+        contentTypeUrls: [
+          "/api/http/contentType/text/plain",
+          "/api/http/contentType/text/html",
+          "/api/http/contentType/text/xml",
+          "/api/http/contentType/image/gif",
+          "/api/http/contentType/image/jpeg",
+          "/api/http/contentType/image/png",
+          "/api/http/contentType/application/json",
+          "/api/http/contentType/application/octetStream",
+        ],
+        postUrls: [
+          "/api/http/contentType/json",
+          "/api/http/contentType/xWwwFormUrlencoded",
+        ],
+        //自动化测试例专用
+        jest_result: false
+      }
+    },
+    onLoad() {
+      this.pageVisible = true;
+    },
+    onUnload() {
+      this.pageVisible = false;
+      uni.hideLoading();
+      this.task?.abort();
+    },
+    methods: {
+      changeMethod(e : RequestMethod) {
+        this.method = e;
+        this.url = methodMap[e] as string;
+        this.data = null;
+        this.header = null;
+      },
+      changeUrl(e : string) {
+        this.method = "GET";
+        this.url = e;
+        this.data = null;
+        this.header = null;
+      },
+      changeUrlFromPost(e : string) {
+        this.method = "POST";
+        this.url = e;
+        switch (e) {
+          case "/api/http/contentType/json":
+            this.header = {
+              "Content-Type": "application/json"
+            };
+            this.data = {
+              "hello": "world"
+            };
+            break;
+          case "/api/http/contentType/xWwwFormUrlencoded":
+            this.header = {
+              "Content-Type": "application/x-www-form-urlencoded"
+            };
+            this.data = "hello=world";
+            break;
+        }
+      },
+      sendRequest() {
+        uni.showLoading({
+          title: "请求中..."
+        })
+        this.task = uni.request({
+          url: this.host + this.url,
+          // dataType: "json",
+          // responseType: "json",
+          method: this.method,
+          data: this.data,
+          header: this.header,
+          timeout: 6000,
+          sslVerify: false,
+          withCredentials: false,
+          firstIpv4: false,
+          success(res) {
+            if (this.pageVisible) {
+              console.log('request success', JSON.stringify(res.data))
+              uni.showToast({
+                title: '请求成功',
+                icon: 'success',
+                mask: true,
+                duration: duration
+              });
+              this.res = '请求结果 : ' + JSON.stringify(res);
+            }
+          },
+          fail(err) {
+            if (this.pageVisible) {
+              console.log('request fail', err);
+              uni.showModal({
+                content: err.errMsg,
+                showCancel: false
+              });
+            }
+          },
+          complete() {
+            uni.hideLoading()
+          },
+        });
+      },
+      //自动化测试例专用
+      jest_request() {
+        uni.request({
+          url: this.host + this.url,
+          // dataType: "json",
+          // responseType: "json",
+          method: this.method,
+          data: this.data,
+          header: this.header,
+          timeout: 6000,
+          sslVerify: false,
+          withCredentials: false,
+          firstIpv4: false,
+          success() {
+            this.jest_result = true;
+          },
+          fail() {
+            this.jest_result = false;
+          },
+        });
+      }
+    }
+  }
+</script>
diff --git a/pages/API/save-image-to-album/save-image-to-album.uvue b/pages/API/save-image-to-photos-album/save-image-to-photos-album.uvue
similarity index 100%
rename from pages/API/save-image-to-album/save-image-to-album.uvue
rename to pages/API/save-image-to-photos-album/save-image-to-photos-album.uvue
diff --git a/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.test.js b/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..08f72a9d10c0ff7f0d160d3426e3e0750dd54235
--- /dev/null
+++ b/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.test.js
@@ -0,0 +1,30 @@
+const CURRENT_PAGE_PATH =
+  "/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color";
+
+describe("setCustomNavigationBarColor", () => {
+  let page;
+  let originLifeCycleNum;
+  beforeAll(async () => {
+    page = await program.navigateTo(CURRENT_PAGE_PATH);
+    await page.waitFor(1000);
+    originLifeCycleNum = await page.callMethod("getLifeCycleNum");
+  });
+
+  afterAll(async () => {
+    await page.callMethod("setLifeCycleNum", originLifeCycleNum);
+    const lifeCycleNum = await page.callMethod("getLifeCycleNum");
+    expect(lifeCycleNum).toBe(originLifeCycleNum);
+  });
+
+  it("setNavigationBarColor2", async () => {
+    await page.callMethod("setNavigationBarColor2");
+    const image = await program.screenshot({adb: true, area:{x:1000, y: 0, width: 80, height: 88}});
+    expect(image).toMatchImageSnapshot();
+  });
+
+  it("setNavigationBarColor1", async () => {
+    await page.callMethod("setNavigationBarColor1");
+    const image = await program.screenshot({adb: true, area:{x:1000, y: 0, width: 80, height: 88}});
+    expect(image).toMatchImageSnapshot();
+  });
+});
diff --git a/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.uvue b/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..dac025f6657c59c6d8354594fe969a577324e887
--- /dev/null
+++ b/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color.uvue
@@ -0,0 +1,105 @@
+<template>
+  <view>
+    <view class="custom-navigation">
+      <text
+        class="back-icon"
+        @click="back"
+        :style="`color:${navigationBarTextColor}`"
+        >{{ backIcon }}</text
+      >
+      <text class="title" :style="`color:${navigationBarTextColor}`"
+        >自定义导航栏</text
+      >
+    </view>
+    <page-head title="setCustomNavigationBarColor"></page-head>
+    <view class="uni-padding-wrap uni-common-mt">
+      <button @tap="setNavigationBarColor1" class="uni-btn">
+        设置自定义导航栏前景色白色
+      </button>
+      <button @tap="setNavigationBarColor2" class="uni-btn">
+        设置自定义导航栏前景色黑色
+      </button>
+    </view>
+  </view>
+</template>
+
+<script lang="uts">
+import { state, setLifeCycleNum } from '@/store/index.uts'
+
+export default {
+  data() {
+    return {
+      backIcon: '\ue582',
+      navigationBarTextColor: '#fff'
+    }
+  },
+  onShow(){
+    uni.loadFontFace({
+      family: 'UniFontFamily',
+      source: 'static/font/uni.ttf'
+    })
+  },
+  methods: {
+    back(){
+      uni.navigateBack()
+    },
+    setNavigationBarColor1() {
+      uni.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#0000',
+        success() {
+          this.navigationBarTextColor = '#fff'
+          console.log('setNavigationBarColor success')
+        },
+        fail() {
+          console.log('setNavigationBarColor success')
+        },
+        complete() {
+          console.log('setNavigationBarColor success')
+        }
+      })
+    },
+    setNavigationBarColor2() {
+      uni.setNavigationBarColor({
+        frontColor: '#000000',
+        backgroundColor: '#0000',
+        success() {
+          this.navigationBarTextColor = '#000'
+          console.log('setNavigationBarColor success')
+        },
+        fail() {
+          console.log('setNavigationBarColor success')
+        },
+        complete() {
+          console.log('setNavigationBarColor success')
+        }
+      })
+    },
+    // 自动化测试
+    getLifeCycleNum(): number {
+      return state.lifeCycleNum
+    },
+    // 自动化测试
+    setLifeCycleNum(num: number) {
+      setLifeCycleNum(num)
+    },
+  },
+}
+</script>
+
+<style>
+.custom-navigation {
+  padding-top: 40px;
+  padding-bottom: 10px;
+  background-color: #007aff;
+}
+.custom-navigation > .title {
+  margin: 0 auto;
+}
+.custom-navigation > .back-icon {
+  position: absolute;
+  font-family: UniFontFamily;
+  font-size: 20px;
+  left: 10px;
+}
+</style>
diff --git a/pages/API/set-navigation-bar-color/set-navigation-bar-color.test.js b/pages/API/set-navigation-bar-color/set-navigation-bar-color.test.js
index aeb3a668d28cb8b73a444b8c259c75ebd0a72291..a293b96b61498f6afbb943c7b787affcb1313045 100644
--- a/pages/API/set-navigation-bar-color/set-navigation-bar-color.test.js
+++ b/pages/API/set-navigation-bar-color/set-navigation-bar-color.test.js
@@ -4,7 +4,6 @@ const CURRENT_PAGE_PATH =
 describe('setNavigationBarColor', () => {
   let page
   let originLifeCycleNum
-  let lifeCycleNum
   beforeAll(async () => {
     page = await program.navigateTo(CURRENT_PAGE_PATH)
     await page.waitFor(1000)
@@ -13,7 +12,7 @@ describe('setNavigationBarColor', () => {
 
   afterAll(async () => {
     await page.callMethod('setLifeCycleNum', originLifeCycleNum)
-    lifeCycleNum = await page.callMethod('getLifeCycleNum')
+    const lifeCycleNum = await page.callMethod('getLifeCycleNum')
     expect(lifeCycleNum).toBe(originLifeCycleNum)
   })
 
diff --git a/pages/API/set-navigation-bar-color/set-navigation-bar-color.uvue b/pages/API/set-navigation-bar-color/set-navigation-bar-color.uvue
index ee5d7a76016b97528faf507a83b31e74d0c27ab6..913daf0a1c8f9c0d26cbd0c0831207abf84ae9ea 100644
--- a/pages/API/set-navigation-bar-color/set-navigation-bar-color.uvue
+++ b/pages/API/set-navigation-bar-color/set-navigation-bar-color.uvue
@@ -8,19 +8,17 @@
       <button @tap="setNavigationBarColor2" class="uni-btn">
         设置导航条背景红色，标题黑色
       </button>
+      <button @tap="goCustomNavigation" class="uni-btn">
+        跳转自定义导航栏页面
+      </button>
     </view>
   </view>
 </template>
 
 <script lang="uts">
-import { State, state, setLifeCycleNum } from '@/store/index.uts'
+import { state, setLifeCycleNum } from '@/store/index.uts'
 
 export default {
-	data() {
-    return {
-			_state: state as State
-		}
-	},
   methods: {
     setNavigationBarColor1() {
       uni.setNavigationBarColor({
@@ -28,36 +26,30 @@ export default {
         backgroundColor: '#00ff00',
         success() {
           console.log('setNavigationBarColor success')
-          setLifeCycleNum(state.lifeCycleNum + 1)
         },
         fail() {
           console.log('setNavigationBarColor success')
-          setLifeCycleNum(state.lifeCycleNum - 1)
         },
         complete() {
           console.log('setNavigationBarColor success')
-          setLifeCycleNum(state.lifeCycleNum + 1)
         }
       })
     },
-		setNavigationBarColor2() {
-		  uni.setNavigationBarColor({
-		    frontColor: '#000000',
-		    backgroundColor: '#ff0000',
-		    success() {
-		      console.log('setNavigationBarColor success')
-		      setLifeCycleNum(state.lifeCycleNum + 1)
-		    },
-		    fail() {
-		      console.log('setNavigationBarColor success')
-		      setLifeCycleNum(state.lifeCycleNum - 1)
-		    },
-		    complete() {
-		      console.log('setNavigationBarColor success')
-		      setLifeCycleNum(state.lifeCycleNum + 1)
-		    }
-		  })
-		},
+    setNavigationBarColor2() {
+      uni.setNavigationBarColor({
+        frontColor: '#000000',
+        backgroundColor: '#ff0000',
+        success() {
+          console.log('setNavigationBarColor success')
+        },
+        fail() {
+          console.log('setNavigationBarColor success')
+        },
+        complete() {
+          console.log('setNavigationBarColor success')
+        }
+      })
+    },
     // 自动化测试
     getLifeCycleNum(): number {
       return state.lifeCycleNum
@@ -66,6 +58,11 @@ export default {
     setLifeCycleNum(num: number) {
       setLifeCycleNum(num)
     },
+    goCustomNavigation(){
+      uni.navigateTo({
+        url: '/pages/API/set-navigation-bar-color/set-custom-navigation-bar-color'
+      })
+    }
   },
 }
 </script>
diff --git a/pages/API/show-loading/show-loading.uvue b/pages/API/show-loading/show-loading.uvue
deleted file mode 100644
index 15889b855f46ff0a42ba9d23639a0daa96407b32..0000000000000000000000000000000000000000
--- a/pages/API/show-loading/show-loading.uvue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-    <view>
-        <page-head :title="title"></page-head>
-		<view class="uni-list">
-		  <view class="uni-list-cell uni-list-cell-pd">
-		    <view class="uni-list-cell-db">是否显示透明蒙层-屏蔽点击事件</view>
-		    <switch :checked="maskSelect" @change="maskChange"/>
-		  </view>
-		  <view class="uni-padding-wrap">
-		    <view class="uni-title uni-common-mt">
-		      <text class="uni-title-text"> 设置标题 </text>
-		    </view>
-		  </view>
-		  <view class="uni-list uni-common-pl">
-		    <radio-group @change="radioChange" class="radio-group">
-		      <radio
-		        class="uni-list-cell uni-list-cell-pd radio"
-		        v-for="(item, index) in items"
-		        :key="item.value"
-		        :class="index < items.length - 1 ? 'uni-list-cell-line' : ''"
-		        :value="item.value"
-		        :checked="index === current"
-		      >
-		        {{ item.name }}
-		      </radio>
-		    </radio-group>
-		  </view>
-		</view>
-        <view class="uni-padding-wrap">
-            <view class="uni-btn-v">
-                <button class="uni-btn-v" type="primary" @click="showLoading">显示 loading 提示框</button>
-                <!-- #ifndef MP-ALIPAY -->
-                <button class="uni-btn-v" @click="hideLoading">隐藏 loading 提示框</button>
-                <!-- #endif -->
-            </view>
-        </view>
-    </view>
-</template>
-<script lang="uts">
-	type ItemType = {
-	  value: string
-	  name: string
-	}
-    export default {
-        data() {
-            return {
-                title: 'loading',
-				items: [
-					{
-					  value: 'null',
-					  name: '无标题',
-					},
-				  {
-				    value: '三秒后自动关闭',
-				    name: '普通标题',
-				  },
-				  {
-				    value: '超长文本内容，测试超出范围-超长文本内容，测试超出范围-三秒后自动关闭',
-				    name: '长标题',
-				  },
-				] as ItemType[],
-				current: 0,
-				maskSelect:false,
-				titleSelect:"null"
-            }
-        },
-        methods: {
-			
-			radioChange(e: RadioGroupChangeEvent) {
-			  const selected = this.items.find((item): boolean => {
-			    return item.value == e.detail.value
-			  })
-			  if(selected != null){
-				  this.titleSelect = selected!!.value
-			  }
-			},
-			maskChange: function (e : SwitchChangeEvent) {
-				this.maskSelect = e.detail.value
-			},
-            showLoading: function() {
-				
-				console.log(this.titleSelect)
-				if(this.titleSelect == "null"){
-					// 测试空的情况 todo
-					uni.showLoading({
-						title: "",
-						mask:this.maskSelect
-					});
-				}else{
-					uni.showLoading({
-					    title: this.titleSelect,
-						mask:this.maskSelect
-					});
-				}
-
-                // #ifdef MP-ALIPAY
-                this._showTimer && clearTimeout(this._showTimer);
-                this._showTimer = setTimeout(() => {
-                    this.hideLoading();
-                }, 3000)
-                // #endif
-				// #ifdef APP-PLUS
-				setTimeout(function() {
-					this.hideLoading();
-				}, 3000);
-				// #endif
-            },
-            hideLoading: function() {
-                uni.hideLoading();
-            }
-        }
-        // #ifdef MP-ALIPAY
-        ,
-        onUnload() {
-			// 页面卸载的时候，手动关闭loading
-            this._showTimer && clearTimeout(this._showTimer);
-        }
-        // #endif
-    }
-</script>
\ No newline at end of file
diff --git a/pages/API/storage/storage.test.js b/pages/API/storage/storage.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..86b330671b6eac9a1515dfc5d1add934c5974ecc
--- /dev/null
+++ b/pages/API/storage/storage.test.js
@@ -0,0 +1,106 @@
+const PAGE_PATH = '/pages/API/storage/storage'
+
+
+describe('ExtApi-StorageInfoTest', () => {
+
+  let page;
+  function getData(key = '') {
+    return new Promise(async (resolve, reject) => {
+      const data = await page.data()
+      resolve(key ? data[key] : data)
+    })
+  }
+
+
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+  });
+
+  it('Check async properties', async () => {
+    // 异步存储测试
+    await page.setData({
+      key: "autotest_key_mock",
+      data:"长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。"
+    })
+    await page.waitFor(600)
+    const btnSetStorageButtonInfo = await page.$('.btn-setstorageAsync')
+    await btnSetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    const btnGetStorageButtonInfo = await page.$('.btn-getstorageAsync')
+    await btnGetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual("长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。")
+
+    await page.setData({
+      key: "autotest_key_mock",
+      data:1100.8989
+    })
+    await page.waitFor(600)
+    await btnSetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    await btnGetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual(1100.8989)
+
+    await page.setData({
+      key: "autotest_key_mock",
+      data:123456789
+    })
+    await page.waitFor(600)
+    await btnSetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    await btnGetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual(123456789)
+
+    let userObj = {
+      name:"zhangsan",
+      age:12
+    }
+    await page.setData({
+      key: "autotest_key_mock",
+      data:userObj
+    })
+    await page.waitFor(600)
+    await btnSetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    await btnGetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual(userObj)
+
+    await page.setData({
+      key: "autotest_key_mock",
+      data:"长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。"
+    })
+    await page.waitFor(600)
+    const btnSetStorageButtonInfo2 = await page.$('.btn-setstorageSync')
+    await btnSetStorageButtonInfo2.tap()
+    await page.waitFor(600)
+    const btnGetStorageButtonInfo2 = await page.$('.btn-getstorageSync')
+    await btnGetStorageButtonInfo2.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual("长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。")
+
+
+  });
+
+
+  it('Check sync properties', async () => {
+
+    await page.setData({
+      key: "autotest_key_mock",
+      data:"长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。"
+    })
+    await page.waitFor(600)
+    const btnSetStorageButtonInfo = await page.$('.btn-setstorageSync')
+    await btnSetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    const btnGetStorageButtonInfo = await page.$('.btn-getstorageSync')
+    await btnGetStorageButtonInfo.tap()
+    await page.waitFor(600)
+    expect(await getData('apiGetData')).toEqual("长安大道连狭斜，青牛白马七香车。玉辇纵横过主第，金鞭络绎向侯家。龙衔宝盖承朝日，凤吐流苏带晚霞。百尺游丝争绕树，一群娇鸟共啼花。游蜂戏蝶千门侧，碧树银台万种色。复道交窗作合欢，双阙连甍垂凤翼。")
+
+  });
+  
+});
diff --git a/pages/API/storage/storage.uvue b/pages/API/storage/storage.uvue
index 82419e950079d90b8e50200815d48e9cfd37294e..c6a229ff1ee345402397eb26b3f8a10265bb9145 100644
--- a/pages/API/storage/storage.uvue
+++ b/pages/API/storage/storage.uvue
@@ -84,12 +84,12 @@
           <view class="uni-btn-v">
             <button
               type="primary"
-              class="uni-btn btn-setstorage"
+              class="uni-btn btn-setstorageAsync"
               @tap="setStorage"
             >
               存储数据-异步
             </button>
-            <button class="uni-btn" @tap="getStorage">读取数据-异步</button>
+            <button class="uni-btn btn-getstorageAsync" @tap="getStorage">读取数据-异步</button>
             <button class="uni-btn" @tap="removeStorage">移除数据-异步</button>
             <button class="uni-btn" @tap="clearStorage">清理数据-异步</button>
           </view>
@@ -97,12 +97,12 @@
           <view class="uni-btn-v">
             <button
               type="primary"
-              class="uni-btn btn-setstorage"
+              class="uni-btn btn-setstorageSync"
               @tap="setStorageSync"
             >
               存储数据-同步
             </button>
-            <button class="uni-btn" @tap="getStorageSync">读取数据-同步</button>
+            <button class="uni-btn btn-getstorageSync" @tap="getStorageSync">读取数据-同步</button>
             <button class="uni-btn" @tap="removeStorageSync">
               移除数据-同步
             </button>
@@ -123,7 +123,8 @@ export default {
     return {
       title: 'get/set/clearStorage',
       key: '',
-      data: '' as any,
+      data: '' as any,
+      apiGetData:'' as any|null,
       storageInfo: '',
     }
   },
@@ -189,13 +190,15 @@ export default {
           content: 'key 不能为空',
           showCancel: false,
         })
-      } else {
+      } else {
+        let that = this
         uni.getStorage({
           key: key,
-          success: (res) => {
+          success: (res) => {
+            that.apiGetData = res.data
             uni.showModal({
               title: '读取数据成功',
-              content: "data: '" + res.data + "'",
+              content: "data: '" + JSON.stringify(that.apiGetData) + "'",
               showCancel: false,
             })
           },
@@ -218,10 +221,10 @@ export default {
           showCancel: false,
         })
       } else {
-        let ret = uni.getStorageSync(key)
+        this.apiGetData = uni.getStorageSync(key)
         uni.showModal({
           title: '读取数据成功',
-          content: "data: '" + ret + "'",
+          content: "data: '" + JSON.stringify(apiGetData) + "'",
           showCancel: false,
         })
       }
diff --git a/pages/API/toast/toast.uvue b/pages/API/toast/toast.uvue
index 7c01fe90edc2ac7d8464f4babeb800ffa35306fc..9e41d537adea7daa0fa4082ed3fea0b3ff322c51 100644
--- a/pages/API/toast/toast.uvue
+++ b/pages/API/toast/toast.uvue
@@ -1,125 +1,110 @@
 <template>
-    <view>
-        <page-head :title="title"></page-head>
-        <view class="uni-padding-wrap">
-            <view class="uni-btn-v">
-                <button class="uni-btn-v" type="default" @tap="toast1Tap">点击弹出默认toast</button>
-				<button class="uni-btn-v" type="default" @tap="toastTapIconError">点击弹出设置icon的toast</button>
-                <button class="uni-btn-v" type="default" @tap="toast2Tap">点击弹出设置duration的toast</button>
-                <button class="uni-btn-v" type="default" @tap="toast3Tap">点击弹出显示loading的toast</button>
-                <!-- #ifndef MP-ALIPAY -->
-                <button class="uni-btn-v" type="default" @tap="toast4Tap">点击弹出显示自定义图片的toast</button>
-                <!-- #endif -->
-                <!-- #ifdef APP-PLUS -->
-                <button class="uni-btn-v" type="default" @tap="toast5Tap">点击显示无图标的居底toast</button>
-                <!-- #endif -->
-                <button class="uni-btn-v" type="default" @tap="hideToast">点击隐藏toast</button>
-            </view>
-			<text>{{exeRet}}</text>
-        </view>
+  <view>
+    <page-head :title="title"></page-head>
+    <view class="uni-padding-wrap">
+      <view class="uni-btn-v">
+        <button class="uni-btn-v" type="default" @tap="toast1Tap">点击弹出默认toast</button>
+        <button class="uni-btn-v" type="default" @tap="toastTapIconError">点击弹出设置icon的toast</button>
+        <button class="uni-btn-v" type="default" @tap="toast2Tap">点击弹出设置duration的toast</button>
+        <button class="uni-btn-v" type="default" @tap="toast3Tap">点击弹出显示loading的toast</button>
+        <!-- #ifndef MP-ALIPAY -->
+        <button class="uni-btn-v" type="default" @tap="toast4Tap">点击弹出显示自定义图片的toast</button>
+        <!-- #endif -->
+        <!-- #ifdef APP-PLUS -->
+        <button class="uni-btn-v" type="default" @tap="toast5Tap">点击显示无图标的居底toast</button>
+        <!-- #endif -->
+        <button class="uni-btn-v" type="default" @tap="hideToast">点击隐藏toast</button>
+      </view>
+      <text>{{exeRet}}</text>
     </view>
+  </view>
 </template>
 <script lang="uts">
-    export default {
-        data() {
-            return {
-                title: 'toast',
-				exeRet:'',
-                _showTimer: 0
-            }
-        },
-        // #ifdef MP-ALIPAY
-        onUnload() {
-            clearTimeout(this._showTimer);
-        },
-        // #endif
-        methods: {
-            toast1Tap: function () {
-                uni.showToast({
-                    title: "默认",
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-            },
-			toastTapIconError: function () {
-                uni.showToast({
-                    title: "默认",
-					icon:'error',
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-            },
-            toast2Tap: function () {
-                uni.showToast({
-                    title: "duration 3000",
-                    duration: 3000,
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-            },
-            toast3Tap: function () {
-                uni.showToast({
-                    title: "loading",
-                    icon: "loading",
-                    duration: 5000,
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-                // #ifdef MP-ALIPAY
-                this._showTimer = setTimeout(() => {
-                    // icon 是 loading 时，showToast 实际执行的是 showLoading
-                    my.hideLoading()
-                    // 执行完所有代码再清除定时器
-                    clearTimeout(this._showTimer);
-                }, 3000)
-                // #endif
-
-            },
-            toast4Tap: function () {
-                uni.showToast({
-                    title: "logo",
-                    image: "/static/uni.png",
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-            },
-            // #ifdef APP-PLUS
-            toast5Tap: function () {
-                uni.showToast({
-                    title: "显示一段轻提示",
-                    position: 'bottom',
-					success:function(res){
-						this.exeRet = "success:" + JSON.stringify(res) + new Date()
-					},
-					fail:function(res){
-						this.exeRet = "fail:" + JSON.stringify(res)
-					},
-                })
-            },
-            // #endif
-            hideToast: function () {
-                uni.hideToast()
-            }
-        }
+  export default {
+    data() {
+      return {
+        title: 'toast',
+        exeRet: ''
+      }
+    },
+    methods: {
+      toast1Tap: function () {
+        uni.showToast({
+          title: "默认",
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      toastTapIconError: function () {
+        uni.showToast({
+          title: "默认",
+          icon: 'error',
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      toast2Tap: function () {
+        uni.showToast({
+          title: "duration 3000",
+          duration: 3000,
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      toast3Tap: function () {
+        uni.showToast({
+          title: "loading",
+          icon: "loading",
+          duration: 5000,
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      toast4Tap: function () {
+        uni.showToast({
+          title: "logo",
+          image: "/static/uni.png",
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      // #ifdef APP-PLUS
+      toast5Tap: function () {
+        uni.showToast({
+          title: "显示一段轻提示",
+          position: 'bottom',
+          success: function (res) {
+            this.exeRet = "success:" + JSON.stringify(res) + new Date()
+          },
+          fail: function (res) {
+            this.exeRet = "fail:" + JSON.stringify(res)
+          },
+        })
+      },
+      // #endif
+      hideToast: function () {
+        uni.hideToast()
+      }
     }
-</script>
\ No newline at end of file
+  }
+</script>
diff --git a/pages/API/unicloud-call-function/unicloud-call-function.test.js b/pages/API/unicloud-call-function/unicloud-call-function.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..ebfa88871fdbb632642047d8ba5ee8d73a796d3d
--- /dev/null
+++ b/pages/API/unicloud-call-function/unicloud-call-function.test.js
@@ -0,0 +1,26 @@
+const PAGE_PATH = '/pages/API/unicloud-call-function/unicloud-call-function'
+
+describe('unicloud-call-function', () => {
+  let page
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
+  })
+
+  it('callFunction', async () => {
+    await page.callMethod('callFunction')
+    await page.waitFor(3000)
+    const {
+      callFunctionResult,
+      callFunctionError
+    } = await page.data()
+    console.error(callFunctionResult)
+    console.error(callFunctionError)
+    expect(callFunctionResult['showMessage']).toBe("Hello uniCloud function")
+    expect(callFunctionResult['event']['num']).toBe(1)
+    expect(callFunctionResult['event']['str']).toBe('ABC')
+  })
+})
diff --git a/pages/API/call-function/call-function.uvue b/pages/API/unicloud-call-function/unicloud-call-function.uvue
similarity index 58%
rename from pages/API/call-function/call-function.uvue
rename to pages/API/unicloud-call-function/unicloud-call-function.uvue
index 3756652e7ffd3ab18b2c2421d9bc1fb765b7c9a4..290927ef1040f36c4bce58040d403d6ab7036685 100644
--- a/pages/API/call-function/call-function.uvue
+++ b/pages/API/unicloud-call-function/unicloud-call-function.uvue
@@ -1,7 +1,7 @@
 <template>
   <!-- #ifdef APP -->
   <scroll-view style="flex: 1">
-    <!-- #endif -->
+  <!-- #endif -->
     <view>
       <page-head :title="title"></page-head>
       <view class="uni-padding-wrap uni-common-mt">
@@ -10,7 +10,7 @@
         </view>
       </view>
     </view>
-    <!-- #ifdef APP -->
+  <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
 </template>
@@ -18,14 +18,33 @@
   export default {
     data() {
       return {
-        title: 'uniCloud.callFunction'
+        title: '请求云函数',
+        callFunctionResult: {},
+        callFunctionError: {},
+        isUniTest: false
       }
     },
     onLoad() {
     },
     onUnload() {
+      if(this.isUniTest){
+        uni.hideToast()
+      }
     },
     methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
       callFunction: function () {
         uni.showLoading({
           title: '加载中...'
@@ -35,24 +54,21 @@
           data: {
             num: 1,
             str: 'ABC'
-          } as UTSJSONObject
+          }
         }).then<void>(res => {
           const result = res.result
+          this.callFunctionResult = result
           console.log(JSON.stringify(result))
           uni.hideLoading()
-          uni.showModal({
-            title: '提示',
-            content: result['showMessage'] as string,
-            showCancel: false
-          })
-        }).catch<void>((err: any | null) => {
+          this.notify(result['showMessage'] as string, '提示')
+        }).catch<void>((err : any | null) => {
           const error = err as UniCloudError
+          this.callFunctionError = {
+            errCode: error.errCode,
+            errMsg: error.errMsg
+          }
           uni.hideLoading()
-          uni.showModal({
-            title: '错误',
-            content: error.errMsg,
-            showCancel: false
-          })
+          this.notify(error.errMsg, '错误')
         })
       }
     }
@@ -60,4 +76,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/API/unicloud-database/unicloud-database.test.js b/pages/API/unicloud-database/unicloud-database.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3ebac830c54ce0bf1c0b87d1c82838d13f4141f
--- /dev/null
+++ b/pages/API/unicloud-database/unicloud-database.test.js
@@ -0,0 +1,61 @@
+const PAGE_PATH = '/pages/API/unicloud-database/unicloud-database'
+
+describe('unicloud-database', () => {
+  let page
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
+  })
+  it('databaseBasic', async () => {
+    await page.callMethod('dbRemove')
+    await page.waitFor(3000)
+    await page.callMethod('dbAdd')
+    await page.waitFor(1500)
+    await page.callMethod('dbBatchAdd')
+    await page.waitFor(1500)
+    await page.callMethod('dbGet')
+    await page.waitFor(1500)
+    await page.callMethod('dbGetWithCommand')
+    await page.waitFor(1500)
+    await page.callMethod('dbUpdate')
+    await page.waitFor(1500)
+    await page.callMethod('dbRemove')
+    await page.waitFor(1500)
+    
+    const {
+      addId,
+      batchAddIds,
+      batchAddinserted,
+      updateUpdated,
+      getData,
+      getWithCommandData,
+      removeDeleted,
+    } = await page.data()
+    
+    expect(addId !== '').toBe(true)
+    expect(batchAddIds.length).toBe(2)
+    expect(batchAddinserted).toBe(2)
+    expect(getData.length).toBe(2)
+    expect(getWithCommandData.length).toBe(1)
+    expect(updateUpdated).toBe(3)
+    expect(removeDeleted).toBe(3)
+    
+  })
+  
+  it('databaseLookup', async () => {
+    await page.callMethod('dbLookupInit')
+    await page.waitFor(3000)
+    await page.callMethod('dbLookup')
+    await page.waitFor(1500)
+    
+    const {
+      lookupData
+    } = await page.data()
+    expect(lookupData.length).toBe(2)
+    expect(lookupData[0]['foreign_id'].length).toBe(1)
+    expect(lookupData[1]['foreign_id'].length).toBe(1)
+  })
+});
\ No newline at end of file
diff --git a/pages/API/unicloud-database/unicloud-database.uvue b/pages/API/unicloud-database/unicloud-database.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..8e2726abcecbcb1c09ee2e498c1cd6694de040b2
--- /dev/null
+++ b/pages/API/unicloud-database/unicloud-database.uvue
@@ -0,0 +1,290 @@
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <view>
+      <page-head :title="title"></page-head>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @click="dbAdd">新增单条数据</button>
+          <button type="primary" @click="dbBatchAdd">新增多条数据</button>
+          <button type="primary" @click="dbUpdate">更新数据</button>
+          <button type="primary" @click="dbGet">where传字符串获取数据</button>
+          <button type="primary" @click="dbGetWithCommand">where传对象获取数据</button>
+          <button type="primary" @click="dbRemove">删除数据</button>
+          <button type="primary" @click="dbLookupInit">初始化联表查询数据</button>
+          <button type="primary" @click="dbLookup">联表查询</button>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        title: 'ClientDB',
+        addId: '',
+        batchAddIds: [] as Array<string>,
+        batchAddinserted: 0,
+        updateUpdated: 0,
+        getData: [] as Array<UTSJSONObject>,
+        getWithCommandData: [] as Array<UTSJSONObject>,
+        removeDeleted: 0,
+        lookupData: [] as Array<UTSJSONObject>,
+        isUniTest: false
+      }
+    },
+    onLoad() {
+    },
+    onUnload() {
+      if(this.isUniTest){
+        uni.hideToast()
+      }
+    },
+    methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
+      dbAdd: function () {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .add({
+            num: 1,
+            tag: 'default-tag',
+            date: new Date(),
+            point: new db.Geo.Point(116, 38)
+          })
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.addId = res.id
+            this.notify(`新增成功，id: ${res.id}`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbBatchAdd() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .add([{
+            num: 2,
+            tag: 'default-tag',
+          }, {
+            num: 3,
+            tag: 'default-tag',
+          }])
+          .then<void>((res) => {
+            uni.hideLoading()
+            console.log(res)
+            console.log('JSON.stringify(res.inserted)', JSON.stringify(res.inserted))
+            this.batchAddIds = res.ids
+            this.batchAddinserted = res.inserted
+            this.notify(`新增成功条数${res.inserted}, id列表: ${res.ids.join(',')}`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbGet() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .where(
+            'tag == "default-tag"'
+          )
+          .field('num, tag')
+          .orderBy('num desc')
+          .skip(1)
+          .limit(2)
+          .get()
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.getData = res.data
+            this.notify(`获取成功，取到了${res.data.length}条数据`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbGetWithCommand() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .where({
+            num: db.command.gt(1)
+          })
+          .field('num, tag')
+          .orderBy('num desc')
+          .skip(1)
+          .limit(2)
+          .get()
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.getWithCommandData = res.data
+            this.notify(`获取成功，取到了${res.data.length}条数据`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbUpdate() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .where(
+            'tag == "default-tag"'
+          )
+          .update({
+            num: 4
+          })
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.updateUpdated = res.updated
+            this.notify(`更新成功，更新了${res.updated}条数据`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbRemove() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('type')
+          .where(
+            'tag == "default-tag"'
+          )
+          .remove()
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.removeDeleted = res.deleted
+            this.notify(`删除成功，删掉了${res.deleted}条数据`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbLookupInit() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        db.collection('local')
+          .where('tag == "default-tag"')
+          .remove()
+          .then(() : Promise<UniCloudDBRemoveResult> => {
+            return db.collection('foreign')
+              .where('tag == "default-tag"')
+              .remove()
+          })
+          .then(() : Promise<UniCloudDBBatchAddResult> => {
+            return db.collection('local')
+              .add([{
+                id: "local_1",
+                name: "local_1_name",
+                tag: "default-tag",
+                foreign_id: "foreign_1"
+              }, {
+                id: "local_2",
+                name: "local_2_name",
+                tag: "default-tag",
+                foreign_id: "foreign_2"
+              }])
+          })
+          .then(() : Promise<UniCloudDBBatchAddResult> => {
+            return db.collection('foreign')
+              .add([{
+                id: "foreign_1",
+                name: "foreign_1_name",
+                tag: "default-tag"
+              }, {
+                id: "foreign_2",
+                name: "foreign_2_name",
+                tag: "default-tag"
+              }])
+          })
+          .then<void>((_) : void => {
+            uni.hideLoading()
+            this.notify('数据初始化成功', '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            console.error(err)
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      },
+      dbLookup() {
+        uni.showLoading({
+          title: '加载中...'
+        })
+        const db = uniCloud.databaseForJQL()
+        const local = db.collection('local')
+          .where('tag == "default-tag"')
+          .getTemp()
+        const foreign = db.collection('foreign')
+          .where('tag == "default-tag"')
+          .getTemp()
+        db.collection(local, foreign)
+          .get()
+          .then<void>(res => {
+            uni.hideLoading()
+            console.log(res)
+            this.lookupData = res.data
+            this.notify(`联表查询成功，取到了${res.data.length}条数据`, '提示')
+          })
+          .catch<void>((err : any | null) => {
+            uni.hideLoading()
+            const error = err as UniCloudError
+            this.notify(error.errMsg, '错误')
+          })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/API/unicloud-file-api/unicloud-file-api.uvue b/pages/API/unicloud-file-api/unicloud-file-api.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..a37cc58735a52d4bb6ec2eaa54c7136d4fca1ac7
--- /dev/null
+++ b/pages/API/unicloud-file-api/unicloud-file-api.uvue
@@ -0,0 +1,71 @@
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <view>
+      <page-head :title="title"></page-head>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @click="uploadFile">选择文件上传</button>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        title: '云存储'
+      }
+    },
+    onLoad() {
+    },
+    onUnload() {
+    },
+    methods: {
+      uploadFile: function () {
+        uni.chooseImage({
+          count: 1,
+          success(res) : void {
+            uni.showLoading({
+              title: '上传中...'
+            })
+            const tempFilePath = res.tempFilePaths[0]
+            uniCloud.uploadFile({
+              filePath: tempFilePath,
+              cloudPath: 'test.jpg'
+            })
+              .then<void>(function (res) {
+                uni.hideLoading()
+                console.log(res)
+                uni.showModal({
+                  content: '上传成功',
+                  showCancel: false
+                });
+              })
+              .catch<void>(function (err : any | null) {
+                uni.hideLoading()
+                const error = err as UniCloudError
+                uni.showModal({
+                  content: '上传失败，' + error.errMsg,
+                  showCancel: false
+                });
+              })
+            // .finally((_: number) : void => {
+            //   uni.hideLoading()
+            // })
+          },
+          fail(err) : void {
+            console.error('chooseImage fail: ', err)
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/API/unicloud-import-object/unicloud-import-object.test.js b/pages/API/unicloud-import-object/unicloud-import-object.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..5c53f2179314937ae5eb8177cd8e428a93a1e10e
--- /dev/null
+++ b/pages/API/unicloud-import-object/unicloud-import-object.test.js
@@ -0,0 +1,33 @@
+const PAGE_PATH = '/pages/API/unicloud-import-object/unicloud-import-object'
+
+describe('unicloud-import-object', () => {
+  let page
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+    await page.setData({
+      isUniTest: true
+    })
+  })
+  it('importObject', async () => {
+    await page.callMethod('addTodo')
+    await page.callMethod('fail')
+    await page.callMethod('success')
+    await page.waitFor(3000)
+    
+    const {
+      todoTitle,
+      todoContent,
+      returnTodoTitle,
+      returnTodoContent,
+      failErrCode,
+      successErrCode,
+    } = await page.data()
+    
+    expect(returnTodoTitle).toBe(todoTitle)
+    expect(returnTodoContent).toBe(todoContent)
+    expect(failErrCode).toBe('TEST_ERROR_CODE')
+    expect(successErrCode).toBe(0)
+    
+  })
+});
\ No newline at end of file
diff --git a/pages/API/unicloud-import-object/unicloud-import-object.uvue b/pages/API/unicloud-import-object/unicloud-import-object.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..ff42363115401a1c1cc301b067a07292fec70fc0
--- /dev/null
+++ b/pages/API/unicloud-import-object/unicloud-import-object.uvue
@@ -0,0 +1,124 @@
+<template>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex:1">
+  <!-- #endif -->
+    <view>
+      <page-head :title="title"></page-head>
+      <view class="uni-padding-wrap uni-common-mt">
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @tap="addTodo">添加Todo</button>
+        </view>
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @tap="randomFail">随机触发失败重试</button>
+        </view>
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @tap="fail">云对象失败调用</button>
+        </view>
+        <view class="uni-btn-v uni-common-mt">
+          <button type="primary" @tap="success">云对象成功调用</button>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: '请求云对象',
+        todoTitle: '学习编程',
+        todoContent: '熟悉uts语法',
+        returnTodoTitle: '',
+        returnTodoContent: '',
+        failErrCode: '',
+        successErrCode: -1,
+        isUniTest: false
+      }
+    },
+    onUnload() {
+      if(this.isUniTest){
+        uni.hideToast()
+      }
+    },
+    methods: {
+      notify(content : string, title : string) {
+        if (!this.isUniTest) {
+          uni.showModal({
+            title,
+            content,
+            showCancel: false
+          })
+        } else {
+          uni.showToast({
+            title: content
+          })
+        }
+      },
+      addTodo() {
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
+        })
+        const title = this.todoTitle
+        const content = this.todoContent
+        todo.add(title, content).then<void>((res : UTSJSONObject) : void => {
+          this.returnTodoTitle = res['title'] as string
+          this.returnTodoContent = res['content'] as string
+          this.notify(res['showMessage'] as string, '提示')
+        }).catch<void>((err : any | null) : void => {
+          const error = err as UniCloudError
+          console.error(error)
+        })
+      },
+      randomFail() {
+        const todoObj = uniCloud.importObject('todo', {
+          errorOptions: {
+            retry: true
+          }
+        })
+        todoObj.randomFail().then<void>((res : UTSJSONObject) : void => {
+          this.notify(res['showMessage'] as string, '提示')
+        }).catch<void>((err : any | null) : void => {
+          const error = err as UniCloudError
+          console.error(error)
+        })
+      },
+      fail() {
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
+        })
+        todo.fail().then<void>((res : UTSJSONObject) : void => {
+          this.notify('todo.fail应调用失败，此处错误的触发了成功回调', '错误')
+          console.log('todo.fail: ', res);
+        }).catch<void>((err : any | null) : void => {
+          const error = err as UniCloudError
+          this.failErrCode = error.errCode as string
+          console.error(error)
+          if (this.isUniTest) {
+            uni.showToast({
+              title: err.errMsg
+            })
+          }
+        })
+      },
+      success() {
+        const todo = uniCloud.importObject('todo', {
+          customUI: this.isUniTest
+        })
+        todo.success().then<void>((res : UTSJSONObject) : void => {
+          this.successErrCode = res['errCode'] as number
+          this.notify(res['showMessage'] as string, '提示')
+        }).catch<void>((err : any | null) : void => {
+          const error = err as UniCloudError
+          console.error(error)
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/API/upload-file/upload-file.test.js b/pages/API/upload-file/upload-file.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..b02e2bc12f1307e983d2717960a0a4354dcdc043
--- /dev/null
+++ b/pages/API/upload-file/upload-file.test.js
@@ -0,0 +1,18 @@
+const PAGE_PATH = '/pages/API/upload-file/upload-file'
+
+describe('ExtApi-UploadFile', () => {
+
+  let page;
+  let res;
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    await page.callMethod('jest_uploadFile');
+    await page.waitFor(500);
+    res = await page.data('jest_result');
+  });
+
+  it('Check ', async () => {
+    expect(res).toBe(true);
+  });
+});
diff --git a/pages/API/upload-file/upload-file.uvue b/pages/API/upload-file/upload-file.uvue
index 7554d04c192dd9a9b5a2658a52b4983e3ad49bde..d239c13886d2b5f8e7048bc7336d3adaef99db76 100644
--- a/pages/API/upload-file/upload-file.uvue
+++ b/pages/API/upload-file/upload-file.uvue
@@ -23,14 +23,15 @@
   <!-- #endif -->
 </template>
 <script>
-import UploadTask from 'uts.sdk.modules.DCloudUniNetwork.UploadTask';
 export default {
 	data() {
 		return {
 			title: 'uploadFile',
 			imageSrc: '',
 			task: null as UploadTask | null,
-			pageVisible: false
+			pageVisible: false,
+      //自动化测试例专用
+      jest_result:false,
 		}
 	},
 	onLoad() {
@@ -53,7 +54,7 @@ export default {
 					var imageSrc = res.tempFilePaths[0]
 					uni.showLoading({
 						title: '上传中'
-					})
+					})
 					this.task = uni.uploadFile({
 						url: 'https://unidemo.dcloud.net.cn/upload', //仅为示例，非真实的接口地址
 						filePath: imageSrc,
@@ -89,7 +90,25 @@ export default {
 					console.log('chooseImage fail', err)
 				}
 			})
-		}
+		},
+    //自动化测试例专用
+    jest_uploadFile(){
+      const imageSrc = "/static/uni.png";
+      this.task = uni.uploadFile({
+      	url: 'https://unidemo.dcloud.net.cn/upload', //仅为示例，非真实的接口地址
+      	filePath: imageSrc,
+      	name: 'file',
+      	formData: {
+      		'user': 'test'
+      	},
+      	success: () => {
+          this.jest_result = true;
+      	},
+      	fail: () => {
+          this.jest_result = false;
+      	},
+      })
+    }
 	}
 }
 </script>
diff --git a/pages/API/websocket-global/websocket-global.uvue b/pages/API/websocket-global/websocket-global.uvue
index 3f751f5d2dd6b1d351c790d17e7e3271361e6ae3..72735bc82958b5c4743237ff194a78bc2cdd9a31 100644
--- a/pages/API/websocket-global/websocket-global.uvue
+++ b/pages/API/websocket-global/websocket-global.uvue
@@ -137,7 +137,7 @@ export default {
       uni.sendSocketMessage({
         data:
           'from ' +
-          platform +
+          this.platform +
           ' : ' +
           parseInt((Math.random() * 10000).toString()).toString(),
         success(res: any) {
diff --git a/pages/API/websocket-socketTask/websocket-socketTask.test.js b/pages/API/websocket-socketTask/websocket-socketTask.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a3bc3d3b279d2f7a94022abb395813b5255b207
--- /dev/null
+++ b/pages/API/websocket-socketTask/websocket-socketTask.test.js
@@ -0,0 +1,18 @@
+const PAGE_PATH = '/pages/API/websocket-socketTask/websocket-socketTask'
+
+describe('ExtApi-WebSocket', () => {
+
+  let page;
+  let res;
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(600);
+    await page.callMethod('jest_connectSocket');
+    await page.waitFor(500);
+    res = await page.data('jest_result');
+  });
+
+  it('Check ', async () => {
+    expect(res).toBe(2);
+  });
+});
diff --git a/pages/API/websocket-socketTask/websocket-socketTask.uvue b/pages/API/websocket-socketTask/websocket-socketTask.uvue
index 8139774e680530b115010054e781a72cab801f20..8285294b15fd30778b811079ee00caf181d52ee5 100644
--- a/pages/API/websocket-socketTask/websocket-socketTask.uvue
+++ b/pages/API/websocket-socketTask/websocket-socketTask.uvue
@@ -35,7 +35,9 @@ export default {
       socketTask: null as SocketTask | null,
       msg: '',
       platform: '',
-      pageVisible: false,
+      pageVisible: false,
+      //自动化测试例专用
+      jest_result: 0,
     }
   },
   computed: {
@@ -135,16 +137,16 @@ export default {
         }
       })
     },
-    send() {
+    send() {
       const data =
         'from ' +
-        platform +
+        this.platform +
         ' : ' +
         parseInt(Math.random() * 10000 + '').toString()
       this.socketTask?.send({
         data,
         success(res: any) {
-          console.log(res)
+          console.log(res)
         },
         fail(err: any) {
           console.log(err)
@@ -162,7 +164,38 @@ export default {
           console.log('uni.closeSocket fail', err)
         },
       } as CloseSocketOptions)
-    },
+    },
+    //自动化测试例专用
+    jest_connectSocket(){
+      this.socketTask = uni.connectSocket({
+        url: 'ws://websocket.dcloud.net.cn',
+        success:(_) => {
+          this.jest_result++
+        },
+        fail:(_) => {
+          this.jest_result = 0
+        },
+      })
+      this.socketTask?.onOpen((_) => {
+          const data =
+            'from ' +
+            this.platform +
+            ' : ' +
+            parseInt(Math.random() * 10000 + '').toString()
+          this.socketTask?.send({
+            data,
+            success(_) {
+              this.jest_result++
+            },
+            fail(_) {
+              this.jest_result = 0
+            },
+          } as SendSocketMessageOptions)
+      })
+      this.socketTask?.onError((_) => {
+          this.jest_result = 0;
+      })
+    }
   },
 }
 </script>
diff --git a/pages/CSS/border/border-bottom.uvue b/pages/CSS/border/border-bottom.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..5ac9b8af54b3b0b279a08bf845152eef0ad4267f
--- /dev/null
+++ b/pages/CSS/border/border-bottom.uvue
@@ -0,0 +1,20 @@
+<template>
+  <view style="flex-grow: 1;">
+    <view>
+      <text>border-bottom: 10rpx dashed blue</text>
+      <view class="common" style="border-bottom: 10rpx dashed blue;"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style>
+  .common {
+    width: 500rpx;
+    height: 500rpx;
+    background-color: gray;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/CSS/border/border-color.uvue b/pages/CSS/border/border-color.uvue
index 31a7392d96b6ce7c2432a6cf7b9be8fbe74142b5..b3753438c5cb39fe59cb5577a46721d0da94f624 100644
--- a/pages/CSS/border/border-color.uvue
+++ b/pages/CSS/border/border-color.uvue
@@ -7,7 +7,7 @@
         <text>border-color: red</text>
         <view
           class="common"
-          style="border-width: 10rpx; border-color: red"
+          style="border-width: 10rpx; border-color: red; border-style: solid;"
         ></view>
       </view>
 
@@ -15,7 +15,7 @@
         <text>border-left-color: red</text>
         <view
           class="common"
-          style="border-left-width: 10rpx; border-left-color: red"
+          style="border-left-width: 10rpx; border-left-color: red; border-left-style:solid;"
         ></view>
       </view>
 
@@ -23,7 +23,7 @@
         <text>border-top-color: green</text>
         <view
           class="common"
-          style="border-top-width: 10rpx; border-top-color: green"
+          style="border-top-width: 10rpx; border-top-color: green; border-top-style: solid;"
         ></view>
       </view>
 
@@ -31,7 +31,7 @@
         <text>border-right-color: yellow</text>
         <view
           class="common"
-          style="border-right-width: 10rpx; border-right-color: yellow"
+          style="border-right-width: 10rpx; border-right-color: yellow; border-right-style: solid;"
         ></view>
       </view>
 
@@ -39,7 +39,7 @@
         <text>border-bottom-color: blue</text>
         <view
           class="common"
-          style="border-bottom-width: 10rpx; border-bottom-color: blue"
+          style="border-bottom-width: 10rpx; border-bottom-color: blue; border-bottom-style: solid; "
         ></view>
       </view>
     </view>
diff --git a/pages/CSS/border/border-left.uvue b/pages/CSS/border/border-left.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..5a36c535c42557b0198b4d06058400173872dd49
--- /dev/null
+++ b/pages/CSS/border/border-left.uvue
@@ -0,0 +1,20 @@
+<template>
+  <view style="flex-grow: 1;">
+    <view>
+      <text>border-left: 10rpx solid blue</text>
+      <view class="common" style="border-left: 10rpx solid blue;"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style>
+  .common {
+    width: 500rpx;
+    height: 500rpx;
+    background-color: gray;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/CSS/border/border-right.uvue b/pages/CSS/border/border-right.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..e32239d4d4aacb37c964780680132d04e90be8e6
--- /dev/null
+++ b/pages/CSS/border/border-right.uvue
@@ -0,0 +1,20 @@
+<template>
+  <view style="flex-grow: 1;">
+    <view>
+      <text>border-right: 10rpx solid blue</text>
+      <view class="common" style="border-right: 10rpx solid blue;"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style>
+  .common {
+    width: 500rpx;
+    height: 500rpx;
+    background-color: gray;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/CSS/border/border-top.uvue b/pages/CSS/border/border-top.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..17605ebbcba335d376f7dd39df672b967a32526e
--- /dev/null
+++ b/pages/CSS/border/border-top.uvue
@@ -0,0 +1,20 @@
+<template>
+  <view style="flex-grow: 1;">
+    <view>
+      <text>border-top: 10rpx dashed blue</text>
+      <view class="common" style="border-top: 10rpx dashed blue;"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style>
+  .common {
+    width: 500rpx;
+    height: 500rpx;
+    background-color: gray;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/CSS/border/border-width.uvue b/pages/CSS/border/border-width.uvue
index 1de2a19d70af4ef4f8b0c26f762a5b8c1ea3f2f5..337338bc071ac66a5e6860efe75a5be0ef05faae 100644
--- a/pages/CSS/border/border-width.uvue
+++ b/pages/CSS/border/border-width.uvue
@@ -5,27 +5,27 @@
     <view style="flex-grow: 1">
       <view>
         <text>border-width: 10rpx</text>
-        <view class="common" style="border-width: 10rpx"></view>
+        <view class="common" style="border-width: 10rpx; border-style: solid;"></view>
       </view>
 
       <view>
         <text>border-left-width: 10rpx</text>
-        <view class="common" style="border-left-width: 10rpx"></view>
+        <view class="common" style="border-left-width: 10rpx; border-left-style: solid; "></view>
       </view>
 
       <view>
         <text>border-top-width: 20rpx</text>
-        <view class="common" style="border-top-width: 20rpx"></view>
+        <view class="common" style="border-top-width: 20rpx; border-top-style: solid; "></view>
       </view>
 
       <view>
         <text>border-right-width: 30rpx</text>
-        <view class="common" style="border-right-width: 30rpx"></view>
+        <view class="common" style="border-right-width: 30rpx; border-right-style: solid; "></view>
       </view>
 
       <view>
         <text>border-bottom-width: 40rpx</text>
-        <view class="common" style="border-bottom-width: 40rpx"></view>
+        <view class="common" style="border-bottom-width: 40rpx; border-bottom-style: solid; "></view>
       </view>
     </view>
     <!-- #ifdef APP -->
diff --git a/pages/CSS/border/complex-border/complex-border.uvue b/pages/CSS/border/complex-border/complex-border.uvue
index 107111efb7bf3659f7e553d1555618879ea1018e..d4245d92501844705536a3dbeb5f16190a2c4bae 100644
--- a/pages/CSS/border/complex-border/complex-border.uvue
+++ b/pages/CSS/border/complex-border/complex-border.uvue
@@ -33,7 +33,8 @@
 		width: 250rpx;
 		height: 250rpx;
 		background-color: #00dd00;
-		border-width: 20rpx;
+		border-width: 20rpx;
+    border-style: solid;
 		border-color: #000000;
 		border-bottom-width: 40rpx;
 		border-bottom-color: #ff0000;
@@ -45,7 +46,8 @@
 
 	.border-rect {
 		width: 250rpx;
-		height: 250rpx;
+		height: 250rpx;
+    border-style: solid;
 		background-color: #00dd00;
 		border-width: 20rpx;
 		border-color: #000000;
@@ -53,4 +55,4 @@
 		border-bottom-color: #ff0000;
 		border-right-color: #FFDC02;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/CSS/layout/z-index.uvue b/pages/CSS/layout/z-index.uvue
index 9eb4ec2d74ec92ad5b867132b9481df579c8d0f3..aa3b84e04678c97ca7b1cfd8d8bc29645a7b229b 100644
--- a/pages/CSS/layout/z-index.uvue
+++ b/pages/CSS/layout/z-index.uvue
@@ -24,7 +24,7 @@
     methods: {
       changeZIndex(zIndex : number) {
         this.zIndex = 20;
-        (this.$refs['view'] as INode).style.setProperty('z-index', zIndex);
+        (this.$refs['view'] as Element).style.setProperty('z-index', zIndex);
       }
     }
   }
diff --git a/pages/CSS/transition/transition.uvue b/pages/CSS/transition/transition.uvue
index 6d39432ce8f44271f04c859fb25bc0f9013ade6c..5b26c35d7b10afa31c3bc337acbe4c8e61bafb5d 100644
--- a/pages/CSS/transition/transition.uvue
+++ b/pages/CSS/transition/transition.uvue
@@ -1,192 +1,189 @@
 <template>
   <!-- #ifdef APP -->
   <scroll-view style="flex: 1">
-    <!-- #endif -->
+  <!-- #endif -->
     <view>
       <view class="container">
         <text class="text">点击修改宽度</text>
-        <view
-          class="base-style transition-width"
-          :style="widthOrHeight"
-          @click="changeWidthOrHeight"
-        ></view>
+        <view class="base-style transition-width" id="widthOrHeight" @click="changeWidthOrHeight"></view>
       </view>
       <view class="container">
         <text class="text">点击修改Margin</text>
-        <view
-          class="base-style transition-margin"
-          :style="styleMargin"
-          @click="changeMargin"
-        ></view>
+        <view class="base-style transition-margin" id="styleMargin" @click="changeMargin"></view>
       </view>
       <view class="container">
         <text class="text">点击修改Padding</text>
-        <view
-          class="base-style transition-padding"
-          :style="stylePadding"
-          @click="changePadding"
-        >
-          <view
-            style="background-color: black; height: 50px; width: 50px"
-          ></view>
+        <view class="base-style transition-padding" id="stylePadding" @click="changePadding">
+          <view style="background-color: black; height: 50px; width: 50px"></view>
         </view>
       </view>
       <view class="container">
         <text class="text">点击修改Background</text>
-        <view
-          class="base-style transition-background"
-          :style="styleBackground"
-          @click="changeBackground"
-        ></view>
+        <view class="base-style transition-background" id="styleBackground" @click="changeBackground"></view>
       </view>
       <view class="container">
         <text class="text">点击修改Transform</text>
-        <view
-          class="base-style transition-transform"
-          :style="styleTransform"
-          @click="changeTransform"
-        ></view>
+        <view class="base-style transition-transform" id="styleTransform" @click="changeTransform"></view>
       </view>
       <view class="container">
         <text class="text">点击修改Border</text>
-        <view
-          class="base-style transition-border"
-          :style="styleBorder"
-          @click="changeBorder"
-        ></view>
+        <view class="base-style transition-border" id="styleBorder" @click="changeBorder"></view>
       </view>
       <view class="container">
         <text class="text">点击修改Position</text>
-        <view
-          class="base-style transition-position"
-          :style="stylePosition"
-          @click="changestylePosition"
-        ></view>
+        <view class="base-style transition-position" id="stylePosition" @click="changestylePosition"></view>
       </view>
     </view>
-    <!-- #ifdef APP -->
+  <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      isTranstionWidthOrHeight: false,
-      widthOrHeight: '',
-      isTranstionChangeMargin: false,
-      styleMargin: '',
-      isTransitionStylePadding: false,
-      stylePadding: '',
-      isTransitionstyleBackground: false,
-      styleBackground: '',
-      isTransitionStyleTransform: false,
-      styleTransform: '',
-      isTransitionstyleBorder: false,
-      styleBorder: '',
-      isTransitionstylePosition: false,
-      stylePosition: '',
-    }
-  },
-  methods: {
-    changeWidthOrHeight() {
-      this.widthOrHeight = this.isTranstionWidthOrHeight
-        ? 'width:400rpx'
-        : 'width:600rpx'
-      this.isTranstionWidthOrHeight = !this.isTranstionWidthOrHeight
+  export default {
+    data() {
+      return {
+        isTranstionWidthOrHeight: false,
+        widthOrHeight: null as Element | null,
+        isTranstionChangeMargin: false,
+        styleMargin: null as Element | null,
+        isTransitionStylePadding: false,
+        stylePadding: null as Element | null,
+        isTransitionstyleBackground: false,
+        styleBackground: null as Element | null,
+        isTransitionStyleTransform: false,
+        styleTransform: null as Element | null,
+        isTransitionstyleBorder: false,
+        styleBorder: null as Element | null,
+        isTransitionstylePosition: false,
+        stylePosition: null as Element | null,
+      }
     },
-    changeMargin() {
-      this.styleMargin = this.isTranstionChangeMargin
-        ? 'margin-top:0rpx;margin-left:0rpx'
-        : 'margin-top:100rpx;margin-left:100rpx'
-      this.isTranstionChangeMargin = !this.isTranstionChangeMargin
+    onReady() {
+      this.widthOrHeight = uni.getElementById("widthOrHeight")
+      this.styleMargin = uni.getElementById("styleMargin")
+      this.stylePadding = uni.getElementById("stylePadding")
+      this.styleBackground = uni.getElementById("styleBackground")
+      this.styleTransform = uni.getElementById("styleTransform")
+      this.styleBorder = uni.getElementById("styleBorder")
+      this.stylePosition = uni.getElementById("stylePosition")
     },
+    methods: {
+      changeWidthOrHeight() {
+        this.widthOrHeight?.style?.setProperty("width", this.isTranstionWidthOrHeight
+          ? '400rpx'
+          : '600rpx')
+        this.isTranstionWidthOrHeight = !this.isTranstionWidthOrHeight
+      },
+      changeMargin() {
+        this.styleMargin?.style?.setProperty("margin-top", this.isTranstionChangeMargin
+          ? '0rpx'
+          : '100rpx'
+        )
+        this.styleMargin?.style?.setProperty("margin-left", this.isTranstionChangeMargin
+          ? '0rpx'
+          : '100rpx'
+        )
+        this.isTranstionChangeMargin = !this.isTranstionChangeMargin
+      },
 
-    changePadding() {
-      this.stylePadding = this.isTransitionStylePadding
-        ? 'padding-top:0rpx;padding-left:0rpx'
-        : 'padding-top:100rpx;padding-left:100rpx'
-      this.isTransitionStylePadding = !this.isTransitionStylePadding
-    },
-    changeBackground() {
-      this.styleBackground = this.isTransitionstyleBackground
-        ? 'background-color: brown;opacity:1'
-        : 'background-color: black;opacity:0.5'
-      this.isTransitionstyleBackground = !this.isTransitionstyleBackground
-    },
-    changeTransform() {
-      this.styleTransform = this.isTransitionStyleTransform
-        ? 'transform: rotate(0deg)'
-        : 'transform: rotate(135deg)'
-      this.isTransitionStyleTransform = !this.isTransitionStyleTransform
+      changePadding() {
+        this.stylePadding?.style?.setProperty("padding-top", this.isTransitionStylePadding
+          ? '0rpx'
+          : '100rpx')
+        this.stylePadding?.style?.setProperty("padding-left", this.isTransitionStylePadding
+          ? '0rpx'
+          : '100rpx')
+        this.isTransitionStylePadding = !this.isTransitionStylePadding
+      },
+      changeBackground() {
+        this.styleBackground?.style?.setProperty("background-color", this.isTransitionstyleBackground
+          ? 'brown'
+          : 'black'
+        )
+        this.styleBackground?.style?.setProperty("opacity", this.isTransitionstyleBackground
+          ? '1'
+          : '0.5'
+        )
+        this.isTransitionstyleBackground = !this.isTransitionstyleBackground
+      },
+      changeTransform() {
+        this.styleTransform?.style?.setProperty("transform", this.isTransitionStyleTransform
+          ? 'rotate(0deg)'
+          : 'rotate(135deg)'
+        )
+        this.isTransitionStyleTransform = !this.isTransitionStyleTransform
+      },
+      changeBorder() {
+        this.styleBorder?.style?.setProperty("border-color", this.isTransitionstyleBorder
+          ? 'brown'
+          : 'yellow'
+        )
+        this.isTransitionstyleBorder = !this.isTransitionstyleBorder
+      },
+      changestylePosition() {
+        this.stylePosition?.style?.setProperty("left", this.isTransitionstylePosition
+          ? '0rpx'
+          : '150rpx'
+        )
+        this.isTransitionstylePosition = !this.isTransitionstylePosition
+      },
     },
-    changeBorder() {
-      this.styleBorder = this.isTransitionstyleBorder
-        ? 'border-color: brown;'
-        : 'border-color: yellow;'
-      this.isTransitionstyleBorder = !this.isTransitionstyleBorder
-    },
-    changestylePosition() {
-      this.stylePosition = this.isTransitionstylePosition
-        ? 'left:0rpx'
-        : 'left:150rpx;'
-      this.isTransitionstylePosition = !this.isTransitionstylePosition
-    },
-  },
-}
+  }
 </script>
 
 <style>
-.container {
-  margin: 15rpx;
-  background-color: white;
-}
-.text {
-  margin-top: 20rpx;
-  margin-bottom: 32rpx;
-}
+  .container {
+    margin: 15rpx;
+    background-color: white;
+  }
+
+  .text {
+    margin-top: 20rpx;
+    margin-bottom: 32rpx;
+  }
 
-.base-style {
-  width: 400rpx;
-  height: 400rpx;
-  background-color: brown;
-}
+  .base-style {
+    width: 400rpx;
+    height: 400rpx;
+    background-color: brown;
+  }
 
-.transition-width {
-  transition-property: width;
-  transition-duration: 1000;
-}
+  .transition-width {
+    transition-property: width;
+    transition-duration: 1000;
+  }
 
-.transition-margin {
-  transition-property: margin-left, margin-top;
-  transition-duration: 1000;
-}
+  .transition-margin {
+    transition-property: margin-left, margin-top;
+    transition-duration: 1000;
+  }
 
-.transition-padding {
-  transition-property: padding-left, padding-top;
-  transition-duration: 1000;
-}
+  .transition-padding {
+    transition-property: padding-left, padding-top;
+    transition-duration: 1000;
+  }
 
-.transition-background {
-  transition-property: background-color, opacity;
-  transition-duration: 1000;
-}
+  .transition-background {
+    transition-property: background-color, opacity;
+    transition-duration: 1000;
+  }
 
-.transition-transform {
-  transition-property: transform;
-  transition-duration: 1000;
-}
+  .transition-transform {
+    transition-property: transform;
+    transition-duration: 1000;
+  }
 
-.transition-border {
-  border-width: 5px;
-  border-color: brown;
-  transition-property: border-color;
-  transition-duration: 1000;
-}
+  .transition-border {
+    border-width: 5px;
+    border-color: brown;
+    border-style: solid;
+    transition-property: border-color;
+    transition-duration: 1000;
+  }
 
-.transition-position {
-  transition-property: left;
-  transition-duration: 1000;
-}
-</style>
+  .transition-position {
+    transition-property: left;
+    transition-duration: 1000;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/component/general-attribute/general-attribute.uvue b/pages/component/general-attribute/general-attribute.uvue
index 923513cc5b141914d415a13a9fd0b1c554a42074..1f4aac95eccd3595fe4a2abe2bd19bc1c41dd6c3 100644
--- a/pages/component/general-attribute/general-attribute.uvue
+++ b/pages/component/general-attribute/general-attribute.uvue
@@ -69,7 +69,7 @@ export default {
   },
   methods: {
     validateGeneralAttributes() {
-      const generalTarget = this.$refs.get('general-target') as INode
+      const generalTarget = this.$refs['general-target'] as Element
       const generalId = generalTarget.getAttribute('id')
       if (generalId != this.generalId) {
         this.validateGeneralAttrText = '基础属性 id 验证失败'
@@ -98,8 +98,8 @@ export default {
       this.validateGeneralAttrText = '基础属性验证成功'
     },
     changeHeight(){
-      const generalTarget = this.$refs.get('general-target') as INode
-      generalTarget.style.set('height', '200px')
+      const generalTarget = this.$refs['general-target'] as Element
+      generalTarget.style.setProperty('height', '200px')
     }
   },
 }
diff --git a/pages/component/image/image-path.uvue b/pages/component/image/image-path.uvue
index 0d561e8d38deb493bf41eeacac9434b9c6738dcd..847369a56bd19bec4786dfd1cbf7653b38b73886 100644
--- a/pages/component/image/image-path.uvue
+++ b/pages/component/image/image-path.uvue
@@ -32,7 +32,7 @@
           },
           {
             src: '../../../static/Test-Image/Logo.png',
-            description: '本地相对路径忽略大小写'
+            description: '本地相对路径忽略大小写（需注意Android打包后无效）'
           },
           {
             src: logo,
@@ -43,7 +43,7 @@
             src: 'file:///storage/emulated/0/Android/data/io.dcloud.uniappx/apps/__UNI__3584C99/www/static/test-image/logo.png',
             // #endif
             // TODO iOS发版时还需再补路径
-            description: '本地绝对路径file:///方式。需注意打包后包名appid匹配'
+            description: '本地绝对路径file://方式（需注意打包后包名appid匹配）'
           },
           {
             src: 'testerror.jpg',
diff --git a/pages/component/image/image.test.js b/pages/component/image/image.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a6ce934a7df8eb6065e1b250d7f398cc5091941
--- /dev/null
+++ b/pages/component/image/image.test.js
@@ -0,0 +1,32 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-image', () => {
+
+    let page;
+    beforeAll(async () => {
+        page = await program.reLaunch('/pages/component/image/image');
+        await page.waitFor(600);
+    });
+
+    it('check_image_load', async () => {
+         expect(await page.data('loadError')).toBe(false)
+    });
+
+    it('check_image_load_url', async () => {
+      await page.setData({
+        loadError: false,
+        imageSrc: 'https://request.dcloud.net.cn/api/http/contentType/image/png'
+      })
+      await page.waitFor(300);
+      expect(await page.data('loadError')).toBe(false)
+    })
+    
+    it('check_image_load_error', async () => {
+      await page.setData({
+        loadError: false,
+        imageSrc: 'testerror.jpg'
+      })
+      await page.waitFor(300);
+      expect(await page.data('loadError')).toBe(true)
+    })
+});
diff --git a/pages/component/image/image.uvue b/pages/component/image/image.uvue
index 9e6345ee63ec73feb6a26b90a8b3bc67861d00e0..6cb20282b61702fd79956348751bb518dd65a439 100644
--- a/pages/component/image/image.uvue
+++ b/pages/component/image/image.uvue
@@ -3,7 +3,7 @@
 		<page-head :title="title"></page-head>
 		<view class="uni-padding-wrap uni-common-mt">
 			<view class="uni-center" style="background:#FFFFFF;">
-				<image class="image" :fade-show="true" mode="widthFix" src="/static/test-image/logo.png" @error="error"
+				<image class="image" :fade-show="true" mode="widthFix" :src="imageSrc" @error="error"
 					@load="load"></image>
 			</view>
 			<view class="uni-btn-v">
@@ -25,11 +25,14 @@
 	export default {
 		data() {
 			return {
-				title: 'image'
+				title: 'image',
+				imageSrc: "/static/test-image/logo.png",
+				loadError: false
 			}
 		},
 		methods: {
-			error(event : ImageErrorEvent) {
+			error(event : ImageErrorEvent) {
+				this.loadError = true
 				console.log(event.type, event.detail);
 			},
 			load(event : ImageLoadEvent) {
@@ -63,4 +66,4 @@
 		margin: 40rpx auto;
 		width: 200rpx;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/component/input/input.test.js b/pages/component/input/input.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab54276ea525e125c9cade9e66af3cab19cf2ee6
--- /dev/null
+++ b/pages/component/input/input.test.js
@@ -0,0 +1,148 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-input', () => {
+
+  let page;
+  beforeAll(async () => {
+    page = await program.reLaunch('/pages/component/input/input')
+    await page.waitFor(3000);
+  });
+
+  // it("beforeAllTestScreenshot", async () => {
+  //   const image = await program.screenshot({
+  //     fullPage: true
+  //   })
+  //   expect(image).toMatchImageSnapshot()
+  // })
+  // 测试焦点及键盘弹起
+  // it('focus', async () => {
+  //   const input = await page.$('.uni-input-focus');
+  //   expect(await input.property('focus')).toBe(true)
+  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
+  //   await page.setData({
+  //     focus: false,
+  //   })
+  //   expect(await input.property('focus')).toBe(false)
+  //   await page.waitFor(1000)
+  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
+  //   await page.setData({
+  //     focus: true,
+  //   })
+  //   expect(await input.property('focus')).toBe(true)
+  //   await page.waitFor(1000)
+  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(true)
+  //   await page.setData({
+  //     focus: false,
+  //   })
+  //   expect(await input.property('focus')).toBe(false)
+  //   await page.waitFor(1000)
+  //   expect(await page.data("inputFocusKeyBoardChangeValue")).toBe(false)
+  //   await page.waitFor(1000)
+  // });
+
+  // 测试修改value属性
+  it("value", async () => {
+    const input = await page.$('.uni-input-default');
+    expect(await input.property('value')).toEqual("hello uni-app x")
+  })
+
+  //测试input的类型
+  it("type", async () => {
+    const text = await page.$('.uni-input-type-text');
+    const number = await page.$('.uni-input-type-number');
+    const digit = await page.$('.uni-input-type-digit');
+    const tel = await page.$('.uni-input-type-tel');
+    expect(await text.property('type')).toEqual("text")
+    expect(await number.property('type')).toEqual("number")
+    expect(await digit.property('type')).toEqual("digit")
+    expect(await tel.property('type')).toEqual("tel")
+  })
+
+  //  测试密码属性
+  // it("password", async () => {
+  //   const input = await page.$('.uni-input-password');
+  //   expect(await input.property('password')).toBe(true)
+  //   await page.setData({
+  //     inputPassword: false,
+  //     inputPasswordValue: "inputPasswordValue"
+  //   })
+  //   expect(await input.property('password')).toBe(false)
+  //   await page.waitFor(500)
+  //   await page.setData({
+  //     inputPassword: true
+  //   })
+  // })
+  // 测试placeholder
+  it("placeholder", async () => {
+    const placeholder1 = await page.$('.uni-input-placeholder1');
+    expect(await placeholder1.property("placeholder-style")).toMatchObject({
+      "color": "red"
+    })
+    expect(await placeholder1.property("placeholder")).toEqual("占位符文字颜色为红色")
+    await page.setData({
+      inputPlaceHolderStyle: "color:#CC00CC",
+    })
+    expect(await placeholder1.property("placeholder-style")).toMatchObject({
+      "color": "#CC00CC"
+    })
+
+    await page.setData({
+      inputPlaceHolderStyle: "color:#CC19CC;background-color:#00b1c0",
+    })
+    expect(await placeholder1.property("placeholder-style")).toMatchObject({
+      "color": "#CC19CC",
+      "backgroundColor": "#00b1c0"
+    })
+
+    await page.setData({
+      inputPlaceHolderStyle: "color:#CC19CC;background-color:#00b1c0;text-align:center;font-size:44px;font-weight:900",
+    })
+    expect(await placeholder1.property("placeholder-style")).toEqual({
+      "backgroundColor": "#00b1c0",
+      "color": "#CC19CC",
+      "fontSize": "44px",
+      "fontWeight": "900",
+      "textAlign": "center"
+    })
+
+    const placeholder2 = await page.$('.uni-input-placeholder2');
+    expect(await placeholder2.property("placeholder-class")).toMatchObject({
+      "backgroundColor": "#008000"
+    })
+    await page.setData({
+      inputPlaceHolderClass: "uni-input-placeholder-class-ts",
+    })
+    expect(await placeholder2.property("placeholder-class")).toMatchObject({
+      "backgroundColor": "#FFA500"
+    })
+    expect(await placeholder2.property("placeholder")).toEqual("占位符背景色为绿色")
+  })
+
+  it("disable", async () => {
+    const input = await page.$('.uni-input-disable');
+    expect(await input.property("disabled")).toBe(true)
+  })
+
+  it("confirm-type", async () => {
+    expect(await (await page.$('.uni-input-confirm-send')).property("confirmType")).toEqual("send")
+    expect(await (await page.$('.uni-input-confirm-search')).property("confirmType")).toEqual("search")
+    expect(await (await page.$('.uni-input-confirm-next')).property("confirmType")).toEqual("next")
+    expect(await (await page.$('.uni-input-confirm-go')).property("confirmType")).toEqual("go")
+    expect(await (await page.$('.uni-input-confirm-done')).property("confirmType")).toEqual("done")
+  })
+
+  // it("maxlength", async () => {
+  //   const input = await page.$('.uni-input-maxlength');
+  //   await page.setData({
+  //     inputMaxLengthValue: "uni-input-maxlength"
+  //   })
+  //   await page.waitFor(500)
+  // })
+
+  // it("afterAllTestScreenshot", async () => {
+  //   const image = await program.screenshot({
+  //     fullPage: true
+  //   })
+  //   expect(image).toMatchImageSnapshot()
+  // })
+});
diff --git a/pages/component/input/input.uvue b/pages/component/input/input.uvue
index d824cbf79b114edc83eea8b2302d402dffb6e30c..91017ae21f954bd22687c53d7af81d701cbebbb6 100644
--- a/pages/component/input/input.uvue
+++ b/pages/component/input/input.uvue
@@ -1,310 +1,327 @@
 <template>
-	<!-- #ifdef APP -->
-	<scroll-view style="flex: 1">
-		<!-- #endif -->
-		<page-head :title="title"></page-head>
-		<view class="uni-common-mt uni-padding-wrap">
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">设置输入框的初始内容</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" value="hello uni-app x" />
-				</view>
-			</view>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <page-head :title="title"></page-head>
+    <view class="uni-common-mt uni-padding-wrap">
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">设置输入框的初始内容</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-default" value="hello uni-app x" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">type取值（不同输入法表现可能不一致）</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" type="text" placeholder="文本输入键盘" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" type="number" placeholder="数字输入键盘" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" type="digit" placeholder="带小数点的数字输入键盘" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" type="tel" placeholder="电话输入键盘" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">type取值（不同输入法表现可能不一致）</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-type-text" type="text" placeholder="文本输入键盘" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-type-number" type="number" placeholder="数字输入键盘" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-type-digit" type="digit" placeholder="带小数点的数字输入键盘" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-type-tel" :type="inputTypeTel" placeholder="电话输入键盘" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">密码输入框</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :password="true" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">密码输入框</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-password" :password="inputPassword" :value="inputPasswordValue" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">占位符样式</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" placeholder-style="color:red" placeholder="占位符文字颜色为红色" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" placeholder-class="uni-input-placeholder-class" placeholder="占位符背景色为绿色" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">占位符样式</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-placeholder1" :placeholder-style="inputPlaceHolderStyle" placeholder="占位符文字颜色为红色" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-placeholder2" :placeholder-class="inputPlaceHolderClass" placeholder="占位符背景色为绿色" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">设置禁用输入框</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :disabled="true" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">设置禁用输入框</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-disable" :disabled="true" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">设置最大输入长度</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :maxlength="10" placeholder="最大输入长度为10" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">设置最大输入长度</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-maxlength" :maxlength="10" placeholder="最大输入长度为10" :value="inputMaxLengthValue" @input="onMaxLengthInput" :focus="inputMaxLengthFocus" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">设置光标与键盘的距离</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :cursor-spacing="1000" placeholder="光标与键盘的距离为1000px" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">设置光标与键盘的距离</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" :cursor-spacing="1000" placeholder="光标与键盘的距离为1000px" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">自动获取焦点</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :focus="true" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">自动获取焦点</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-focus" :focus="focus" @keyboardheightchange="inputFocusKeyBoardChange"/>
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">confirm-type取值（不同输入法表现可能不一致）</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" confirmType="send" placeholder="键盘右下角按钮显示为发送" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" confirmType="search" placeholder="键盘右下角按钮显示为搜索" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" confirmType="next" placeholder="键盘右下角按钮显示为下一个" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" confirmType="go" placeholder="键盘右下角按钮显示为前往" />
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" confirmType="done" placeholder="键盘右下角按钮显示为完成" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">confirm-type取值（不同输入法表现可能不一致）</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-confirm-send" confirmType="send" placeholder="键盘右下角按钮显示为发送" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-confirm-search" confirmType="search" placeholder="键盘右下角按钮显示为搜索" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-confirm-next" confirmType="next" placeholder="键盘右下角按钮显示为下一个" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-confirm-go" confirmType="go" placeholder="键盘右下角按钮显示为前往" />
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input uni-input-confirm-done" confirmType="done" placeholder="键盘右下角按钮显示为完成" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">点击键盘右下角按钮时保持键盘不收起</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :confirm-hold="true" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">点击键盘右下角按钮时保持键盘不收起</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" :confirm-hold="true" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title" @click="setCursor(4)">
-					<text class="uni-title-text">设置输入框聚焦时光标的位置（点击生效）</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input ref="input" class="uni-input" value="0123456789" :cursor="cursor" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title" @click="setCursor(4)">
+          <text class="uni-title-text">设置输入框聚焦时光标的位置（点击生效）</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input ref="input" class="uni-input" value="0123456789" :cursor="cursor" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title" @click="setSelection(0, 4)">
-					<text class="uni-title-text">设置输入框聚焦时光标的起始位置和结束位置（点击生效）</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input ref="input2" class="uni-input" value="0123456789" :selection-start="selectionStart"
-						:selection-end="selectionEnd" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title" @click="setSelection(0, 4)">
+          <text class="uni-title-text">设置输入框聚焦时光标的起始位置和结束位置（点击生效）</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input ref="input2" class="uni-input" value="0123456789" :selection-start="selectionStart" :selection-end="selectionEnd" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">键盘弹起时，自动上推页面</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" :adjust-position="true" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">键盘弹起时，自动上推页面</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" :adjust-position="true" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">input事件</text>
-					<text class="uni-subtitle-text" v-if="inputEventDetail">{{inputEventDetail}}</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" @input="onInput" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">input事件</text>
+          <text class="uni-subtitle-text" v-if="inputEventDetail">{{inputEventDetail}}</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" @input="onInput" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">focus事件和blur事件</text>
-					<text class="uni-subtitle-text" v-if="focusAndBlurEventDetail">{{focusAndBlurEventDetail}}</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" @focus="onFocus" @blur="onBlur" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">focus事件和blur事件</text>
+          <text class="uni-subtitle-text" v-if="focusAndBlurEventDetail">{{focusAndBlurEventDetail}}</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" @focus="onFocus" @blur="onBlur" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">confirm事件</text>
-					<text class="uni-subtitle-text" v-if="confirmEventDetail">{{confirmEventDetail}}</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" @confirm="onConfirm" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">confirm事件</text>
+          <text class="uni-subtitle-text" v-if="confirmEventDetail">{{confirmEventDetail}}</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" @confirm="onConfirm" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">keyboardheightchange事件</text>
-					<text class="uni-subtitle-text"
-						v-if="keyboardHeightChangeEventDetail">{{keyboardHeightChangeEventDetail}}</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" @keyboardheightchange="onKeyborardHeightChange" />
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">keyboardheightchange事件</text>
+          <text class="uni-subtitle-text" v-if="keyboardHeightChangeEventDetail">{{keyboardHeightChangeEventDetail}}</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" @keyboardheightchange="onKeyborardHeightChange" />
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">带清除按钮的输入框</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" placeholder="带清除按钮的输入框" :value="inputClearValue" @input="clearInput" />
-					<image class="uni-icon" src="/static/icons/clear.png" v-if="showClearIcon" @click="clearIcon">
-					</image>
-				</view>
-			</view>
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">带清除按钮的输入框</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" placeholder="带清除按钮的输入框" :value="inputClearValue" @input="clearInput" />
+          <image class="uni-icon" src="/static/icons/clear.png" v-if="showClearIcon" @click="clearIcon">
+          </image>
+        </view>
+      </view>
 
-			<view>
-				<view class="uni-title">
-					<text class="uni-title-text">可查看密码的输入框</text>
-				</view>
-				<view class="uni-input-wrapper">
-					<input class="uni-input" placeholder="请输入密码" :password="showPassword" />
-					<image class="uni-icon"
-						:src="!showPassword ? '/static/icons/eye-active.png' : '/static/icons/eye.png'"
-						@click="changePassword"></image>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef APP -->
-	</scroll-view>
-	<!-- #endif -->
+      <view>
+        <view class="uni-title">
+          <text class="uni-title-text">可查看密码的输入框</text>
+        </view>
+        <view class="uni-input-wrapper">
+          <input class="uni-input" placeholder="请输入密码" :password="showPassword" />
+          <image class="uni-icon" :src="!showPassword ? '/static/icons/eye-active.png' : '/static/icons/eye.png'" @click="changePassword"></image>
+        </view>
+      </view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
 </template>
 <script lang="uts">
-	export default {
-		data() {
-			return {
-				title: 'input',
-				showClearIcon: false,
-				inputClearValue: '',
-				showPassword: true,
-				cursor: -1,
-				selectionStart: -1,
-				selectionEnd: -1,
-				inputEventDetail: '',
-				focusAndBlurEventDetail: '',
-				confirmEventDetail: '',
-				keyboardHeightChangeEventDetail: ''
-			}
-		},
-		methods: {
-			setCursor: function (cursor : number) {
-				(this.$refs['input'] as INode).focus();
-				this.cursor = cursor;
-			},
-			setSelection: function (selectionStart : number, selectionEnd : number) {
-				(this.$refs['input2'] as INode).focus();
-				this.selectionStart = selectionStart;
-				this.selectionEnd = selectionEnd;
-			},
-			clearInput: function (event : InputEvent) {
-				this.inputClearValue = event.detail.value
-				if (event.detail.value.length > 0) {
-					this.showClearIcon = true
-				} else {
-					this.showClearIcon = false
-				}
-			},
-			clearIcon: function () {
-				this.inputClearValue = ''
-				this.showClearIcon = false
-			},
-			changePassword: function () {
-				this.showPassword = !this.showPassword
-			},
-			onInput: function (event : InputEvent) {
-				console.log("键盘输入", JSON.stringify(event.detail));
-				this.inputEventDetail = JSON.stringify(event.detail)
-			},
-			onFocus: function (event : InputFocusEvent) {
-				console.log("输入框聚焦", JSON.stringify(event.detail));
-				this.focusAndBlurEventDetail = JSON.stringify(event.detail);
-			},
-			onBlur: function (event : InputBlurEvent) {
-				console.log("输入框失去焦点", JSON.stringify(event.detail));
-				this.focusAndBlurEventDetail = JSON.stringify(event.detail);
-			},
-			onConfirm: function (event : InputConfirmEvent) {
-				console.log("点击完成按钮", JSON.stringify(event.detail));
-				this.confirmEventDetail = JSON.stringify(event.detail);
-			},
-			onKeyborardHeightChange: function (event : InputKeyboardHeightChangeEvent) {
-				console.log("键盘高度发生变化", JSON.stringify(event.detail));
-				this.keyboardHeightChangeEventDetail = JSON.stringify(event.detail);
-			}
-		}
-	}
+  export default {
+    data() {
+      return {
+        title: 'input',
+        showClearIcon: false,
+        inputClearValue: '',
+        showPassword: true,
+        cursor: -1,
+        selectionStart: -1,
+        selectionEnd: -1,
+        inputEventDetail: '',
+        focusAndBlurEventDetail: '',
+        confirmEventDetail: '',
+        keyboardHeightChangeEventDetail: '',
+        focus: true,
+        inputPassword: true,
+        inputTypeTel: "tel",
+        inputPlaceHolderStyle: "color:red",
+        inputPlaceHolderClass: "uni-input-placeholder-class",
+        inputMaxLengthValue:"",
+        onMaxLengthInputValue:"",
+        inputMaxLengthFocus:false,
+        inputPasswordValue:"",
+        inputFocusKeyBoardChangeValue:true
+      }
+    },
+    methods: {
+      inputFocusKeyBoardChange(e:InputKeyboardHeightChangeEvent) {
+        this.inputFocusKeyBoardChangeValue = e.detail.height > 50
+      },
+      onMaxLengthInput(event:InputEvent) {
+        this.onMaxLengthInputValue = event.detail.value
+      },
+      setCursor: function (cursor : number) {
+        (this.$refs['input'] as Element).focus();
+        this.cursor = cursor;
+      },
+      setSelection: function (selectionStart : number, selectionEnd : number) {
+        (this.$refs['input2'] as Element).focus();
+        this.selectionStart = selectionStart;
+        this.selectionEnd = selectionEnd;
+      },
+      clearInput: function (event : InputEvent) {
+        this.inputClearValue = event.detail.value
+        if (event.detail.value.length > 0) {
+          this.showClearIcon = true
+        } else {
+          this.showClearIcon = false
+        }
+      },
+      clearIcon: function () {
+        this.inputClearValue = ''
+        this.showClearIcon = false
+      },
+      changePassword: function () {
+        this.showPassword = !this.showPassword
+      },
+      onInput: function (event : InputEvent) {
+        console.log("键盘输入", JSON.stringify(event.detail));
+        this.inputEventDetail = JSON.stringify(event.detail)
+      },
+      onFocus: function (event : InputFocusEvent) {
+        console.log("输入框聚焦", JSON.stringify(event.detail));
+        this.focusAndBlurEventDetail = JSON.stringify(event.detail);
+      },
+      onBlur: function (event : InputBlurEvent) {
+        console.log("输入框失去焦点", JSON.stringify(event.detail));
+        this.focusAndBlurEventDetail = JSON.stringify(event.detail);
+      },
+      onConfirm: function (event : InputConfirmEvent) {
+        console.log("点击完成按钮", JSON.stringify(event.detail));
+        this.confirmEventDetail = JSON.stringify(event.detail);
+      },
+      onKeyborardHeightChange: function (event : InputKeyboardHeightChangeEvent) {
+        console.log("键盘高度发生变化", JSON.stringify(event.detail));
+        this.keyboardHeightChangeEventDetail = JSON.stringify(event.detail);
+      },
+      test_check_input_value():number {
+        return this.onMaxLengthInputValue.length
+      }
+    }
+  }
 </script>
 
 <style scoped>
-	.uni-input-wrapper {
-		display: flex;
-		padding: 8px 13px;
-		margin: 10rpx 0;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		background-color: #ffffff;
-	}
+  .uni-input-wrapper {
+    display: flex;
+    padding: 8px 13px;
+    margin: 10rpx 0;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    background-color: #ffffff;
+  }
 
-	.uni-input {
-		height: 28px;
-		line-height: 28px;
-		font-size: 15px;
-		padding: 0px;
-		flex: 1;
-		background-color: #ffffff;
-	}
+  .uni-input {
+    height: 28px;
+    font-size: 15px;
+    padding: 0px;
+    flex: 1;
+    background-color: #ffffff;
+  }
 
-	.uni-icon {
-		width: 24px;
-		height: 24px;
-	}
+  .uni-icon {
+    width: 24px;
+    height: 24px;
+  }
 
-	.uni-input-placeholder-class {
-		background-color: green;
-	}
-</style>
\ No newline at end of file
+  .uni-input-placeholder-class {
+    background-color: green;
+  }
+  .uni-input-placeholder-class-ts {
+    background-color: orange;
+  }
+</style>
diff --git a/pages/component/list-view/list-view.test.js b/pages/component/list-view/list-view.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b31fc1d51cbe8662c3f637fa9b6058394038b29
--- /dev/null
+++ b/pages/component/list-view/list-view.test.js
@@ -0,0 +1,79 @@
+describe('component-native-list-view', () => {
+  let page
+  beforeAll(async () => {
+    //打开list-view测试页
+    page = await program.reLaunch('/pages/component/list-view/list-view')
+    await page.waitFor(600)
+  })
+
+  //检测竖向可滚动区域
+  it('check_scroll_height', async () => {
+    await page.callMethod('change_scroll_y_boolean', true)
+    await page.callMethod('change_scroll_x_boolean', false)
+    await page.waitFor(600)
+    const value = await page.callMethod('check_scroll_height')
+    expect(value).toBe(true)
+  })
+
+  //检测竖向scrolltop属性赋值
+  it('check_scroll_top', async () => {
+    await page.callMethod('confirm_scroll_top_input', 600)
+    await page.waitFor(600)
+    const listElement = await page.$('#listview')
+    const scrollTop = await listElement.attribute("scrollTop")
+    console.log("check_scroll_top---"+scrollTop)
+    expect(scrollTop-600).toBeGreaterThanOrEqual(0)
+  })
+
+  //检测竖向scroll_into_view属性赋值
+  it('check_scroll_into_view_top', async () => {
+    await page.callMethod('item_change_size_enum', 3)
+    await page.waitFor(600)
+    const listElement = await page.$('#listview')
+    const scrollTop = await listElement.attribute("scrollTop")
+    console.log("check_scroll_into_view_top--"+scrollTop)
+    await page.callMethod('item_change_size_enum', 0)
+    expect(scrollTop-690).toBeGreaterThanOrEqual(0)
+  })
+
+  //检测下拉刷新
+  it('check_refresher', async () => {
+    await page.setData({
+        refresher_enabled_boolean: true,
+        refresher_triggered_boolean: true
+    })
+    await page.waitFor(2000)
+    expect(await page.data('refresherrefresh')).toBe(true)
+  })
+
+  //检测横向可滚动区域
+  it('check_scroll_width', async () => {
+    await page.callMethod('change_scroll_y_boolean', false)
+    await page.callMethod('change_scroll_x_boolean', true)
+    await page.waitFor(600)
+    const value = await page.callMethod('check_scroll_width')
+    expect(value).toBe(true)
+  })
+
+  //检测横向scrollLeft属性赋值
+  it('check_scroll_left', async () => {
+    await page.callMethod('confirm_scroll_left_input', 600)
+    await page.waitFor(600)
+    const listElement = await page.$('#listview')
+    const scrollLeft = await listElement.attribute("scrollLeft")
+    console.log("check_scroll_left---"+scrollLeft)
+    expect(scrollLeft-600).toBeGreaterThanOrEqual(0)
+  })
+
+  //检测横向scroll_into_view属性赋值
+  it('check_scroll_into_view_left', async () => {
+    await page.callMethod('item_change_size_enum', 3)
+    await page.waitFor(600)
+    const listElement = await page.$('#listview')
+    const scrollLeft = await listElement.attribute("scrollLeft")
+    console.log("check_scroll_into_view_left--"+scrollLeft)
+    await page.callMethod('item_change_size_enum', 0)
+    expect(scrollLeft-1080).toBeGreaterThanOrEqual(0)
+  })
+
+})
diff --git a/pages/component/list-view/list-view.uvue b/pages/component/list-view/list-view.uvue
index 5777db59f70ab904b6da818d8867ec9fbbbe8100..b9ee3f6608454089f7b86ccd6887093827a0753d 100644
--- a/pages/component/list-view/list-view.uvue
+++ b/pages/component/list-view/list-view.uvue
@@ -1,4 +1,5 @@
 <script>
+  import { type ItemType } from '@/components/enum-data/enum-data.vue'
   export default {
     data() {
       return {
@@ -14,7 +15,10 @@
         scroll_top_input: 0,
         scroll_left_input: 0,
         refresher_background_input: "#FFF",
-        scrollData: [] as Array<string>
+        scrollData: [] as Array<string>,
+        size_enum: [{ "value": 0, "name": "item---0" }, { "value": 3, "name": "item---3" }] as ItemType[],
+        scrollIntoView: "",
+        refresherrefresh: false
       }
     },
     onLoad() {
@@ -32,18 +36,22 @@
       list_view_touchend() { console.log("手指触摸动作结束") },
       list_view_tap() { console.log("手指触摸后马上离开") },
       list_view_longpress() { console.log("如果一个组件被绑定了 longpress 事件，那么当用户长按这个组件时，该事件将会被触发。") },
-      list_view_refresherpulling() { console.log("自定义下拉刷新控件被下拉") },
-      list_view_refresherrefresh() { 
-        console.log("自定义下拉刷新被触发") 
+      list_view_refresherpulling() { console.log("下拉刷新控件被下拉") },
+      list_view_refresherrefresh() {
+        console.log("下拉刷新被触发 ")
+        this.refresherrefresh = true
         this.refresher_triggered_boolean = true
         setTimeout(function(){
         	this.refresher_triggered_boolean = false
         }, 1500)
       },
-      list_view_refresherrestore() { console.log("自定义下拉刷新被复位") },
-      list_view_refresherabort() { console.log("自定义下拉刷新被中止") },
-      list_view_scrolltoupper() { console.log("滚动到顶部/左边，会触发 scrolltoupper 事件") },
-      list_view_scrolltolower() { console.log("滚动到底部/右边，会触发 scrolltolower 事件") },
+      list_view_refresherrestore() {
+        this.refresherrefresh = false
+        console.log("下拉刷新被复位")
+      },
+      list_view_refresherabort() { console.log("下拉刷新被中止") },
+      list_view_scrolltoupper(e:ScrollToUpperEvent) { console.log("滚动到顶部/左边，会触发 scrolltoupper 事件  direction="+e.detail.direction) },
+      list_view_scrolltolower(e:ScrollToLowerEvent) { console.log("滚动到底部/右边，会触发 scrolltolower 事件  direction="+e.detail.direction) },
       list_view_scroll() { console.log("滚动时触发，event.detail = {scrollLeft, scrollTop, scrollHeight, scrollWidth, deltaX, deltaY}") },
       list_item_click() { console.log("list-item组件被点击时触发") },
       list_item_touchstart() { console.log("手指触摸list-item组件动作开始") },
@@ -63,7 +71,26 @@
       confirm_lower_threshold_input(value : number) { this.lower_threshold_input = value },
       confirm_scroll_top_input(value : number) { this.scroll_top_input = value },
       confirm_scroll_left_input(value : number) { this.scroll_left_input = value },
-      confirm_refresher_background_input(value : string) { this.refresher_background_input = value }
+      confirm_refresher_background_input(value : string) { this.refresher_background_input = value },
+      item_change_size_enum(index : number) { this.scrollIntoView = "item---"+index },
+      //自动化测试例专用
+      check_scroll_height(): Boolean {
+        var listElement = this.$refs["listview"] as Element
+        console.log("check_scroll_height--"+listElement.scrollHeight)
+        if(listElement.scrollHeight > 2000) {
+          return true
+        }
+        return false
+      },
+      //自动化测试例专用
+      check_scroll_width(): Boolean {
+        var listElement = this.$refs["listview"] as Element
+        console.log("check_scroll_width"+listElement.scrollWidth)
+        if(listElement.scrollWidth > 2000) {
+          return true
+        }
+        return false
+      }
     }
   }
 </script>
@@ -72,17 +99,17 @@
   <view class="main">
     <list-view :scroll-x="scroll_x_boolean" :scroll-y="scroll_y_boolean" :rebound="rebound_boolean"
       :upper-threshold="upper_threshold_input" :lower-threshold="lower_threshold_input" :scroll-top="scroll_top_input"
-      :scroll-left="scroll_left_input" :show-scrollbar="show_scrollbar_boolean"
+      :scroll-left="scroll_left_input" :show-scrollbar="show_scrollbar_boolean" :scroll-into-view="scrollIntoView"
       :scroll-with-animation="scroll_with_animation_boolean" :refresher-enabled="refresher_enabled_boolean"
       :refresher-background="refresher_background_input" :refresher-triggered="refresher_triggered_boolean"
       @click="list_view_click" @touchstart="list_view_touchstart" @touchmove="list_view_touchmove"
       @touchcancel="list_view_touchcancel" @touchend="list_view_touchend" @tap="list_view_tap"
       @longpress="list_view_longpress" @refresherpulling="list_view_refresherpulling"
       @refresherrefresh="list_view_refresherrefresh" @refresherrestore="list_view_refresherrestore"
-      @refresherabort="list_view_refresherabort" @scrolltoupper="list_view_scrolltoupper"
+      @refresherabort="list_view_refresherabort" @scrolltoupper="list_view_scrolltoupper" ref="listview" id="listview"
       @scrolltolower="list_view_scrolltolower" @scroll="list_view_scroll" style="width:100%;">
       <list-item
-        v-for="key in scrollData" :key="key" @click="list_item_click" @touchstart="list_item_touchstart"
+        v-for="key in scrollData" :key="key" :id="key" @click="list_item_click" @touchstart="list_item_touchstart"
         @touchmove="list_item_touchmove" @touchcancel="list_item_touchcancel" @touchend="list_item_touchend"
         @tap="list_item_tap" @longpress="list_item_longpress"
         class="list-item">
@@ -97,7 +124,7 @@
     <view class="content nvue">
       <boolean-data :defaultValue="false" title="设置当前下拉刷新状态，true 表示下拉刷新已经被触发，false 表示下拉刷新未被触发"
         @change="change_refresher_triggered_boolean"></boolean-data>
-      <boolean-data :defaultValue="false" title="开启自定义下拉刷新" @change="change_refresher_enabled_boolean"></boolean-data>
+      <boolean-data :defaultValue="false" title="开启下拉刷新" @change="change_refresher_enabled_boolean"></boolean-data>
       <boolean-data :defaultValue="false" title="是否在设置滚动条位置时使用滚动动画，设置false没有滚动动画"
         @change="change_scroll_with_animation_boolean"></boolean-data>
       <boolean-data :defaultValue="true" title="控制是否出现滚动条" @change="change_show_scrollbar_boolean"></boolean-data>
@@ -110,8 +137,9 @@
         @confirm="confirm_lower_threshold_input"></input-data>
       <input-data defaultValue="0" title="设置竖向滚动条位置" type="number" @confirm="confirm_scroll_top_input"></input-data>
       <input-data defaultValue="0" title="设置横向滚动条位置" type="number" @confirm="confirm_scroll_left_input"></input-data>
-      <input-data defaultValue="#FFF" title="设置自定义下拉刷新区域背景颜色" type="text"
+      <input-data defaultValue="#FFF" title="设置下拉刷新区域背景颜色" type="text"
         @confirm="confirm_refresher_background_input"></input-data>
+      <enum-data :items="size_enum" title="通过id位置跳转" @change="item_change_size_enum"></enum-data>
     </view>
     <!-- #ifdef APP -->
   </scroll-view>
diff --git a/pages/component/long-list/detail/detail.uvue b/pages/component/long-list/detail/detail.uvue
deleted file mode 100644
index 118d8043d64be96a9cb9e1b13a0f373065cfd3cb..0000000000000000000000000000000000000000
--- a/pages/component/long-list/detail/detail.uvue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-	<!-- #ifdef APP -->
-	<scroll-view style="flex: 1">
-		<!-- #endif -->
-		<view class="article-content">
-			<text>{{content}}</text>
-		</view>
-		<!-- #ifdef APP -->
-	</scroll-view>
-	<!-- #endif -->
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				content: "",
-			}
-		},
-		onLoad(event) {
-			this.content = event["content"] ?? "";
-		},
-		methods: {
-		}
-	}
-</script>
-
-<style>
-	.article-content {
-		padding: 0 30rpx;
-		overflow: hidden;
-		font-size: 30rpx;
-		margin-bottom: 30rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/component/long-list/long-list.uvue b/pages/component/long-list/long-list.uvue
deleted file mode 100644
index 4aaa0a36513ac1bbcfbdf1c620f2a378389e48c3..0000000000000000000000000000000000000000
--- a/pages/component/long-list/long-list.uvue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-	<view style="width: 100%;height: 100%;">
-		<list-view class="uni-list" refresher-enabled=true @refresherrefresh="onRefresherrefresh"
-			:refresher-triggered="refresherTriggered" scroll-y = true>
-			<list-item v-for="(value, index) in listData" :key="index">
-				<view class="uni-list-cell" hover-class="uni-list-cell-hover" @click="goDetail(value)">
-					<view class="uni-media-list">
-						<image class="uni-media-list-logo" :src="value.img"></image>
-						<view class="uni-media-list-body">
-							<text class="uni-media-list-text-top">{{ value.title }}</text>
-							<view class="uni-media-list-text-bottom">
-								<text class="uni-media-list-text">{{ value.subTitle }}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</list-item>
-		</list-view>
-	</view>
-</template>
-
-<script>
-	type Item = {
-		title: string
-		subTitle: string,
-		img: string,
-		detail: string,
-	}
-
-    
-	export default {
-		data() {
-			return {
-				refresherTriggered: false,
-				listData: [] as Item[],
-				last_id: '',
-				pageVisible: false
-			};
-		},
-		onLoad() {
-			this.pageVisible = true;
-			this.getList();
-		},
-		onUnload() {
-			this.pageVisible = false;
-		},
-		methods: {
-			getList() {
-				const fileManager = uni.getFileSystemManager()
-                fileManager.readFile({
-					encoding:'utf-8',
-					filePath:'static/list-mock/mock.json',
-					success:function(result){
-						const content = result.data;
-						const items = [] as Item[];
-						const jsonArr = JSON.parse<Array<UTSJSONObject>>(content);
-						if(jsonArr != null){
-							for(const res in jsonArr){
-								const json = res as UTSJSONObject;
-								const title = json["title"] as string;
-								const subTitle = json["subTitle"] as string;
-								const img = json["img"] as string;
-								const detail = json["detail"] as string;
-								const item:Item = {
-									title,
-									subTitle,
-									img,
-									detail
-								}
-								items.push(item);
-							}
-							let temp = [] as Item[];
-							for(let i = 0; i < 100; i++){
-								temp = temp.concat(items);
-							}
-							listData = temp;
-						}
-						setTimeout(()=>{
-							this.refresherTriggered = false
-						},0);
-					},
-					complete:function(_){
-						
-					}
-				} as ReadFileOptions)
-			},
-			goDetail(e: Item) {
-				uni.navigateTo({
-					url: '/pages/component/long-list/detail/detail?content=' + e.detail
-				});
-			},
-			onRefresherrefresh() {
-				if(this.pageVisible){
-					this.refresherTriggered = true
-					this.getList();
-				}
-			}
-		}
-	};
-</script>
-
-<style>
-	.uni-media-list {
-		padding: 22rpx 30rpx;
-		box-sizing: border-box;
-		display: flex;
-		width: 100%;
-		flex-direction: row;
-	}
-
-	.uni-media-list-logo {
-		width: 180rpx;
-		height: 140rpx;
-	}
-
-	.uni-media-list-body {
-		flex: 1;
-		padding-left: 15rpx;
-	}
-
-	.uni-media-list-text-top {
-		font-size: 28rpx;
-		lines:2;
-		overflow: hidden;
-	}
-
-	.uni-media-list-text-bottom {
-		display: flex;
-		margin-top: 10rpx;
-	}
-	
-	.uni-media-list-text {
-		color: #9D9D9F;
-		font-size: 25rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/component/navigator/navigator.test.js b/pages/component/navigator/navigator.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..f424dded594c0b5e9b5e017735101b0ee7221cfa
--- /dev/null
+++ b/pages/component/navigator/navigator.test.js
@@ -0,0 +1,30 @@
+const PAGE_PATH = '/pages/component/navigator/navigator'
+const PAGE_PATH_NAVIGATE = '/pages/component/navigator/navigate'
+const PAGE_PATH_REDIRECT = '/pages/component/navigator/redirect'
+
+describe('navigator', () => {
+  let page
+  beforeAll(async () => {})
+  it('navigate', async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+
+    const btnNavigate = await page.$('.navigate')
+    await btnNavigate.tap()
+    await page.waitFor(100)
+
+    const currentPage = await program.currentPage()
+    expect(currentPage.path).toBe(PAGE_PATH_NAVIGATE.substring(1))
+  })
+  it('redirect', async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+
+    const btnRedirect = await page.$('.redirect')
+    await btnRedirect.tap()
+    await page.waitFor(100)
+
+    const currentPage = await program.currentPage()
+    expect(currentPage.path).toBe(PAGE_PATH_REDIRECT.substring(1))
+  })
+})
diff --git a/pages/component/navigator/navigator.uvue b/pages/component/navigator/navigator.uvue
index 81680683b4e3b4491db9c7156c906119de4d23f9..da656d03c7d9c5b29e53840156dc7b31fe83ec2d 100644
--- a/pages/component/navigator/navigator.uvue
+++ b/pages/component/navigator/navigator.uvue
@@ -2,10 +2,10 @@
   <view>
     <page-head :title="title"></page-head>
     <view class="uni-padding-wrap uni-common-mt">
-      <navigator class="navigator" url="navigate?title=navigate">
+      <navigator class="navigator navigate" url="navigate?title=navigate">
         <button type="default">跳转到新页面</button>
       </navigator>
-      <navigator class="navigator" url="redirect?title=redirect" open-type="redirect">
+      <navigator class="navigator redirect" url="redirect?title=redirect" open-type="redirect">
         <button type="default">在当前页打开</button>
       </navigator>
     </view>
diff --git a/pages/component/rich-text/rich-text.uvue b/pages/component/rich-text/rich-text.uvue
index 901be5ff7e1ffda738b1da58d8e46a361ff33d04..bed489ae9c9fc50cb8de3a5a62ef854c732bd8f5 100644
--- a/pages/component/rich-text/rich-text.uvue
+++ b/pages/component/rich-text/rich-text.uvue
@@ -9,17 +9,27 @@
       </view>
       <view class="uni-btn-v">
         <navigator url="/pages/component/rich-text/rich-text-complex">
-        <button type="primary">rich-text渲染复杂HTML示例</button>
+          <button type="primary">rich-text渲染复杂HTML示例</button>
         </navigator>
       </view>
+      <view class="uni-title">
+        <text class="uni-subtitle-text">selectable</text>
+      </view>
+      <view class="text-box">
+        <rich-text :selectable="true"
+          nodes="<span>hello uni-app x!</span><br/><span>uni-app x，终极跨平台方案</span>"></rich-text>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  
+
 </script>
 
 <style>
-
-</style>
+  .text-box {
+    padding: 40rpx 0;
+    background-color: white;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue b/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
index 56a8d5f499665f750eed2ba9c4130eabdbe86b56..ab1c939257d01f01b1ed48ea34995e9056d07ba9 100644
--- a/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
+++ b/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-	import RefresherEvent from 'io.dcloud.uniapp.runtime.RefresherEvent';
 	import refreshBox from '../../template/custom-refresher/refresh-box/refresh-box.uvue';
 	export default {
 		components: { refreshBox },
diff --git a/pages/component/scroll-view/scroll-view-props.test.js b/pages/component/scroll-view/scroll-view-props.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..68b9b83feb42de7c1cb1d676419deb67b25296b8
--- /dev/null
+++ b/pages/component/scroll-view/scroll-view-props.test.js
@@ -0,0 +1,85 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-scroll-view', () => {
+
+    let page;
+    beforeAll(async () => {
+        page = await program.reLaunch('/pages/component/scroll-view/scroll-view-props');
+        await page.waitFor(300);
+    });
+
+    //检测竖向可滚动区域
+    it('check_scroll_height', async () => {
+      await page.setData({
+          scrollX: false
+      })
+      await page.waitFor(300);
+      const value = await page.callMethod('checkScrollHeight')
+      expect(value).toBe(true)
+    })
+
+    //检测竖向scrolltop属性赋值
+    it('check_scroll_top', async () => {
+        await page.setData({
+            scrollTop: 600
+        })
+        await page.waitFor(600)
+        const element = await page.$('#scrollViewY')
+        const scrollTop = await element.attribute("scrollTop")
+        console.log("check_scroll_top---"+scrollTop)
+        expect(scrollTop-600).toBeGreaterThanOrEqual(0)
+    })
+
+    //检测竖向scroll_into_view属性赋值
+    it('check_scroll_into_view_top', async () => {
+        await page.setData({
+            scrollIntoView: "item3"
+        })
+        await page.waitFor(600)
+        const element = await page.$('#scrollViewY')
+        const scrollTop = await element.attribute("scrollTop")
+        console.log("check_scroll_into_view_top--"+scrollTop)
+        await page.setData({
+            scrollIntoView: ""
+        })
+        expect(scrollTop-570).toBeGreaterThanOrEqual(0)
+    })
+
+    //检测横向可滚动区域
+    it('check_scroll_width', async () => {
+      await page.setData({
+          scrollX: true
+      })
+      await page.waitFor(300);
+      const value = await page.callMethod('checkScrollWidth')
+      expect(value).toBe(true)
+    })
+    
+    //检测横向scrollLeft属性赋值
+    it('check_scroll_left', async () => {
+      await page.setData({
+          scrollLeft: 600
+      })
+      await page.waitFor(600)
+      const element = await page.$('#scrollViewX')
+      const scrollLeft = await element.attribute("scrollLeft")
+      console.log("check_scroll_left---"+scrollLeft)
+      expect(scrollLeft-600).toBeGreaterThanOrEqual(0)
+    })
+    
+    //检测横向scroll_into_view属性赋值
+    it('check_scroll_into_view_left', async () => {
+      await page.setData({
+          scrollIntoView: "horizontal_item3"
+      })
+      await page.waitFor(600)
+      const element = await page.$('#scrollViewX')
+      const scrollLeft = await element.attribute("scrollLeft")
+      console.log("check_scroll_into_view_left--"+scrollLeft)
+      await page.setData({
+          scrollIntoView: ""
+      })
+      expect(scrollLeft-930).toBeGreaterThanOrEqual(0)
+    })
+
+});
diff --git a/pages/component/scroll-view/scroll-view-props.uvue b/pages/component/scroll-view/scroll-view-props.uvue
index 6ec4680eca52eaa5b6f4d610754341702fd0e665..4c1090ce1396f9f03ce1f15990633a15cfb774f1 100644
--- a/pages/component/scroll-view/scroll-view-props.uvue
+++ b/pages/component/scroll-view/scroll-view-props.uvue
@@ -5,11 +5,11 @@
 		<page-head title="非下拉刷新的scroll-view属性示例"></page-head>
 		<view class="uni-margin-wrap">
 			<!-- 暂时分成两个方向不同的滚动视图，原因为：scroll-x或scroll-y属性一经设置不能动态改变。 -->
-			<scroll-view v-if="scrollX" :scroll-x="true" :scroll-top="scrollTop" :scroll-left="scrollLeft"
+			<scroll-view v-if="scrollX" :scroll-x="true" :scroll-y="false" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
 				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
-				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend">
+				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend" ref="scrollViewX" id="scrollViewX">
 				<view class="item" :id="'horizontal_'+item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>
@@ -18,7 +18,7 @@
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
 				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
-				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend">
+				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend" ref="scrollViewY" id="scrollViewY">
 				<view class="item" :id="item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>
@@ -57,13 +57,13 @@
 
 			<view class="uni-option">
 				<text>设置触发scrolltoupper的距离</text>
-				<input style="width: 100rpx;border-width: 2rpx;text-align: center; " :value="upperThreshold"
+				<input style="width: 100rpx;border-width: 2rpx;text-align: center;border-style: solid; " :value="upperThreshold"
 					type="number" @input="handleUpperThresholdInput" />
 			</view>
 
 			<view class="uni-option">
 				<text>设置触发scrolltolower的距离</text>
-				<input style="width: 100rpx;border-width: 2rpx;text-align: center; " :value="lowerThreshold"
+				<input style="width: 100rpx;border-width: 2rpx;text-align: center;border-style: solid; " :value="lowerThreshold"
 					type="number" @input="handleLowerThresholdInput" />
 			</view>
 
@@ -161,7 +161,31 @@
 			},
 			scrollend() {
 				console.log("滚动停止");
-			}
+			},
+      //自动化测试专用
+      checkScrollHeight(): Boolean {
+        var element = this.$refs["scrollViewY"]
+        if(element != null) {
+           var scrollHeight = (element as Element).scrollHeight
+           console.log("checkScrollHeight"+scrollHeight)
+           if(scrollHeight > 1900) {
+             return true
+           }
+        }
+        return false
+      },
+      //自动化测试专用
+      checkScrollWidth(): Boolean {
+        var element = this.$refs["scrollViewX"]
+        if(element != null) {
+           var scrollWidth = (element as Element).scrollWidth
+           console.log("checkScrollWidth---"+scrollWidth)
+           if(scrollWidth > 1900) {
+             return true
+           }
+        }
+        return false
+      }
 		}
 	}
 </script>
@@ -179,7 +203,8 @@
 		height: 400rpx;
 		width: 100%;
 		background-color: azure;
-		border-width: 2rpx;
+		border-width: 2rpx;
+    border-style: solid;
 		border-color: chocolate;
 	}
 
@@ -206,4 +231,4 @@
 		padding: 30rpx;
 		justify-content: center;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/component/scroll-view/scroll-view-refresher-props.uvue b/pages/component/scroll-view/scroll-view-refresher-props.uvue
index 90e5788531143e28eb90aad532c174a3d0d5bce6..beb739b98ef2faa94cfef8ce752685f88d36300e 100644
--- a/pages/component/scroll-view/scroll-view-refresher-props.uvue
+++ b/pages/component/scroll-view/scroll-view-refresher-props.uvue
@@ -31,13 +31,13 @@
 
 			<view class="uni-option">
 				<text>设置下拉刷新阈值</text>
-				<input style="width: 100rpx;border-width: 2rpx;text-align: center; " :disabled="!refresherEnabled"
+				<input style="width: 100rpx;border-width: 2rpx;text-align: center;  border-style: solid;" :disabled="!refresherEnabled"
 					:value="refresherThreshold" type="number" @input="handleRefresherThresholdInput" />
 			</view>
 
 			<view class="uni-option">
 				<text>设置下拉刷新区域背景颜色</text>
-				<input style="width: 200rpx;border-width: 2rpx;text-align: center; " :disabled="!refresherEnabled"
+				<input style="width: 200rpx;border-width: 2rpx;text-align: center; border-style: solid;" :disabled="!refresherEnabled"
 					:value="refresherBackground" @input="handleRefresherBackground" />
 			</view>
 
@@ -54,7 +54,6 @@
 				</view>
 			</view>
 
-			<!-- //todo 还有自定义下拉刷新样式的例子 -->
 			<view class="uni-common-pb"></view>
 		</scroll-view>
 
@@ -143,6 +142,7 @@
 		width: 100%;
 		background-color: azure;
 		border-width: 2rpx;
+    border-style: solid;
 		border-color: chocolate;
 	}
 
diff --git a/pages/component/scroll-view/scroll-view-refresher.test.js b/pages/component/scroll-view/scroll-view-refresher.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc050d6656557cb028c9bcad31e440bd21d2d87c
--- /dev/null
+++ b/pages/component/scroll-view/scroll-view-refresher.test.js
@@ -0,0 +1,19 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('test title', () => {
+
+    let page;
+    beforeAll(async () => {
+        page = await program.reLaunch('/pages/component/scroll-view/scroll-view-refresher');
+        await page.waitFor(300);
+    });
+
+
+    it('check_refresher', async () => {
+      await page.setData({
+          refresherTriggered: true
+      })
+      await page.waitFor(2000);
+      expect(await page.data('refresherrefresh')).toBe(true)
+    });
+});
diff --git a/pages/component/scroll-view/scroll-view-refresher.uvue b/pages/component/scroll-view/scroll-view-refresher.uvue
index e335a7eabb0c7315d4f13849fc24b58ece6fd568..8d26c19e93a6477935c8c93da0da6c65000c29d2 100644
--- a/pages/component/scroll-view/scroll-view-refresher.uvue
+++ b/pages/component/scroll-view/scroll-view-refresher.uvue
@@ -13,14 +13,13 @@
 	</view>
 </template>
 <script>
-	import RefresherEvent from 'io.dcloud.uniapp.runtime.RefresherEvent';
-	import ScrollToLowerEvent from 'io.dcloud.uniapp.runtime.ScrollToLowerEvent';
 	export default {
 
 		data() {
 			return {
 				scrollData: [] as Array <string>,
-				refresherTriggered: false 
+				refresherTriggered: false,
+				refresherrefresh: false
 			};
 		},
 		onLoad() {
@@ -32,7 +31,8 @@
 		},
 
 		methods: {
-			onRefresherrefresh(_: RefresherEvent) {
+			onRefresherrefresh(_: RefresherEvent) {
+				this.refresherrefresh = true
 				console.log("onRefresherrefresh--------------下拉刷新触发")
 				this.refresherTriggered = true
 				setTimeout(function(){
@@ -43,7 +43,8 @@
 			onRefresherabort(_: RefresherEvent) {
 				console.log("onRefresherabort------下拉刷新被中止")
 			},
-			onRefresherrestore(_: RefresherEvent) {
+			onRefresherrestore(_: RefresherEvent) {
+				this.refresherrefresh = false
 				console.log("onRefresherrestore------下拉刷新被复位")
 			},
 			onRefresherpulling(e: RefresherEvent) {
diff --git a/pages/component/scroll-view/scroll-view.uvue b/pages/component/scroll-view/scroll-view.uvue
index 92220543f00e1896e0e11f4025f1aef4b0fed096..bcd22ab4ff840d87d5cba3f4b4579100beee5bb5 100644
--- a/pages/component/scroll-view/scroll-view.uvue
+++ b/pages/component/scroll-view/scroll-view.uvue
@@ -62,8 +62,6 @@
 	<!-- #endif -->
 </template>
 <script lang="uts">
-	import ScrollToLowerEvent from 'io.dcloud.uniapp.runtime.ScrollToLowerEvent'
-	import ScrollToUpperEvent from 'io.dcloud.uniapp.runtime.ScrollToUpperEvent'
 	export default {
 		data() {
 			return {
diff --git a/pages/component/slider-100/slider-100.test.js b/pages/component/slider-100/slider-100.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf942e1cc8905ec7d5ed37333af01c90c7dec6d4
--- /dev/null
+++ b/pages/component/slider-100/slider-100.test.js
@@ -0,0 +1,26 @@
+const PAGE_PATH = '/pages/component/slider-100/slider-100'
+
+describe('slider', () => {
+  let page
+  beforeAll(async () => {
+    page = await program.reLaunch(PAGE_PATH)
+    await page.waitFor(500)
+  })
+  it('value', async () => {
+    const sliderValue = 80
+    await page.setData({
+      sliderValue: sliderValue,
+    })
+    await page.waitFor(100)
+
+    // TODO 暂时仅获取第一个
+    const slider1 = await page.$('.slider')
+    expect(await slider1.property('value')).toBe(sliderValue)
+
+    // const slider100 = await page.$$('.slider')
+    // for (let i = 0; i < slider100.length; i++) {
+    //   const slider = slider100[i];
+    //   expect(await slider.property('value')).toBe(sliderValue)
+    // }
+  })
+})
diff --git a/pages/component/slider-100/slider-100.uvue b/pages/component/slider-100/slider-100.uvue
index 7659451050b76742b598c1d25d550b39bad421be..ce2d1d640cbe4a4f0e29f1d78464068255483892 100644
--- a/pages/component/slider-100/slider-100.uvue
+++ b/pages/component/slider-100/slider-100.uvue
@@ -1,7 +1,7 @@
 <template>
   <!-- #ifdef APP -->
   <scroll-view class="page">
-    <!-- #endif -->
+  <!-- #endif -->
     <page-head :title="title"></page-head>
     <view class="flex-row">
       <view class="flex-fill">
@@ -21,7 +21,7 @@
           @change="sliderChange" :value="sliderValue" :block-size="20" :show-value="true" />
       </view>
     </view>
-    <!-- #ifdef APP -->
+  <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
 </template>
@@ -41,25 +41,21 @@
       sliderChanging(e : SliderChangeEvent) {
         this.updateSliderValue(e.detail.value)
       },
-      updateSliderValue(value : Number) {
+      updateSliderValue(value : number) {
         // this.sliderValue = value
 
-        // 跳过vue框架，直接修改原生组件
-        (this.$refs["slider1"]! as ComponentPublicInstance[]).forEach((item) => {
-          item.$data["$sliderValue"] = value
-          item.$callMethod("_onRender")
+        // TODO 跳过vue框架，直接修改原生组件
+        (this.$refs["slider1"]! as SliderElement[]).forEach((item) => {
+          item.value = value
         });
-        (this.$refs["slider2"]! as ComponentPublicInstance[]).forEach((item) => {
-          item.$data["$sliderValue"] = value
-          item.$callMethod("_onRender")
+        (this.$refs["slider2"]! as SliderElement[]).forEach((item) => {
+          item.value = value
         });
-        (this.$refs["slider3"]! as ComponentPublicInstance[]).forEach((item) => {
-          item.$data["$sliderValue"] = value
-          item.$callMethod("_onRender")
+        (this.$refs["slider3"]! as SliderElement[]).forEach((item) => {
+          item.value = value
         });
-        (this.$refs["slider4"]! as ComponentPublicInstance[]).forEach((item) => {
-          item.$data["$sliderValue"] = value
-          item.$callMethod("_onRender")
+        (this.$refs["slider4"]! as SliderElement[]).forEach((item) => {
+          item.value = value
         });
       }
     },
diff --git a/pages/component/swiper/swiper.test.js b/pages/component/swiper/swiper.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..449c725ec09c881fee3861db1eda26a1c98c5a29
--- /dev/null
+++ b/pages/component/swiper/swiper.test.js
@@ -0,0 +1,83 @@
+function getData(key = '') {
+  return new Promise(async (resolve, reject) => {
+    const data = await page.data()
+    resolve(key ? data[key] : data)
+  })
+}
+
+let page;
+beforeAll(async () => {
+  page = await program.reLaunch('/pages/component/swiper/swiper')
+  await page.waitFor(600)
+})
+
+
+describe('test swiper', () => {
+
+
+    it('check indicator show', async () => {
+        await page.setData({
+          dotsSelect: true,
+        })
+        await page.waitFor(600)
+        await page.setData({
+          dotsSelect: false,
+        })
+        await page.waitFor(600)
+        /**
+         * todo 暂无判断条件
+         */
+    });
+
+    it('check autoplay loop', async () => {
+        await page.setData({
+          autoplaySelect: true,
+        })
+        await page.waitFor(600)
+        expect(await getData('currentValChange')).toEqual(0)
+        await page.waitFor(2000)
+        expect(await getData('currentValChange')).toEqual(1)
+        await page.waitFor(5000)
+        expect(await getData('currentValChange')).toEqual(2)
+
+        await page.setData({
+          circularSelect: true
+        })
+        expect(await getData('currentValChange')).toEqual(2)
+        await page.waitFor(1000)
+        expect(await getData('currentValChange')).toEqual(0)
+        await page.setData({
+          circularSelect: false,
+          autoplaySelect: false
+        })
+    });
+
+
+    it('check current', async () => {
+        await page.setData({
+          currentVal: 2,
+        })
+        await page.waitFor(600)
+        expect(await getData('currentValChange')).toEqual(2)
+        await page.setData({
+          currentVal: 0,
+        })
+        await page.waitFor(600)
+        expect(await getData('currentValChange')).toEqual(0)
+    });
+
+    it('check currentId', async () => {
+        await page.setData({
+          currentItemIdVal: 'C',
+        })
+        await page.waitFor(600)
+        expect(await getData('currentValChange')).toEqual(2)
+        await page.setData({
+          currentItemIdVal: 'A',
+        })
+        await page.waitFor(600)
+        expect(await getData('currentValChange')).toEqual(0)
+    });
+
+});
+
diff --git a/pages/component/swiper/swiper.uvue b/pages/component/swiper/swiper.uvue
index 12adcd98c5825b73ea53c296e3294eb0a0676d1e..cf1d56ae58e5c09ff8609d82f52f0ccdff64d98b 100644
--- a/pages/component/swiper/swiper.uvue
+++ b/pages/component/swiper/swiper.uvue
@@ -86,7 +86,6 @@
 		data() {
 			return {
 				background: ['color1', 'color2', 'color3'],
-				interval: 2000,
 				dotsSelect: false,
         reboundSelect:false,
 				autoplaySelect: false,
@@ -95,7 +94,7 @@
 				verticalSelect: false,
 				currentSelect: false,
 				currentItemIdSelect: false,
-				intervalSelect: 1000,
+				intervalSelect: 2000,
 				indicatorColor: "",
 				indicatorColorActive: "",
 				currentVal: 0,
@@ -103,12 +102,15 @@
 				disableTouchSelect: false,
 				swiperTransitionSelect: false,
 				swiperAnimationfinishSelect: false,
-				swiperChangeSelect: false
+				swiperChangeSelect: false,
+        currentValChange:0
 			}
-		},
+		},
 		methods: {
 
-			swiperChange: function (e : SwiperChangeEvent) {
+			swiperChange: function (e : SwiperChangeEvent) {
+        this.currentValChange = e.detail.current
+        console.log(this.currentValChange)
 				if (this.swiperChangeSelect) {
 					console.log("swiperChange")
 					console.log(e)
diff --git a/pages/component/textarea/textarea.test.js b/pages/component/textarea/textarea.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f7f57c00f23afd45087878be4fdcc3371ea3ea1
--- /dev/null
+++ b/pages/component/textarea/textarea.test.js
@@ -0,0 +1,88 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-textarea', () => {
+
+  let page;
+  let textarea;
+  beforeAll(async () => {
+    page = await program.reLaunch("/pages/component/textarea/textarea");
+    await page.waitFor(3000);
+    textarea = await page.$('.uni-textarea');
+    await page.waitFor(1000);
+  });
+
+  it('focus', async () => {
+    expect(await textarea.property("focus")).toBe(false)
+    await page.setData({
+      focus_boolean: true,
+    })
+    await page.waitFor(500)
+    expect(await textarea.property("focus")).toBe(true)
+  });
+  /* it("auto-height", async () => {
+    await page.setData({
+      auto_height_boolean: true
+    })
+    await page.waitFor(500)
+    // 原始高度
+    var {
+      width,
+      height
+    } = await textarea.size()
+    expect(height).toBeGreaterThanOrEqual(150)
+    await page.waitFor(500)
+    // 只有一行的高度
+    await page.setData({
+      maxlength: 3,
+    })
+    await page.waitFor(500)
+    await page.setData({
+      default_value: "第一行\n第二行\n第三行",
+    })
+    await page.waitFor(500)
+    var {
+      width,
+      height
+    } = await textarea.size()
+    expect(height).toBeLessThanOrEqual(50)
+
+    // 四行的高度
+    await page.setData({
+      maxlength: -1,
+    })
+    await page.waitFor(500)
+    await page.setData({
+      default_value: "第一行\n第二行\n第三行\n第四行",
+    })
+    await page.waitFor(500)
+    var {
+      width,
+      height
+    } = await textarea.size()
+    expect(height).toBeLessThanOrEqual(150)
+  }) */
+
+  it("inputmode", async () => {
+    const inputmodeEnum = await page.data("inputmode_enum")
+    for (var i = 0; i < inputmodeEnum.length; i++) {
+      var x = inputmodeEnum[i]
+      console.log(x['value'], x['name'])
+      await page.callMethod("radio_change_inputmode_enum", x['value']);
+      await page.waitFor(500)
+      expect(await textarea.property("inputmode")).toEqual(x['name'])
+      await page.waitFor(500)
+    }
+  })
+
+  it("confirm-type", async () => {
+    const inputmodeEnum = await page.data("confirm_type_enum")
+    for (var i = 0; i < inputmodeEnum.length; i++) {
+      var x = inputmodeEnum[i]
+      console.log(x['value'], x['name'])
+      await page.callMethod("radio_change_confirm_type_enum", x['value']);
+      await page.waitFor(500)
+      expect(await textarea.property("confirm-type")).toEqual(x['name'])
+      await page.waitFor(500)
+    }
+  })
+});
diff --git a/pages/component/textarea/textarea.uvue b/pages/component/textarea/textarea.uvue
index 8646b28c3e8a774bcfe3ca1d20f896492803d2e4..2114cd467eb679f7821b50542c5cf251a505a144 100644
--- a/pages/component/textarea/textarea.uvue
+++ b/pages/component/textarea/textarea.uvue
@@ -9,13 +9,16 @@ export default {
 			auto_height_boolean: false,
 			confirm_hold_boolean: false,
 			focus_boolean: false,
-			auto_focus_boolean: false,
+			auto_focus_boolean: false,
+      default_value:"",
+      maxlength:-1,
 			confirm_type_enum: [{"value":0,"name":"send"},{"value":1,"name":"search"},{"value":2,"name":"next"},{"value":3,"name":"go"},{"value":4,"name":"done"}] as ItemType[],
 			confirm_type_enum_current: 0,
 			inputmode_enum: [{"value":0,"name":"none"},{"value":1,"name":"text"},{"value":2,"name":"decimal"},{"value":3,"name":"numeric"},{"value":4,"name":"tel"},{"value":5,"name":"search"},{"value":6,"name":"email"},{"value":7,"name":"url"}] as ItemType[],
 			inputmode_enum_current: 0
 		}
-	},
+	},
+
 	methods: {
 		textarea_click() { console.log("组件被点击时触发") },
 		textarea_touchstart() { console.log("手指触摸动作开始") },
@@ -45,7 +48,8 @@ export default {
 
 <template>
   <view class="main">
-    <textarea
+    <textarea
+    :value="default_value"
       class="uni-textarea"
       :auto-focus="auto_focus_boolean"
       :focus="focus_boolean"
@@ -55,7 +59,8 @@ export default {
       :fixed="fixed_boolean"
       :show-confirm-bar="show_confirm_bar_boolean"
       :adjust-position="adjust_position_boolean"
-      :inputmode="inputmode_enum[inputmode_enum_current].name"
+      :inputmode="inputmode_enum[inputmode_enum_current].name"
+      :maxlength="maxlength"
       @click="textarea_click"
       @touchstart="textarea_touchstart"
       @touchmove="textarea_touchmove"
@@ -81,7 +86,8 @@ export default {
         :defaultValue="false"
         title="键盘弹起时，是否自动上推页面"
         @change="change_adjust_position_boolean"
-      ></boolean-data>
+      ></boolean-data>
+      <!-- #ifdef !APP -->
       <boolean-data
         :defaultValue="false"
         title="是否显示键盘上方带有”完成“按钮那一栏"
@@ -91,7 +97,8 @@ export default {
         :defaultValue="false"
         title="如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true"
         @change="change_fixed_boolean"
-      ></boolean-data>
+      ></boolean-data>
+      <!-- #endif -->
       <boolean-data
         :defaultValue="false"
         title="是否自动增高，设置auto-height时，style.height不生效"
@@ -103,22 +110,22 @@ export default {
         @change="change_confirm_hold_boolean"
       ></boolean-data>
       <boolean-data
-        :defaultValue="false"
+        :defaultValue="focus_boolean"
         title="获取焦点"
-        @change="change_focus_boolean"
+        @change="change_focus_boolean" class="textarea-focus"
       ></boolean-data>
       <boolean-data
         :defaultValue="false"
         title="自动获取焦点"
         @change="change_auto_focus_boolean"
       ></boolean-data>
-      <enum-data
+      <enum-data class="textarea-confirm"
         :items="confirm_type_enum"
         title="设置键盘右下角按钮的文字"
         @change="radio_change_confirm_type_enum"
       ></enum-data>
       <enum-data
-        :items="inputmode_enum"
+        :items="inputmode_enum" class="textarea-input"
         title="是一个枚举属性，它提供了用户在编辑元素或其内容时可能输入的数据类型的提示。在符合条件的高版本webview里，uni-app的 web 和 app-vue 平台中可使用本属性。"
         @change="radio_change_inputmode_enum"
       ></enum-data>
diff --git a/pages/component/video/video.js b/pages/component/video/video.js
new file mode 100644
index 0000000000000000000000000000000000000000..fbc65dfdcb6cd8a8accbee73e43a3c346fa87040
--- /dev/null
+++ b/pages/component/video/video.js
@@ -0,0 +1,47 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-video', () => {
+
+  let page;
+  beforeAll(async () => {
+    page = await program.reLaunch('/pages/component/video/video');
+    await page.waitFor(1000);
+  });
+
+  it('check API play', async () => {
+    await page.callMethod('playTest');
+    await page.waitFor(500);
+    expect(await page.data('isPlaying')).toBe(true);
+    expect(await page.data('isPause')).toBe(false);
+  });
+
+  it('check API requestFullScreen', async () => {
+    await page.callMethod('requestFullScreenTest');
+    await page.waitFor(1000);
+    expect(await page.data('isFullScreen')).toBe(true);
+  });
+
+  it('check API exitFullScreen', async () => {
+    await page.callMethod('exitFullScreenTest');
+    await page.waitFor(1000);
+    expect(await page.data('isFullScreen')).toBe(false);
+  });
+
+  it('check API pause', async () => {
+    await page.callMethod('pauseTest');
+    await page.waitFor(500);
+    expect(await page.data('isPause')).toBe(true);
+    expect(await page.data('isPlaying')).toBe(false);
+    await page.callMethod('playTest');
+    await page.waitFor(500);
+    expect(await page.data('isPlaying')).toBe(true);
+    expect(await page.data('isPause')).toBe(false);
+  });
+
+  it('check API stop', async () => {
+    await page.callMethod('stopTest');
+    await page.waitFor(500);
+    expect(await page.data('isPause')).toBe(true);
+    expect(await page.data('isPlaying')).toBe(false);
+  });
+});
\ No newline at end of file
diff --git a/pages/component/video/video.uvue b/pages/component/video/video.uvue
index 7eecaa475b20c473db5df9980fefb1c9facb090d..0d0cccc3af9eca3175257b19dad1f6f414051c6c 100644
--- a/pages/component/video/video.uvue
+++ b/pages/component/video/video.uvue
@@ -25,7 +25,7 @@
         <button type="primary" @click="seek(pos)">跳转到指定位置</button>
       </view>
       <view class="uni-btn-v">
-        <button type="primary" @click="requestFullScreen(direction)">进入全屏</button>
+        <button type="primary" @click="requestFullScreen(requestFullScreenOptions)">进入全屏</button>
       </view>
       <view class="uni-btn-v">
         <button type="primary" @click="exitFullScreen">退出全屏</button>
@@ -33,15 +33,6 @@
       <view class="uni-btn-v">
         <button type="primary" @click="stop">停止</button>
       </view>
-      <view class="uni-btn-v">
-        <button type="primary" @click="hide">隐藏</button>
-      </view>
-      <view class="uni-btn-v">
-        <button type="primary" @click="show">显示</button>
-      </view>
-      <view class="uni-btn-v">
-        <button type="primary" @click="close">关闭</button>
-      </view>
       <view class="uni-btn-v">
         <button type="primary" @click="sendDanmu(danmu)">发送弹幕</button>
       </view>
@@ -49,7 +40,7 @@
         <button type="primary" @click="playbackRate(rate)">设置倍速</button>
       </view>
       <view class="uni-title">
-        <text class="uni-title-text uni-center">属性示例</text>
+        <text class="uni-title-text">属性示例</text>
       </view>
       <view class="uni-btn-v">
         <button type="primary" @click="setSrc(_src)">设置播放资源</button>
@@ -137,7 +128,6 @@
 </template>
 
 <script lang="uts">
-  import { VideoNode } from "uts.sdk.modules.DCloudUniVideo";
   export default {
     onReady() {
       this.videoContext = uni.createVideoContext('video', this);
@@ -180,10 +170,9 @@
         danmuBtn: false,
         enableDanmu: true,
         pageGesture: false,
-        direction: {
-          direction: 0
-        } as RequestFullScreenOptions,
-        _direction: {
+        direction: -90,
+        _direction: 0,
+        requestFullScreenOptions: {
           direction: -90
         } as RequestFullScreenOptions,
         showProgress: true,
@@ -219,7 +208,11 @@
         danmu: {
           text: '要显示的文本',
           color: '#FF0000'
-        } as Danmu
+        } as Danmu,
+        // 自动化测试
+        isPlaying: false,
+        isPause: false,
+        isFullScreen: false
       }
     },
     methods: {
@@ -246,19 +239,7 @@
       },
       stop: function () {
         console.log("stop");
-        (this.$refs["video"] as VideoNode).stop();
-      },
-      hide: function () {
-        console.log("hide");
-        (this.$refs["video"] as VideoNode).hide();
-      },
-      show: function () {
-        console.log("show");
-        (this.$refs["video"] as VideoNode).show();
-      },
-      close: function () {
-        console.log("close");
-        (this.$refs["video"] as VideoNode).close();
+        this.videoContext?.stop();
       },
       sendDanmu: function (danmu : Danmu) {
         console.log("sendDanmu -> " + danmu);
@@ -305,8 +286,8 @@
         this.pageGesture = !this.pageGesture;
         console.log("pageGesture -> " + this.pageGesture)
       },
-      setDirection: function (options : RequestFullScreenOptions) {
-        this.direction = options;
+      setDirection: function (direction: number) {
+        this.direction = direction;
         console.log("direction -> " + this.direction)
       },
       setShowProgress: function () {
@@ -380,9 +361,13 @@
       // 事件
       onPlay: function (res : any) {
         console.log(JSON.stringify(res));
+        this.isPlaying = true;
+        this.isPause = false;
       },
       onPause: function (res : any) {
         console.log(JSON.stringify(res));
+        this.isPlaying = false;
+        this.isPause = true;
       },
       onEnded: function (res : any) {
         console.log(JSON.stringify(res));
@@ -392,6 +377,7 @@
       },
       onFullScreenChange: function (res : any) {
         console.log(JSON.stringify(res));
+        this.isFullScreen = !this.isFullScreen;
       },
       onWaiting: function (res : any) {
         console.log(JSON.stringify(res));
@@ -407,6 +393,25 @@
       },
       onControlsToggle: function (res : any) {
         console.log(JSON.stringify(res));
+      },
+      // 自动化测试
+      playTest: function () {
+        this.videoContext?.play();
+      },
+      pauseTest: function () {
+        this.videoContext?.pause();
+      },
+      requestFullScreenTest: function () {
+        const options : RequestFullScreenOptions = {
+          direction: -90
+        };
+        this.videoContext?.requestFullScreen(options);
+      },
+      exitFullScreenTest: function () {
+        this.videoContext?.exitFullScreen();
+      },
+      stopTest: function () {
+        this.videoContext?.stop();
       }
     }
   }
@@ -417,4 +422,4 @@
     width: 750rpx;
     height: 400rpx;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/component/view/view-draw.uvue b/pages/component/view/view-draw.uvue
index 6664010bd404fbe1c0e846ac530b5ea2789bbadf..d358b9dda6cb153520f2a676739b3037ecf9b8ad 100644
--- a/pages/component/view/view-draw.uvue
+++ b/pages/component/view/view-draw.uvue
@@ -1,287 +1,310 @@
 <template>
-	<!-- #ifdef APP -->
-	<scroll-view style="flex: 1">
-		<!-- #endif -->
-		<view>
-			<view ref="draw-text-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-line-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-circle-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-dash-line" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-house" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-style" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-			<view ref="draw-odd" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
-		</view>
-		<!-- #ifdef APP -->
-	</scroll-view>
-	<!-- #endif -->
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+  <!-- #endif -->
+    <view>
+      <view ref="draw-text-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-line-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-circle-view" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-dash-line" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-house" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-style" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-odd" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+      <view ref="draw-arcto" style="width: 750rpx;height: 550rpx; background-color: lightgray;margin: 30rpx 0rpx;"></view>
+    </view>
+  <!-- #ifdef APP -->
+  </scroll-view>
+  <!-- #endif -->
 </template>
 
 <script>
-	var y = 160
-	export default {
-		data() {
-			return {
-				texts: [
-					'HBuilderX，轻巧、极速，极客编辑器',
-					'uni-app x，终极跨平台方案',
-					'uniCloud，js serverless云服务',
-					'uts，大一统语言',
-					'uniMPSdk，让你的App具备小程序能力',
-					'uni-admin，开源、现成的全端管理后台',
-					'uni-id，开源、全端的账户中心',
-					'uni-pay，开源、云端一体、全平台的支付',
-					'uni-ai，聚合ai能力',
-					'uni-cms，开源、云端一体、全平台的内容管理平台',
-					'uni-im，开源、云端一体、全平台的im即时消息',
-					'uni统计，开源、完善、全平台的统计报表',
-					'......'
-				] as string[]
-			}
-		},
-		onShow() {
-		},
+  var y = 160
+  export default {
+    data() {
+      return {
+        texts: [
+          'HBuilderX，轻巧、极速，极客编辑器',
+          'uni-app x，终极跨平台方案',
+          'uniCloud，js serverless云服务',
+          'uts，大一统语言',
+          'uniMPSdk，让你的App具备小程序能力',
+          'uni-admin，开源、现成的全端管理后台',
+          'uni-id，开源、全端的账户中心',
+          'uni-pay，开源、云端一体、全平台的支付',
+          'uni-ai，聚合ai能力',
+          'uni-cms，开源、云端一体、全平台的内容管理平台',
+          'uni-im，开源、云端一体、全平台的im即时消息',
+          'uni统计，开源、完善、全平台的统计报表',
+          '......'
+        ] as string[]
+      }
+    },
+    onShow() {
+    },
 
-		onReady() {
-			this.drawText()
-			this.drawLines()
-			this.drawCircles()
-			this.drawStar()
-			this.drawhouse()
-			this.drawPoint()
-			this.drawRect()
-		},
-		onUnload() {
-			y = 160
-		},
-		methods: {
-			drawText() {
-				let node = (this.$refs['draw-text-view'] as INode)
-				let ctx = node.getDrawableContext()
-				let width = node.getBoundingClientRect().width
-				ctx!!.reset()
-				ctx!!.font = "15px"
-				ctx!.textAlign = "center"
-				for (var i = 0; i < this.texts.length; i++) {
-					let value = this.texts[i]
-					if (i % 2 == 0) {
-						ctx!!.fillText(value, width / 2, (20 * (i + 1)))
-					} else {
-						ctx!!.strokeText(value, width / 2, (20 * (i + 1)))
-					}
-				}
-				ctx!!.update()
-			},
-			drawLines() {
-				let ctx = (this.$refs['draw-line-view'] as INode).getDrawableContext()
-				ctx!!.reset()
-				ctx!!.lineWidth = 10;
+    onReady() {
+      this.drawText()
+      this.drawLines()
+      this.drawCircles()
+      this.drawStar()
+      this.drawhouse()
+      this.drawPoint()
+      this.drawRect()
+      this.drawArcTo()
+    },
+    onUnload() {
+      y = 160
+    },
+    methods: {
+      drawText() {
+        let element = (this.$refs['draw-text-view'] as Element)
+        let ctx = element.getDrawableContext()
+        let width = element.getBoundingClientRect().width
+        ctx!!.reset()
+        ctx!!.font = "15px"
+        ctx!.textAlign = "center"
+        for (var i = 0; i < this.texts.length; i++) {
+          let value = this.texts[i]
+          if (i % 2 == 0) {
+            ctx!!.fillText(value, width / 2, (20 * (i + 1)))
+          } else {
+            ctx!!.strokeText(value, width / 2, (20 * (i + 1)))
+          }
+        }
+        ctx!!.update()
+      },
+      drawLines() {
+        let ctx = (this.$refs['draw-line-view'] as Element).getDrawableContext()
+        ctx!!.reset()
+        ctx!!.lineWidth = 10;
 
-				["round", "bevel", "miter"].forEach((join, i) => {
-					ctx!.lineJoin = join;
-					ctx!.beginPath();
-					ctx!.moveTo(5, 10 + i * 40);
-					ctx!.lineTo(50, 50 + i * 40);
-					ctx!.lineTo(90, 10 + i * 40);
-					ctx!.lineTo(130, 50 + i * 40);
-					ctx!.lineTo(170, 10 + i * 40);
-					ctx!.stroke();
-				});
-				ctx!!.lineWidth = 1
-				var space = 170
-				ctx!.strokeStyle = '#09f';
-				ctx!.beginPath();
-				ctx!.moveTo(10 + space, 10);
-				ctx!.lineTo(140 + space, 10);
-				ctx!.moveTo(10 + space, 140);
-				ctx!.lineTo(140 + space, 140);
-				ctx!.stroke();
-				// Draw lines
-				ctx!.strokeStyle = 'black';
-				['butt', 'round', 'square'].forEach((lineCap, i) => {
-					ctx!.lineWidth = 15;
-					ctx!.lineCap = lineCap;
-					ctx!.beginPath();
-					ctx!.moveTo(25 + space + i * 50, 10);
-					ctx!.lineTo(25 + space + i * 50, 140);
-					ctx!.stroke();
-				});
-				ctx!.lineWidth = 1;
-				this.drawDashedLine([], ctx);
-				this.drawDashedLine([2, 2], ctx);
-				this.drawDashedLine([10, 10], ctx);
-				this.drawDashedLine([20, 5], ctx);
-				this.drawDashedLine([15, 3, 3, 3], ctx);
-				this.drawDashedLine([20, 3, 3, 3, 3, 3, 3, 3], ctx);
-				ctx!.lineDashOffset = 18;
-				this.drawDashedLine([12, 3, 3], ctx);
-				ctx!.lineDashOffset = 0
-				ctx!.setLineDash([0])
-				ctx!!.update()
-			},
-			drawDashedLine(pattern : Array<number>, ctx : DrawableContext) {
-				ctx.beginPath();
-				ctx.setLineDash(pattern);
-				ctx.moveTo(0, y);
-				ctx.lineTo(300, y);
-				ctx.stroke();
-				y += 15;
-			},
-			drawCircles() {
-				let ctx = (this.$refs['draw-circle-view'] as INode).getDrawableContext()
-				ctx!!.reset()
-				// Draw shapes
-				for (var i = 0; i < 4; i++) {
-					for (var j = 0; j < 3; j++) {
-						ctx!!.beginPath();
-						var x = 25 + j * 50;               // x coordinate
-						var y = 25 + i * 50;               // y coordinate
-						var radius = 20;                    // Arc radius
-						var startAngle = 0;                     // Starting point on circle
-						var endAngle = Math.PI + (Math.PI * j) / 2; // End point on circle
-						var clockwise = i % 2 == 0 ? false : true; // clockwise or anticlockwise
+        ["round", "bevel", "miter"].forEach((join, i) => {
+          ctx!.lineJoin = join;
+          ctx!.beginPath();
+          ctx!.moveTo(5, 10 + i * 40);
+          ctx!.lineTo(50, 50 + i * 40);
+          ctx!.lineTo(90, 10 + i * 40);
+          ctx!.lineTo(130, 50 + i * 40);
+          ctx!.lineTo(170, 10 + i * 40);
+          ctx!.stroke();
+        });
+        ctx!!.lineWidth = 1
+        var space = 170
+        ctx!.strokeStyle = '#09f';
+        ctx!.beginPath();
+        ctx!.moveTo(10 + space, 10);
+        ctx!.lineTo(140 + space, 10);
+        ctx!.moveTo(10 + space, 140);
+        ctx!.lineTo(140 + space, 140);
+        ctx!.stroke();
+        // Draw lines
+        ctx!.strokeStyle = 'black';
+        ['butt', 'round', 'square'].forEach((lineCap, i) => {
+          ctx!.lineWidth = 15;
+          ctx!.lineCap = lineCap;
+          ctx!.beginPath();
+          ctx!.moveTo(25 + space + i * 50, 10);
+          ctx!.lineTo(25 + space + i * 50, 140);
+          ctx!.stroke();
+        });
+        ctx!.lineWidth = 1;
+        this.drawDashedLine([], ctx!);
+        this.drawDashedLine([2, 2], ctx!);
+        this.drawDashedLine([10, 10], ctx!);
+        this.drawDashedLine([20, 5], ctx!);
+        this.drawDashedLine([15, 3, 3, 3], ctx!);
+        this.drawDashedLine([20, 3, 3, 3, 3, 3, 3, 3], ctx!);
+        ctx!.lineDashOffset = 18;
+        this.drawDashedLine([12, 3, 3], ctx!);
+        ctx!.lineDashOffset = 0
+        ctx!.setLineDash([0])
+        ctx!!.update()
+      },
+      drawDashedLine(pattern : Array<number>, ctx : DrawableContext) {
+        ctx.beginPath();
+        ctx.setLineDash(pattern);
+        ctx.moveTo(0, y);
+        ctx.lineTo(300, y);
+        ctx.stroke();
+        y += 15;
+      },
+      drawCircles() {
+        let ctx = (this.$refs['draw-circle-view'] as Element).getDrawableContext()
+        ctx!!.reset()
+        // Draw shapes
+        for (var i = 0; i < 4; i++) {
+          for (var j = 0; j < 3; j++) {
+            ctx!!.beginPath();
+            var x = 25 + j * 50;               // x coordinate
+            var y = 25 + i * 50;               // y coordinate
+            var radius = 20;                    // Arc radius
+            var startAngle = 0;                     // Starting point on circle
+            var endAngle = Math.PI + (Math.PI * j) / 2; // End point on circle
+            var clockwise = i % 2 == 0 ? false : true; // clockwise or anticlockwise
 
-						ctx!.arc(x, y, radius, startAngle, endAngle, clockwise);
+            ctx!.arc(x, y, radius, startAngle, endAngle, clockwise);
 
-						if (i > 1) {
-							ctx!.fill();
-						} else {
-							ctx!.stroke();
-						}
-					}
-				}
-				ctx!!.update()
-			},
+            if (i > 1) {
+              ctx!.fill();
+            } else {
+              ctx!.stroke();
+            }
+          }
+        }
+        ctx!!.update()
+      },
 
-			drawStar() {
-				let ctx = (this.$refs['draw-dash-line'] as INode).getDrawableContext()
-				ctx!!.reset()
-				ctx!!.beginPath();
-				var horn = 5; // 画5个角
-				var angle = 360 / horn; // 五个角的度数
-				// 两个圆的半径
-				var R = 50;
-				var r = 20;
-				// 坐标
-				var x = 100;
-				var y = 100;
-				for (var i = 0; i < horn; i++) {
-					// 角度转弧度：角度/180*Math.PI
-					// 外圆顶点坐标
-					ctx!.lineTo(Math.cos((18 + i * angle) / 180.0 * Math.PI) * R + x, -Math.sin((18 + i * angle) / 180.0 * Math.PI) * R + y);
-					// 內圆顶点坐标
-					ctx!.lineTo(Math.cos((54 + i * angle) / 180.0 * Math.PI) * r + x, -Math.sin((54 + i * angle) / 180.0 * Math.PI) * r + y);
-				}
-				// closePath：关闭路径，将路径的终点与起点相连
-				ctx!.closePath();
-				ctx!.lineWidth = 3;
-				ctx!.fillStyle = '#E4EF00';
-				ctx!.strokeStyle = "red";
-				ctx!.fill();
-				ctx!.stroke();
+      drawStar() {
+        let ctx = (this.$refs['draw-dash-line'] as Element).getDrawableContext()
+        ctx!!.reset()
+        ctx!!.beginPath();
+        var horn = 5; // 画5个角
+        var angle = 360 / horn; // 五个角的度数
+        // 两个圆的半径
+        var R = 50;
+        var r = 20;
+        // 坐标
+        var x = 100;
+        var y = 100;
+        for (var i = 0; i < horn; i++) {
+          // 角度转弧度：角度/180*Math.PI
+          // 外圆顶点坐标
+          ctx!.lineTo(Math.cos((18 + i * angle) / 180.0 * Math.PI) * R + x, -Math.sin((18 + i * angle) / 180.0 * Math.PI) * R + y);
+          // 內圆顶点坐标
+          ctx!.lineTo(Math.cos((54 + i * angle) / 180.0 * Math.PI) * r + x, -Math.sin((54 + i * angle) / 180.0 * Math.PI) * r + y);
+        }
+        // closePath：关闭路径，将路径的终点与起点相连
+        ctx!.closePath();
+        ctx!.lineWidth = 3;
+        ctx!.fillStyle = '#E4EF00';
+        ctx!.strokeStyle = "red";
+        ctx!.fill();
+        ctx!.stroke();
 
-				ctx!.lineWidth = 10;
-				ctx!.beginPath()
-				ctx!.moveTo(170, 100)
-				ctx!.lineTo(255, 15)
-				ctx!.lineTo(340, 100)
-				ctx!.closePath()
-				ctx!.fill()
-				ctx!.strokeStyle = "blue"
-				ctx!.stroke()
-				ctx!.beginPath()
-				ctx!.moveTo(170, 145)
-				ctx!.lineTo(255, 45)
-				ctx!.lineTo(340, 145)
-				ctx!.closePath()
-				ctx!.fill()
-				ctx!.strokeStyle = "gray"
-				ctx!.stroke()
-				// 未设置beginPath，导致上下表现一致，与前端一致
-				ctx!.moveTo(170, 190)
-				ctx!.lineTo(255, 90)
-				ctx!.lineTo(340, 190)
-				ctx!.closePath()
-				ctx!.fillStyle = "orange"
-				ctx!.fill()
-				ctx!.strokeStyle = "khaki"
-				ctx!.stroke()
-				ctx!!.update()
-			},
-			hex(num : number) : string {
-				if (num == 0) {
-					return "00"
-				}
-				let hexChars = "0123456789ABCDEF";
-				let result = "";
-				while (num > 0) {
-					let remainder : Int = num.toInt() % 16;
-					result = hexChars[remainder] + result;
-					num = Math.floor(num.toInt() / 16);
-				}
-				if (result.length == 1) {
-					return "0" + result
-				}
-				return result
-			},
-			drawhouse() {
-				let ctx = (this.$refs['draw-house'] as INode).getDrawableContext()
-				ctx!!.reset()
-				ctx!!.lineWidth = 10;
+        ctx!.lineWidth = 10;
+        ctx!.beginPath()
+        ctx!.moveTo(170, 100)
+        ctx!.lineTo(255, 15)
+        ctx!.lineTo(340, 100)
+        ctx!.closePath()
+        ctx!.fill()
+        ctx!.strokeStyle = "blue"
+        ctx!.stroke()
+        ctx!.beginPath()
+        ctx!.moveTo(170, 145)
+        ctx!.lineTo(255, 45)
+        ctx!.lineTo(340, 145)
+        ctx!.closePath()
+        ctx!.fill()
+        ctx!.strokeStyle = "gray"
+        ctx!.stroke()
+        // 未设置beginPath，导致上下表现一致，与前端一致
+        ctx!.moveTo(170, 190)
+        ctx!.lineTo(255, 90)
+        ctx!.lineTo(340, 190)
+        ctx!.closePath()
+        ctx!.fillStyle = "orange"
+        ctx!.fill()
+        ctx!.strokeStyle = "khaki"
+        ctx!.stroke()
+        ctx!!.update()
+      },
+      hex(num : number) : string {
+        if (num == 0) {
+          return "00"
+        }
+        let hexChars = "0123456789ABCDEF";
+        let result = "";
+        while (num > 0) {
+          let remainder : Int = num.toInt() % 16;
+          result = hexChars[remainder] + result;
+          num = Math.floor(num.toInt() / 16);
+        }
+        if (result.length == 1) {
+          return "0" + result
+        }
+        return result
+      },
+      drawhouse() {
+        let ctx = (this.$refs['draw-house'] as Element).getDrawableContext()
+        ctx!!.reset()
+        ctx!!.lineWidth = 10;
 
-				// Wall
-				ctx!.strokeRect(75, 140, 150, 110);
+        // Wall
+        ctx!.strokeRect(75, 140, 150, 110);
 
-				// Door
-				ctx!.fillRect(130, 190, 40, 60);
+        // Door
+        ctx!.fillRect(130, 190, 40, 60);
 
-				// Roof
-				ctx!.beginPath();
-				ctx!.moveTo(50, 140);
-				ctx!.lineTo(150, 60);
-				ctx!.lineTo(250, 140);
-				ctx!.closePath();
-				ctx!.stroke();
-				ctx!!.update()
-			},
-			drawPoint() {
-				let ctx = (this.$refs['draw-style'] as INode).getDrawableContext()
-				ctx!!.reset()
-				for (let i = 0; i < 6; i++) {
-					for (let j = 0; j < 6; j++) {
-						ctx!!.strokeStyle = `rgb(0,${Math.floor(255 - 42.5 * i)},${Math.floor(255 - 42.5 * j)})`;
-						ctx!.beginPath();
-						ctx!.arc(12.5 + j * 25, 12.5 + i * 25, 10, 0, Math.PI * 2, true);
-						ctx!.stroke();
-					}
-				}
-				for (let i = 0; i < 6; i++) {
-					for (let j = 0; j < 6; j++) {
-						ctx!!.fillStyle = `rgb(${Math.floor(255 - 42.5 * i)},${Math.floor(255 - 42.5 * j)},0)`;
-						ctx!.fillRect(180 + j * 25, i * 25, 25, 25);
-					}
-				}
-				ctx!!.update()
-			},
-			drawRect() {
-				let ctx = (this.$refs['draw-odd'] as INode).getDrawableContext()
-				ctx!!.reset()
-				// Create path
-				ctx!!.moveTo(30, 90);
-				ctx!.lineTo(110, 20);
-				ctx!.lineTo(240, 130);
-				ctx!.lineTo(60, 130);
-				ctx!.lineTo(190, 20);
-				ctx!.lineTo(270, 90);
-				ctx!.closePath();
+        // Roof
+        ctx!.beginPath();
+        ctx!.moveTo(50, 140);
+        ctx!.lineTo(150, 60);
+        ctx!.lineTo(250, 140);
+        ctx!.closePath();
+        ctx!.stroke();
+        ctx!!.update()
+      },
+      drawPoint() {
+        let ctx = (this.$refs['draw-style'] as Element).getDrawableContext()
+        ctx!!.reset()
+        for (let i = 0; i < 6; i++) {
+          for (let j = 0; j < 6; j++) {
+            ctx!!.strokeStyle = `rgb(0,${Math.floor(255 - 42.5 * i)},${Math.floor(255 - 42.5 * j)})`;
+            ctx!.beginPath();
+            ctx!.arc(12.5 + j * 25, 12.5 + i * 25, 10, 0, Math.PI * 2, true);
+            ctx!.stroke();
+          }
+        }
+        for (let i = 0; i < 6; i++) {
+          for (let j = 0; j < 6; j++) {
+            ctx!!.fillStyle = `rgb(${Math.floor(255 - 42.5 * i)},${Math.floor(255 - 42.5 * j)},0)`;
+            ctx!.fillRect(180 + j * 25, i * 25, 25, 25);
+          }
+        }
+        ctx!!.update()
+      },
+      drawRect() {
+        let ctx = (this.$refs['draw-odd'] as Element).getDrawableContext()
+        ctx!!.reset()
+        // Create path
+        ctx!!.moveTo(30, 90);
+        ctx!.lineTo(110, 20);
+        ctx!.lineTo(240, 130);
+        ctx!.lineTo(60, 130);
+        ctx!.lineTo(190, 20);
+        ctx!.lineTo(270, 90);
+        ctx!.closePath();
 
-				// Fill path
-				ctx!.fillStyle = "green";
-				ctx!.fill("evenodd");
-				ctx!!.update()
+        // Fill path
+        ctx!.fillStyle = "green";
+        ctx!.fill("evenodd");
+        ctx!!.update()
 
-			}
-		}
-	}
+      },
+      drawArcTo() {
+        let ctx = (this.$refs['draw-arcto'] as Element).getDrawableContext()
+        ctx!.reset()
+        ctx!.beginPath();
+        ctx!.moveTo(50, 20);
+        ctx!.bezierCurveTo(230, 30, 150, 60, 50, 100);
+        ctx!.stroke();
+
+        ctx!.fillStyle = "blue";
+        // start point
+        ctx!.fillRect(50, 20, 10, 10);
+        // end point
+        ctx!.fillRect(50, 100, 10, 10);
+
+        ctx!.fillStyle = "red";
+        // control point one
+        ctx!.fillRect(230, 30, 10, 10);
+        // control point two
+        ctx!.fillRect(150, 70, 10, 10);
+        ctx!.update()
+      }
+    }
+  }
 </script>
 
 <style>
diff --git a/pages/component/view/view.uvue b/pages/component/view/view.uvue
index e6cdd816f01b82bb1e6bb816ceaff1fc0b2643ae..c2e5fdbbef4087f32f8e8308d84844e2ad100358 100644
--- a/pages/component/view/view.uvue
+++ b/pages/component/view/view.uvue
@@ -1,119 +1,51 @@
 <template>
-  <!-- #ifdef APP -->
-  <scroll-view style="flex: 1">
-    <!-- #endif -->
-    <view>
-      <page-head title="view"></page-head>
-      <view class="uni-padding-wrap uni-common-mt uni-common-mb">
-        <view>
-          <text class="uni-hello-text"> Flex是Flexible Box的缩写，意为“弹性布局”，用来为盒状模型提供最大的灵活性。当设置display: flex后，继续给view等容器组件设置flex-direction: row或column，就可以在该容器内按行或列排布子组件。uni-app推荐使用flex布局。因为flex布局有利于跨更多平台，尤其是采用原生渲染的平台。 </text>
-        </view>
-
-        <view class="uni-title uni-common-mt">
-          <text class="uni-title-text"> flex-direction: row </text>
-          <text class="uni-subtitle-text"> 横向布局 </text>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="flex-item uni-bg-red"><text style="color: #fff">A</text></view>
-          <view class="flex-item uni-bg-green"><text style="color: #fff">B</text></view>
-          <view class="flex-item uni-bg-blue"><text style="color: #fff">C</text></view>
-        </view>
-
-        <view class="uni-title uni-common-mt">
-          <text class="uni-title-text"> flex-direction: column </text>
-          <text class="uni-subtitle-text"> 纵向布局 </text>
-        </view>
-        <view class="uni-flex uni-column">
-          <view class="flex-item flex-item-V uni-bg-red"><text style="color: #fff">A</text></view>
-          <view class="flex-item flex-item-V uni-bg-green"><text style="color: #fff">B</text></view>
-          <view class="flex-item flex-item-V uni-bg-blue"><text style="color: #fff">C</text></view>
-        </view>
-
-        <view class="uni-title uni-common-mt">
-          <text class="uni-title-text"> 更多布局示例 </text>
-          <text class="uni-subtitle-text"> flex布局演示 </text>
-        </view>
-        <view>
-          <view class="text-box"><text class="text">纵向布局-自动宽度</text></view>
-          <view class="text-box" style="width: 300rpx"><text class="text">纵向布局-固定宽度</text></view>
-          <view class="text-box"><text class="text">横向布局-自动宽度</text></view>
-          <view class="text-box"><text class="text">横向布局-自动宽度</text></view>
-        </view>
-        <view class="uni-flex uni-row" style="-webkit-justify-content: center; justify-content: center">
-          <view class="text-box"><text class="text">横向布局-居中</text></view>
-          <view class="text-box"><text class="text">横向布局-居中</text></view>
-        </view>
-        <view class="uni-flex uni-row" style="-webkit-justify-content: flex-end; justify-content: flex-end">
-          <view class="text-box"><text class="text">横向布局-居右</text></view>
-          <view class="text-box"><text class="text">横向布局-居右</text></view>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="text-box" style="-webkit-flex: 1; flex: 1"><text class="text">横向布局-平均分布</text></view>
-          <view class="text-box" style="-webkit-flex: 1; flex: 1"><text class="text">横向布局-平均分布</text></view>
-        </view>
-        <view class="uni-flex uni-row" style="-webkit-justify-content: space-between; justify-content: space-between">
-          <view class="text-box"><text class="text">横向布局-两端对齐</text></view>
-          <view class="text-box"><text class="text">横向布局-两端对齐</text></view>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="text-box" style="width: 200rpx"><text class="text">固定宽度</text></view>
-          <view class="text-box" style="-webkit-flex: 1; flex: 1"><text class="text">自动占满余量</text></view>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="text-box" style="width: 200rpx"><text class="text">固定宽度</text></view>
-          <view class="text-box" style="-webkit-flex: 1; flex: 1"><text class="text">自动占满</text></view>
-          <view class="text-box" style="width: 200rpx"><text class="text">固定宽度</text></view>
-        </view>
-        <view class="uni-flex uni-row" style="-webkit-flex-wrap: wrap; flex-wrap: wrap">
-          <view class="text-box" style="width: 320rpx"><text class="text">一行显示不全,wrap折行</text></view>
-          <view class="text-box" style="width: 320rpx"><text class="text">一行显示不全,wrap折行</text></view>
-          <view class="text-box" style="width: 320rpx"><text class="text">一行显示不全,wrap折行</text></view>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="text-box" style="-webkit-flex: 1; flex: 1; height: 200rpx; -webkit-justify-content: center; justify-content: center; -webkit-align-items: flex-start; align-items: flex-start">
-            <text class="text" style="line-height: 70rpx">垂直居顶</text>
-          </view>
-          <view class="text-box" style="-webkit-flex: 1; flex: 1; height: 200rpx; -webkit-justify-content: center; justify-content: center; -webkit-align-items: center; align-items: center">
-            <text class="text">垂直居中</text>
-          </view>
-          <view class="text-box" style="-webkit-flex: 1; flex: 1; height: 200rpx; -webkit-justify-content: center; justify-content: center; -webkit-align-items: flex-end; align-items: flex-end">
-            <text class="text" style="line-height: 70rpx">垂直居底</text>
-          </view>
-        </view>
-
-        <view class="uni-title uni-common-mt">
-          <text class="uni-title-text"> 组合示例 </text>
-          <text class="uni-subtitle-text"> flex布局演示 </text>
-        </view>
-        <view class="uni-flex uni-row">
-          <view class="text-box uni-flex" style="width: 200rpx; height: 220rpx; -webkit-justify-content: center; justify-content: center; -webkit-align-items: center; align-items: center">
-            <image src="/static/plus.png" style="width: 150rpx; height: 150rpx"></image>
-          </view>
-          <view class="uni-flex uni-column" style="-webkit-flex: 1; flex: 1; -webkit-justify-content: space-between; justify-content: space-between">
-            <view class="text-box" style="height: 120rpx; justify-content: start; align-items: start; padding-left: 20rpx">
-              <text class="text" style="line-height: 70rpx">文字居左，留出左间距</text>
-            </view>
-
-            <view class="uni-flex uni-row">
-              <view class="text-box" style="-webkit-flex: 1; flex: 1">
-                <text class="text">剩余数量</text>
-              </view>
-              <view class="text-box" style="-webkit-flex: 1; flex: 1">
-                <text class="text">立即购买</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <button class="uni-common-mt" @click="goGeneralAttribute('/pages/component/view/view-draw')">DrawableContext</button>
-      </view>
-    </view>
-    <!-- #ifdef APP -->
-  </scroll-view>
+  <page-head title="view"></page-head>
+  <view class="main" :hover-class="hover_class ? 'is-parent-hover' : 'none'">
+    <view class="test-view" :hover-class="hover_class ? 'is-hover' : 'none'" :hover-stop-propagation="stop_propagation" :hover-start-time="start_time" :hover-stay-time="stay_time">
+    </view>
+  </view>
+  <!-- #ifdef APP -->
+  <scroll-view style="flex: 1">
+    <!-- #endif -->
+    <view class="content">
+      <boolean-data :defaultValue="false" title="是否指定按下去的样式类" @change="change_hover_class_boolean"></boolean-data>
+      <boolean-data :defaultValue="false" title="是否阻止本节点的祖先节点出现点击态" @change="change_stop_propagation_boolean"></boolean-data>
+      <enum-data :items="start_time_enum" title="按住后多久出现点击态" @change="radio_change_start_time_enum"></enum-data>
+      <enum-data :items="stay_time_enum" title="手指松开后点击态保留时间" @change="radio_change_stay_time_enum"></enum-data>
+      <view class="uni-padding-wrap uni-common-mt uni-common-mb">
+        <button class="uni-common-mt" @click="goGeneralAttribute('/pages/component/view/view-draw')">DrawableContext</button>
+      </view>
+    </view>
+    <!-- #ifdef APP -->
+  </scroll-view>
   <!-- #endif -->
 </template>
-<script>
-export default {
-  methods: {
+<script>
+import { type ItemType } from '@/components/enum-data/enum-data.vue'
+export default {
+  data() {
+    return {
+      hover_class: false,
+      stop_propagation: false,
+      start_time: 50,
+      stay_time: 400,
+      start_time_enum: [{ "value": 50, "name": "50毫秒" }, { "value": 200, "name": "200毫秒" }] as ItemType[],
+      stay_time_enum: [{ "value": 400, "name": "400毫秒" }, { "value": 200, "name": "200毫秒" }] as ItemType[]
+    }
+  },
+  methods: {
+    change_hover_class_boolean(checked : boolean) {
+      this.hover_class = checked
+    },
+    change_stop_propagation_boolean(checked : boolean) {
+      this.stop_propagation = checked
+    },
+    radio_change_start_time_enum(time : number) {
+      this.start_time = time
+    },
+    radio_change_stay_time_enum(time : number) {
+      this.stay_time = time
+    },
     goGeneralAttribute(path: string) {
       uni.navigateTo({
         url: path,
@@ -124,32 +56,25 @@ export default {
 </script>
 
 <style>
-.flex-item {
-  width: 33.3%;
-  height: 200rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+.main {
+    padding: 10rpx 0;
+    flex-direction: row;
+    justify-content: center;
 }
-
-.flex-item-V {
-  width: 100%;
-  height: 150rpx;
+.test-view {
+  height: 200px;
+  width: 200px;
+  background-color: white;
 }
-
-.text-box {
-  margin: 15rpx 10rpx;
-  padding: 0 20rpx;
-  background-color: #ebebeb;
-  height: 70rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: row;
-}
-
 .text {
   color: #777;
   font-size: 26rpx;
+}
+.is-hover {
+    background-color: #179b16;
+}
+
+.is-parent-hover {
+    background-color: #aa0000;
 }
 </style>
diff --git a/pages/component/web-view-local/web-view-local.test.js b/pages/component/web-view-local/web-view-local.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed3ea2bff7041c0b138738b7be52c3c418d3bf95
--- /dev/null
+++ b/pages/component/web-view-local/web-view-local.test.js
@@ -0,0 +1,14 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('test title', () => {
+
+    let page;
+    beforeAll(async () => {
+        page = await program.reLaunch('/pages/component/web-view-local/web-view-local');
+        await page.waitFor(1000);
+    });
+
+    it('check_load_url', async () => {
+      expect(await page.data('loadError')).toBe(false)
+    });
+});
diff --git a/pages/component/web-view-local/web-view-local.uvue b/pages/component/web-view-local/web-view-local.uvue
index 684353ff163544c40b97d6b7f74b24ad6009bd42..4cc848026555e1848c8a7ff745baaa5127dac5a8 100644
--- a/pages/component/web-view-local/web-view-local.uvue
+++ b/pages/component/web-view-local/web-view-local.uvue
@@ -10,6 +10,7 @@
   export default {
     data() {
       return {
+        loadError: false
       }
     },
     methods: {
@@ -21,6 +22,7 @@
         });
       },
       error(event : WebViewErrorEvent) {
+        this.loadError = true
         console.log(JSON.stringify(event.detail));
       },
       loading(event : WebViewLoadingEvent) {
diff --git a/pages/component/web-view/web-view.test.js b/pages/component/web-view/web-view.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..bca16763be3d8ac30c0270a59d10513198af5cc7
--- /dev/null
+++ b/pages/component/web-view/web-view.test.js
@@ -0,0 +1,14 @@
+// uni-app自动化测试教程: uni-app自动化测试教程: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/
+
+describe('component-native-web-view', () => {
+
+    let page;
+    beforeAll(async () => {
+        page = await program.reLaunch('/pages/component/web-view/web-view');
+        await page.waitFor(3000);
+    });
+
+    it('check_load_url', async () => {
+        expect(await page.data('loadError')).toBe(false)
+    });
+});
diff --git a/pages/component/web-view/web-view.uvue b/pages/component/web-view/web-view.uvue
index fa6b517a656960b9eebdc3251a33fdb44cf1a4f4..04c5eb85c15d8aafaac092d27403e1fa1575c0a5 100644
--- a/pages/component/web-view/web-view.uvue
+++ b/pages/component/web-view/web-view.uvue
@@ -34,13 +34,14 @@
   export default {
     data() {
       return {
-        src: 'https://www.baidu.com',
+        src: 'https://www.dcloud.io',
         webview_styles: {
           progress: {
             color: '#FF3333'
           }
         },
-        webviewContext: null as WebviewContext | null
+        webviewContext: null as WebviewContext | null,
+        loadError: false
       }
     },
     onReady() {
@@ -66,6 +67,7 @@
         console.log(JSON.stringify(event.detail));
       },
       error(event : WebViewErrorEvent) {
+        this.loadError = true
         console.log(JSON.stringify(event.detail));
       },
       loading(event : WebViewLoadingEvent) {
@@ -94,4 +96,4 @@
   .uni-btn-ml {
     margin-left: 10rpx;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/pages.test.js b/pages/pages.test.js
new file mode 100755
index 0000000000000000000000000000000000000000..1041af21d6f893d6fc49260ccc02db62dda385b0
--- /dev/null
+++ b/pages/pages.test.js
@@ -0,0 +1,147 @@
+let pageIndex = 0
+const pages = [
+  // component
+  '/pages/component/button/button',
+  '/pages/component/checkbox/checkbox',
+  '/pages/component/general-attribute/general-attribute',
+  '/pages/component/general-event/general-event',
+  '/pages/component/image/image-format',
+  // '/pages/component/image/image-large', // 截图过大
+  '/pages/component/image/image-mode',
+  '/pages/component/image/image-path',
+  '/pages/component/image/image',
+  '/pages/component/input/input',
+  '/pages/component/list-view/list-view',
+  '/pages/component/navigator/navigate',
+  '/pages/component/navigator/navigator',
+  '/pages/component/navigator/redirect',
+  // '/pages/component/picker-view/picker-view', //动态内容
+  '/pages/component/progress/progress',
+  '/pages/component/radio/radio',
+  '/pages/component/rich-text/rich-text-complex',
+  '/pages/component/rich-text/rich-text-tags',
+  '/pages/component/rich-text/rich-text',
+  '/pages/component/scroll-view/scroll-view-custom-refresher-props',
+  '/pages/component/scroll-view/scroll-view-props',
+  '/pages/component/scroll-view/scroll-view-refresher-props',
+  '/pages/component/scroll-view/scroll-view-refresher',
+  '/pages/component/scroll-view/scroll-view',
+  '/pages/component/slider/slider',
+  '/pages/component/slider-100/slider-100',
+  '/pages/component/swiper/swiper',
+  '/pages/component/switch/switch',
+  '/pages/component/text/text-props',
+  '/pages/component/text/text',
+  '/pages/component/textarea/textarea',
+  // '/pages/component/video/video',
+  '/pages/component/view/view-draw',
+  '/pages/component/view/view',
+  // '/pages/component/web-view/web-view', // 动态内容
+  '/pages/component/web-view-local/web-view-local',
+  
+  // CSS
+  '/pages/CSS/background/background-color',
+  '/pages/CSS/background/background-image',
+  '/pages/CSS/border/complex-border/complex-border',
+  '/pages/CSS/border/border-bottom',
+  '/pages/CSS/border/border-color',
+  '/pages/CSS/border/border-left',
+  '/pages/CSS/border/border-radius',
+  '/pages/CSS/border/border-right',
+  '/pages/CSS/border/border-style',
+  '/pages/CSS/border/border-top',
+  '/pages/CSS/border/border-width',
+  '/pages/CSS/border/border',
+  // '/pages/CSS/box-shadow/box-shadow',
+  '/pages/CSS/display/flex',
+  '/pages/CSS/display/none',
+  '/pages/CSS/flex/align-content',
+  '/pages/CSS/flex/align-items',
+  '/pages/CSS/flex/flex-basis',
+  '/pages/CSS/flex/flex-direction',
+  '/pages/CSS/flex/flex-flow',
+  '/pages/CSS/flex/flex-grow',
+  '/pages/CSS/flex/flex-shrink',
+  '/pages/CSS/flex/flex',
+  '/pages/CSS/flex/justify-content',
+  '/pages/CSS/layout/height',
+  '/pages/CSS/layout/max-height',
+  '/pages/CSS/layout/max-width',
+  '/pages/CSS/layout/min-height',
+  '/pages/CSS/layout/min-width',
+  '/pages/CSS/layout/position',
+  '/pages/CSS/layout/visibility',
+  '/pages/CSS/layout/width',
+  '/pages/CSS/layout/z-index',
+  '/pages/CSS/margin/margin-bottom',
+  '/pages/CSS/margin/margin-left',
+  '/pages/CSS/margin/margin-right',
+  '/pages/CSS/margin/margin-top',
+  '/pages/CSS/margin/margin',
+  '/pages/CSS/padding/padding-bottom',
+  '/pages/CSS/padding/padding-left',
+  '/pages/CSS/padding/padding-right',
+  '/pages/CSS/padding/padding-top',
+  '/pages/CSS/padding/padding',
+  '/pages/CSS/text/color',
+  '/pages/CSS/text/font-family',
+  '/pages/CSS/text/font-size',
+  '/pages/CSS/text/font-style',
+  '/pages/CSS/text/font-weight',
+  '/pages/CSS/text/letter-spacing',
+  '/pages/CSS/text/line-height',
+  '/pages/CSS/text/text-align',
+  '/pages/CSS/text/text-decoration-line',
+  '/pages/CSS/text/text-overflow',
+  '/pages/CSS/transform/rotate',
+  '/pages/CSS/transform/scale',
+  '/pages/CSS/transform/translate',
+  '/pages/CSS/transition/transition',
+  
+  // tabBar
+  '/pages/tabBar/API',
+  '/pages/tabBar/component',
+  '/pages/tabBar/CSS',
+  '/pages/tabBar/template',
+  
+  // template
+  // '/pages/template/calendar/calendar', // 动态内容
+  '/pages/template/custom-refresher/custom-refresher',
+  '/pages/template/custom-tab-bar/custom-tab-bar',
+  // '/pages/template/drop-card/drop-card',
+  '/pages/template/half-screen/half-screen',
+  '/pages/template/list-news/list-news',
+  '/pages/template/list-news/detail/detail',
+  // '/pages/template/long-list/long-list', // 动态内容
+  '/pages/template/navbar-lite/navbar-lite',
+  '/pages/template/pull-zoom-image/pull-zoom-image',
+  '/pages/template/scroll-fold-nav/scroll-fold-nav',
+  '/pages/template/scroll-sticky/scroll-sticky',
+  '/pages/template/swiper-list/swiper-list',
+  '/pages/template/swiper-list2/swiper-list2',
+  // '/pages/template/swiper-vertical-video/swiper-vertical-video'
+]
+
+let page;
+describe('page screenshot test', () => {
+  beforeAll(async () => {
+    console.log("page screenshot test start");
+  });
+  beforeEach(async () => {
+    page = await program.reLaunch(pages[pageIndex]);
+    await page.waitFor(1000);
+  });
+  afterEach(() => {
+    pageIndex++;
+  });
+  afterAll(() => {
+    console.log("page screenshot test finish");
+  });
+  test.each(pages)('%s', async () => {
+    const image = await program.screenshot({
+      fullPage: true
+    });
+    expect(image).toMatchImageSnapshot();
+    await page.waitFor(500);
+  })
+})
diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index e3f45999ad98714491fdb3123c76e1b8440f6116..02b5b58871d6fb874541fe6e06a5ba82b3a2038d 100644
--- a/pages/tabBar/API.uvue
+++ b/pages/tabBar/API.uvue
@@ -47,7 +47,6 @@
   type ListItem = {
     id : string
     name : string
-    open : boolean
     pages : Page[]
     url ?: string
     enable ?: boolean
@@ -59,7 +58,6 @@
           {
             id: 'global',
             name: '全局',
-            open: false,
             pages: [
               {
                 name: 'getApp',
@@ -74,7 +72,6 @@
           {
             id: 'base',
             name: '基础',
-            open: false,
             pages: [
               {
                 name: '事件总线event-bus',
@@ -94,7 +91,6 @@
           {
             id: 'page',
             name: '页面和路由',
-            open: false,
             pages: [
               {
                 name: '页面跳转',
@@ -127,42 +123,9 @@
               },
             ] as Page[],
           },
-          {
-            id: 'network',
-            name: '网络',
-            pages: [
-              {
-                name: '发起请求request',
-                url: 'request',
-              },
-              {
-                name: '上传文件',
-                url: 'upload-file',
-              },
-              {
-                name: '下载文件',
-                url: 'download-file',
-              },
-              {
-                name: '获取设备网络状态',
-                url: 'get-network-type',
-              },
-              {
-                name: 'socketTask',
-                url: 'websocket-socketTask',
-                api: [""] //它不是uni.的api
-              },
-              {
-                name: '全局websocket',
-                url: 'websocket-global',
-                api: ["connectSocket", "onSocketOpen", "onSocketError", "sendSocketMessage", "onSocketMessage", "closeSocket", "onSocketClose"]
-              },
-            ] as Page[],
-          },
           {
             id: 'ui',
             name: '界面',
-            open: false,
             pages: [
               /* {
                 name: "创建动画",
@@ -178,40 +141,76 @@
                 name: "节点布局交互状态",
                 url: "intersection-observer",
                 enable: false
-              }, */
+              }, */
+              {
+                name: 'element元素',
+                url: 'get-element-by-id',
+                api: ["getElementById"]
+              },
               {
-                name: '节点信息',
+                name: 'node节点',
                 url: 'nodes-info',
                 api: ["createSelectorQuery"]
               },
               {
-                name: '显示操作菜单',
+                name: '动态加载字体',
+                url: 'load-font-face',
+              },
+              {
+                name: 'actionSheet操作菜单',
                 url: 'action-sheet',
               },
               {
-                name: '显示模态弹窗',
+                name: 'showModal模态弹窗',
                 url: 'modal',
                 api: ["showModal"]
               },
               {
-                name: '显示加载提示框',
-                url: 'show-loading',
+                name: 'showLoading等待框',
+                url: 'loading',
               },
               {
-                name: '显示消息提示框',
+                name: 'showToast轻提示框',
                 url: 'toast',
                 api: ["showToast"]
-              },
-              {
-                name: '动态加载字体',
-                url: 'load-font-face',
-              },
+              }
             ] as Page[],
+          },
+          {
+            id: 'network',
+            name: '网络',
+            pages: [
+              {
+                name: '发起请求request',
+                url: 'request',
+              },
+              {
+                name: '上传文件',
+                url: 'upload-file',
+              },
+              {
+                name: '下载文件',
+                url: 'download-file',
+              },
+              {
+                name: '获取设备网络状态',
+                url: 'get-network-type',
+              },
+              {
+                name: 'socketTask',
+                url: 'websocket-socketTask',
+                api: [""] //它不是uni.的api
+              },
+              {
+                name: '全局websocket',
+                url: 'websocket-global',
+                api: ["connectSocket", "onSocketOpen", "onSocketError", "sendSocketMessage", "onSocketMessage", "closeSocket", "onSocketClose"]
+              },
+            ] as Page[],
           },
           {
             id: 'device',
             name: '设备',
-            open: false,
             pages: [
               {
                 name: '获取系统信息',
@@ -298,16 +297,19 @@
           {
             id: 'media',
             name: '媒体',
-            open: false,
-            pages: [
+            pages: [
+              {
+                name: "拍照和相册选择",
+                url: 'choose-image'
+              },
               {
-                name: '图片选择和预览',
+                name: '图片预览',
                 url: 'preview-image',
-                api: ["previewImage", "closePreviewImage", "chooseImage"]
+                api: ["previewImage", "closePreviewImage"]
               },
               {
                 name: "保存图片到相册",
-                url: 'save-image-to-album'
+                url: 'save-image-to-photos-album'
               }
               /* {
                 name: "图片选择和拍照",
@@ -383,7 +385,19 @@
             pages: [
               {
                 name: '云函数',
-                url: 'call-function',
+                url: 'unicloud-call-function',
+              },
+              {
+                name: '云对象',
+                url: 'unicloud-import-object',
+              },
+              {
+                name: '云存储',
+                url: 'unicloud-file-api',
+              },
+              {
+                name: 'clientDB',
+                url: 'unicloud-database',
               },
             ] as Page[],
           },
@@ -391,7 +405,6 @@
             id: "rewarded-video-ad",
             url: "rewarded-video-ad",
             name: "激励视频广告",
-            open: false,
             enable: false,
             pages: [] as Page[]
           },
@@ -399,14 +412,12 @@
             id: "full-screen-video-ad",
             url: "full-screen-video-ad",
             name: "全屏视频广告",
-            open: false,
             enable: false,
             pages: [] as Page[]
           },
           {
             id: "login",
             name: "登录",
-            open: false,
             pages: [
               {
                 name: "登录",
@@ -421,7 +432,6 @@
           {
             id: "share",
             name: "分享",
-            open: false,
             pages: [
               {
                 name: "分享",
@@ -432,7 +442,6 @@
           {
             id: "payment",
             name: "支付",
-            open: false,
             pages: [
               {
                 name: "发起支付",
@@ -443,7 +452,6 @@
           {
             id: "speech",
             name: "语音",
-            open: false,
             pages: [
               {
                 name: "语音识别",
@@ -454,7 +462,6 @@
           {
             id: "push",
             name: "推送",
-            open: false,
             pages: [
               {
                 name: "推送",
@@ -469,24 +476,6 @@
       }
     },
     methods: {
-      triggerCollapse(index ?: number, item : ListItem) {
-        if (item.pages.length == 0) {
-          const page : Page = {
-            name: item.name,
-            enable: item.enable,
-            url: item.url!,
-          }
-          this.goDetailPage(page)
-          return
-        }
-        for (var i = 0; i < this.list.length; ++i) {
-          if (index == i) {
-            this.list[i].open = !this.list[i].open
-          } else {
-            this.list[i].open = false
-          }
-        }
-      },
       goDetailPage(e : Page) {
         if (e.enable == false) {
           uni.showToast({
@@ -506,10 +495,10 @@
         })
       },
       showPop: function () {
-        (this.$refs["pop"] as INode).style.setProperty("display", "flex")
+        (this.$refs["pop"] as Element).style.setProperty("display", "flex")
       },
       hidePop: function () {
-        (this.$refs["pop"] as INode).style.setProperty("display", "none")
+        (this.$refs["pop"] as Element).style.setProperty("display", "none")
       },
       stopClickPop: function (e : MouseEvent) {
         e.stopPropagation() //点击到pop的非灰色区域，拦截点击事件
diff --git a/pages/tabBar/CSS.uvue b/pages/tabBar/CSS.uvue
index 514b50adbc100911756d6f2a2418783649f0925b..291bc1280cb33d856ce8a38d9e6b8a66c3d62124 100644
--- a/pages/tabBar/CSS.uvue
+++ b/pages/tabBar/CSS.uvue
@@ -38,7 +38,6 @@
   type ListItem = {
     id : string
     name : string
-    open : boolean
     pages : Page[]
     url ?: string
     enable ?: boolean
@@ -50,7 +49,6 @@
           {
             id: 'background',
             name: 'background',
-            open: false,
             pages: [
               {
                 name: 'background-color',
@@ -65,7 +63,6 @@
           {
             id: 'border',
             name: 'border',
-            open: false,
             pages: [
               {
                 name: 'border',
@@ -86,6 +83,22 @@
               {
                 name: 'border-radius',
                 url: '/pages/CSS/border/border-radius',
+              },
+              {
+                name: 'border-top',
+                url: '/pages/CSS/border/border-top',
+              },
+              {
+                name: 'border-bottom',
+                url: '/pages/CSS/border/border-bottom',
+              },
+              {
+                name: 'border-left',
+                url: '/pages/CSS/border/border-left',
+              },
+              {
+                name: 'border-right',
+                url: '/pages/CSS/border/border-right',
               },
               {
                 name: 'border属性复合示例',
@@ -96,7 +109,6 @@
           {
             id: 'box-shadow',
             name: 'box-shadow',
-            open: false,
             pages: [
               {
                 name: 'box-shadow',
@@ -107,7 +119,6 @@
           {
             id: 'display',
             name: 'display',
-            open: false,
             pages: [
               {
                 name: 'flex',
@@ -122,7 +133,6 @@
           {
             id: 'flex',
             name: 'flex',
-            open: false,
             pages: [
               {
                 name: 'align-content',
@@ -165,7 +175,6 @@
           {
             id: 'layout',
             name: 'layout',
-            open: false,
             pages: [
               {
                 name: 'height',
@@ -208,7 +217,6 @@
           {
             id: 'margin',
             name: 'margin',
-            open: false,
             pages: [
               {
                 name: 'margin-bottom',
@@ -235,7 +243,6 @@
           {
             id: 'padding',
             name: 'padding',
-            open: false,
             pages: [
               {
                 name: 'padding-bottom',
@@ -262,7 +269,6 @@
           {
             id: 'text',
             name: 'text',
-            open: false,
             pages: [
               {
                 name: 'color',
@@ -309,7 +315,6 @@
           {
             id: 'transform',
             name: 'transform',
-            open: false,
             pages: [
               {
                 name: 'translate',
@@ -328,7 +333,6 @@
           {
             id: 'transition',
             name: 'transition',
-            open: false,
             pages: [
               {
                 name: 'transition',
@@ -343,24 +347,6 @@
       }
     },
     methods: {
-      triggerCollapse(index ?: number, item : ListItem) {
-        if (item.pages.length == 0) {
-          const page : Page = {
-            name: item.name,
-            enable: item.enable,
-            url: item.url,
-          }
-          this.goDetailPage(page)
-          return
-        }
-        for (var i = 0; i < this.list.length; ++i) {
-          if (index == i) {
-            this.list[i].open = !this.list[i].open
-          } else {
-            this.list[i].open = false
-          }
-        }
-      },
       goDetailPage(e : Page) {
         if (e.enable == false) {
           uni.showToast({
@@ -384,4 +370,4 @@
   .item {
     margin-bottom: 12px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/tabBar/component.uvue b/pages/tabBar/component.uvue
index 1466446cf946b24387adc214a28b41ac7d19c60d..6e94ad1e922d92bc4a4ac23d45cc9d19f036029c 100644
--- a/pages/tabBar/component.uvue
+++ b/pages/tabBar/component.uvue
@@ -54,7 +54,6 @@ type Page = {
 type ListItem = {
   id : string
   name : string
-  open : boolean
   pages : Page[]
   url ?: string
   enable ?: boolean
@@ -66,7 +65,6 @@ export default {
         {
           id: 'view',
           name: '视图容器',
-          open: false,
           pages: [
             {
               name: 'view',
@@ -95,7 +93,6 @@ export default {
         {
           id: 'content',
           name: '基础内容',
-          open: false,
           pages: [
             {
               name: 'text',
@@ -112,7 +109,6 @@ export default {
         {
           id: 'form',
           name: '表单组件',
-          open: false,
           pages: [
             {
               name: 'button',
@@ -162,7 +158,6 @@ export default {
         {
           id: 'nav',
           name: '导航',
-          open: false,
           pages: [{
             name: 'navigator',
             enable: true
@@ -171,7 +166,6 @@ export default {
         {
           id: 'media',
           name: '媒体组件',
-          open: false,
           pages: [
             {
               name: 'image',
@@ -191,7 +185,6 @@ export default {
           {
             id: 'map',
             name: '地图',
-            open: false,
             pages: [
               {
                 name: 'map',
@@ -202,7 +195,6 @@ export default {
           {
             id: 'canvas',
             name: '画布',
-            open: false,
             pages: [
               {
                 name: 'canvas'
@@ -213,7 +205,6 @@ export default {
         {
           id: 'web-view',
           name: '网页',
-          open: false,
           pages: [
             {
               name: '网络网页',
@@ -233,14 +224,12 @@ export default {
             url: 'ad',
             name: 'AD组件',
             enable: false,
-            open: false,
             pages: [] as Page[]
           }
           */
            {
          id: 'general-attr-event',
          name: '通用属性和事件',
-         open: false,
          pages: [
            {
              name: '通用属性',
@@ -261,24 +250,6 @@ export default {
     }
   },
   methods: {
-    triggerCollapse(index ?: number, item : ListItem) {
-      if (item.pages.length == 0) {
-        const page : Page = {
-          name: item.name,
-          enable: item.enable,
-          url: item.url,
-        }
-        this.goDetailPage(page)
-        return
-      }
-      for (var i = 0; i < this.list.length; ++i) {
-        if (index == i) {
-          this.list[i].open = !this.list[i].open
-        } else {
-          this.list[i].open = false
-        }
-      }
-    },
     goDetailPage(e : Page) {
       if (e.enable == false) {
         uni.showToast({
diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue
index 75eee77393ca9217dc10e5be3d60acf12895b9f2..bee81fdd60315b8c83f86ff1ff79528cef5e927c 100644
--- a/pages/tabBar/template.uvue
+++ b/pages/tabBar/template.uvue
@@ -145,20 +145,35 @@ export default {
           open: false,
           pages: [] as Page[],
         },
-        {
-          id: 'half-screen',
-          url: 'half-screen',
-          name: '半屏弹窗',
-          open: false,
-          enable: false,
-          pages: [] as Page[],
-        },
+        // {
+        //   id: 'half-screen',
+        //   url: 'half-screen',
+        //   name: '半屏弹窗',
+        //   open: false,
+        //   enable: false,
+        //   pages: [] as Page[],
+        // },
         {
           id: 'drop-card',
           url: 'drop-card',
           name: '划走式卡片',
           open: false,
           pages: [] as Page[],
+        },
+        {
+          id: 'navbar-lite',
+          url: 'navbar-lite',
+          name: '自定义导航栏',
+          open: false,
+          pages: [] as Page[],
+        },
+        {
+          id: 'custom-tab-bar',
+          url: 'custom-tab-bar',
+          name: '自定义TabBar',
+          open: false,
+          enable: true,
+          pages: [] as Page[],
         },
         {
           id: 'calendar',
@@ -174,7 +189,7 @@ export default {
     }
   },
   methods: {
-    triggerCollapse(index?: number, item: ListItem) {
+    triggerCollapse(index: number, item: ListItem) {
       if (item.pages.length == 0) {
         const page: Page = {
           name: item.name,
diff --git a/pages/template/calendar/calendar.uts b/pages/template/calendar/calendar.uts
index 0950683b88c73d73fa3b19373a39f363cc014b8f..765be1a0f94c2301f4f1d3968362194c8a47364c 100644
--- a/pages/template/calendar/calendar.uts
+++ b/pages/template/calendar/calendar.uts
@@ -125,7 +125,7 @@ export class Lunar {
 		* 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
 		* @param lunar Year
 		* @return Number (0-12)
-		* @eg:let leapMonth = calendar.leapMonth(1987) ;//leapMonth=6 
+		* @eg:let leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
 		*/
 	leapMonth(year : number) : number {
 		return lunarYears[year - 1900] & 0xF;
@@ -146,7 +146,7 @@ export class Lunar {
 
 	// 某年份农历各月天数
 	lunarMonthDays(year : number) : number[] {
-		
+
 		 let monthDays = this.lunarMonthDaysMap.get(year)
 			if (monthDays != null) {
 					return monthDays
@@ -164,7 +164,7 @@ export class Lunar {
 			// 添加闰月
 			let leapM = this.leapMonth(year);
 
-			if (leapM > 0) monthDays.splice(leapM, 0, leapDays(year));
+			if (leapM > 0) monthDays.splice(leapM, 0, this.leapDays(year));
 			this.lunarMonthDaysMap.set(year, monthDays)
 
 			return monthDays;
@@ -265,7 +265,7 @@ export class Lunar {
 		} else {
 			// 补偿公历1901年2月的农历信息
 			if (offset == -23) {
-				const info : InfoType = {
+				let info : InfoType = {
 					lunarY: i,
 					lunarM: 12,
 					lunarD: 8,
@@ -294,4 +294,4 @@ export class Lunar {
 
 		return info
 	}
-}
\ No newline at end of file
+}
diff --git a/pages/template/calendar/calendar.uvue b/pages/template/calendar/calendar.uvue
index f786b99b7db0e396f614b5536b5c5dc3732b9078..05359064050ac98dd421bdb679a1678871e567e3 100644
--- a/pages/template/calendar/calendar.uvue
+++ b/pages/template/calendar/calendar.uvue
@@ -65,7 +65,7 @@
 
 			// 触发整个日历的点击事件，需要计算点击位置
 			select(event : TouchEvent) {
-				const refs = this.$refs['draw-weeks'] as INode
+				const refs = this.$refs['draw-weeks'] as Element
 				const rect = refs.getBoundingClientRect();
 				const dom_x = rect.left; // 元素左上角相对于视口的 X 坐标
 				const dom_y = rect.top; // 元素左上角相对于视口的 Y 坐标
@@ -139,8 +139,9 @@
 
 			// 绘制日历顶部信息
 			drawHeader() {
-				const refs = this.$refs['draw-header'] as INode
-				let ctx = refs.getDrawableContext()
+				const refs = this.$refs['draw-header'] as Element
+				let ctx = refs.getDrawableContext()
+				if (ctx == null) return
 				const date_header_map = ['一', '二', '三', '四', '五', '六', '日']
 
 				const width = refs.getBoundingClientRect().width
@@ -166,8 +167,9 @@
 			// 绘制日历主体
 			drawWeek(weeks : Array<Array<DateType>>, time : string) {
 				const start_time = Date.now()
-				const refs = this.$refs['draw-weeks'] as INode
+				const refs = this.$refs['draw-weeks'] as Element
 				let ctx = refs.getDrawableContext()
+				if (ctx == null) return
 				const dom = refs.getBoundingClientRect()
 				const width = dom.width
 				const height = dom.height
@@ -283,4 +285,4 @@
 		justify-content: space-between;
 		margin: 20px 0;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/template/custom-refresher/custom-refresher.uvue b/pages/template/custom-refresher/custom-refresher.uvue
index 02df00cf085946dbc871c34519a381fe3943ca88..e8c5d068bab4fa779de616105fe45a09d95634fe 100644
--- a/pages/template/custom-refresher/custom-refresher.uvue
+++ b/pages/template/custom-refresher/custom-refresher.uvue
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-  import RefresherEvent from 'io.dcloud.uniapp.runtime.RefresherEvent';
   import refreshBox from './refresh-box/refresh-box.uvue';
   export default {
     components:{refreshBox},
diff --git a/pages/template/custom-tab-bar/custom-tab-bar-tab1.uvue b/pages/template/custom-tab-bar/custom-tab-bar-tab1.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..8d399308bfeda2b1c5b343cc46fdeda17e5e640f
--- /dev/null
+++ b/pages/template/custom-tab-bar/custom-tab-bar-tab1.uvue
@@ -0,0 +1,60 @@
+<template>
+  <list-view ref="listView" class="list" :rebound="false" :scroll-with-animation="true" :scroll-y="true" @scrolltolower="loadData()"
+    @scroll="onScroll">
+    <list-item class="list-item" v-for="(item, index) in dataList" :key="index">
+      <text class="title">{{item.title}}</text>
+    </list-item>
+  </list-view>
+</template>
+
+<script>
+  type ListItem = {
+    title : string
+  }
+
+  export default {
+    data() {
+      return {
+        dataList: [] as ListItem[]
+      }
+    },
+    created() {
+      this.loadData()
+    },
+    methods: {
+      loadData() {
+        let index = this.dataList.length
+        for (let i = 0; i < 10; i++) {
+          this.dataList.push({
+            title: index.toString(),
+          } as ListItem)
+          index++
+        }
+      },
+      onScroll(e : ScrollEvent) {
+        uni.$emit('tabchange', e.detail.scrollTop)
+      },
+      scrollTop(top : number) {
+        (this.$refs["listView"] as Element).setAttribute('scrollTop', top)
+      }
+    }
+  }
+</script>
+
+<style>
+  .list {
+    flex: 1;
+    background-color: #ffffff;
+  }
+
+  .list-item {
+    flex-direction: row;
+    padding: 30px;
+    border-bottom: 1px solid #dbdbdb;
+  }
+
+  .title {
+    font-size: 16px;
+    text-align: center;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/template/custom-tab-bar/custom-tab-bar-tab2.uvue b/pages/template/custom-tab-bar/custom-tab-bar-tab2.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..063e1fbabf8fde88d5cb3c1a30fb1eed03989441
--- /dev/null
+++ b/pages/template/custom-tab-bar/custom-tab-bar-tab2.uvue
@@ -0,0 +1,24 @@
+<template>
+  <view class="page">
+    <button type="primary">登录</button>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+      }
+    },
+    created() {
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style>
+  .page {
+    padding: 15px;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/template/custom-tab-bar/custom-tab-bar.uvue b/pages/template/custom-tab-bar/custom-tab-bar.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..7c04890f89952579f100fdc043cc78ebbfd3b156
--- /dev/null
+++ b/pages/template/custom-tab-bar/custom-tab-bar.uvue
@@ -0,0 +1,200 @@
+<template>
+  <view class="tabs">
+    <view ref="tabview" class="tab-view">
+      <tab1 ref="tab1" v-if="tabList[0].init" v-show="selectedIndex==0"></tab1>
+      <tab2 ref="tab2" v-if="tabList[1].init" v-show="selectedIndex==1"></tab2>
+    </view>
+    <view ref="tabbar" class="tab-bar">
+      <view class="tab-item" @click="onTabClick(0)">
+        <view ref="tab-item1" class="tab-item-content">
+          <text v-if="displayArrow" class="tab-item-icon tab-item-arrow uni-icon"
+            :class="selectedIndex==0 ? 'tab-item-text-active' : ''">
+            {{'\ue6bd'}}
+          </text>
+          <text v-if="!displayArrow" class="tab-item-icon uni-icon"
+            :class="selectedIndex==0 ? 'tab-item-text-active' : ''">{{'\ue644'}}</text>
+          <text v-if="!displayArrow" class="tab-item-text" :class="selectedIndex==0 ? 'tab-item-text-active' : ''">
+            首页
+          </text>
+        </view>
+      </view>
+      <view @click="onPlusClick">
+        <image class="concave-image" mode="heightFix" src="/static/template/custom-tab-bar/concave.png"></image>
+        <view class="btn-plus">
+          <text class="btn-plus-text">+</text>
+        </view>
+      </view>
+      <view class="tab-item" @click="onTabClick(1)">
+        <view ref="tab-item2" class="tab-item-content">
+          <text class="tab-item-icon uni-icon"
+            :class="selectedIndex==1 ? 'tab-item-text-active' : ''">{{'\ue699'}}</text>
+          <text class="tab-item-text" :class="selectedIndex==1 ? 'tab-item-text-active' : ''">
+            我的
+          </text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { ComponentPublicInstance } from 'vue';
+  import tab1 from './custom-tab-bar-tab1.uvue';
+  import tab2 from './custom-tab-bar-tab2.uvue';
+
+  type TabItem = {
+    init : boolean,
+    preload : boolean,
+  }
+
+  export default {
+    components: {
+      tab1,
+      tab2
+    },
+    data() {
+      return {
+        tabList: [
+          {
+            init: false
+          } as TabItem,
+          {
+            init: false
+          } as TabItem,
+        ] as TabItem[],
+        selectedIndex: -1,
+        displayArrow: false,
+        $tabViewHeight: 0
+      }
+    },
+    onLoad() {
+      uni.$on('tabchange', this.onTabPageEvent)
+    },
+    onReady() {
+      this.setSelectedIndex(0)
+      this.$tabViewHeight = (this.$refs["tabview"] as Element).getBoundingClientRect().height
+    },
+    onUnload() {
+      uni.$off('tabchange', this.onTabPageEvent)
+    },
+    methods: {
+      onTabClick(index : number) {
+        this.setSelectedIndex(index);
+        if (index == 0) {
+          (this.$refs["tab1"]! as ComponentPublicInstance).$callMethod('scrollTop', 0)
+        }
+      },
+      onTabPageEvent(top : number) {
+        this.displayArrow = top > this.$tabViewHeight
+      },
+      setSelectedIndex(index : number) {
+        if (this.selectedIndex === index) {
+          return
+        }
+        if (!this.tabList[index].init) {
+          this.tabList[index].init = true
+        }
+        this.selectedIndex = index
+      },
+      onPlusClick() {
+        uni.showModal({
+          title: "提示",
+          content: "你点击了 +",
+          showCancel: false
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+  @font-face {
+    font-family: "UniIcon";
+    src: url('@/static/fonts/uni-icon.ttf');
+  }
+
+  .uni-icon {
+    font-family: "UniIcon";
+    font-size: 16px;
+    font-style: normal;
+  }
+
+  .tabs {
+    flex: 1;
+    background-color: #fff;
+    overflow: visible;
+  }
+
+  .tab-view {
+    flex: 1;
+  }
+
+  .tab-view-item {
+    flex: 1;
+  }
+
+  .tab-bar {
+    flex-direction: row;
+    height: 56px;
+    overflow: visible;
+  }
+
+  .tab-item {
+    flex: 1;
+    position: relative;
+    background-color: #1e90ff;
+    overflow: visible;
+  }
+
+  .tab-item-content {
+    margin: auto;
+    transition: transform 0.3s;
+  }
+
+  .tab-item-icon {
+    color: #ccc;
+    font-size: 12px;
+    text-align: center;
+    margin-bottom: 4px;
+  }
+
+  .tab-item-text {
+    color: #ccc;
+    font-size: 12px;
+    text-align: center;
+  }
+
+  .tab-item-text-active {
+    color: #fff;
+  }
+
+  .tab-item-arrow {
+    font-size: 30px !important;
+    font-weight: bold;
+  }
+
+  .concave-image {
+    height: 56px;
+  }
+
+  .btn-plus {
+    position: absolute;
+    left: 43px;
+    width: 70px;
+    height: 70px;
+    border-radius: 50px;
+    background-color: #FE5722;
+    box-shadow: 0 0 4px rgba(0, 0, 0, 0.5);
+    /* margin-left: auto;
+    margin-right: auto; */
+    margin-top: -35px;
+    align-items: center;
+    justify-content: center;
+    overflow: visible;
+  }
+
+  .btn-plus-text {
+    color: #fff;
+    font-size: 32px;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/template/drop-card/card/card.uvue b/pages/template/drop-card/card/card.uvue
index 6eda7ee0232886fcc9c063291d3b24a8cf7b8837..56e15b81a640d286ec7559e8ceb5d79b89a1f80b 100644
--- a/pages/template/drop-card/card/card.uvue
+++ b/pages/template/drop-card/card/card.uvue
@@ -21,7 +21,7 @@
   export default {
     data() {
       return {
-        $nodeMap:new Map<string, INode>(),
+        $elementMap:new Map<string, Element>(),
         x: 0 as number,
         y: 0 as number,
         // 飘走的卡片计数
@@ -59,8 +59,8 @@
 
       // TODO 需要延迟设置才能生效
       setTimeout(()=>{
-        this.setINodeStyle('card','height', screenHeight * 0.7 + 'px');
-        this.setINodeStyle('card-img','height', screenHeight * 0.7 + 'px');
+        this.setElementStyle('card','height', screenHeight * 0.7 + 'px');
+        this.setElementStyle('card-img','height', screenHeight * 0.7 + 'px');
         this.initCardStyle()
       },200)
 
@@ -74,20 +74,20 @@
       initCardStyle(){
         let _index = (this.cardIndex + this.floatCount)%3
         // console.log('~~~~~~_index:'+_index + ' cardIndex:'+this.cardIndex+' floatCount:'+this.floatCount);
-        this.setINodeStyle('card','z-index', _index)
-        this.setINodeStyle('card','margin-top', screenHeight * 0.15 - 30 * _index + 'px');
-        this.setINodeStyle('card','transform', 'scale('+(0.9 + 0.05 * _index)+')')
+        this.setElementStyle('card','z-index', _index)
+        this.setElementStyle('card','margin-top', screenHeight * 0.15 - 30 * _index + 'px');
+        this.setElementStyle('card','transform', 'scale('+(0.9 + 0.05 * _index)+')')
       },
-      // 工具方法，用于快速设置 INode 的 style
-      setINodeStyle(refName:string,propertyName : string, propertyStyle : any) : void {
-        let node : INode | null = this.$nodeMap.get(refName)
-        if(node == null){
-          node = this.$refs.get(refName) as INode;
-          this.$nodeMap.set(refName,node)
+      // 工具方法，用于快速设置 Element 的 style
+      setElementStyle(refName:string,propertyName : string, propertyStyle : any) : void {
+        let element : Element | null = this.$elementMap.get(refName)
+        if(element == null){
+          element = this.$refs[refName] as Element;
+          this.$elementMap.set(refName,element)
         }else{
           // console.log('直接拿');
         }
-        node?.style?.setProperty(propertyName, propertyStyle);
+        element?.style?.setProperty(propertyName, propertyStyle);
       },
       touchstart(e : TouchEvent) {
         // console.log('touchstart')
@@ -160,13 +160,13 @@
         if(k.toInt() != 0){
           cardTo(k * screenWidth * 1.3, this.y * 3,()=>{
             //  状态图标变回透明
-            this.setINodeStyle("state-icon-like",'opacity', 0)
-            this.setINodeStyle("state-icon-dislike",'opacity', 0)
+            this.setElementStyle("state-icon-like",'opacity', 0)
+            this.setElementStyle("state-icon-dislike",'opacity', 0)
 
             // 设置为透明，防止飘回时因为 margin-top 太高，露出来
-            this.setINodeStyle("card",'opacity', 0)
+            this.setElementStyle("card",'opacity', 0)
             setTimeout(()=>{
-              this.setINodeStyle("card",'opacity', 1)
+              this.setElementStyle("card",'opacity', 1)
             },300)
 
             // 执行卡片飘动后事件，注意uni.$emit是全局事件。其他卡片也会执行
@@ -185,12 +185,12 @@
         }
       },
       moveCard() {
-        this.setINodeStyle("card",
+        this.setElementStyle("card",
           'transform',
           `translate(${this.x}px,${this.y}px) rotate(${this.x/-30}deg) scale(1)`
         )
-        this.setINodeStyle("state-icon-like",'opacity', this.x < 0 ? 0 : movePercent * 10)
-        this.setINodeStyle("state-icon-dislike",'opacity', this.x > 0 ? 0 : movePercent * 10)
+        this.setElementStyle("state-icon-like",'opacity', this.x < 0 ? 0 : this.movePercent * 10)
+        this.setElementStyle("state-icon-dislike",'opacity', this.x > 0 ? 0 : this.movePercent * 10)
       }
     }
   }
diff --git a/pages/template/half-screen/half-screen.uvue b/pages/template/half-screen/half-screen.uvue
index 4dbb4ad7938ae977c91c1655dee5778cae07b093..840b8e66dd7788598f6c2a54ed1a8b80c1e2f2ea 100644
--- a/pages/template/half-screen/half-screen.uvue
+++ b/pages/template/half-screen/half-screen.uvue
@@ -26,8 +26,8 @@
 				lastY: 0,			//上次
 				lastY2: 0,			//
 				bAnimation: false,	//是否动画
-				halfNode: null as INode | null,
-				scrollNode: null as INode | null
+				halfNode: null as Element | null,
+				scrollNode: null as Element | null
 			}
 		},
 		methods: {
@@ -75,9 +75,9 @@
 					bHide = (this.lastY-this.lastY2)>3;		//向下滑动计算加速度判断是否关闭，简单处理未考虑时间
 				}
 				if(bHide){
-					switchHalfScreen(false);
+					this.switchHalfScreen(false);
 				}else{
-					resumeHalfScreen();
+					this.resumeHalfScreen();
 				}
 			},
 			onScroll(_: ScrollEvent) {
@@ -131,9 +131,9 @@
 			}
 		},
 		onReady() {
-			this.halfNode = this.$refs['halfScreen'] as INode;
+			this.halfNode = this.$refs['halfScreen'] as Element;
 			this.halfHeight = this.halfNode!.getBoundingClientRect().height;
-			this.scrollNode = this.$refs['halfScroll'] as INode;
+			this.scrollNode = this.$refs['halfScroll'] as Element;
 			
 			this.totalHeight = uni.getWindowInfo().windowHeight;
 			this.halfNode?.style?.setProperty('top', this.totalHeight.toString());
diff --git a/pages/template/list-news/detail/detail.uvue b/pages/template/list-news/detail/detail.uvue
index 09f151e7de0eecaddd97f0dee6ef8e9d36e3dcac..0d1ef04a3fb5fe053a517fd321241bfc843e6b3b 100644
--- a/pages/template/list-news/detail/detail.uvue
+++ b/pages/template/list-news/detail/detail.uvue
@@ -23,10 +23,11 @@
 			}
 		},
 		onLoad(event) {
-      // console.log(event);
-			this.post_id = event["post_id"] ?? "";
-			this.cover = event["cover"] ?? "";
-			this.title = event["title"] ?? "";
+      if (event != null) {
+        this.post_id = event["post_id"] ?? "";
+        this.cover = event["cover"] ?? "";
+        this.title = event["title"] ?? "";
+      }
 			this.getDetail();
 		},
 		methods: {
diff --git a/pages/template/long-list/long-list-page.uvue b/pages/template/long-list/long-list-page.uvue
index f6eeb9a953eeea6b12036af8124fe842e51dc800..bf7f90aef3e72865fe4fba5cd80f9fa5ba17f2ad 100644
--- a/pages/template/long-list/long-list-page.uvue
+++ b/pages/template/long-list/long-list-page.uvue
@@ -224,7 +224,7 @@
   }
 
   .tag-item {
-    font-size: 14px;
+    font-size: 12px;
     background-color: #EFF9F0;
     color: #639069;
     border-radius: 20px;
diff --git a/pages/template/long-list/long-list.uvue b/pages/template/long-list/long-list.uvue
index 9efae74407e31aaa0a121587a14dec6b5ac7d28c..97f1c131ec88c53eeefec3f304803992d53fb87d 100644
--- a/pages/template/long-list/long-list.uvue
+++ b/pages/template/long-list/long-list.uvue
@@ -25,6 +25,7 @@
 </template>
 
 <script>
+  import { ComponentPublicInstance } from 'vue';
   import longPage from './long-list-page.uvue';
 
   type SwiperTabsItem = {
@@ -76,21 +77,21 @@
           } as SwiperViewItem
         ] as SwiperViewItem[],
         swiperIndex: -1,
-        $pageScrollView: null as null | INode,
+        $pageScrollView: null as null | Element,
         $headerHeight: 0,
         $animationFinishIndex: 0,
-        $tabScrollView: null as null | INode,
-        $indicatorNode: null as null | INode,
+        $tabScrollView: null as null | Element,
+        $indicatorNode: null as null | Element,
         $swiperWidth: 0,
         $swiperTabsRect: [] as SwiperTabsItem[]
       }
     },
     onReady() {
-      this.$pageScrollView = this.$refs['pageScrollView'] as INode;
-      this.$headerHeight = (this.$refs['header'] as INode).offsetHeight
-      this.$swiperWidth = (this.$refs['swiper'] as INode).getBoundingClientRect().width
-      this.$tabScrollView = this.$refs['tabScroll'] as INode
-      this.$indicatorNode = this.$refs['indicator'] as INode
+      this.$pageScrollView = this.$refs['pageScrollView'] as Element;
+      this.$headerHeight = (this.$refs['header'] as Element).offsetHeight
+      this.$swiperWidth = (this.$refs['swiper'] as Element).getBoundingClientRect().width
+      this.$tabScrollView = this.$refs['tabScroll'] as Element
+      this.$indicatorNode = this.$refs['indicator'] as Element
       this.cacheTabItemsSize()
       this.setSwiperIndex(0, true)
     },
@@ -108,10 +109,10 @@
         const deltaY = event.deltaY
         const scrollTop = this.$pageScrollView!.scrollTop
 
-        /// 优先处理父容器滚动，父容器不能滚动时滚动子
-        // 向上滚动
+        // 优先处理父容器滚动，父容器不能滚动时滚动子
+
         if (deltaY > 0) {
-          // 如果父容器 header scrollTop < offsetHeight，先滚动父容器
+          // 向上滚动，如果父容器 header scrollTop < offsetHeight，先滚动父容器
           if (scrollTop < this.$headerHeight) {
             const difference = this.$headerHeight - scrollTop - deltaY
             if (difference > 0) {
@@ -170,7 +171,7 @@
       },
       cacheTabItemsSize() {
         this.$swiperTabsRect.length = 0
-        const tabs = this.$refs["swipertab"] as INode[]
+        const tabs = this.$refs["swipertab"] as Element[]
         tabs.forEach((node) => {
           this.$swiperTabsRect.push({
             x: node.offsetLeft,
@@ -192,9 +193,10 @@
         }
       },
       updateTabIndicator(current_index : number, move_to_index : number, percentage : number) {
-        // 计算指示线
         const current_size = this.$swiperTabsRect[current_index]
         const move_to_size = this.$swiperTabsRect[move_to_index]
+
+        // 计算指示线 左边距 和 宽度 在移动过程中的线性值
         const indicator_line_x = lerpNumber(current_size.x, move_to_size.x, percentage)
         const indicator_line_w = lerpNumber(current_size.w, move_to_size.w, percentage)
 
@@ -235,6 +237,7 @@
 
   .swiper-tabs {
     background-color: #ffffff;
+    flex-direction: column;
   }
 
   .swiper-tabs-item {
diff --git a/pages/template/navbar-lite/navbar-lite.uvue b/pages/template/navbar-lite/navbar-lite.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..31c337b3e1139e99fe81df0be6164721c6d15701
--- /dev/null
+++ b/pages/template/navbar-lite/navbar-lite.uvue
@@ -0,0 +1,57 @@
+<template>
+  <view class="content">
+    <uni-navbar-lite :title="title" :is-left="isLeft"></uni-navbar-lite>
+    <scroll-view class="scroll-view" scroll-y="true">
+      <view class="content-item" @click="onClick">
+        <text>点击此处，将标题切换为{{isLeft?'居中':'左侧'}}显示</text>
+      </view>
+      <view class="content-item" v-for="item in 100">
+        <text class="text">内容：{{item}}</text>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: 'Hello uni-app',
+        isLeft: false
+      }
+    },
+    onLoad() { },
+    methods: {
+      onClick(){
+        this.isLeft = !this.isLeft
+      }
+    }
+  }
+</script>
+
+<style>
+  .content {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+
+  .scroll-view {
+    flex: 1;
+    background-color: #f5f5f5;
+    padding: 5px 0;
+  }
+
+  .content-item {
+    padding: 15px;
+    margin: 5px 10px;
+    background-color: #fff;
+    border-radius: 5px;
+
+  }
+
+  .text {
+    font-size: 14px;
+    color: #666;
+  }
+</style>
diff --git a/pages/template/pull-zoom-image/pull-zoom-image.uvue b/pages/template/pull-zoom-image/pull-zoom-image.uvue
index 3ccf595d9499a9039dc347acd6e73291e87732cf..88d679ae5e00742fac3cb6430c69ebf7473ae218 100644
--- a/pages/template/pull-zoom-image/pull-zoom-image.uvue
+++ b/pages/template/pull-zoom-image/pull-zoom-image.uvue
@@ -25,7 +25,7 @@
 
     <view slot="refresher">
       <view class="head-img-box-1">
-        <image class="img" ref="head-img-1" src="../../../static/template/pull-zoom-image/head-img.jpg" mode="scaleToFill"></image>
+        <image class="img" ref="head-img-1" src="/static/template/pull-zoom-image/head-img.jpg" mode="scaleToFill"></image>
       </view>
     </view>
 
@@ -36,7 +36,7 @@
   export default {
     data() {
       return {
-        $INodeMap: new Map<string, INode>()
+        $elementMap: new Map<string, Element>()
       }
     },
     methods: {
@@ -51,23 +51,23 @@
           s = 0.7
         }
         let x : number = (1 - s) * -100
-        this.setINodeStyle("user-info", "transform", `translate(${x},${y + (s-1)* -50}px) scale(${s})`)
-        this.setINodeStyle("head-img-box-2", "transform", `translateY(${y}px)`)
+        this.setElementStyle("user-info", "transform", `translate(${x},${y + (s-1)* -50}px) scale(${s})`)
+        this.setElementStyle("head-img-box-2", "transform", `translateY(${y}px)`)
       },
       onRefresherpulling(e : RefresherEvent) {
         // console.log('onRefresherpulling',e.detail.dy)
         let pullingDistance : number = e.detail.dy
-        this.setINodeStyle("head-img-1", 'transform', `scale(${pullingDistance / 200 + 1})`)
-        this.setINodeStyle("head-img-2", 'transform', `scale(${pullingDistance / 200 + 1})`)
+        this.setElementStyle("head-img-1", 'transform', `scale(${pullingDistance / 200 + 1})`)
+        this.setElementStyle("head-img-2", 'transform', `scale(${pullingDistance / 200 + 1})`)
       },
-      // 工具方法，用于快速设置 INode 的 style
-      setINodeStyle(refName : string, propertyName : string, propertyStyle : any) : void {
-        let iNode : INode | null = this.$INodeMap.get(refName)
-        if (iNode == null) {
-          iNode = this.$refs.get(refName) as INode;
-          this.$INodeMap.set(refName, iNode)
+      // 工具方法，用于快速设置 Element 的 style
+      setElementStyle(refName : string, propertyName : string, propertyStyle : any) : void {
+        let element : Element | null = this.$elementMap.get(refName)
+        if (element == null) {
+          element = this.$refs.get(refName) as Element;
+          this.$elementMap.set(refName, element)
         }
-        iNode.style.setProperty(propertyName, propertyStyle);
+        element.style.setProperty(propertyName, propertyStyle);
       },
       back() {
         uni.navigateBack({
diff --git a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
index 5dc83f133c5bbf43f74152f287b8013e336e411d..30659e13c217b70d9c6218b8afd28db3aefbd9ed 100644
--- a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
+++ b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
@@ -41,17 +41,17 @@
         statusBarHeight: 35,
         scrollTop: 0,
         searchWidth: 700,
-        searchNode: null as INode | null,
-        boxNode: null as INode | null,
-        navNode: null as INode | null
+        searchNode: null as Element | null,
+        boxNode: null as Element | null,
+        navNode: null as Element | null
       }
     },
     onLoad() { },
     onReady() {
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight ?? 35;
-      this.searchNode = this.$refs['search'] as INode;
-      this.boxNode = this.$refs['top-box'] as INode;
-      this.navNode = this.$refs['scroll-fold-nav'] as INode;
+      this.searchNode = this.$refs['search'] as Element;
+      this.boxNode = this.$refs['top-box'] as Element;
+      this.navNode = this.$refs['scroll-fold-nav'] as Element;
     },
     methods: {
       onScroll(e : ScrollEvent) {
@@ -150,7 +150,7 @@
 
   .nav-back {
     position: absolute;
-    top: 44px;
+    top: 46px;
     left: 8px;
   }
 
diff --git a/pages/template/scroll-sticky/scroll-sticky.uvue b/pages/template/scroll-sticky/scroll-sticky.uvue
index bc0680d6b7a39264399c6813c680ff6c60e82948..782ae1da7279f62642dc17b0b201b855edfa0d80 100644
--- a/pages/template/scroll-sticky/scroll-sticky.uvue
+++ b/pages/template/scroll-sticky/scroll-sticky.uvue
@@ -1,5 +1,5 @@
 <template>
-	<scroll-view :scroll-y="true" @scroll="onScroll" class="page">
+	<scroll-view :scroll-y="true" @scroll="onScroll" class="page" rebound="false">
 		<view class="content-item">
 			<text class="text">向上滑动页面，体验元素吸顶效果。</text>
 		</view>
@@ -7,10 +7,7 @@
 			<text class="text">first content-{{item}}</text>
 		</view>
 
-		<!-- <view ref="sticky" class="search" @click="" :style="{
-'transform': 'translateY('+stickyTran+'px)'
-	}"> -->
-		<view ref="sticky" class="search" @click="">
+		<view ref="sticky" class="search">
 			<view style="flex-direction: row;">
 				<image src="/static/template/scroll-fold-nav/search.png" style="width: 15px;" mode="widthFix"></image>
 				<text class="search-tip-text">请输入你要搜索的内容</text>
@@ -37,7 +34,7 @@
 				stickyTop: 0,
 				stickyTran: 0,
 				scrollTop: 0,
-				stickyNode: null as INode | null
+				stickyNode: null as Element | null
 			}
 		},
 		methods: {
@@ -70,11 +67,11 @@
 		onLoad() {
 		},
 		onReady() {
-			this.stickyNode = this.$refs['sticky'] as INode;
+			this.stickyNode = this.$refs['sticky'] as Element;
 			// let rect = this.stickyNode?.getBoundingClientRect();
 			// this.stickyTop = rect?.top;
 			//this.stickyTop = this.stickyNode?.getBoundingClientRect()?.top;
-			let rect = (this.$refs['sticky'] as INode).getBoundingClientRect();
+			let rect = (this.$refs['sticky'] as Element).getBoundingClientRect();
 			this.stickyTop = rect.top;
 		}
 	}
diff --git a/pages/template/swiper-list/swiper-list.uvue b/pages/template/swiper-list/swiper-list.uvue
index 5aebd6ddce87375014dc4164d66cc067f7941672..cd40b4521afbef0201c72d475cfe34935130351e 100644
--- a/pages/template/swiper-list/swiper-list.uvue
+++ b/pages/template/swiper-list/swiper-list.uvue
@@ -45,14 +45,15 @@
       return {
         swiperList: [] as SwiperViewItem[],
         swiperIndex: -1,
-        $tabScrollView: null as null | INode,
-        $indicatorNode: null as null | INode,
+        $tabScrollView: null as null | Element,
+        $indicatorNode: null as null | Element,
         $animationFinishIndex: 0,
         $swiperWidth: 0,
         $swiperTabsRect: [] as SwiperTabsItem[]
       }
     },
     onLoad() {
+      // 初始化 8 个页签，宽度依次递增，用于演示在滑动 swiper 过程中指示线宽度的线性变化
       for (let i = 0; i < 8; i++) {
         const space = " ".repeat(i)
         this.swiperList.push({
@@ -61,13 +62,18 @@
       }
     },
     onReady() {
-      this.$tabScrollView = this.$refs['tabScroll'] as INode
-      this.$indicatorNode = this.$refs['indicator'] as INode
-      this.$swiperWidth = (this.$refs["swiper"] as INode).getBoundingClientRect().width
+      this.$tabScrollView = this.$refs['tabScroll'] as Element
+      this.$indicatorNode = this.$refs['indicator'] as Element
+      this.$swiperWidth = (this.$refs["swiper"] as Element).getBoundingClientRect().width
       this.cacheTabItemsSize()
       this.setSwiperIndex(0, true)
     },
     methods: {
+      /**
+       * 每个页签的点击事件，点击后设置当前 swiper.
+       * @constructor
+       * @param {number} index - 当前索引，该值应介于 0 和 最大数量之间.
+       */
       onTabClick(index : number) {
         this.setSwiperIndex(index, false)
       },
@@ -98,13 +104,21 @@
         // 通知更新指示线
         this.updateTabIndicator(current_index, move_to_index, percentage)
       },
+      /**
+       * Swiper滑动动画结束事件.
+       */
       onSwiperAnimationfinish(e : SwiperAnimationFinishEvent) {
         this.setSwiperIndex(e.detail.current, true)
+
+        // 记录上次的索引位置
         this.$animationFinishIndex = e.detail.current
       },
+      /**
+       * 缓存所有页签的左边距和宽度，用于计算指示线在移动过程中的线性变化.
+       */
       cacheTabItemsSize() {
         this.$swiperTabsRect.length = 0;
-        const tabs = this.$refs["swipertab"] as INode[]
+        const tabs = this.$refs["swipertab"] as Element[]
         tabs.forEach((node) => {
           this.$swiperTabsRect.push({
             x: node.offsetLeft,
@@ -112,6 +126,12 @@
           } as SwiperTabsItem)
         })
       },
+      /**
+       * 设置当前 swiper 选中的索引值.
+       * @constructor
+       * @param {number} index - 当前索引，该值应介于 0 和 最大数量之间.
+       * @param {boolean} updateIndicator - 是否更新指示线.
+       */
       setSwiperIndex(index : number, updateIndicator : boolean) {
         if (this.swiperIndex === index) {
           return
@@ -123,14 +143,22 @@
           this.updateTabIndicator(index, index, 1)
         }
       },
+      /**
+       * 更新页签指示线的位置和宽度.
+       * @constructor
+       * @param {number} current_index - 当前索引，该值应介于 0 和 最大数量之间.
+       * @param {number} move_to_index - 目标索引，该值应介于 0 和 最大数量之间.
+       * @param {number} percentage - 偏移百分比，应介于 0 和 1 之间，用于计算在移动过程中的线性值.
+       */
       updateTabIndicator(current_index : number, move_to_index : number, percentage : number) {
-        // 计算指示线
         const current_size = this.$swiperTabsRect[current_index]
         const move_to_size = this.$swiperTabsRect[move_to_index]
+
+        // 计算指示线 位置 和 宽度 在移动过程中的线性值
         const indicator_line_x = lerpNumber(current_size.x, move_to_size.x, percentage)
         const indicator_line_w = lerpNumber(current_size.w, move_to_size.w, percentage)
 
-        // 更新指示线
+        // 通过 transform 更新指示线，避免重排版
         const x = indicator_line_x + indicator_line_w / 2
         this.$indicatorNode!.style.setProperty('transform', `translateX(${x}px) scaleX(${indicator_line_w})`)
 
diff --git a/pages/template/swiper-list2/swiper-list2.uvue b/pages/template/swiper-list2/swiper-list2.uvue
index c707db8cda32120c02813d4c9fb87d80623d6b51..18b82f54bbc5ed536fca99f166372a09d93eea62 100644
--- a/pages/template/swiper-list2/swiper-list2.uvue
+++ b/pages/template/swiper-list2/swiper-list2.uvue
@@ -39,7 +39,7 @@
       return {
         swiperList: [] as SwiperViewItem[],
         swiperIndex: -1,
-        $tabScrollView: null as null | INode,
+        $tabScrollView: null as null | Element,
         $animationFinishIndex: 0,
         $swiperWidth: 0
       }
@@ -52,8 +52,8 @@
       }
     },
     onReady() {
-      this.$tabScrollView = this.$refs['tabScroll'] as INode
-      this.$swiperWidth = (this.$refs["swiper"] as INode).getBoundingClientRect().width
+      this.$tabScrollView = this.$refs['tabScroll'] as Element
+      this.$swiperWidth = (this.$refs["swiper"] as Element).getBoundingClientRect().width
       this.setSwiperIndex(0, true)
     },
     methods: {
@@ -98,7 +98,8 @@
         }
       },
       updateTabIndicator(current_index : number, move_to_index : number, percentage : number) {
-        if (percentage == 0) {
+        // TODO 0.0 != 0
+        if (percentage.toDouble() == 0.0) {
           return
         }
 
@@ -106,7 +107,7 @@
         const min_ratio = 1
         const max_ratio = 1.3
 
-        const tabs = this.$refs['swipertab'] as INode[]
+        const tabs = this.$refs['swipertab'] as Element[]
         const current_node = tabs[current_index]!
         const move_to_node = tabs[move_to_index]!
 
diff --git a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
index d515af480f802f9efeefdc350f1370f7d9f195ea..63270640325ab94ed3713269d82c6e3385ad6e6d 100644
--- a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
+++ b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
@@ -71,9 +71,8 @@
 					let visibleList = this.list.slice(3 * page, 3 * page + 3)
 					// 换数据
 					this.visibleList = visibleList
-				}
-			},
-			current(current) {
+				}
+
 				this.state.forEach((val : string, index : number) => {
 					if (index === current) {
 						this.doPlay(current)
@@ -105,7 +104,7 @@
 				if (this.state[index] === 'play') {
 					this.doPause(index)
 				} else {
-					this.doPlay(current)
+					this.doPlay(this.current)
 				}
 			},
       onLoadstart(index : number) {
diff --git a/static/fonts/uni-icon.ttf b/static/fonts/uni-icon.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..835f33bc9411461b8b9046b3fec742e921d6ce3a
Binary files /dev/null and b/static/fonts/uni-icon.ttf differ
diff --git a/static/template/custom-tab-bar/concave.png b/static/template/custom-tab-bar/concave.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a1c882bc0f18dbdf89dc74f760cb2e85834954d
Binary files /dev/null and b/static/template/custom-tab-bar/concave.png differ
diff --git a/store/index.uts b/store/index.uts
index 948ff4614e840f27f0ee1da2f61f83221419ab61..9b0a7acefc7e5871d3eb4ecc4633357130cf4d90 100644
--- a/store/index.uts
+++ b/store/index.uts
@@ -1,3 +1,5 @@
+import {reactive} from 'vue'
+
 export type State = {
   lifeCycleNum: number
 }
diff --git a/uniCloud-aliyun/cloudfunctions/facial-recognition-co/index.obj.js b/uniCloud-aliyun/cloudfunctions/facial-recognition-co/index.obj.js
new file mode 100644
index 0000000000000000000000000000000000000000..8cd050f6b6ec30d7721e7948fd8079029fd32675
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/facial-recognition-co/index.obj.js
@@ -0,0 +1,26 @@
+// 注意本文件为实人认证API示例代码，如需在业务中使用需补充业务逻辑，比如用户需要登录才能使用实人认证、限制每个用户每天能实人认证的次数等
+module.exports = {
+  _before() {
+    this.frvManager = uniCloud.getFacialRecognitionVerifyManager({
+      requestId: this.getUniCloudRequestId()
+    })
+  },
+  async getCertifyId({
+    realName,
+    idCard,
+    metaInfo
+  } = {}) {
+    const result = await this.frvManager.getCertifyId({
+      realName,
+      idCard,
+      metaInfo
+    })
+    return result
+  },
+  async getAuthResult(certifyId) {
+    const result = await this.frvManager.getAuthResult({
+      certifyId
+    })
+    return result
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/facial-recognition-co/package.json b/uniCloud-aliyun/cloudfunctions/facial-recognition-co/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..4c910500a846c2f1eb1d61c9daab052039a71226
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/facial-recognition-co/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "facial-recognition-co",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-verify": {}
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/todo/index.obj.js b/uniCloud-aliyun/cloudfunctions/todo/index.obj.js
new file mode 100644
index 0000000000000000000000000000000000000000..4680891d9042b8f8c3623dbe3cdab2121986ad4e
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/todo/index.obj.js
@@ -0,0 +1,41 @@
+// 云对象教程: https://uniapp.dcloud.net.cn/uniCloud/cloud-obj
+// jsdoc语法提示教程：https://ask.dcloud.net.cn/docs/#//ask.dcloud.net.cn/article/129
+module.exports = {
+  async add(title, content) {
+    console.log(title, content)
+    return {
+      title,
+      content,
+      showMessage: `Todo added, title: ${title}, content: ${content}`
+    }
+  },
+  async randomFail() {
+    const random = Math.random()
+    console.log(random);
+    if (random > 0.5) {
+      return {
+        errCode: 'RANDOM_FAIL',
+        errMsg: '[预期内的报错]执行失败请重试'
+      }
+    } else {
+      return {
+        errCode: 0,
+        errMsg: '',
+        showMessage: '执行成功'
+      }
+    }
+  },
+  async fail() {
+    return {
+      errCode: 'TEST_ERROR_CODE',
+      errMsg: '[预期内的报错]执行失败',
+    }
+  },
+  async success() {
+    return {
+      errCode: 0,
+      errMsg: '',
+      showMessage: '执行成功'
+    }
+  }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/todo/package.json b/uniCloud-aliyun/cloudfunctions/todo/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..217bc85cf26801806122fed25a297cfa417acfd1
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/todo/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "todo",
+  "dependencies": {},
+  "extensions": {
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/foreign.schema.json b/uniCloud-aliyun/database/foreign.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..d9654950564d63edc8e786c135bd7f2afbcb6bda
--- /dev/null
+++ b/uniCloud-aliyun/database/foreign.schema.json
@@ -0,0 +1,25 @@
+// 文档教程: https://uniapp.dcloud.net.cn/uniCloud/schema
+{
+  "bsonType": "object",
+  "required": [],
+  "permission": {
+    "read": true,
+    "create": true,
+    "update": true,
+    "delete": true
+  },
+  "properties": {
+    "_id": {
+      "description": "ID，系统自动生成"
+    },
+    "id": {
+      "bsonType": "string"
+    },
+    "name": {
+      "bsonType": "string"
+    },
+    "tag": {
+      "bsonType": "string"
+    }
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/local.schema.json b/uniCloud-aliyun/database/local.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..28bd811a5f6b5d27b01c82bc2a50952210623756
--- /dev/null
+++ b/uniCloud-aliyun/database/local.schema.json
@@ -0,0 +1,28 @@
+// 文档教程: https://uniapp.dcloud.net.cn/uniCloud/schema
+{
+  "bsonType": "object",
+  "required": [],
+  "permission": {
+    "read": true,
+    "create": true,
+    "update": true,
+    "delete": true
+  },
+  "properties": {
+    "_id": {
+      "description": "ID，系统自动生成"
+    },
+    "id": {
+      "bsonType": "string"
+    },
+    "name": {
+      "bsonType": "string"
+    },
+    "tag": {
+      "bsonType": "string"
+    },
+    "foreign_id": {
+      "foreignKey": "foreign.id"
+    }
+  }
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/type.schema.json b/uniCloud-aliyun/database/type.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..0fb1618d868f136357cbf33a10554617027b5994
--- /dev/null
+++ b/uniCloud-aliyun/database/type.schema.json
@@ -0,0 +1,30 @@
+// 文档教程: https://uniapp.dcloud.net.cn/uniCloud/schema
+{
+  "bsonType": "object",
+  "required": [],
+  "permission": {
+    "read": true,
+    "create": true,
+    "update": true,
+    "delete": true
+  },
+  "properties": {
+    "_id": {
+      "description": "ID，系统自动生成"
+    },
+    "num": {
+      "bsonType": "int"
+    },
+    "tag": {
+      "bsonType": "string",
+      "maxLength": 50,
+      "minLength": 0
+    },
+    "date": {
+      "bsonType": "date"
+    },
+    "point": {
+      "bsonType": "object"
+    }
+  }
+}
diff --git a/uni_modules/uni-getbatteryinfo/changelog.md b/uni_modules/uni-getbatteryinfo/changelog.md
index f17dd2de1cee9bcbaddcc6a219af2bbf5055a9dd..03f2110d87b74dec98a92f48f4e18b227cff4fad 100644
--- a/uni_modules/uni-getbatteryinfo/changelog.md
+++ b/uni_modules/uni-getbatteryinfo/changelog.md
@@ -1,7 +1,12 @@
+## 1.3.1（2023-09-15）
+app端适配使用UniError
+
 ## 1.3.0（2023-05-30）
-+ 新增 同步获取电量api
+新增 同步获取电量api
+
 ## 1.2.0（2022-10-17）
 实现百度小程序/支付宝小程序/QQ小程序获取电量
+
 ## 1.1.0（2022-10-17）
 实现ios平台获取电量
 
diff --git a/uni_modules/uni-getbatteryinfo/package.json b/uni_modules/uni-getbatteryinfo/package.json
index cd789cb132dc3c8d379a9f31f561dafbf879d995..0fc760c92199662311d098a5213e48fd6c81c37f 100644
--- a/uni_modules/uni-getbatteryinfo/package.json
+++ b/uni_modules/uni-getbatteryinfo/package.json
@@ -1,14 +1,14 @@
 {
   "id": "uni-getbatteryinfo",
   "displayName": "uni-getbatteryinfo",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "使用uts开发，实现在多个平台获取电池电量功能",
   "keywords": [
     "battery"
 ],
   "repository": "",
   "engines": {
-    "HBuilderX": "^3.6.0"
+    "HBuilderX": "^3.9.0"
   },
   "dcloudext": {
     "type": "uts",
@@ -32,10 +32,12 @@
   },
   "uni_modules": {
     "uni-ext-api": {
-      "uni": [
-        "getBatteryInfo",
-        "getBatteryInfoSync"
-    ]
+      "uni":  {
+        "getBatteryInfo": "getBatteryInfo",
+        "getBatteryInfoSync": {
+          "web": false
+        }
+      }
     },
     "dependencies": [],
     "encrypt": [],
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
index a978085f0578f4cd28de9f2b593945bffeb5515d..060043b8662663d4b6ce54b71974de7089599503 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
@@ -1,69 +1,83 @@
-import Context from "android.content.Context";
-import BatteryManager from "android.os.BatteryManager";
-import { UTSAndroid } from "io.dcloud.uts";
+import Context from "android.content.Context";
+import BatteryManager from "android.os.BatteryManager";
+
+import { GetBatteryInfo, GetBatteryInfoOptions, GetBatteryInfoSuccess, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts'
+import IntentFilter from 'android.content.IntentFilter';
+import Intent from 'android.content.Intent';
 
-import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoFail, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts'
-/**
- * 异步获取电量
- * @param {Object} options
- */
-export const getBatteryInfo : GetBatteryInfo = function (options) {
-    const context = UTSAndroid.getAppContext();
-    if (context != null) {
-        const manager = context.getSystemService(
-            Context.BATTERY_SERVICE
-        ) as BatteryManager;
-        const level = manager.getIntProperty(
-            BatteryManager.BATTERY_PROPERTY_CAPACITY
+
+/**
+ * 异步获取电量
+ */
+export const getBatteryInfo : GetBatteryInfo = function (options : GetBatteryInfoOptions) {
+
+
+    const context = UTSAndroid.getAppContext();
+    if (context != null) {
+        const manager = context.getSystemService(
+            Context.BATTERY_SERVICE
+        ) as BatteryManager;
+        const level = manager.getIntProperty(
+            BatteryManager.BATTERY_PROPERTY_CAPACITY
         );
-        const res : GetBatteryInfoSuccess = {
-            errMsg: 'getBatteryInfo:ok',
-            level,
-            isCharging: manager.isCharging()
-        }
-        options.success?.(res)
-        options.complete?.(res)
-    } else {
-        const res : GetBatteryInfoFail = {
-            errSubject: "uni-getBatteryInfo",
-            errCode: 1001,
-            errMsg: 'getBatteryInfo:fail getAppContext is null',
-            cause: null
-        }
-        options.fail?.(res)
-        options.complete?.(res)
-    }
-}
 
-/**
- * 同步获取电量示例
- */
-export const getBatteryInfoSync : GetBatteryInfoSync = function (): GetBatteryInfoResult {
-	
-    const context = UTSAndroid.getAppContext();
+        let ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        let batteryStatus = context.registerReceiver(null, ifilter);
+        let status = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+        let isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL;
+
+        const res : GetBatteryInfoSuccess = {
+            errMsg: 'getBatteryInfo:ok',
+            level,
+            isCharging: isCharging
+        }
+        options.success?.(res)
+        options.complete?.(res)
+    } else {
+		const res = new UniError("uni-getBatteryInfo", 1001, "getBatteryInfo:fail getAppContext is null")
+        options.fail?.(res)
+        options.complete?.(res)
+    }
+}
+
+/**
+ * 同步获取电量示例
+ */
+export const getBatteryInfoSync : GetBatteryInfoSync = function (): GetBatteryInfoResult {
+
+    const context = UTSAndroid.getAppContext();
     if (context != null) {
-        const manager = context.getSystemService(
-            Context.BATTERY_SERVICE
-        ) as BatteryManager;
-        const level = manager.getIntProperty(
-            BatteryManager.BATTERY_PROPERTY_CAPACITY
-        );
-		
-		const res : GetBatteryInfoResult = {
-		    level: level,
-		    isCharging: manager.isCharging()
-		};
-		return res;
-    } else {
-		/**
-		 * 无有效上下文
-		 */
-		const res : GetBatteryInfoResult = {
-		    level: -1,
-		    isCharging: false
-		};
-		return res;
+
+
+        const manager = context.getSystemService(
+            Context.BATTERY_SERVICE
+        ) as BatteryManager;
+        const level = manager.getIntProperty(
+            BatteryManager.BATTERY_PROPERTY_CAPACITY
+        );
+        
+        let ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        let batteryStatus = context.registerReceiver(null, ifilter);
+        let status = batteryStatus?.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+        let isCharging = status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL;
+        
+        const res : GetBatteryInfoResult = {
+            level: level,
+            isCharging: isCharging
+        };
+
+        return res;
     }
-	
-	
-}
\ No newline at end of file
+    else {
+        /**
+         * 无有效上下文
+         */
+        const res : GetBatteryInfoResult = {
+            level: -1,
+            isCharging: false
+        };
+        return res;
+    }
+
+
+}
diff --git a/uni_modules/uni-getbatteryinfo/index.d.ts b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
similarity index 88%
rename from uni_modules/uni-getbatteryinfo/index.d.ts
rename to uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
index 60b511f68f86e4fff522ee27ff04f3d5713a9645..9f0b83c4e53a1a27957eb4b291cf3b1fc032f7d8 100644
--- a/uni_modules/uni-getbatteryinfo/index.d.ts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
@@ -34,4 +34,9 @@ declare interface Uni {
    * 文档: [https://uniapp.dcloud.net.cn/api/system/batteryInfo.html](https://uniapp.dcloud.net.cn/api/system/batteryInfo.html)
    */
   getBatteryInfo(option?: UniNamespace.GetBatteryInfoOption): void;
+
+	/**
+	 * 同步获取电池电量信息
+	 */
+	getBatteryInfoSync(): UniNamespace.GetBatteryInfoSuccessCallbackResult;
 }
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
index d64e60860de6405b9a417afd00d17d64e479a314..d674221a16620c90639a24de95efbe59177ffa9d 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts
@@ -1,113 +1,113 @@
-export type GetBatteryInfoSuccess = {
-	errMsg : string,
-	/**
-	* 设备电量，范围1 - 100
-	*/
-	level : number,
-	/**
-	* 是否正在充电中
-	*/
-	isCharging : boolean
-}
-
-export type GetBatteryInfoFail = {
-	/**
-	* 错误码
-	*/
-	errCode : number,
-	/**
-	* 调用API的名称
-	*/
-	errSubject : string,
-	/**
-	* 错误的详细信息
-	*/
-	errMsg : string,
-	/**
-	* 错误来源
-	*/
-	cause : any | null
-}
-
-
-
-export type GetBatteryInfoOptions = {
-	/**
-		* 接口调用结束的回调函数（调用成功、失败都会执行）
-		*/
-	success ?: (res : GetBatteryInfoSuccess) => void
-	/**
-		* 接口调用失败的回调函数
-		*/
-	fail ?: (res : GetBatteryInfoFail) => void
-	/**
-		* 接口调用成功的回调
-		*/
-	complete ?: (res : any) => void
-}
-
-export type GetBatteryInfoResult = {
-	/**
-	* 设备电量，范围1 - 100
-	*/
-	level : number,
-	/**
-	* 是否正在充电中
-	*/
-	isCharging : boolean
+export type GetBatteryInfoSuccess = {
+	errMsg : string,
+	/**
+	* 设备电量，范围1 - 100
+	*/
+	level : number,
+	/**
+	* 是否正在充电中
+	*/
+	isCharging : boolean
+}
+
+// export type GetBatteryInfoFail = {
+// 	/**
+// 	* 错误码
+// 	*/
+// 	errCode : number,
+// 	/**
+// 	* 调用API的名称
+// 	*/
+// 	errSubject : string,
+// 	/**
+// 	* 错误的详细信息
+// 	*/
+// 	errMsg : string,
+// 	/**
+// 	* 错误来源
+// 	*/
+// 	cause : any | null
+// }
+
+
+
+export type GetBatteryInfoOptions = {
+	/**
+		* 接口调用结束的回调函数（调用成功、失败都会执行）
+		*/
+	success ?: (res : GetBatteryInfoSuccess) => void
+	/**
+		* 接口调用失败的回调函数
+		*/
+	fail ?: (res : UniError) => void
+	/**
+		* 接口调用成功的回调
+		*/
+	complete ?: (res : any) => void
 }
 
-/**
-* 获取电量信息
-* @param {GetBatteryInfoOptions} options
-* 
-*
-* @tutorial https://uniapp.dcloud.net.cn/api/system/batteryInfo.html
-* @platforms APP-IOS = ^9.0,APP-ANDROID = ^22
-* @since 3.6.11
-* 
-* @assert () => success({errCode: 0, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:ok", level: 60, isCharging: false })
-* @assert () => fail({errCode: 1001, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:fail getAppContext is null" })
-*/
+export type GetBatteryInfoResult = {
+	/**
+	* 设备电量，范围1 - 100
+	*/
+	level : number,
+	/**
+	* 是否正在充电中
+	*/
+	isCharging : boolean
+}
+
+/**
+* 获取电量信息
+* @param {GetBatteryInfoOptions} options
+*
+*
+* @tutorial https://uniapp.dcloud.net.cn/api/system/batteryInfo.html
+* @platforms APP-IOS = ^9.0,APP-ANDROID = ^22
+* @since 3.6.11
+*
+* @assert () => success({errCode: 0, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:ok", level: 60, isCharging: false })
+* @assert () => fail({errCode: 1001, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:fail getAppContext is null" })
+*/
 export type GetBatteryInfo = (options : GetBatteryInfoOptions) => void
 
-
-export type GetBatteryInfoSync = () => GetBatteryInfoResult
-
-interface Uni {
-
-	/**
-	 * 获取电池电量信息
-	 * @description 获取电池电量信息
-	 * @param {GetBatteryInfoOptions} options 
-	 * @example
-	 * ```typescript
-	 * uni.getBatteryInfo({
-	 *		success(res) {
-	 *			console.log(res);
-	 *		}
-	 * })
-	 * ```
-	 * @remark
-	 * - 该接口需要同步调用
-	 * @uniPlatform {
-	 *    "app": {
-	 *        "android": {
-	 *            "osVer": "4.4.4",
-	 *            "uniVer": "3.6.11",
-	 *            "unixVer": "3.9.0"
-	 *        },
-	 *        "ios": {
-	 *            "osVer": "9.0",
-	 *            "uniVer": "3.6.11",
-	 *            "unixVer": "3.9.0"
-	 *        }
-	 *    }
-	 * }
-	 * @uniVueVersion 2,3  //支持的vue版本
-	 *
-	 */
-	getBatteryInfo : GetBatteryInfo,
+
+export type GetBatteryInfoSync = () => GetBatteryInfoResult
+
+interface Uni {
+
+	/**
+	 * 获取电池电量信息
+	 * @description 获取电池电量信息
+	 * @param {GetBatteryInfoOptions} options
+	 * @example
+	 * ```typescript
+	 * uni.getBatteryInfo({
+	 *		success(res) {
+	 *			console.log(res);
+	 *		}
+	 * })
+	 * ```
+	 * @remark
+	 * - 该接口需要同步调用
+	 * @uniPlatform {
+	 *    "app": {
+	 *        "android": {
+	 *            "osVer": "4.4.4",
+	 *            "uniVer": "3.6.11",
+	 *            "unixVer": "3.9.0"
+	 *        },
+	 *        "ios": {
+	 *            "osVer": "9.0",
+	 *            "uniVer": "3.6.11",
+	 *            "unixVer": "3.9.0"
+	 *        }
+	 *    }
+	 * }
+	 * @uniVueVersion 2,3  //支持的vue版本
+	 *
+	 */
+	getBatteryInfo (options : GetBatteryInfoOptions) : void,
 	/**
 	 * 同步获取电池电量信息
 	 * @description 获取电池电量信息
@@ -134,6 +134,6 @@ interface Uni {
 	 * @uniVueVersion 2,3  //支持的vue版本
 	 *
 	 */
-	getBatteryInfoSync: GetBatteryInfoSync
-
-}
\ No newline at end of file
+	getBatteryInfoSync():GetBatteryInfoResult
+
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
index 4fdced2ee3aa9d80eafdffdc5f06d522c7a1f08a..473f1a07d3f5b227f9bb1caa1099ddfd99d254da 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js
@@ -1,3 +1,6 @@
 export function getBatteryInfo(options) {
     return my.getBatteryInfo(options)
 }
+export function getBatteryInfoSync(options) {
+    return my.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
index 5944a774bdc27de75cbe441c1af274dfef4ab8ac..1ee373a514964b33fd47e1bd59170fb22661c0d9 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js
@@ -1,3 +1,6 @@
 export function getBatteryInfo(options) {
     return swan.getBatteryInfo(options)
 }
+export function getBatteryInfoSync(options) {
+    return swan.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
index 06287bc468d46e1c12f79e455a934fcbea7c52c5..6eabfcff9737dcd28de56bdb67dbb9c96287dcb8 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js
@@ -1,3 +1,6 @@
 export function getBatteryInfo(options) {
     return qq.getBatteryInfo(options)
 }
+export function getBatteryInfoSync(options) {
+    return qq.getBatteryInfoSync(options)
+}
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js b/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
index 5124b3de21a08a351d2d7eb631aaf96a600aa147..3bdfa9184b26d8df7a53aa9eb61c1ef37d66a8a9 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
+++ b/uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js
@@ -1,3 +1,6 @@
 export function getBatteryInfo(options) {
     return wx.getBatteryInfo(options)
 }
+export function getBatteryInfoSync(options) {
+    return wx.getBatteryInfoSync(options)
+}