diff --git a/api/store.js b/api/store.js index 13c59c7..6f0df78 100644 --- a/api/store.js +++ b/api/store.js @@ -209,4 +209,13 @@ export function getMallNewsDetail(params) { export function searchGoods(params) { return request.get('goods/searchByName', {params}); -} \ No newline at end of file +} + +export function getHotList(params) { + return request.get('goods/hotList', {params}); +} + +export function getNewGoods(params) { + return request.get('goods/newGoods', {params}); +} + diff --git a/bundle_b/pages/mall_news/index.vue b/bundle_b/pages/mall_news/index.vue index 148cacc..8c7c3a8 100644 --- a/bundle_b/pages/mall_news/index.vue +++ b/bundle_b/pages/mall_news/index.vue @@ -9,24 +9,24 @@ {{item.title}} {{item.desc}} - - - - - - - - - - - - + + + + + + + + + + + + 推荐商品 - + {{item.shop.name}} @@ -43,14 +43,15 @@ - - {{item.title}} - {{item.desc}} + + {{item.title}} + {{item.desc}} + - + @@ -58,7 +59,6 @@ - @@ -82,10 +82,18 @@ }; }, methods: { - preview(url) { - uni.previewImage({ - urls: [url] - }); + preview(current, files) { + console.log(current) + console.log(files) + let f = files.map((item) => { + return item.src + }) + this.$nextTick(() => { + uni.previewImage({ + current, + urls: f + }); + }) }, upCallback(page) { diff --git a/components/active-area/active-area.vue b/components/active-area/active-area.vue index 348f824..3b331c4 100644 --- a/components/active-area/active-area.vue +++ b/components/active-area/active-area.vue @@ -2,21 +2,22 @@ {{title}} - + 更多 - - - - - - + + + + + - + 查看更多 diff --git a/components/cate-home/cate-home.vue b/components/cate-home/cate-home.vue index 9ab98d8..ba92101 100644 --- a/components/cate-home/cate-home.vue +++ b/components/cate-home/cate-home.vue @@ -7,7 +7,7 @@ - + diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 39ad067..f05e92a 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -63,6 +63,9 @@ line-through :price="item.market_price || item.price"> --> + + @@ -312,6 +315,10 @@ priceType: { type: Number, default: 0 + }, + showOrder: { + type: Boolean, + default: false } }, data() { @@ -360,6 +367,7 @@ width: 347rpx; border-radius: 10rpx; overflow: hidden; + position: relative; .goods-info { padding: 10rpx; @@ -368,7 +376,6 @@ height: 80rpx; line-height: 40rpx; } - } } } @@ -431,15 +438,12 @@ } } - .goods-row, - .goods-hot { - .paixu { - position: absolute; - top: 0; - left: 20rpx; - width: 48rpx; - height: 60rpx; - } + .paixu { + position: absolute; + top: 0; + left: 20rpx; + width: 48rpx; + height: 60rpx; } } \ No newline at end of file diff --git a/components/index-home/index-home.vue b/components/index-home/index-home.vue index 951140a..ce2b56e 100644 --- a/components/index-home/index-home.vue +++ b/components/index-home/index-home.vue @@ -100,11 +100,12 @@ - + - + +