Commit a206e8de authored by hbcui1984's avatar hbcui1984

降低右滑关闭灵敏度,增加上拉加载没有更多数据提示语配置;

parent b22cd0ff
...@@ -1330,8 +1330,11 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -1330,8 +1330,11 @@ input[type="submit"]:active, input[type="submit"].mui-active,
margin-top: 15px; margin-top: 15px;
} }
.mui-card .mui-input-group { .mui-card .mui-input-group:before, .mui-card .mui-input-group:after {
background: none; height: 0;
}
.mui-card .mui-input-group .mui-input-row:last-child:before, .mui-card .mui-input-group .mui-input-row:last-child:after {
height: 0;
} }
.mui-card .mui-table-view { .mui-card .mui-table-view {
...@@ -1349,20 +1352,12 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -1349,20 +1352,12 @@ input[type="submit"]:active, input[type="submit"].mui-active,
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
} }
.mui-card .mui-table-view:before, .mui-card .mui-table-view:after { .mui-card .mui-table-view:before, .mui-card .mui-table-view:after {
height: 0; height: 0;
} }
.mui-card > .mui-table-view { .mui-card > .mui-table-view > .mui-table-view-cell:last-child:before, .mui-card > .mui-table-view > .mui-table-view-cell:last-child:after {
background-image: none; height: 0;
}
.mui-card > .mui-table-view > .mui-table-view-cell:last-child {
background-image: none;
}
.mui-card .mui-input-group .mui-input-row:last-child {
background-image: none;
} }
.mui-table-view { .mui-table-view {
...@@ -1532,6 +1527,7 @@ input[type="submit"]:active, input[type="submit"].mui-active, ...@@ -1532,6 +1527,7 @@ input[type="submit"]:active, input[type="submit"].mui-active,
} }
.mui-table-view-divider { .mui-table-view-divider {
position: relative;
padding-top: 6px; padding-top: 6px;
padding-bottom: 6px; padding-bottom: 6px;
padding-left: 15px; padding-left: 15px;
...@@ -2889,10 +2885,10 @@ select:focus { ...@@ -2889,10 +2885,10 @@ select:focus {
height: 40px; height: 40px;
} }
.mui-pull-bottom-pocket .mui-pull-loading { .mui-pull-bottom-pocket .mui-pull-loading {
opacity: 0; display: none;
} }
.mui-pull-bottom-pocket .mui-pull-loading.mui-in { .mui-pull-bottom-pocket .mui-pull-loading.mui-in {
opacity: 1; display: inline-block;
} }
.mui-pull { .mui-pull {
...@@ -2906,6 +2902,7 @@ select:focus { ...@@ -2906,6 +2902,7 @@ select:focus {
} }
.mui-pull-loading { .mui-pull-loading {
margin-right: 10px;
vertical-align: middle; vertical-align: middle;
-webkit-transition: -webkit-transform .4s; -webkit-transition: -webkit-transform .4s;
transition: transform .4s; transition: transform .4s;
...@@ -2924,7 +2921,6 @@ select:focus { ...@@ -2924,7 +2921,6 @@ select:focus {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin-top: 0; margin-top: 0;
margin-left: 10px;
overflow: visible; overflow: visible;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 24px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1592,7 +1592,7 @@ var mui = (function(document, undefined) { ...@@ -1592,7 +1592,7 @@ var mui = (function(document, undefined) {
}); });
window.addEventListener('swiperight', function(e) { window.addEventListener('swiperight', function(e) {
var detail = e.detail; var detail = e.detail;
if ($.options.swipeBack === true && detail.angle > -10 && detail.angle < 10) { if ($.options.swipeBack === true && Math.abs(detail.angle)< 6) {
$.back(); $.back();
} }
}); });
...@@ -2157,6 +2157,7 @@ var mui = (function(document, undefined) { ...@@ -2157,6 +2157,7 @@ var mui = (function(document, undefined) {
height: 50, height: 50,
contentdown: '上拉显示更多', contentdown: '上拉显示更多',
contentrefresh: '正在加载...', contentrefresh: '正在加载...',
contentnomore: '没有更多数据了',
duration: 300 duration: 300
} }
}, options, true)); }, options, true));
...@@ -3071,12 +3072,13 @@ var mui = (function(document, undefined) { ...@@ -3071,12 +3072,13 @@ var mui = (function(document, undefined) {
var self = this; var self = this;
if (self.bottomPocket) { if (self.bottomPocket) {
self.loading = false; self.loading = false;
self._setCaption(self.options.up.contentdown);
if (finished) { if (finished) {
self.bottomPocket.classList.remove(CLASS_VISIBILITY); self._setCaption(self.options.up.contentnomore);
self.bottomPocket.classList.add(CLASS_HIDDEN); // self.bottomPocket.classList.remove(CLASS_VISIBILITY);
// self.bottomPocket.classList.add(CLASS_HIDDEN);
self.wrapper.removeEventListener('scrollbottom', self); self.wrapper.removeEventListener('scrollbottom', self);
} else { } else {
self._setCaption(self.options.up.contentdown);
setTimeout(function() { setTimeout(function() {
self.loading || self.bottomPocket.classList.remove(CLASS_VISIBILITY); self.loading || self.bottomPocket.classList.remove(CLASS_VISIBILITY);
}, 350); }, 350);
...@@ -3085,11 +3087,12 @@ var mui = (function(document, undefined) { ...@@ -3085,11 +3087,12 @@ var mui = (function(document, undefined) {
}, },
refresh: function(isReset) { refresh: function(isReset) {
if (isReset) { if (isReset) {
var classList = this.bottomPocket.classList; // var classList = this.bottomPocket.classList;
if (classList.contains(CLASS_HIDDEN)) { // if (classList.contains(CLASS_HIDDEN)) {
classList.remove(CLASS_HIDDEN); // classList.remove(CLASS_HIDDEN);
// this._setCaption(self.options.up.contentdown);
this.wrapper.addEventListener('scrollbottom', this); this.wrapper.addEventListener('scrollbottom', this);
} // }
} }
this._super(); this._super();
}, },
...@@ -3542,13 +3545,14 @@ var mui = (function(document, undefined) { ...@@ -3542,13 +3545,14 @@ var mui = (function(document, undefined) {
var self = this; var self = this;
if (self.pullLoading) { if (self.pullLoading) {
self.pullLoading.classList.remove(CLASS_IN); self.pullLoading.classList.remove(CLASS_IN);
self.pullCaption.innerHTML = self.options.up.contentdown;
self.isLoading = false; self.isLoading = false;
if (finished) { if (finished) {
self.bottomPocket.classList.remove(CLASS_BLOCK); self.pullCaption.innerHTML = self.options.up.contentnomore;
self.bottomPocket.classList.add(CLASS_HIDDEN); // self.bottomPocket.classList.remove(CLASS_BLOCK);
// self.bottomPocket.classList.add(CLASS_HIDDEN);
document.removeEventListener('plusscrollbottom', self); document.removeEventListener('plusscrollbottom', self);
} else { //初始化时隐藏,后续不再隐藏 } else { //初始化时隐藏,后续不再隐藏
self.pullCaption.innerHTML = self.options.up.contentdown;
// setTimeout(function() { // setTimeout(function() {
// self.loading || self.bottomPocket.classList.remove(CLASS_BLOCK); // self.loading || self.bottomPocket.classList.remove(CLASS_BLOCK);
// }, 350); // }, 350);
...@@ -3557,11 +3561,11 @@ var mui = (function(document, undefined) { ...@@ -3557,11 +3561,11 @@ var mui = (function(document, undefined) {
}, },
refresh: function(isReset) { refresh: function(isReset) {
if (isReset) { if (isReset) {
var classList = this.bottomPocket.classList; // var classList = this.bottomPocket.classList;
if (classList.contains(CLASS_HIDDEN)) { // if (classList.contains(CLASS_HIDDEN)) {
classList.remove(CLASS_HIDDEN); // classList.remove(CLASS_HIDDEN);
document.addEventListener('plusscrollbottom', this); document.addEventListener('plusscrollbottom', this);
} // }
} }
} }
}, $.PullRefresh)); }, $.PullRefresh));
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment