diff --git a/package.json b/package.json index 778365c..961e218 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "element-ui": "^2.4.6", "lodash": "^4.17.4", "vue": "^2.5.9", - "vue-awesome-swiper": "^3.1.3", + "vue-awesome-swiper": "3.4.2", "vue-router": "^2.8.1", "vue-template-compiler": "^2.5.9", "vue-weui": "^0.3.2", diff --git a/src/main.js b/src/main.js index 0c22fed..06b3c2e 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,7 @@ import '@/common/rem.js' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import $ from 'jquery' +//import Swiper from 'swiper/dist/js/swiper.js'; import VueAwesomeSwiper from 'vue-awesome-swiper' import 'swiper/dist/css/swiper.css'//这里注意具体看使用的版本是否需要引入样式,以及具体位置。 diff --git a/src/view/home.vue b/src/view/home.vue index 1263920..e017d6c 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -13,10 +13,14 @@ @@ -234,12 +238,25 @@ .home .page-content { background:rgba(255,255,255,1); } +.home .page-content .banner { + height: 2.56rem; +} +.home .page-content .banner > div { + height: 2.56rem; +} .home .page-content .banner a { display: block; } -.home .page-content .banner img { +.home .page-content .banner div img { width: 100%; display: block; + margin: auto; +} +.swiper-img { + width: 100%; + height: 2.56rem; + background-size: cover; + background-position: center center; } .home .page-content .coupon { margin-top: 0.3rem; diff --git a/src/view/poster.vue b/src/view/poster.vue index b277575..a79ce8c 100644 --- a/src/view/poster.vue +++ b/src/view/poster.vue @@ -52,7 +52,10 @@ }, methods: { getCityName (){ - let name = localStorage.getItem("cityName") + let name = localStorage.getItem("cityName")||'' + if(!name){ + return + } let arr = name.split(',') this.addressValue = arr let cityNameArr = arr[2].split('&') @@ -62,14 +65,6 @@ }, getPoster (){ var merchantNo = $("#merchantNo").val() - console.log(merchantNo) - //判断是否在微信环境下操作 -// var ua = window.navigator.userAgent.toLowerCase(); -// //通过正则表达式匹配ua中是否含有MicroMessenger字符串 -// if(ua.match(/MicroMessenger/i) != 'micromessenger'){ -// this.ImgFix = true -// return; -// } posterApi.getPoster(merchantNo).then(res => { if ( res.code == 0 ){ @@ -137,9 +132,11 @@ } }, mounted() { - this.getAddress() - this.getCityName() - this.getPoster() + window.onload=()=>{ + this.getPoster(); + this.getAddress() + this.getCityName() + } } };