From d16a2fabcff3c4cb669a7e4af9e742a9a8668415 Mon Sep 17 00:00:00 2001 From: LightZhang <978854603@qq.com> Date: Sun, 28 Oct 2018 20:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E9=97=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 4 + src/assets/static/common.js | 758 ++++++++++---------- src/components/ihead.vue | 10 + src/main.js | 1 + src/views/index.vue | 4 +- src/views/ourPlan/reaEstate.vue | 5 +- src/views/ourPlan/technologyIntegration.vue | 7 +- 7 files changed, 391 insertions(+), 398 deletions(-) diff --git a/public/index.html b/public/index.html index a8124d7..5aad40e 100644 --- a/public/index.html +++ b/public/index.html @@ -4,10 +4,14 @@ + + + 上海丙维科技有限公司
+ diff --git a/src/assets/static/common.js b/src/assets/static/common.js index 7a8a919..0051622 100644 --- a/src/assets/static/common.js +++ b/src/assets/static/common.js @@ -1,5 +1,6 @@ -var isMobile = isMobileWidth(); -var isPhone = isPhoneWidth(); + +var isMobile = null; +var isPhone = null; var wasMobile = isMobile; var wasDesktop = !isMobile; @@ -7,441 +8,420 @@ var isMiniHeader = false; var myLocationLat = null; var myLocationLong = null; - -$(document).ready(function() { - - initListeners(); - initHeader(); - initForms(); - initMobileMenu(); - adjustElementsForScreen(); -}); -//create trigger to resizeEnd event, called after event is finished -$(window).resize(function() { - if(this.resizeTO) clearTimeout(this.resizeTO); - this.resizeTO = setTimeout(function() { - $(this).trigger('resizeEnd'); - }, 100); -}); +class Common { + constructor(name, age) { + this.name = name; + this.age = age; + } -//cdetermine scren type and call style functions after window resize is completed -$(window).on('resizeEnd', function() { + init() { - adjustElementsForScreen(); + var self=this; -}); + isMobile = common.isMobileWidth(); + isPhone = common.isPhoneWidth(); -$(window).scroll(function() { - if($(window).scrollTop() > 200) { - if(isMiniHeader === false && !isMobileWidth()) { - $('.header').addClass('mini'); - isMiniHeader = true; - } - } else { - if(isMiniHeader === true) { + //create trigger to resizeEnd event, called after event is finished + $(window).resize(function () { + if (this.resizeTO) clearTimeout(this.resizeTO); + this.resizeTO = setTimeout(function () { + $(this).trigger('resizeEnd'); + }, 100); + }); + + //cdetermine scren type and call style functions after window resize is completed + $(window).on('resizeEnd', function () { + + self.adjustElementsForScreen(); + + }); + + $(window).scroll(function () { + if ($(window).scrollTop() > 200) { + if (isMiniHeader === false && !self.isMobileWidth()) { + $('.header').addClass('mini'); + isMiniHeader = true; + } + } else { + if (isMiniHeader === true) { + $('.header').removeClass('mini'); + isMiniHeader = false; + } + + } + //var scroll = $(window).scrollTop(); + }); + + + + $.scrollToElement = function ($element) { + + var adjustment = 0; + if (isMiniHeader) { + adjustment = 35; + } + var $header = $('.header:first'); + $('html,body').animate({ scrollTop: $element.offset().top - ($header.length > 0 ? $header.height() : 0) - adjustment }, 'slow'); + }; + + + + + } + + adjustElementsForScreen() { + + isMobile = this.isMobileWidth(); + isPhone = this.isPhoneWidth(); + + if (!this.isMobileWidth()) { + $(".mobileContent").hide(); + } + + if (isMobile) wasMobile = true; + if (!isMobile) wasDesktop = true; + + if (wasDesktop && isMobile) { + if (location.pathname.indexOf("index.php") === -1 && location.pathname.indexOf(".php") > -1) { + handleActivePage(); + } + } + if (wasMobile && !isMobile) location.reload(); + + if (isMobile && isMiniHeader === true) { $('.header').removeClass('mini'); isMiniHeader = false; } - - } - //var scroll = $(window).scrollTop(); -}); + //adjust 'find us' Google Maps links as user location not always located accurately on desktop + if (isMobile) { + $(".findUsSweden").attr("href", "https://www.google.com/maps/dir/?api=1&destination=Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm"); + $(".findUsUK").attr("href", "https://www.google.com/maps/dir/?api=1&destination=180+Piccadilly,+St.+James's,+London+W1J+9HF,+UK"); + $(".findUsNorway").attr("href", "https://www.google.com/maps/dir/?api=1&destination=Skogliveien+4a,+3047+Drammen,+Norway"); + } else { + $(".findUsSweden").attr("href", "https://www.google.com/maps/dir//Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm"); + $(".findUsUK").attr("href", "https://www.google.com/maps/dir//180+Piccadilly,+St.+James's,+London+W1J+9HF,+UK"); + $(".findUsNorway").attr("href", "https://www.google.com/maps/dir//Skogliveien+4a,+3047+Drammen,+Norway"); + } -function adjustElementsForScreen() { + this.adjustContentBannersForScreen(); - isMobile = isMobileWidth(); - isPhone = isPhoneWidth(); - - if (!isMobileWidth()) { - $(".mobileContent").hide(); } - if (isMobile) wasMobile = true; - if (!isMobile) wasDesktop = true; - if (wasDesktop && isMobile) { - if (location.pathname.indexOf("index.php") === -1 && location.pathname.indexOf(".php") > -1) { - handleActivePage(); - } - } - if (wasMobile && !isMobile) location.reload(); - if (isMobile && isMiniHeader === true) { - $('.header').removeClass('mini'); - isMiniHeader = false; - } + initHeader() { - //adjust 'find us' Google Maps links as user location not always located accurately on desktop - if (isMobile) { - $(".findUsSweden").attr("href", "https://www.google.com/maps/dir/?api=1&destination=Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm"); - $(".findUsUK").attr("href", "https://www.google.com/maps/dir/?api=1&destination=180+Piccadilly,+St.+James's,+London+W1J+9HF,+UK"); - $(".findUsNorway").attr("href", "https://www.google.com/maps/dir/?api=1&destination=Skogliveien+4a,+3047+Drammen,+Norway"); - }else{ - $(".findUsSweden").attr("href", "https://www.google.com/maps/dir//Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm"); - $(".findUsUK").attr("href", "https://www.google.com/maps/dir//180+Piccadilly,+St.+James's,+London+W1J+9HF,+UK"); - $(".findUsNorway").attr("href", "https://www.google.com/maps/dir//Skogliveien+4a,+3047+Drammen,+Norway"); - } - - adjustContentBannersForScreen(); - -} - -function initHeader() { - - //go to main page if not there on logo click - $(".logoCell .logo").on("click", function() { - if (window.location.href.indexOf("index.php") === -1) { - window.location.href = "index.php"; - } - }); - - //show/hide main menu dropdowns on hover - $(".mainMenu > tbody > tr > td") - .on("mouseenter", function(e) { - e.stopPropagation(); - $(".dropDown").hide(); - $("table.mainMenu > tbody > tr > td.selected").css("box-shadow", "none"); - $(this).find(".dropDown").addClass("droppedDown"); - $(this).find(".dropDown").slideDown(); - }) - .on("mouseleave", function(e) { - e.stopPropagation(); - $(this).find(".dropDown").removeClass("droppedDown"); - $(this).find(".dropDown").hide(); - $("table.mainMenu > tbody > tr > td.selected").css("box-shadow", "0 -3px 0 #ff0000 inset"); + //go to main page if not there on logo click + $(".logoCell .logo").on("click", function () { + if (window.location.href.indexOf("index.php") === -1) { + window.location.href = "index.php"; + } }); - highlightHeaderCategory(); + //show/hide main menu dropdowns on hover + $(".mainMenu > tbody > tr > td") + .on("mouseenter", function (e) { + e.stopPropagation(); + $(".dropDown").hide(); + $("table.mainMenu > tbody > tr > td.selected").css("box-shadow", "none"); + $(this).find(".dropDown").addClass("droppedDown"); + $(this).find(".dropDown").slideDown(); + }) + .on("mouseleave", function (e) { + e.stopPropagation(); + $(this).find(".dropDown").removeClass("droppedDown"); + $(this).find(".dropDown").hide(); + $("table.mainMenu > tbody > tr > td.selected").css("box-shadow", "0 -3px 0 #ff0000 inset"); + }); -} + this.highlightHeaderCategory(); -//highlight the appproprate main header meny category by examing url -function highlightHeaderCategory() { - - var myLocation = location.pathname; - - //console.log("My location: " + myLocation); - - if (myLocation.indexOf("index.php") !== -1) { - $("#mainMenuGroup0").addClass("selected"); - }else if ( - myLocation.indexOf("/fm-") !== -1 || - myLocation.indexOf("/prs-") !== -1 || - myLocation.indexOf("/lvh-") !== -1 || - myLocation.indexOf("/fas-") !== -1 || - myLocation.indexOf("/sb-") !== -1 || - myLocation.indexOf("/tek-") !== -1) { - $("#mainMenuGroup1").addClass("selected"); - }else if ( - myLocation.indexOf("/mobila-losningar.php") !== -1 || - myLocation.indexOf("/ifrs16.php") !== -1 || - myLocation.indexOf("/gdpr.php") !== -1) { - $("#mainMenuGroup2").addClass("selected"); - }else if ( - myLocation.indexOf("/det-har-ar-pythagoras.php") !== -1 || - myLocation.indexOf("/kontakta-oss.php") !== -1 || - myLocation.indexOf("/jobba-hos-oss.php") !== -1) { - $("#mainMenuGroup3").addClass("selected"); - }else if (myLocation.indexOf(".php") === -1){ - $("#mainMenuGroup0").addClass("selected"); } -} -//event listners for elements -function initListeners() { + highlightHeaderCategory() { - $("#hamburger").on("click", function() { + var myLocation = location.pathname; - if ($("#mobileLanguageMenu").hasClass("showing")) { - $("#mobileLanguageMenu").hide(); - $("#mobileLanguageMenu").removeClass("showing"); + //console.log("My location: " + myLocation); + + if (myLocation.indexOf("index.php") !== -1) { + $("#mainMenuGroup0").addClass("selected"); + } else if ( + myLocation.indexOf("/fm-") !== -1 || + myLocation.indexOf("/prs-") !== -1 || + myLocation.indexOf("/lvh-") !== -1 || + myLocation.indexOf("/fas-") !== -1 || + myLocation.indexOf("/sb-") !== -1 || + myLocation.indexOf("/tek-") !== -1) { + $("#mainMenuGroup1").addClass("selected"); + } else if ( + myLocation.indexOf("/mobila-losningar.php") !== -1 || + myLocation.indexOf("/ifrs16.php") !== -1 || + myLocation.indexOf("/gdpr.php") !== -1) { + $("#mainMenuGroup2").addClass("selected"); + } else if ( + myLocation.indexOf("/det-har-ar-pythagoras.php") !== -1 || + myLocation.indexOf("/kontakta-oss.php") !== -1 || + myLocation.indexOf("/jobba-hos-oss.php") !== -1) { + $("#mainMenuGroup3").addClass("selected"); + } else if (myLocation.indexOf(".php") === -1) { + $("#mainMenuGroup0").addClass("selected"); } + } - if ($("#mobileMenu").hasClass("showing")) { - hideMobileMenu(); - }else{ - showMobileMenu(); - } - }); + initListeners() { - $("#mobileLanguage").on("click", function(e) { + $("#hamburger").on("click", function () { - if ($("#mobileMenu").hasClass("showing")) { - $("#mobileMenu").hide(); - $("#mobileMenu").removeClass("showing"); - } + if ($("#mobileLanguageMenu").hasClass("showing")) { + $("#mobileLanguageMenu").hide(); + $("#mobileLanguageMenu").removeClass("showing"); + } - if ($("#mobileLanguageMenu").hasClass("showing")) { - hideMobileLanguageMenu(); - }else{ - showMobileLanguageMenu(); - } + if ($("#mobileMenu").hasClass("showing")) { + hideMobileMenu(); + } else { + showMobileMenu(); + } + }); - }); + $("#mobileLanguage").on("click", function (e) { - $("#screenOverlayBehindHeader, .linkGoBack").on("click", function(e) { - if ($("#mobileMenu").hasClass("showing")) { - hideMobileMenu(); - } - if ($("#mobileLanguageMenu").hasClass("showing")) { - hideMobileLanguageMenu(); - } - }); + if ($("#mobileMenu").hasClass("showing")) { + $("#mobileMenu").hide(); + $("#mobileMenu").removeClass("showing"); + } - $("#mobileLanguageMenu a").on("click", function(e) { - e.preventDefault(); - }); + if ($("#mobileLanguageMenu").hasClass("showing")) { + hideMobileLanguageMenu(); + } else { + showMobileLanguageMenu(); + } - //show support form - $("a.linkSupport").on("click", function(e) { - e.preventDefault(); - showForm("support"); - }); - - //show contact form - $("a.linkContactUs").on("click", function(e) { - e.preventDefault(); - showForm("contact"); - }); - - $("#scrollToBoxes").on("click", function(e){ - e.preventDefault(); - $.scrollToElement($("#pageBoxesContainer")); - }); + }); - $('.cookiesInfo').children('input[type=button]').on('click', function(){ - $(this).parent().remove(); - }); + $("#screenOverlayBehindHeader, .linkGoBack").on("click", function (e) { + if ($("#mobileMenu").hasClass("showing")) { + hideMobileMenu(); + } + if ($("#mobileLanguageMenu").hasClass("showing")) { + hideMobileLanguageMenu(); + } + }); - //location - /*$("#ourLocationSweden").on("click", function(e) { - e.preventDefault(); - navigateTo("sweden", $(this)); - });*/ - -} - -function initMobileMenu() { - $("#mobileMenu a").on("click", function(e) { - - if ($(this).hasClass("hasSubmenu")) { + $("#mobileLanguageMenu a").on("click", function (e) { e.preventDefault(); - $("#mobileMenu .subMenu").not($(this).siblings()).slideUp(); - $(".hasSubmenu").not($(this)).css("font-weight", "normal"); - $(this).css("font-weight", "bold"); - //$(this).parent().css("border-bottom", "none"); - $(this).parent().find(".subMenu").slideDown(); - - }else{ - hideMobileMenu(); - } - }); -} - - -function initForms() { - - - $(".btnQuitForm").on("click", function() { - $("#forms").hide(); - $("#screenOverlay").hide(); - $("#formContactContainer").hide(); - $("#formSupportContainer").hide(); - }); - - $("#formSupport").on("submit", function(e) { - e.preventDefault(); - submitSupportForm($(this)); - }); - - $("#formContact").on("submit", function(e) { - e.preventDefault(); - submitContactForm($(this)); - }); -} - - -function showForm(formName) { - - $("#forms").show(); - $("#screenOverlay").show(); - - $(".contactTable").show(); - $(".formInputContainer").show(); - $(".formResultContainer").hide(); - - if (formName === "contact") { - var $conCommentsTitle = $("label[for='conComments']"); - console.log($(".contentTableRight").find("[data-contact-link]").data("contact-link")); - if ($(".contentTableRight").find("[data-contact-link]").length) { - $conCommentsTitle.html("Berätta vad du vill veta mer om gällande " + - $(".contentTableRight").find("[data-contact-link]").data("contact-link") + ": *"); - }else{ - $conCommentsTitle.html("Vad vill du veta mer om: "); - } - $("#formContactContainer").show(); - } else if (formName === "support") { - $("#formSupportContainer").show(); - } - - scrollToTop(); - -} - - -function submitSupportForm(form) { - - $.post("http://biz199.inmotionhosting.com/~rustyt6/pythagoras/php/submit_support_form.php", - { - subject: $("#supSubject").val(), - company: $("#supCompany").val(), - name: $("#supName").val(), - email: $("#supEmail").val(), - phone: $("#supPhone").val(), - product: $("#supProduct").val(), - comments: $("#supComments").val() - }, - function(data) { - console.log(data); - } - ); - - $(".formInputContainer").hide(); - $(".formResultContainer").show(); - scrollToTop(); - - $("#supSubject").val(""); - $("#supCompany").val(""); - $("#supName").val(""); - $("#supEmail").val(""); - $("#supPhone").val(""); - $("#supProduct").val(""); - $("#supComments").val(""); -} - -function submitContactForm(form) { - - $.post("http://biz199.inmotionhosting.com/~rustyt6/pythagoras/php/submit_contact_form.php", - { - name: $("#conName").val(), - email: $("#conEmail").val(), - phone: $("#conPhone").val(), - comments: $("#conComments").val() - }, - function(data) { - console.log(data); - } - ); - - $(".contactTable").hide(); - $(".formResultContainer").show(); - scrollToTop(); - - $("#conName").val(""); - $("#conEmail").val(""); - $("#conPhone").val(""); - $("#conComments").val(""); -} - - -function adjustContentBannersForScreen() { - - if (isMobileWidth()) { - $("#pageBannerImage1").attr("src", "images/banner_page_mobile_solutions_mobile.jpg"); - $("#pageBannerImage2").attr("src", "images/banner_page_ifrs16_mobile.jpg"); - $("#pageBannerImage3").attr("src", "images/banner_page_gdpr_mobile.jpg"); - }else{ - $("#pageBannerImage1").attr("src", "images/banner_page_mobile_solutions.jpg"); - $("#pageBannerImage2").attr("src", "images/banner_page_ifrs16.jpg"); - $("#pageBannerImage3").attr("src", "images/banner_page_gdpr.jpg"); - } -} - -/*function navigateTo(destination, $element) { - - var baseAddress = "https://www.google.com/maps/dir/"; - - var addressSweden = "Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm"; - - if (myLocationLat == null || myLocationLong == null) { - getUserLocationForDirections(); - }else{ - if ($element.attr("href").length <= 1) { - $element.attr("href", baseAddress + myLocationLat + "," + myLocationLong + "/" + addressSweden); - } - console.log($element.attr("href")); - } - -} - -function getUserLocationForDirections() { - $.post("https://www.googleapis.com/geolocation/v1/geolocate?key=AIzaSyB04D7_YYzWb3y3TDtVr-FR3rkBHSV6oOg", - function(data){ - console.log(data); - myLocationLat = data.location.lat; - myLocationLong = data.location.lng; - console.log(myLocationLat, myLocationLong); - //setupDirections(); - //https://www.google.com/maps/dir/?api=1&destination=Pythagoras+AB,+S%C3%B6der+M%C3%A4larstrand+27+B,+118+25+Stockholm }); -}*/ -function showMobileMenu() { - $("#screenOverlayBehindHeader").show(); + //show support form + $("a.linkSupport").on("click", function (e) { + e.preventDefault(); + showForm("support"); + }); - $("#mobileMenu").slideDown(); - $("#mobileMenu").addClass("showing"); -} + //show contact form + $("a.linkContactUs").on("click", function (e) { + e.preventDefault(); + showForm("contact"); + }); -function hideMobileMenu() { - $("#mobileMenu").slideUp(function(){ - $("#screenOverlayBehindHeader").hide(); - }); - $("#mobileMenu").removeClass("showing"); -} + $("#scrollToBoxes").on("click", function (e) { + e.preventDefault(); + $.scrollToElement($("#pageBoxesContainer")); + }); -function showMobileLanguageMenu() { - $("#screenOverlayBehindHeader").show(); - $("#mobileLanguageMenu").slideDown(); - $("#mobileLanguageMenu").addClass("showing"); -} + $('.cookiesInfo').children('input[type=button]').on('click', function () { + $(this).parent().remove(); + }); -function hideMobileLanguageMenu() { - $("#mobileLanguageMenu").slideUp(function(){ - $("#screenOverlayBehindHeader").hide(); - }); - $("#mobileLanguageMenu").removeClass("showing"); -} - -$.scrollToElement = function($element){ - - var adjustment = 0; - if (isMiniHeader) { - adjustment = 35; } - var $header = $('.header:first'); - $('html,body').animate({scrollTop: $element.offset().top-($header.length > 0 ? $header.height() : 0) - adjustment}, 'slow'); -}; -//scroll page to top -function scrollToTop() { - $("body,html").animate({ scrollTop: 0 }, "slow"); + initMobileMenu() { + $("#mobileMenu a").on("click", function (e) { + + if ($(this).hasClass("hasSubmenu")) { + e.preventDefault(); + $("#mobileMenu .subMenu").not($(this).siblings()).slideUp(); + $(".hasSubmenu").not($(this)).css("font-weight", "normal"); + $(this).css("font-weight", "bold"); + //$(this).parent().css("border-bottom", "none"); + $(this).parent().find(".subMenu").slideDown(); + + } else { + hideMobileMenu(); + } + }); + } + + + initForms() { + + + $(".btnQuitForm").on("click", function () { + $("#forms").hide(); + $("#screenOverlay").hide(); + $("#formContactContainer").hide(); + $("#formSupportContainer").hide(); + }); + + $("#formSupport").on("submit", function (e) { + e.preventDefault(); + submitSupportForm($(this)); + }); + + $("#formContact").on("submit", function (e) { + e.preventDefault(); + submitContactForm($(this)); + }); + } + + + showForm(formName) { + + $("#forms").show(); + $("#screenOverlay").show(); + + $(".contactTable").show(); + $(".formInputContainer").show(); + $(".formResultContainer").hide(); + + if (formName === "contact") { + var $conCommentsTitle = $("label[for='conComments']"); + console.log($(".contentTableRight").find("[data-contact-link]").data("contact-link")); + if ($(".contentTableRight").find("[data-contact-link]").length) { + $conCommentsTitle.html("Berätta vad du vill veta mer om gällande " + + $(".contentTableRight").find("[data-contact-link]").data("contact-link") + ": *"); + } else { + $conCommentsTitle.html("Vad vill du veta mer om: "); + } + $("#formContactContainer").show(); + } else if (formName === "support") { + $("#formSupportContainer").show(); + } + + scrollToTop(); + + } + + + submitSupportForm(form) { + + $.post("http://biz199.inmotionhosting.com/~rustyt6/pythagoras/php/submit_support_form.php", + { + subject: $("#supSubject").val(), + company: $("#supCompany").val(), + name: $("#supName").val(), + email: $("#supEmail").val(), + phone: $("#supPhone").val(), + product: $("#supProduct").val(), + comments: $("#supComments").val() + }, + function (data) { + console.log(data); + } + ); + + $(".formInputContainer").hide(); + $(".formResultContainer").show(); + scrollToTop(); + + $("#supSubject").val(""); + $("#supCompany").val(""); + $("#supName").val(""); + $("#supEmail").val(""); + $("#supPhone").val(""); + $("#supProduct").val(""); + $("#supComments").val(""); + } + + + submitContactForm(form) { + + $.post("http://biz199.inmotionhosting.com/~rustyt6/pythagoras/php/submit_contact_form.php", + { + name: $("#conName").val(), + email: $("#conEmail").val(), + phone: $("#conPhone").val(), + comments: $("#conComments").val() + }, + function (data) { + console.log(data); + } + ); + + $(".contactTable").hide(); + $(".formResultContainer").show(); + scrollToTop(); + + $("#conName").val(""); + $("#conEmail").val(""); + $("#conPhone").val(""); + $("#conComments").val(""); + } + + + adjustContentBannersForScreen() { + + if (this.isMobileWidth()) { + $("#pageBannerImage1").attr("src", "images/banner_page_mobile_solutions_mobile.jpg"); + $("#pageBannerImage2").attr("src", "images/banner_page_ifrs16_mobile.jpg"); + $("#pageBannerImage3").attr("src", "images/banner_page_gdpr_mobile.jpg"); + } else { + $("#pageBannerImage1").attr("src", "images/banner_page_mobile_solutions.jpg"); + $("#pageBannerImage2").attr("src", "images/banner_page_ifrs16.jpg"); + $("#pageBannerImage3").attr("src", "images/banner_page_gdpr.jpg"); + } + } + + showMobileMenu() { + $("#screenOverlayBehindHeader").show(); + + $("#mobileMenu").slideDown(); + $("#mobileMenu").addClass("showing"); + } + + + hideMobileMenu() { + $("#mobileMenu").slideUp(function () { + $("#screenOverlayBehindHeader").hide(); + }); + $("#mobileMenu").removeClass("showing"); + } + + showMobileLanguageMenu() { + $("#screenOverlayBehindHeader").show(); + + $("#mobileLanguageMenu").slideDown(); + $("#mobileLanguageMenu").addClass("showing"); + } + + hideMobileLanguageMenu() { + $("#mobileLanguageMenu").slideUp(function () { + $("#screenOverlayBehindHeader").hide(); + }); + $("#mobileLanguageMenu").removeClass("showing"); + } + + scrollToTop() { + $("body,html").animate({ scrollTop: 0 }, "slow"); + } + + isMobileWidth() { + return $('#mobile_indicator').is(':visible'); + } + + isPhoneWidth() { + return $('#phone_indicator').is(':visible'); + } } -//is screen mobile? (<= 768 px) -//#mobile_indicator is show/hidden via media query -function isMobileWidth() { - return $('#mobile_indicator').is(':visible'); -} -//is screen phone? (<= 480 px) -//#mobile_indicator is show/hidden via media query -function isPhoneWidth() { - return $('#phone_indicator').is(':visible'); -} \ No newline at end of file +export const common = new Common(); + + diff --git a/src/components/ihead.vue b/src/components/ihead.vue index 7aa0588..bd27e9c 100644 --- a/src/components/ihead.vue +++ b/src/components/ihead.vue @@ -87,11 +87,21 @@ diff --git a/src/main.js b/src/main.js index d8358c0..0ccfb34 100644 --- a/src/main.js +++ b/src/main.js @@ -4,6 +4,7 @@ import 'swiper/dist/css/swiper.css' import './assets/static/config.js' import './assets/static/jquery.js' +import './assets/static/common.js' import 'es6-promise/auto' diff --git a/src/views/index.vue b/src/views/index.vue index 4bdd826..61307ed 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -110,10 +110,10 @@ export default { methods: { onSlideChangeStart(currentPage) { - console.log("onSlideChangeStart", currentPage); + }, onSlideChangeEnd(currentPage) { - console.log("onSlideChangeEnd", currentPage); + } } }; diff --git a/src/views/ourPlan/reaEstate.vue b/src/views/ourPlan/reaEstate.vue index 25db7b1..f966a65 100644 --- a/src/views/ourPlan/reaEstate.vue +++ b/src/views/ourPlan/reaEstate.vue @@ -1,16 +1,15 @@