diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index d4f6903..1c380d8 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -46,37 +46,58 @@ - + - - - - - {{item.subject}} + + + + + + ¥{{pro.couponName}} + ¥{{pro.discountPrice}} - + - - - - - - {{item.subject}} + + + + + + + + + {{item.couponName}} + ¥{{ item.discountPrice}} - + + + + + + + + + + + ¥{{pro.couponName}} + ¥{{pro.discountPrice}} + + + + - - + @@ -171,7 +192,9 @@ ], //猜你喜欢列表 productList: [], + productListleg: '', goldproductList: [], + goldproductListleg: '', loadingText: '正在加载...', pageNum: 1, pageSize: 6, @@ -192,37 +215,6 @@ text: '美食' } ], - list: [{ - id: 1, - img: '/static/img/wenj.png', - subject: '104' - }, - { - id: 1, - img: '/static/img/wenj.png', - subject: '123' - }, - { - id: 1, - img: '/static/img/wenj.png', - subject: '112' - }, - { - id: 1, - img: '/static/img/wenj.png', - subject: '221' - }, - { - id: 1, - img: '/static/img/wenj.png', - subject: '343' - }, - { - id: 1, - img: '/static/img/wenj.png', - subject: '123' - } - ] }; }, @@ -427,6 +419,7 @@ getCouponList(params).then(res => { if (res.return_code == '000000') { this.productList = res.return_data.list; + this.productListleg = res.return_data.total; } }) }, @@ -441,6 +434,7 @@ getCouponList(params).then(res => { if (res.return_code == '000000') { this.goldproductList = res.return_data.list; + this.goldproductListleg = res.return_data.total; } }) }, @@ -803,8 +797,8 @@ } .goods-list { + background-color: #FFFFFF; - // background-color: #f4f4f4; .title { width: 100%; display: flex; @@ -890,6 +884,7 @@ position: relative; box-sizing: border-box; } + .orange-title { display: flex; justify-content: space-between; @@ -911,11 +906,11 @@ } .orange-content { - height: 110px; + height: 160px; width: 90%; margin-left: 5%; - border: 2px solid #ff5836; - margin-top: -4px; + border-radius: 0 0 10px 10px; + margin-top: -3px; background-color: white; } @@ -924,7 +919,7 @@ } .orange-content .swiper-item { - height: 140rpx; + height: 180rpx; margin-left: 14rpx; margin-top: 14rpx; } @@ -932,6 +927,7 @@ .orange-content .swiper-item .img { width: 100%; height: 100%; + // border-Radius:10rpx; } .orange-content .swiper-item .subject { diff --git a/static/img/fqhed.png b/static/img/fqhed.png new file mode 100644 index 0000000..6eccf1c Binary files /dev/null and b/static/img/fqhed.png differ diff --git a/static/img/fqicon.png b/static/img/fqicon.png new file mode 100644 index 0000000..cca093f Binary files /dev/null and b/static/img/fqicon.png differ diff --git a/static/img/headzq.png b/static/img/headzq.png index ca8809f..f7c2ae9 100644 Binary files a/static/img/headzq.png and b/static/img/headzq.png differ diff --git a/static/img/jbhed.png b/static/img/jbhed.png new file mode 100644 index 0000000..b08e8da Binary files /dev/null and b/static/img/jbhed.png differ diff --git a/static/img/jbicon.png b/static/img/jbicon.png new file mode 100644 index 0000000..10fe986 Binary files /dev/null and b/static/img/jbicon.png differ