Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop

@@ -35,6 +35,11 @@
     .demo-page .sort span {
     .demo-page .sort span {
         font-size: 20px;
         font-size: 20px;
     }
     }
+
+    .your-div {
+        width: 500px;
+        height: 200px;
+    }
 </style>
 </style>
 <div class="demo-page blk-page">
 <div class="demo-page blk-page">
     {{# content}}
     {{# content}}
@@ -178,6 +183,27 @@
         <p class="title">17. 分享</p>
         <p class="title">17. 分享</p>
         {{> share}}
         {{> share}}
 
 
+
+        <p class="title">18. 个性化滚动条</p>
+
+        <div class="your-div nano">
+            <div class="nano-content">
+                <pre>
+                // html 添加样式 .nano   .nano-content
+                &lt;div class="your-div nano">
+                    &lt;div class="nano-content">
+                        your content...
+                    &lt;/div>
+                &lt;/div>
+
+
+                // js
+
+                    require('yoho-jquery-nanoscroller');
+                    $('.nano').nanoScroller();
+                </pre>
+            </div>
+        </div>
         {{/ content}}
         {{/ content}}
     </div>
     </div>
 
 

@@ -13,9 +13,12 @@ var change = $('#change');
 var show = false;
 var show = false;
 
 
 require('yoho-jquery-qrcode');
 require('yoho-jquery-qrcode');
+require('yoho-jquery-nanoscroller');
 require('../plugins/tips');
 require('../plugins/tips');
 require('../plugins/check');
 require('../plugins/check');
 
 
+$('.nano').nanoScroller();
+
 $('.alert-btn').click(function() {
 $('.alert-btn').click(function() {
     new _alert('购买成功<br>进入 个人中心>我的订单<br>查看门票信息').show();
     new _alert('购买成功<br>进入 个人中心>我的订单<br>查看门票信息').show();
 });
 });
@@ -92,7 +95,7 @@ $(function() {
     // 运行此demo
     // 运行此demo
     // 1. 安装 npm i -g json-server
     // 1. 安装 npm i -g json-server
     // 2. json-server --watch mock/address.json
     // 2. json-server --watch mock/address.json
-    cascadingAddress({
+    window.add = cascadingAddress({
         el: '#address',
         el: '#address',
         url: 'http://localhost:3000/areas/0',
         url: 'http://localhost:3000/areas/0',
         resource: 'areas'
         resource: 'areas'

@@ -34,4 +34,8 @@
             dist: '320102'  // 区县
             dist: '320102'  // 区县
         });
         });
 
 
+    重置地址:
+
+        address.reset();
+
     开发者: 董金虎
     开发者: 董金虎

@@ -439,6 +439,19 @@ CascadingAddress.prototype.setAddress = function(targetAddr) {
     }
     }
 };
 };
 
 
+// 重置地址
+CascadingAddress.prototype.reset = function() {
+    var items = $(this.config.el).find('.items-indicator'),
+        labels = this.config.indicators;
+
+    items.each(function(index, item) {
+        $(item).find('span.indicator-name').text(labels[index])
+               .next().val('')
+               .parent().next()
+               .find('span.checked').removeClass('checked').prev().hide();
+    });
+};
+
 module.exports = function(options) {
 module.exports = function(options) {
     return new CascadingAddress(options);
     return new CascadingAddress(options);
 };
 };

@@ -2,6 +2,10 @@
 
 
     font-size: 14px;
     font-size: 14px;
 
 
+    .btn {
+        cursor: pointer;
+    }
+
     .center-content {
     .center-content {
         .left {
         .left {
             width: 250px;
             width: 250px;
@@ -12,6 +16,7 @@
     }
     }
     .input-radio {
     .input-radio {
         padding: 10px 1px;
         padding: 10px 1px;
+        cursor: pointer;
 
 
         .round-color {
         .round-color {
             width: 22px;
             width: 22px;
@@ -79,6 +84,7 @@
             padding: 5px 0;
             padding: 5px 0;
             margin: 5px 11px 5px 0;
             margin: 5px 11px 5px 0;
             display: inline-block;
             display: inline-block;
+            cursor: pointer;
         }
         }
 
 
         .select {
         .select {
@@ -88,6 +94,7 @@
         .mulit-choose {
         .mulit-choose {
             border: 1px solid #1b1b1b;
             border: 1px solid #1b1b1b;
             padding: 5px 10px;
             padding: 5px 10px;
+            cursor: pointer;
         }
         }
     }
     }
     .brand-btns {
     .brand-btns {
@@ -188,6 +195,7 @@
             float: right;
             float: right;
             color: #878787;
             color: #878787;
             margin: 22px 20px 0 0;
             margin: 22px 20px 0 0;
+            cursor: pointer;
         }
         }
 
 
         .filter-item {
         .filter-item {
@@ -197,6 +205,7 @@
             border: 1px solid #adacad;
             border: 1px solid #adacad;
             background-color: #fff;
             background-color: #fff;
             padding: 8px;
             padding: 8px;
+            cursor: pointer;
 
 
             span {
             span {
                 font-size: 14px;
                 font-size: 14px;
@@ -241,6 +250,7 @@
             margin: 14px 15px;
             margin: 14px 15px;
             height: 24px;
             height: 24px;
             line-height: 24px;
             line-height: 24px;
+            cursor: pointer;
         }
         }
 
 
         .dest {
         .dest {
@@ -252,6 +262,7 @@
             margin: 14px 15px;
             margin: 14px 15px;
             margin-left: -10px;
             margin-left: -10px;
             margin-bottom: -10px;
             margin-bottom: -10px;
+            cursor: pointer;
 
 
             .iconfont {
             .iconfont {
                 display: block;
                 display: block;
@@ -304,6 +315,7 @@
                 font-size: 14px;
                 font-size: 14px;
                 text-align: center;
                 text-align: center;
                 margin-right: 8px;
                 margin-right: 8px;
+                cursor: pointer;
             }
             }
 
 
             .page.disable {
             .page.disable {
@@ -324,6 +336,7 @@
             display: inline-block;
             display: inline-block;
             text-align: center;
             text-align: center;
             border: 2px solid #fff;
             border: 2px solid #fff;
+            cursor: pointer;
 
 
             .goods-brand {
             .goods-brand {
                 font-weight: 700;
                 font-weight: 700;
@@ -390,6 +403,7 @@
 
 
                 img {
                 img {
                     margin: 8px 0;
                     margin: 8px 0;
+                    cursor: pointer;
                 }
                 }
             }
             }
         }
         }