diff --git a/pages/index/index.vue b/pages/index/index.vue index 7749067..db7146d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -316,7 +316,7 @@ 店内现货 - + 查看更多 @@ -459,7 +459,7 @@ return { isLogin: false, isTop: false, - logoImage:'', + logoImage: '', // background: { // backgroundColor: 'transparent', // }, @@ -719,13 +719,17 @@ }) }, getTypeList() { - GoodsApi.typeList().then(res => { + GoodsApi.typeList({ + is_in_store: this.current==0?0:1 + }).then(res => { if (res.status == 200) { this.tabList = res.data.list; this.catagoryList = res.data.list[0].children + if(this.current==0){ this.getRankingList(this.tabList[0].category_id) this.getNewGoods(this.tabList[0].category_id) - this.getBigList(this.tabList[0].category_id) + } + this.getBigList(this.current==0?(this.tabList[0].category_id):(this.tabList[this.tabCurrent].category_id)) } }) }, @@ -831,7 +835,7 @@ categoryId: val, is_brand: 0, is_new: 1, - order: 1 + order: 1, } GoodsApi.brandList(param).then(res => { let arr = res.data.data @@ -860,7 +864,8 @@ categoryId: val, is_brand: 1, is_new: 0, - order: 1 + order: 1, + is_in_store: this.current==0?0:1 } GoodsApi.brandList(param).then(res => { let arr = res.data.data; @@ -923,6 +928,8 @@ }, changeHome(val) { this.current = val; + this.getTypeList() + // this.getBigList(this.tabList[this.tabCurrent].category_id) }, getCityInfo() { const that = this @@ -937,7 +944,7 @@ async getStore() { newFunApi.storeData().then(res => { if (res.status == 200) { - this.logoImage=res.data.storeInfo.logoImage.preview_url + this.logoImage = res.data.storeInfo.logoImage.preview_url } }) .finally(() => {}) @@ -2263,4 +2270,4 @@ // height:10px; // width:10px; // } - + diff --git a/pages/invite/index.vue b/pages/invite/index.vue index 2cf124f..5072613 100644 --- a/pages/invite/index.vue +++ b/pages/invite/index.vue @@ -5,7 +5,7 @@ - + @@ -55,10 +55,10 @@ - + diff --git a/pages/news/rules/rulesList.vue b/pages/news/rules/rulesList.vue index 1a0f3b3..9013aff 100644 --- a/pages/news/rules/rulesList.vue +++ b/pages/news/rules/rulesList.vue @@ -27,6 +27,7 @@ }, onLoad(options) { this.itemInfo = JSON.parse(decodeURIComponent(options.itemInfo)) + console.log(this.itemInfo ) this.title = this.itemInfo.name this.list = this.itemInfo.child }, diff --git a/pages/user/vip/goods.vue b/pages/user/vip/goods.vue index a74889e..42557de 100644 --- a/pages/user/vip/goods.vue +++ b/pages/user/vip/goods.vue @@ -2,7 +2,8 @@ - + + @@ -28,8 +29,8 @@ 综合 - + 自营{{item.goods_name}} @@ -69,9 +70,13 @@ categoryChildren: [], list: [], swiperList: [], - orderSort: 1 + orderSort: 1, + type: 0 } }, + onLoad(op) { + this.type = op.type + }, /** * 生命周期函数--监听页面显示 */ @@ -94,7 +99,7 @@ // 获取分类 getCategoryList() { const app = this; - Api.category() + Api.category({is_in_store:this.type==1?1:0}) .then(result => { app.categoryList = result.data.list; app.categoryChildren = result.data.list[0].children; @@ -111,13 +116,14 @@ is_brand: 1, is_new: 0, categoryId: categoryId, - order: app.orderSort + order: app.orderSort, + is_in_store:this.type==1?1:0 } Api.brandList(pamars) .then(result => { let arr = result.data.data; - if(arr && arr.length > 0){ - arr.map(a=>{ + if (arr && arr.length > 0) { + arr.map(a => { a.goods_price_min = Number(a.goods_price_min) a.goods_price_max = Number(a.goods_price_max) a.line_price_min = Number(a.line_price_min) @@ -129,12 +135,12 @@ .finally(() => app.isLoading = false) }, tabItem(index, item) { - console.log(item,'1') + console.log(item, '1') this.tabIndex = index; this.getBrandList(item.category_id) }, tabItem1(item, index) { - console.log(item,'2') + console.log(item, '2') this.tabIndex1 = index; let app = this; app.categoryChildren = []; @@ -183,6 +189,7 @@ &-hd { width: 100%; height: 400rpx; + image { width: 100%; height: 100%;