From 190bffa1144a77d3f03517b7d63fa9cfe08ab377 Mon Sep 17 00:00:00 2001 From: koppthe Date: Fri, 27 Jul 2018 14:32:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(doc):=20=E9=87=8D=E6=9E=84=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E7=BB=84=E4=BB=B6=E5=B1=95=E7=A4=BA=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/basic/button/index.js | 199 ++++++++++++++++++------------ src/pages/basic/button/index.scss | 6 +- src/pages/basic/icon/index.js | 23 +++- src/pages/basic/icon/index.scss | 6 +- 4 files changed, 137 insertions(+), 97 deletions(-) diff --git a/src/pages/basic/button/index.js b/src/pages/basic/button/index.js index 8da5d233b..a67a67b3f 100644 --- a/src/pages/basic/button/index.js +++ b/src/pages/basic/button/index.js @@ -22,96 +22,131 @@ export default class ButtonPage extends Taro.Component { } render () { - // let {icons} = this.state return ( - - 页面主操作 + {/* S Header */} + + 按钮 - - 带loading - - - 带icon - - - 点击态 - - - 不可操作 - - + {/* E Header */} - - 页面次操作 - - - 带icon - - - 点击态 - - - 不可操作 - - - - 页面次要操作 - - - 带icon - - - 点击态 - - - 不可操作 - + {/* S Body */} + + {/* 主操作 */} + + 主操作 + + + 页面主操作 + + + 带loading + + + 带icon + + + 点击态 + + + 不可操作 + + + - - 按钮 - 按钮 - 按钮 - - - - - - - - 按钮 - 按钮 - 按钮 - - - 按钮 - 按钮 - 按钮 - + {/* 次操作 */} + + 主操作 + + + 页面次操作 + + + 带icon + + + 点击态 + + + 不可操作 + + + - {/* 带圆角 */} - - 按钮 - 按钮 - 按钮 - - - - - - - - 按钮 - 按钮 - 按钮 - - - 按钮 - 按钮 - 按钮 - + {/* 线框按钮 */} + + 线框按钮 + + + 页面次要操作 + + + 带icon + + + 点击态 + + + 不可操作 + + + + {/* 小按钮 */} + + 小按钮 + + + 按钮 + 按钮 + 按钮 + + + + + + + + 按钮 + 按钮 + 按钮 + + + 按钮 + 按钮 + 按钮 + + + + {/* 圆角按钮 */} + + 圆角按钮 + + + 按钮 + 按钮 + 按钮 + + + + + + + + 按钮 + 按钮 + 按钮 + + + 按钮 + 按钮 + 按钮 + + + + + {/* E Body */} ) } diff --git a/src/pages/basic/button/index.scss b/src/pages/basic/button/index.scss index 0d54ab3d2..846b052ac 100644 --- a/src/pages/basic/button/index.scss +++ b/src/pages/basic/button/index.scss @@ -1,8 +1,4 @@ - - -.page { - background-color: #fff; -} +@import '../../../assets/style/common.scss'; .example { margin-bottom: 15px; diff --git a/src/pages/basic/icon/index.js b/src/pages/basic/icon/index.js index 3727934d8..fc3209968 100644 --- a/src/pages/basic/icon/index.js +++ b/src/pages/basic/icon/index.js @@ -24,12 +24,25 @@ export default class IconPage extends Taro.Component { const { icons } = this.state return ( - - {icons.map((icon, index) => ( - - - ))} + {/* S Header */} + + 图标 + + {/* E Header */} + {/* S Body */} + + + ICON + + + {icons.map((icon, index) => ( + + + ))} + + + ) diff --git a/src/pages/basic/icon/index.scss b/src/pages/basic/icon/index.scss index 908d47a51..8442dd2e5 100644 --- a/src/pages/basic/icon/index.scss +++ b/src/pages/basic/icon/index.scss @@ -1,8 +1,4 @@ - - -.page { - background-color: #fff; -} +@import '../../../assets/style/common.scss'; .at-icon { margin: 0 10px;