浏览代码

Merge branch 'dev' of https://github.com/jdf2e/nutui into dev

unknown 7 年之前
父节点
当前提交
02b278f818
共有 2 个文件被更改,包括 23 次插入11 次删除
  1. 21 9
      src/demo/select.vue
  2. 2 2
      src/package/select/src/dateSwiper.vue

+ 21 - 9
src/demo/select.vue

@@ -44,15 +44,27 @@ export default {
         return{
           demo1: {
             data: [
-              {"n": "北京", "s": [{"n": "海淀区"},{"n": "通州区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "河北省", "s": [{"n": "石家庄市", "s": [{"n": "城东区"},{"n": "城西区"}]},{"n":"秦皇岛市"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]},
-              {"n": "上海", "s": [{"n": "浦东新区"},{"n": "其他区"}]}
+              {
+                "n": "北京", 
+                "s": [
+                  {"n": "海淀区","s": [{"n": "城东区"},{"n": "城西区"}]},
+                  {"n": "通州区","s": [{"n": "通州东区"},{"n": "通州西区"}]}
+                ]
+              },                
+              {
+                "n": "上海", 
+                "s": [
+                  {"n": "浦东新区", "s": [{"n": "浦东东区"},{"n": "浦东西区"}]},
+                  {"n": "陆家嘴区","s": [{"n": "陆家嘴东区"},{"n": "陆家嘴西区"}]}
+                ]
+              },
+              {
+                "n": "河北省", 
+                "s": [
+                  {"n": "石家庄市", "s": [{"n": "城东区"},{"n": "城西区"}]},
+                  {"n":"秦皇岛市", "s": [{"n": "海港区"},{"n": "山海关区"}]}
+                ]
+              }
             ],
             selected: '河北省-石家庄市-城东区',
             txt: `<nut-select class="demo1-select" 

+ 2 - 2
src/package/select/src/dateSwiper.vue

@@ -106,7 +106,7 @@
             font-size: 0.28rem!important;
             width: 100%;
             height: 2.5rem!important;
-            padding-top: 1.4rem!important;
+            padding-top: 1.40rem!important;
         }
         .nut-swiper-silde-selected {
             color: #333!important;
@@ -133,7 +133,7 @@
     }
     .selected-bg {
         position: absolute;
-        margin-top: 1.4rem;
+        margin-top: 1.39rem;
         height: 0.7rem;
         width: 100%;
         border-top: 0.01rem solid #f0f0f0;