diff --git a/App.vue b/App.vue
index c58a0855bfb980f1adfbb45559b8bf8d88c5442f..fc8f1f3b3b4724c1448ab6738d811e4e7bb77bba 100644
--- a/App.vue
+++ b/App.vue
@@ -1,19 +1,24 @@
+ /*每个页面公共css */
+ @import './common/uni.css';
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 8674b8a4f93c365cc594231e664e678277a830aa..c9e13511eadb9f24433118cd679059b99f452f28 100644
--- a/pages.json
+++ b/pages.json
@@ -36,7 +36,6 @@
"navigationBarTitleText": "button"
}
},
-
{
"path": "pages/component/radio/radio",
"style": {
@@ -61,6 +60,18 @@
"navigationBarTitleText": "textarea"
}
},
+ {
+ "path": "pages/component/slider/slider",
+ "style": {
+ "navigationBarTitleText": "slider"
+ }
+ },
+ {
+ "path": "pages/component/switch/switch",
+ "style": {
+ "navigationBarTitleText": "switch"
+ }
+ },
{
"path": "pages/component/image/image",
"style": {
diff --git a/pages/component/slider/slider.uvue b/pages/component/slider/slider.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..a988a9e5a48799ad46f7c37e419bbc01c89f608e
--- /dev/null
+++ b/pages/component/slider/slider.uvue
@@ -0,0 +1,43 @@
+
+
+
+ 显示当前value
+
+
+
+
+ 设置步进step跳动
+
+
+
+
+ 设置最小/最大值
+
+
+
+
+ 不同颜色和大小的滑块
+
+
+
+
+
+
+
+
+
diff --git a/pages/component/switch/switch.uvue b/pages/component/switch/switch.uvue
new file mode 100644
index 0000000000000000000000000000000000000000..33d29b4676cbd0780c2d3eefe8bae32102b6fb95
--- /dev/null
+++ b/pages/component/switch/switch.uvue
@@ -0,0 +1,51 @@
+
+
+
+ 默认样式
+
+
+
+
+ 不同颜色和尺寸的switch
+
+
+
+
+ 推荐展示样式
+
+
+
+ 开启中
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabBar/component/component.uvue b/pages/tabBar/component/component.uvue
index a36099691a3c0cd774f31272aa5ca4ed2fe0600b..b6589d59854e115bccfb25aeca25da159c723cf0 100644
--- a/pages/tabBar/component/component.uvue
+++ b/pages/tabBar/component/component.uvue
@@ -122,10 +122,10 @@
enable: true
}, {
name: 'slider',
- enable: false
+ enable: true
}, {
name: 'switch',
- enable: false
+ enable: true
}, {
name: 'textarea',
enable: true