diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index e9d0feb..ab3fa6d 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -4,10 +4,8 @@ - - - - + - + @@ -33,8 +32,7 @@ indicator-active-color="#fff"> - + @@ -116,7 +114,7 @@ mounted() { this.appLocation() }, - + methods: { swiperClick(item) { const url = item.info[1].value @@ -206,9 +204,11 @@ } = e.detail; if (source === 'autoplay' || source === 'touch') { this.bgColor = this.swiper.url[e.detail.current]['img'] - this.$emit('kkchange',this.bgColor) + this.$emit('kkchange', this.bgColor) } }, + + // 对象转数组 objToArr(data) { let obj = Object.keys(data).sort(); @@ -251,7 +251,7 @@ transform: translate(-50%, 0); width: 102%; height: 133px; - border-radius: 30px 30px 0 0; + border-radius: 30px 30px 0 0; background-color: #fff; } diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index b48ea07..e5c2800 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -1,7 +1,7 @@ --> + @@ -261,9 +263,14 @@ \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 7007b87..3271ce8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,18 +2,26 @@ - - - - {{street}} + + + + + + + {{street}} + + + + + + + + + + + - - - - - - @@ -23,14 +31,50 @@ + :activeStyle="activeStyle" itemStyle="padding-left: 0px; height: 33px;"> + + - + + + + + + + + + + + + + + + + + {{item.title}} + + + + {{item.author && item.author.nickname}} + + + + {{item.count_start}} + + + + + + + @@ -132,7 +143,7 @@ import mTabbar from '@/components/m-tabbar/m-tabbar.vue' import zbpSwiper from '@/components/zbpSwiper' import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'; - + import Cache from '@/utils/cache'; import { getSlideAPI } from '@/api/lihai.js' @@ -190,7 +201,7 @@ where: { category_id: 0, page: 1, - limit: 15 + limit: 6 }, currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区 keyword: '', @@ -206,14 +217,29 @@ isFshow: false, } }, + watch: { + street: { + handler(newVal, oldVal) { + this.street = newVal + let arr = Cache.get('ADRESS_LOCATION') + console.log(arr, '1') + if (arr.length > 0) { + this.street = arr.split(',')[0] + + + } + }, + } + }, onPullDownRefresh() { this.getCateList() this.cateGoods = [] this.getGoods() - this.selfLocation() + this.Area() uni.stopPullDownRefresh() }, + onLoad() { this.getCateList() @@ -236,36 +262,37 @@ }) }, - onShow() {}, + onReachBottom() { if (this.status == 'nomore') return; this.status = 'loading'; + this.where.limit = 2 this.where.page = ++this.where.page; this.getGoods() }, mounted() { // #ifdef H5 - - // #endif // 监听页面滚动事件 window.addEventListener("scroll", this.scrolling); + // #endif + }, // #ifdef APP-PLUS onPageScroll(e) { // this.scrollTop = e.scrollTop; console.log(e.scrollTop) - if(e.scrollTop>0){ - this.isFshow=true - }else{ - this.isFshow=false + if (e.scrollTop > 0) { + this.isFshow = true + } else { + this.isFshow = false } - + }, // #endif - + methods: { - + scrolling() { // 滚动条距文档顶部的距离 let scrollTop = @@ -357,8 +384,16 @@ res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0 }) }, + selectLocation() { + this.showPicker = true + }, confirm(e) { - this.where.street_id = e.value[1].code + this.street = e.value[1].name + Cache.set('ADRESS_LOCATION', + e.value[1].name + ',' + e.value[1].name + ',' + + + e.value[1].code + ) this.showPicker = false }, changeHandler(e) { @@ -458,10 +493,6 @@ this.tabsData.list = [{ cate_name: "推荐", category_id: 0 - }, { - cate_name: "视频", - category_id: -1, - children: [] }, ...data] }, tabsChange(item) { @@ -643,10 +674,30 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); } + + .sistbox { + opacity: 0; + } + + @keyframes fadenum { + 0% { + opacity: 0; + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + } + } + .bg-img { position: absolute; width: 100%; height: 100%; + top: 0; /* #ifdef MP || APP-PLUS */ z-index: -100; @@ -657,7 +708,7 @@ z-index: -100; filter: blur(0); overflow: hidden; - + transition: fadenum 3s linear; img { width: 100%; @@ -667,15 +718,36 @@ } } + .sitbox { + opacity: 1 !important; + background: #ac3525 !important; + } + .site-box { width: 100%; - height: 120rpx; + /* #ifdef MP || APP-PLUS */ + height: 160rpx; + /* #endif */ + /* #ifdef H5 */ + height: 120rpx; + /* #endif */ margin-bottom: 26.32rpx; position: absolute; top: 0rpx; position: fixed; z-index: 999; - padding-top: 30rpx; + /* #ifdef MP || APP-PLUS */ + padding-top: 75rpx; + /* #endif */ + /* #ifdef H5 */ + padding-top: 25rpx; + /* #endif */ + // background-color: #e5e5e5; + // opacity: 0; + /* 初始时设置元素不透明 */ + transition: opacity 0.2s ease-in; + transition-delay: 1.5s; + transition: background 0.2s ease-in; padding-right: 20rpx; // 位置 @@ -683,6 +755,9 @@ color: #fff; margin-right: 24.56rpx; font-size: 30rpx; + opacity: 0; + transition: opacity 1s ease-in; + transition-delay: 1.5s; .town_name { margin-left: 21rpx; @@ -690,6 +765,9 @@ } .iconfont { + font-size: 30rpx; + + font-size: 35.09rpx; } } @@ -804,7 +882,7 @@ } .goodslist { - display: flex; + // display: flex; margin: 0 auto; width: 725rpx; } @@ -813,9 +891,13 @@ margin: 0 auto; width: 725rpx; + display: flex; + flex-wrap: wrap; + justify-content: space-between; + .goods_item { width: 356rpx; - height: 450rpx; + border: 1px solid; border-radius: 8px; overflow: hidden; background-color: #fff; @@ -823,6 +905,12 @@ flex-direction: column; margin-bottom: 10.53rpx; position: relative; + margin-top: -40rpx; + + .kk { + width: 365rpx; + height: 251rpx; + } .goods_item_img { position: absolute; @@ -919,7 +1007,7 @@ .goods_items { width: 356rpx; - height: 536rpx; + border-radius: 8px; overflow: hidden; diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index e18d577..efa92cc 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -20,8 +20,8 @@ 】 --> - - - - + + --> + - + @@ -63,7 +63,7 @@
- +