From a65b037180dc38f25e4a64b5fab754b93ace3672 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 31 May 2018 15:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83tab?= =?UTF-8?q?=E9=A1=B5=E5=9B=BA=E5=AE=9A=E3=80=81=E5=8F=AA=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=88=BF=E6=90=9C=E7=B4=A2=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/sm-tabs.js | 497 ++++++++++++++++++ .../views/intelligentHouse/index.html | 13 +- fangija-zsyf/views/user/userInfo.html | 1 + 3 files changed, 507 insertions(+), 4 deletions(-) create mode 100644 fangija-zsyf/js/sm-tabs.js diff --git a/fangija-zsyf/js/sm-tabs.js b/fangija-zsyf/js/sm-tabs.js new file mode 100644 index 0000000..0ea93c8 --- /dev/null +++ b/fangija-zsyf/js/sm-tabs.js @@ -0,0 +1,497 @@ +/*! + * ===================================================== + * SUI Mobile - http://m.sui.taobao.org/ + * + * ===================================================== + */ + + + +/* =============================================================================== +************ Tabs ************ +=============================================================================== */ ++function ($) { + "use strict"; + + var showTab = function (tab, tabLink, force) { + var newTab = $(tab); + if (arguments.length === 2) { + if (typeof tabLink === 'boolean') { + force = tabLink; + } + } + if (newTab.length === 0) return false; + if (newTab.hasClass('active')) { + if (force) newTab.trigger('show'); + return false; + } + var tabs = newTab.parent('.tabs'); + if (tabs.length === 0) return false; + + // Animated tabs + /*var isAnimatedTabs = tabs.parent().hasClass('tabs-animated-wrap'); + if (isAnimatedTabs) { + tabs.transform('translate3d(' + -newTab.index() * 100 + '%,0,0)'); + }*/ + + // Remove active class from old tabs + var oldTab = tabs.children('.tab.active').removeClass('active'); + // Add active class to new tab + newTab.addClass('active'); + // Trigger 'show' event on new tab + newTab.trigger('show'); + + // Update navbars in new tab + /*if (!isAnimatedTabs && newTab.find('.navbar').length > 0) { + // Find tab's view + var viewContainer; + if (newTab.hasClass(app.params.viewClass)) viewContainer = newTab[0]; + else viewContainer = newTab.parents('.' + app.params.viewClass)[0]; + app.sizeNavbars(viewContainer); + }*/ + + // Find related link for new tab + if (tabLink) tabLink = $(tabLink); + else { + // Search by id + if (typeof tab === 'string') tabLink = $('.tab-link[href="' + tab + '"]'); + else tabLink = $('.tab-link[href="#' + newTab.attr('id') + '"]'); + // Search by data-tab + if (!tabLink || tabLink && tabLink.length === 0) { + $('[data-tab]').each(function () { + if (newTab.is($(this).attr('data-tab'))) tabLink = $(this); + }); + } + } + if (tabLink.length === 0) return; + + // Find related link for old tab + var oldTabLink; + if (oldTab && oldTab.length > 0) { + // Search by id + var oldTabId = oldTab.attr('id'); + if (oldTabId) oldTabLink = $('.tab-link[href="#' + oldTabId + '"]'); + // Search by data-tab + if (!oldTabLink || oldTabLink && oldTabLink.length === 0) { + $('[data-tab]').each(function () { + if (oldTab.is($(this).attr('data-tab'))) oldTabLink = $(this); + }); + } + } + + // Update links' classes + if (tabLink && tabLink.length > 0) tabLink.addClass('active'); + if (oldTabLink && oldTabLink.length > 0) oldTabLink.removeClass('active'); + tabLink.trigger('active'); + + //app.refreshScroller(); + + return true; + }; + + var old = $.showTab; + $.showTab = showTab; + + $.showTab.noConflict = function () { + $.showTab = old; + return this; + }; + //a标签上的click事件,在iscroll下响应有问题 + $(document).on("click", ".tab-link", function(e) { + e.preventDefault(); + var clicked = $(this); + showTab(clicked.data("tab") || clicked.attr('href'), clicked); + }); + + +}(Zepto); + +/* =============================================================================== +************ Tabs ************ +=============================================================================== */ ++function ($) { + "use strict"; + $.initFixedTab = function(){ + var $fixedTab = $('.fixed-tab'); + if ($fixedTab.length === 0) return; + $('.fixed-tab').fixedTab();//默认{offset: 0} + }; + var FixedTab = function(pageContent, _options) { + var $pageContent = this.$pageContent = $(pageContent); + var shadow = $pageContent.clone(); + //var fixedTop = $pageContent[0].getBoundingClientRect().top; + var fixedTop = 298; + alert(fixedTop) + shadow.css('visibility', 'hidden'); + this.options = $.extend({}, this._defaults, { + fixedTop: fixedTop, + shadow: shadow, + offset: 0 + }, _options); + + this._bindEvents(); + }; + + FixedTab.prototype = { + _defaults: { + offset: 0, + }, + _bindEvents: function() { + this.$pageContent.parents('.content').on('scroll', this._scrollHandler.bind(this)); + this.$pageContent.on('active', '.tab-link', this._tabLinkHandler.bind(this)); + }, + _tabLinkHandler: function(ev) { + var isFixed = $(ev.target).parents('.buttons-fixed').length > 0; + var fixedTop = this.options.fixedTop; + var offset = this.options.offset; + $.refreshScroller(); + if (!isFixed) return; + this.$pageContent.parents('.content').scrollTop(fixedTop - offset); + }, + // 滚动核心代码 + _scrollHandler: function(ev) { + var $scroller = $(ev.target); + var $pageContent = this.$pageContent; + var shadow = this.options.shadow; + var offset = this.options.offset; + var fixedTop = this.options.fixedTop; + var scrollTop = $scroller.scrollTop(); + var isFixed = scrollTop >= fixedTop - offset; + if (isFixed) { + shadow.insertAfter($pageContent); + $pageContent.addClass('buttons-fixed').css('top', offset); + } else { + shadow.remove(); + $pageContent.removeClass('buttons-fixed').css('top', 0); + } + } + }; + + //FixedTab PLUGIN DEFINITION + // ======================= + + function Plugin(option) { + var args = Array.apply(null, arguments); + args.shift(); + this.each(function() { + var $this = $(this); + var options = $.extend({}, $this.dataset(), typeof option === 'object' && option); + var data = $this.data('fixedtab'); + if (!data) { + //获取data-api的 + $this.data('fixedtab', (data = new FixedTab(this, options))); + } + }); + + } + $.fn.fixedTab = Plugin; + $.fn.fixedTab.Constructor = FixedTab; + $(document).on('pageInit',function(){ + $.initFixedTab(); + }); + + + +}(Zepto); + ++ function($) { + "use strict"; + //这里实在js滚动时使用的下拉刷新代码。 + + var refreshTime = 0; + var initPullToRefreshJS = function(pageContainer) { + var eventsTarget = $(pageContainer); + if (!eventsTarget.hasClass('pull-to-refresh-content')) { + eventsTarget = eventsTarget.find('.pull-to-refresh-content'); + } + if (!eventsTarget || eventsTarget.length === 0) return; + + var page = eventsTarget.hasClass('content') ? eventsTarget : eventsTarget.parents('.content'); + var scroller = $.getScroller(page[0]); + if(!scroller) return; + + + var container = eventsTarget; + + function handleScroll() { + if (container.hasClass('refreshing')) return; + if (scroller.scrollTop() * -1 >= 44) { + container.removeClass('pull-down').addClass('pull-up'); + } else { + container.removeClass('pull-up').addClass('pull-down'); + } + } + + function handleRefresh() { + if (container.hasClass('refreshing')) return; + container.removeClass('pull-down pull-up'); + container.addClass('refreshing transitioning'); + container.trigger('refresh'); + refreshTime = +new Date(); + } + scroller.on('scroll', handleScroll); + scroller.scroller.on('ptr', handleRefresh); + + // Detach Events on page remove + function destroyPullToRefresh() { + scroller.off('scroll', handleScroll); + scroller.scroller.off('ptr', handleRefresh); + } + eventsTarget[0].destroyPullToRefresh = destroyPullToRefresh; + + }; + + var pullToRefreshDoneJS = function(container) { + container = $(container); + if (container.length === 0) container = $('.pull-to-refresh-content.refreshing'); + if (container.length === 0) return; + var interval = (+new Date()) - refreshTime; + var timeOut = interval > 1000 ? 0 : 1000 - interval; //long than bounce time + var scroller = $.getScroller(container); + setTimeout(function() { + scroller.refresh(); + container.removeClass('refreshing'); + container.transitionEnd(function() { + container.removeClass("transitioning"); + }); + }, timeOut); + }; + var pullToRefreshTriggerJS = function(container) { + container = $(container); + if (container.length === 0) container = $('.pull-to-refresh-content'); + if (container.hasClass('refreshing')) return; + container.addClass('refreshing'); + var scroller = $.getScroller(container); + scroller.scrollTop(44 + 1, 200); + container.trigger('refresh'); + }; + + var destroyPullToRefreshJS = function(pageContainer) { + pageContainer = $(pageContainer); + var pullToRefreshContent = pageContainer.hasClass('pull-to-refresh-content') ? pageContainer : pageContainer.find('.pull-to-refresh-content'); + if (pullToRefreshContent.length === 0) return; + if (pullToRefreshContent[0].destroyPullToRefresh) pullToRefreshContent[0].destroyPullToRefresh(); + }; + + $._pullToRefreshJSScroll = { + "initPullToRefresh": initPullToRefreshJS, + "pullToRefreshDone": pullToRefreshDoneJS, + "pullToRefreshTrigger": pullToRefreshTriggerJS, + "destroyPullToRefresh": destroyPullToRefreshJS, + }; +}(Zepto); // jshint ignore:line + ++ function($) { + 'use strict'; + $.initPullToRefresh = function(pageContainer) { + var eventsTarget = $(pageContainer); + if (!eventsTarget.hasClass('pull-to-refresh-content')) { + eventsTarget = eventsTarget.find('.pull-to-refresh-content'); + } + if (!eventsTarget || eventsTarget.length === 0) return; + + var isTouched, isMoved, touchesStart = {}, + isScrolling, touchesDiff, touchStartTime, container, refresh = false, + useTranslate = false, + startTranslate = 0, + translate, scrollTop, wasScrolled, triggerDistance, dynamicTriggerDistance; + + container = eventsTarget; + + // Define trigger distance + if (container.attr('data-ptr-distance')) { + dynamicTriggerDistance = true; + } else { + triggerDistance = 44; + } + + function handleTouchStart(e) { + if (isTouched) { + if ($.device.android) { + if ('targetTouches' in e && e.targetTouches.length > 1) return; + } else return; + } + isMoved = false; + isTouched = true; + isScrolling = undefined; + wasScrolled = undefined; + touchesStart.x = e.type === 'touchstart' ? e.targetTouches[0].pageX : e.pageX; + touchesStart.y = e.type === 'touchstart' ? e.targetTouches[0].pageY : e.pageY; + touchStartTime = (new Date()).getTime(); + /*jshint validthis:true */ + container = $(this); + } + + function handleTouchMove(e) { + if (!isTouched) return; + var pageX = e.type === 'touchmove' ? e.targetTouches[0].pageX : e.pageX; + var pageY = e.type === 'touchmove' ? e.targetTouches[0].pageY : e.pageY; + if (typeof isScrolling === 'undefined') { + isScrolling = !!(isScrolling || Math.abs(pageY - touchesStart.y) > Math.abs(pageX - touchesStart.x)); + } + if (!isScrolling) { + isTouched = false; + return; + } + + scrollTop = container[0].scrollTop; + if (typeof wasScrolled === 'undefined' && scrollTop !== 0) wasScrolled = true; + + if (!isMoved) { + /*jshint validthis:true */ + container.removeClass('transitioning'); + if (scrollTop > container[0].offsetHeight) { + isTouched = false; + return; + } + if (dynamicTriggerDistance) { + triggerDistance = container.attr('data-ptr-distance'); + if (triggerDistance.indexOf('%') >= 0) triggerDistance = container[0].offsetHeight * parseInt(triggerDistance, 10) / 100; + } + startTranslate = container.hasClass('refreshing') ? triggerDistance : 0; + if (container[0].scrollHeight === container[0].offsetHeight || !$.device.ios) { + useTranslate = true; + } else { + useTranslate = false; + } + useTranslate = true; + } + isMoved = true; + touchesDiff = pageY - touchesStart.y; + + if (touchesDiff > 0 && scrollTop <= 0 || scrollTop < 0) { + // iOS 8 fix + if ($.device.ios && parseInt($.device.osVersion.split('.')[0], 10) > 7 && scrollTop === 0 && !wasScrolled) useTranslate = true; + + if (useTranslate) { + e.preventDefault(); + translate = (Math.pow(touchesDiff, 0.85) + startTranslate); + container.transform('translate3d(0,' + translate + 'px,0)'); + } else {} + if ((useTranslate && Math.pow(touchesDiff, 0.85) > triggerDistance) || (!useTranslate && touchesDiff >= triggerDistance * 2)) { + refresh = true; + container.addClass('pull-up').removeClass('pull-down'); + } else { + refresh = false; + container.removeClass('pull-up').addClass('pull-down'); + } + } else { + + container.removeClass('pull-up pull-down'); + refresh = false; + return; + } + } + + function handleTouchEnd() { + if (!isTouched || !isMoved) { + isTouched = false; + isMoved = false; + return; + } + if (translate) { + container.addClass('transitioning'); + translate = 0; + } + container.transform(''); + if (refresh) { + //防止二次触发 + if(container.hasClass('refreshing')) return; + container.addClass('refreshing'); + container.trigger('refresh'); + } else { + container.removeClass('pull-down'); + } + isTouched = false; + isMoved = false; + } + + // Attach Events + eventsTarget.on($.touchEvents.start, handleTouchStart); + eventsTarget.on($.touchEvents.move, handleTouchMove); + eventsTarget.on($.touchEvents.end, handleTouchEnd); + + + function destroyPullToRefresh() { + eventsTarget.off($.touchEvents.start, handleTouchStart); + eventsTarget.off($.touchEvents.move, handleTouchMove); + eventsTarget.off($.touchEvents.end, handleTouchEnd); + } + eventsTarget[0].destroyPullToRefresh = destroyPullToRefresh; + + }; + $.pullToRefreshDone = function(container) { + $(window).scrollTop(0);//解决微信下拉刷新顶部消失的问题 + container = $(container); + if (container.length === 0) container = $('.pull-to-refresh-content.refreshing'); + container.removeClass('refreshing').addClass('transitioning'); + container.transitionEnd(function() { + container.removeClass('transitioning pull-up pull-down'); + }); + }; + $.pullToRefreshTrigger = function(container) { + container = $(container); + if (container.length === 0) container = $('.pull-to-refresh-content'); + if (container.hasClass('refreshing')) return; + container.addClass('transitioning refreshing'); + container.trigger('refresh'); + }; + + $.destroyPullToRefresh = function(pageContainer) { + pageContainer = $(pageContainer); + var pullToRefreshContent = pageContainer.hasClass('pull-to-refresh-content') ? pageContainer : pageContainer.find('.pull-to-refresh-content'); + if (pullToRefreshContent.length === 0) return; + if (pullToRefreshContent[0].destroyPullToRefresh) pullToRefreshContent[0].destroyPullToRefresh(); + }; + + //这里是否需要写到 scroller 中去? +/* $.initPullToRefresh = function(pageContainer) { + var $pageContainer = $(pageContainer); + $pageContainer.each(function(index, item) { + if ($.detectScrollerType(item) === 'js') { + $._pullToRefreshJSScroll.initPullToRefresh(item); + } else { + initPullToRefresh(item); + } + }); + }; + + + $.pullToRefreshDone = function(pageContainer) { + var $pageContainer = $(pageContainer); + $pageContainer.each(function(index, item) { + if ($.detectScrollerType(item) === 'js') { + $._pullToRefreshJSScroll.pullToRefreshDone(item); + } else { + pullToRefreshDone(item); + } + }); + }; + + + $.pullToRefreshTrigger = function(pageContainer) { + var $pageContainer = $(pageContainer); + $pageContainer.each(function(index, item) { + if ($.detectScrollerType(item) === 'js') { + $._pullToRefreshJSScroll.pullToRefreshTrigger(item); + } else { + pullToRefreshTrigger(item); + } + }); + }; + + $.destroyPullToRefresh = function(pageContainer) { + var $pageContainer = $(pageContainer); + $pageContainer.each(function(index, item) { + if ($.detectScrollerType(item) === 'js') { + $._pullToRefreshJSScroll.destroyPullToRefresh(item); + } else { + destroyPullToRefresh(item); + } + }); + }; +*/ + +}(Zepto); //jshint ignore:line + + diff --git a/fangija-zsyf/views/intelligentHouse/index.html b/fangija-zsyf/views/intelligentHouse/index.html index a434a16..d7aaf29 100644 --- a/fangija-zsyf/views/intelligentHouse/index.html +++ b/fangija-zsyf/views/intelligentHouse/index.html @@ -1078,10 +1078,15 @@ var searchAddress = function(){ var s = []; var html = ""; for (var i = 0; i < results.getCurrentNumPois(); i ++){ - html += '
  • '+ - '
    '+results.getPoi(i).title+'
    '+ - results.getPoi(i).address+''+ - '
  • '; + if(results.getPoi(i).tags == null || results.getPoi(i).tags == undefined){ + continue; + }else{ + html += '
  • '+ + '
    '+results.getPoi(i).title+'
    '+ + results.getPoi(i).address+''+ + '
  • '; + } + } $("#searchBaiduAddress").html(html); $(".popup-about02 ul li").on("click", function () { diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 4248f55..cd036df 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -212,6 +212,7 @@ +