Merge branch 'dev'

CHANGELOG.en-US.md

@@ -15,7 +15,7 @@ toc: hidden
 
 `2019-03-08`
 
--Feature
+- Feature
   - Optimize `Swiper` gestures
 
 - Fix

CHANGELOG.md

@@ -15,7 +15,7 @@ toc: hidden
 
 `2019-03-08`
 
--Feature
+- Feature
   - 优化`Swiper`滚动边界
 
 - Fix

components/cashier/channel-item.vue

@@ -69,13 +69,14 @@ export default {
   position relative
   padding 20px 40px 20px 0
   box-sizing border-box
-  display flex
-  align-items center
+  // display flex
+  // align-items center
   .item-icon, .item-image
     position relative
     float left
     width 32px
     height 32px
+    margin 6px 0
   .item-image img
     block() 
   .item-label

components/dialog/README.en-US.md

@@ -67,6 +67,7 @@ Dynamically create a confirmation dialog
 | cancelWarning | clicking the Cancel button is a warning action | Boolean | `false` |
 | confirmWarning | clicking the Confirm button is a warning action | Boolean | `false` |
 | onConfirm | callback function is invoked when clicking confirmation button | Function | -|
+| onCancel | callback function is invoked when clicking cancellation button | Function | -|
 
 ##### Dialog.alert(props)
 Dynamically create an alert dialog
@@ -89,6 +90,7 @@ Dynamically create a success dialog
 | content | content of dialog | String | -|
 | confirmText | confirmation button | String | `Confirm` |
 | onConfirm | callback function is invoked when clicking confirmation button| Function | -|
+| onCancel | callback function is invoked when clicking cancellation button | Function | -|
 
 ##### Dialog.failed(props)
 Dynamically create a fail dialog
@@ -99,6 +101,7 @@ Dynamically create a fail dialog
 | content | content of dialog | String | -|
 | confirmText | confirmation button | String | `Confirm` |
 | onConfirm | callback function is invoked when clicking confirmation button| Function | -|
+| onCancel | callback function is invoked when clicking cancellation button | Function | -|
 
 ##### Dialog.closeAll()
 Close all global dialogs

components/dialog/README.md

@@ -66,6 +66,7 @@ this.$dialog.alert({ content: '' }) // 全量引入
 | cancelWarning | 点击取消按钮为警示操作 | Boolean | `false` |
 | confirmWarning | 点击确认按钮为警示操作 | Boolean | `false` |
 | onConfirm | 点击确认按钮回调函数 | Function | -|
+| onCancel | 点击取消按钮回调函数 | Function | -|
 
 ##### Dialog.alert(props)
 静态方法创建警告模态窗口, 返回Dialog实例
@@ -88,6 +89,7 @@ this.$dialog.alert({ content: '' }) // 全量引入
 | content | 正文内容 | String | -|
 | confirmText | 底部确认按钮文字 | String | `确认`|
 | onConfirm | 点击确认按钮回调函数 | Function | -|
+| onCancel | 点击取消按钮回调函数 | Function | -|
 
 ##### Dialog.failed(props)
 静态方法创建失败确认模态窗口, 返回Dialog实例
@@ -98,6 +100,7 @@ this.$dialog.alert({ content: '' }) // 全量引入
 | content | 正文内容 | String | -|
 | confirmText | 底部确认按钮文字 | String | `确认`|
 | onConfirm | 点击确认按钮回调函数 | Function | -|
+| onCancel | 点击取消按钮回调函数 | Function | -|
 
 ##### Dialog.closeAll()
 静态方法关闭所有动态创建的全局Dialog

components/scroll-view/README.en-US.md

@@ -33,8 +33,8 @@ Vue.component(ScrollView.name, ScrollView)
 |auto-reflow| automatically reset scroller size when content changes | Boolean | `false` | manually call `reflowScroller` when set to `false` |
 |manual-init | manual initialization | Boolean | `false` | generally used for asynchronous initialization scenarios, you need to manually call the `init` method to complete the initialization |
 |end-reached-threshold | threshold for emitting `endReached`. | Number | 0 | unit `px` |
-|immediate-check-end-reaching | check if it reaches the bottom at initialization | Boolean | `false` | - |
-|touch-angle | angle value range that triggers scrolling | Number | 45 | unit `deg` |
+|immediate-check-end-reaching <sup class="version-after">2.1.0+</sup>| check if it reaches the bottom at initialization | Boolean | `false` | - |
+|touch-angle <sup class="version-after">2.1.0+</sup>| angle value range that triggers scrolling | Number | 45 | unit `deg` |
 
 #### ScrollViewRefresh Props
 |Props | Description | Type | Default | Note |

components/scroll-view/README.md

@@ -33,8 +33,8 @@ Vue.component(ScrollView.name, ScrollView)
 |auto-reflow | 内容发生变化时自动重置滚动区域尺寸 | Boolean | `false` | 当设置为`false`时，内容发生变化需手动调用`reflowScroller` |
 |manual-init | 手动初始化 | Boolean | `false` | 一般用于异步初始化的场景，需手动调用`init`方法完成初始化 |
 |end-reached-threshold | 触发到达底部的提前量 | Number | 0 | 单位`px` |
-|immediate-check-end-reaching | 初始化时立即触发是否到达底部检查 | Boolean | `false` | - |
-|touch-angle | 触发滚动的角度范围 | Number | 45 | 单位`deg` |
+|immediate-check-end-reaching <sup class="version-after">2.1.0+</sup>| 初始化时立即触发是否到达底部检查 | Boolean | `false` | - |
+|touch-angle <sup class="version-after">2.1.0+</sup>| 触发滚动的角度范围 | Number | 45 | 单位`deg` |
 
 #### ScrollViewRefresh Props
 |属性 | 说明 | 类型 | 默认值 | 备注|

site/docs/development.en-US.md

@@ -3,9 +3,9 @@ title: Development Guide
 ---
 
 ### Environment
-node = 6+
 
-npm = 3+
+* node = 8+
+* npm = 3+
 
 ### Development Process
 

site/docs/development.md

@@ -4,7 +4,7 @@ title: 开发指南
 
 ### 环境
 
-* node = 6+
+* node = 8+
 * npm = 3+
 
 ### 开发流程

site/docs/started.en-US.md

@@ -31,9 +31,7 @@ vue invoke mand
 
 ```shell
 npm install mand-mobile --save
-
-# or 
-
+# OR 
 yarn add mand-mobile
 ```
 

site/docs/started.md

@@ -31,9 +31,7 @@ vue invoke mand
 
 ```shell
 npm install mand-mobile --save
-
-# or 
-
+# OR 
 yarn add mand-mobile
 ```
 

site/theme/default/assets/css/hightlight.css

@@ -1,17 +1,52 @@
-.hljs{display:block;overflow-x:auto;padding:.5em;background:#f8f8f8;color:#333}
-.hljs-comment,.hljs-quote{color:#999;font-style:italic}
-.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#333;font-weight:500}
-.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}
-.hljs-doctag,.hljs-string{color:#2F86F6}
-.hljs-section,.hljs-selector-id,.hljs-title{color:#900;font-weight:500}
-.hljs-subst{font-weight:400}
-.hljs-class .hljs-title,.hljs-type{color:#458;font-weight:500}
-.hljs-attribute,.hljs-name,.hljs-tag{color:#525252;font-weight:400}
-.hljs-link,.hljs-regexp{color:#009926}
-.hljs-bullet,.hljs-symbol{color:#990073}
-.hljs-built_in,.hljs-builtin-name{color:#0086b3}
-.hljs-meta{color:#999;font-weight:500}
-.hljs-deletion{background:#fdd}
-.hljs-addition{background:#dfd}
-.hljs-emphasis{font-style:italic}
-.hljs-strong{font-weight:500}
+.hljs {
+	display: block;
+	overflow-x: auto;
+	padding: .5em;
+	color: #383a42;
+	background: #fafafa
+}
+
+.hljs-comment,.hljs-quote {
+	color: #a0a1a7;
+	font-style: italic
+}
+
+.hljs-doctag,.hljs-keyword,.hljs-formula {
+	color: #a626a4
+}
+
+.hljs-section,.hljs-name,.hljs-selector-tag,.hljs-deletion,.hljs-subst {
+	color: #e45649
+}
+
+.hljs-literal {
+	color: #0184bb
+}
+
+.hljs-string,.hljs-regexp,.hljs-addition,.hljs-attribute,.hljs-meta-string {
+	color: #2f86f6
+}
+
+.hljs-built_in,.hljs-class .hljs-title {
+	color: #c18401
+}
+
+.hljs-attr,.hljs-variable,.hljs-template-variable,.hljs-type,.hljs-selector-class,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-number {
+	color: #986801
+}
+
+.hljs-symbol,.hljs-bullet,.hljs-link,.hljs-meta,.hljs-selector-id,.hljs-title {
+	color: #4078f2
+}
+
+.hljs-emphasis {
+	font-style: italic
+}
+
+.hljs-strong {
+	font-weight: bold
+}
+
+.hljs-link {
+	text-decoration: underline
+}

site/theme/default/assets/css/markdown.styl

@@ -135,12 +135,12 @@
   code:after{
     content: '';
     position: absolute;
-    top: -2px;
-    left: 0px;
-    color: #ddd;
-    font-size: 20px;
+    top: 5px;
+    right: 5px;
+    color: #ccc;
+    font-size: 12px;
     font-weight: 600;
-    opacity: .3;
+    // opacity: .3;
   }
   code.lang-vue:after{
     content: 'Vue';

site/theme/default/components/Doc.vue

@@ -559,8 +559,12 @@ export default {
     border-top dashed 1px #ebebeb
     pre
       margin-bottom 0
+      padding-bottom 0
       background #fff
       transition all .3s
+      code:after
+        left 5px
+        right auto !important
   .doc-demo-box-toggle
     // display none
     position absolute