diff --git a/src/App.vue b/src/App.vue index 872aff8..8b201f1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,7 +9,7 @@ import Setting from '@/setting'; import util from '@/libs/util'; export default { name: 'App', - created() { + created () { //在页面加载时读取localStorage里的状态信息 if (util.local.get(Setting.storeKey)) { this.$store.replaceState(Object.assign({}, this.$store.state, util.local.get(Setting.storeKey))); @@ -20,7 +20,7 @@ export default { util.local.set(Setting.storeKey, this.$store.state); }); // 判断当前处于什么终端 true为PC端,false为手机端 - function IsPCModel() { + function IsPCModel () { var userAgentInfo = navigator.userAgent; var Agents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod']; var flagPc = true; @@ -35,85 +35,85 @@ export default { var flagZt = IsPCModel(); this.$store.commit('updateModelType', flagZt) window.onresize = this.throttle(() => { - if(document.body.clientWidth <= 1200) { + if (document.body.clientWidth <= 1200) { this.$store.commit('updateModelType', false) - }else if(document.body.clientWidth > 1700 ) { + } else if (document.body.clientWidth > 1700) { this.$store.commit('updateModelType', true) this.$store.dispatch('updateNavSumA', 10) sessionStorage.setItem('navPageSize', 10) - }else if(document.body.clientWidth > 1600 && document.body.clientWidth <= 1700 ) { + } else if (document.body.clientWidth > 1600 && document.body.clientWidth <= 1700) { this.$store.commit('updateModelType', true) if (this.$i18n.locale == 'en') { this.$store.dispatch('updateNavSumA', 9) sessionStorage.setItem('navPageSize', 9) - }else { + } else { this.$store.dispatch('updateNavSumA', 10) - sessionStorage.setItem('navPageSize', 10) + sessionStorage.setItem('navPageSize', 10) } - }else if(document.body.clientWidth > 1500 && document.body.clientWidth <= 1600) { + } else if (document.body.clientWidth > 1500 && document.body.clientWidth <= 1600) { this.$store.commit('updateModelType', true) this.$store.dispatch('updateNavSumA', 9) sessionStorage.setItem('navPageSize', 9) - }else if(document.body.clientWidth > 1400 && document.body.clientWidth <= 1500) { + } else if (document.body.clientWidth > 1400 && document.body.clientWidth <= 1500) { this.$store.commit('updateModelType', true) if (this.$i18n.locale == 'en') { this.$store.dispatch('updateNavSumA', 7) sessionStorage.setItem('navPageSize', 7) - }else { + } else { this.$store.dispatch('updateNavSumA', 8) - sessionStorage.setItem('navPageSize', 8) + sessionStorage.setItem('navPageSize', 8) } - }else if(document.body.clientWidth > 1300 && document.body.clientWidth <= 1400) { + } else if (document.body.clientWidth > 1300 && document.body.clientWidth <= 1400) { this.$store.commit('updateModelType', true) if (this.$i18n.locale == 'en') { this.$store.dispatch('updateNavSumA', 6) sessionStorage.setItem('navPageSize', 6) - }else { + } else { this.$store.dispatch('updateNavSumA', 7) - sessionStorage.setItem('navPageSize', 7) + sessionStorage.setItem('navPageSize', 7) } - }else if(document.body.clientWidth > 1200 && document.body.clientWidth <= 1300) { + } else if (document.body.clientWidth > 1200 && document.body.clientWidth <= 1300) { this.$store.commit('updateModelType', true) if (this.$i18n.locale == 'en') { this.$store.dispatch('updateNavSumA', 6) sessionStorage.setItem('navPageSize', 6) - }else { + } else { this.$store.dispatch('updateNavSumA', 6) - sessionStorage.setItem('navPageSize', 6) + sessionStorage.setItem('navPageSize', 6) } - }else { + } else { this.$store.commit('updateModelType', true) } - },500) + }, 500) }, - mounted() { - window.onbeforeunload = function(){ + mounted () { + window.onbeforeunload = function () { sessionStorage.removeItem('navPageSize') } - if(document.body.clientWidth > 1600 ) { - sessionStorage.setItem('navPageSize', 10) - }else if(document.body.clientWidth > 1500 && document.body.clientWidth <= 1600) { - sessionStorage.setItem('navPageSize', 9) - }else if(document.body.clientWidth > 1400 && document.body.clientWidth <= 1500) { - sessionStorage.setItem('navPageSize', 8) - }else if(document.body.clientWidth > 1300 && document.body.clientWidth <= 1400) { - sessionStorage.setItem('navPageSize', 7) - }else if(document.body.clientWidth > 1200 && document.body.clientWidth <= 1300) { - sessionStorage.setItem('navPageSize', 6) - } + if (document.body.clientWidth > 1600) { + sessionStorage.setItem('navPageSize', 10) + } else if (document.body.clientWidth > 1500 && document.body.clientWidth <= 1600) { + sessionStorage.setItem('navPageSize', 9) + } else if (document.body.clientWidth > 1400 && document.body.clientWidth <= 1500) { + sessionStorage.setItem('navPageSize', 8) + } else if (document.body.clientWidth > 1300 && document.body.clientWidth <= 1400) { + sessionStorage.setItem('navPageSize', 7) + } else if (document.body.clientWidth > 1200 && document.body.clientWidth <= 1300) { + sessionStorage.setItem('navPageSize', 6) + } }, methods: { - throttle(func, delay) { - var prev = Date.now() - return function () { - var context = this; - var args = arguments; - var now = Date.now(); - if (now - prev >= delay) { - func.apply(context, args); - prev = Date.now(); - } + throttle (func, delay) { + var prev = Date.now() + return function () { + var context = this; + var args = arguments; + var now = Date.now(); + if (now - prev >= delay) { + func.apply(context, args); + prev = Date.now(); } + } } }, }; diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index e2ed577..d0e389f 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -798,6 +798,7 @@ export default { width: 100%; height: 155px; transition: 0.3s; + object-fit: cover; } .my-school { position: absolute; diff --git a/src/pages/supplier/index.vue b/src/pages/supplier/index.vue index 35846a4..f3e38ea 100644 --- a/src/pages/supplier/index.vue +++ b/src/pages/supplier/index.vue @@ -158,7 +158,7 @@ export default { .banner { position: relative; height: 350px; - padding: 100px 0 0 180px; + padding: 70px 0 0 180px; background: url(../../assets/images/dev/banner2.png) (90% 32px) / auto no-repeat, url(../../assets/images/dev/banner1.png) 0 0/100% 100% no-repeat; .dev { @@ -375,10 +375,7 @@ export default { @media (max-width: 1200px) { .wrap { .banner { - padding: 120px 0 0 50px; - .dev { - bottom: 80px; - } + padding-left: 50px; } .inner { width: 90%; diff --git a/src/store/index.js b/src/store/index.js index 154cac2..745a7bc 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -25,7 +25,6 @@ const store = new Vuex.Store({ mutations: { // 根据屏幕尺寸分别移动或者pc updateModelType(state, type) { - console.log(state) state.modelType = type; }, // 根据屏幕尺寸显示的导航栏条数 diff --git a/vue.config.js b/vue.config.js index 4ca5b33..7dbd125 100644 --- a/vue.config.js +++ b/vue.config.js @@ -17,5 +17,6 @@ module.exports = { }, configureWebpack: { devtool: 'source-map' - } + }, + productionSourceMap: false, }; \ No newline at end of file