From 694ff257afd26a39f4007ff5ec6fa825d2df6532 Mon Sep 17 00:00:00 2001 From: rex-zsd Date: Wed, 17 Oct 2018 16:53:06 +0800 Subject: [PATCH] [build] 0.4.1 --- dist/card/index.wxss | 2 +- dist/cell/index.wxml | 4 +++- dist/cell/index.wxss | 2 +- dist/dialog/dialog.js | 6 ++++++ dist/dialog/index.js | 17 +++++++++-------- dist/submit-bar/index.wxml | 10 +++++----- dist/submit-bar/index.wxss | 2 +- dist/tabs/index.wxml | 3 ++- 8 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dist/card/index.wxss b/dist/card/index.wxss index 265036e5..52e42213 100644 --- a/dist/card/index.wxss +++ b/dist/card/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-card{box-sizing:border-box;position:relative;height:100px;padding:5px 15px 5px 115px;background:#fafafa;color:#333;font-size:12px}.van-card--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:absolute;top:5px;left:15px;width:90px;height:90px}.van-card__img{width:100%;height:100%}.van-card,.van-card__content{display:-webkit-flex;display:flex}.van-card__content{width:100%}.van-card__desc,.van-card__title{line-height:20px;word-break:break-all}.van-card__title{max-height:40px}.van-card__desc{max-height:20px;color:#666}.van-card__left{-webkit-flex:1;flex:1}.van-card__right{-webkit-flex:none;flex:none;padding-left:10px;line-height:20px;text-align:right}.van-card__origin-price{color:#666;text-decoration:line-through}.van-card__num{color:#666}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{position:absolute;right:15px;bottom:5px}.van-card__footer .van-button{margin-left:5px} \ No newline at end of file +@import '../common/index.wxss';.van-card{box-sizing:border-box;position:relative;height:100px;padding:5px 15px 5px 115px;background:#fafafa;color:#333;font-size:12px}.van-card--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:absolute;top:5px;left:15px;width:90px;height:90px}.van-card__img{width:100%;height:100%}.van-card,.van-card__content{display:-webkit-flex;display:flex}.van-card__content{width:100%}.van-card__desc,.van-card__title{line-height:20px;word-break:break-all}.van-card__title{max-height:40px}.van-card__desc{max-height:20px;color:#666}.van-card__left{-webkit-flex:1;flex:1;min-width:0}.van-card__right{-webkit-flex:none;flex:none;padding-left:10px;line-height:20px;text-align:right}.van-card__origin-price{color:#666;text-decoration:line-through}.van-card__num{color:#666}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{position:absolute;right:15px;bottom:5px}.van-card__footer .van-button{margin-left:5px} \ No newline at end of file diff --git a/dist/cell/index.wxml b/dist/cell/index.wxml index 4d8bc746..1350ad53 100644 --- a/dist/cell/index.wxml +++ b/dist/cell/index.wxml @@ -1,11 +1,12 @@ @@ -29,6 +30,7 @@ diff --git a/dist/cell/index.wxss b/dist/cell/index.wxss index 91f6ac0b..9078e7a8 100644 --- a/dist/cell/index.wxss +++ b/dist/cell/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-cell{width:100%;display:-webkit-flex;display:flex;padding:10px 15px;box-sizing:border-box;line-height:24px;position:relative;background-color:#fff;color:#333;font-size:14px}.van-cell::after{content:' ';position:absolute;pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;top:auto;left:15px;right:0;bottom:0;-webkit-transform:scaleY(.5);transform:scaleY(.5);border-bottom:1px solid #eee}.van-cell--borderless::after{display:none}.van-cell-group{background-color:#fff}.van-cell__label{font-size:12px;line-height:1.2;color:#666}.van-cell__title,.van-cell__value{-webkit-flex:1;flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle}.van-cell__left-icon{font-size:16px!important;line-height:24px;margin-right:5px;vertical-align:middle}.van-cell__right-icon{color:#999;font-size:12px!important;line-height:24px;margin-left:5px}.van-cell--clickable:active{background-color:#e8e8e8}.van-cell--required{overflow:visible}.van-cell--required::before{content:'*';position:absolute;left:7px;font-size:14px;color:#f44}.van-cell--center{-webkit-align-items:center;align-items:center} \ No newline at end of file +@import '../common/index.wxss';.van-cell{width:100%;display:-webkit-flex;display:flex;padding:10px 15px;box-sizing:border-box;line-height:24px;position:relative;background-color:#fff;color:#333;font-size:14px}.van-cell::after{content:' ';position:absolute;pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;top:auto;left:15px;right:0;bottom:0;-webkit-transform:scaleY(.5);transform:scaleY(.5);border-bottom:1px solid #eee}.van-cell--borderless::after{display:none}.van-cell-group{background-color:#fff}.van-cell__label{font-size:12px;line-height:1.2;color:#666}.van-cell__title,.van-cell__value{-webkit-flex:1;flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle}.van-cell__left-icon-wrap,.van-cell__right-icon-wrap{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:24px}.van-cell__left-icon{font-size:16px!important;line-height:24px;margin-right:5px;vertical-align:middle}.van-cell__right-icon{color:#999;font-size:12px!important;line-height:24px;margin-left:5px}.van-cell--clickable:active{background-color:#e8e8e8}.van-cell--required{overflow:visible}.van-cell--required::before{content:'*';position:absolute;left:7px;font-size:14px;color:#f44}.van-cell--center{-webkit-align-items:center;align-items:center} \ No newline at end of file diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js index 4661923b..8801d1da 100644 --- a/dist/dialog/dialog.js +++ b/dist/dialog/dialog.js @@ -52,6 +52,12 @@ Dialog.close = function () { queue = []; }; +Dialog.stopLoading = function () { + queue.forEach(function (dialog) { + dialog.stopLoading(); + }); +}; + Dialog.setDefaultOptions = function (options) { Object.assign(Dialog.currentOptions, options); }; diff --git a/dist/dialog/index.js b/dist/dialog/index.js index 937a2aee..ff4eef8f 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -40,14 +40,7 @@ VantComponent({ }, watch: { show: function show(_show) { - if (!_show) { - this.setData({ - loading: { - confirm: false, - cancel: false - } - }); - } + !_show && this.stopLoading(); } }, methods: { @@ -74,6 +67,14 @@ VantComponent({ show: false }); }, + stopLoading: function stopLoading() { + this.setData({ + loading: { + confirm: false, + cancel: false + } + }); + }, onClose: function onClose(action) { if (!this.data.asyncClose) { this.close(); diff --git a/dist/submit-bar/index.wxml b/dist/submit-bar/index.wxml index 134f51fc..4eca8193 100644 --- a/dist/submit-bar/index.wxml +++ b/dist/submit-bar/index.wxml @@ -14,14 +14,14 @@ {{ loading ? '' : buttonText }} diff --git a/dist/submit-bar/index.wxss b/dist/submit-bar/index.wxss index 83bb0e26..b7353613 100644 --- a/dist/submit-bar/index.wxss +++ b/dist/submit-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;color:#f56723;font-size:12px;line-height:18px;background-color:#fff7cc}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{padding-right:12px;color:#f44}.van-submit-bar__button button{width:110px}.van-submit-bar__button--disabled button{border:none!important} \ No newline at end of file +@import '../common/index.wxss';.van-submit-bar{z-index:100;position:fixed;bottom:0;left:0;width:100%;-webkit-user-select:none;user-select:none}.van-submit-bar__tip{padding:10px;color:#f56723;font-size:12px;line-height:18px;background-color:#fff7cc}.van-submit-bar__bar{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;height:50px;background-color:#fff;font-size:14px}.van-submit-bar__text{-webkit-flex:1;flex:1;color:#333;font-weight:500;text-align:right}.van-submit-bar__price{padding-right:12px;color:#f44}.van-submit-bar__button button{width:110px} \ No newline at end of file diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml index 2138fef7..2213dd58 100644 --- a/dist/tabs/index.wxml +++ b/dist/tabs/index.wxml @@ -5,8 +5,9 @@ scroll-with-animation scroll-left="{{ scrollLeft }}" class="van-tabs__scroll--{{ type }}" + style="{{ color ? 'border-color: ' + color : '' }}" > - +