diff --git a/pages/index/index.vue b/pages/index/index.vue index 04ee354..5ad02ff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -668,7 +668,7 @@ if (data.select_mechant && uni.getStorageSync('storeVersion') == 1) { this.gridList.splice(5, 1, { - image: '/static/tabbar/shop-active.png', + image: `${this.$picUrl}/static/index/shop-active.png`, text: "精选商户", path: '/pages/shopList/index', type: 2 @@ -1065,6 +1065,7 @@ if (res.status == 200) { this.logoImage = res.data.storeInfo.logoImage ? res.data.storeInfo.logoImage .preview_url : ""; + uni.setStorageSync('storeInfo', JSON.stringify(res.data.storeInfo)); uni.setStorageSync('storeVersion', res.data.storeInfo.store_version || 0); } }) diff --git a/pages/shopList/shopPage.vue b/pages/shopList/shopPage.vue index 68173a9..315c339 100644 --- a/pages/shopList/shopPage.vue +++ b/pages/shopList/shopPage.vue @@ -12,7 +12,8 @@ - + + {{ storeInfo.store_name }} 100%正品 @@ -141,15 +142,18 @@ goods: [] }; }, - // computed: { - // styleIndex() { - // const index = uni.getStorageSync('styleIndex') || ''; - // return index; - // }, - // navBgColor() { - // return this.styleIndex ? (styleColor.shopNavBgColor[this.styleIndex - 1] || '#FFA3B2') : '#FFA3B2' - // } - // }, + computed: { + storeInfo() { + return JSON.parse(uni.getStorageSync('storeInfo') || '{}'); + }, + // styleIndex() { + // const index = uni.getStorageSync('styleIndex') || ''; + // return index; + // }, + // navBgColor() { + // return this.styleIndex ? (styleColor.shopNavBgColor[this.styleIndex - 1] || '#FFA3B2') : '#FFA3B2' + // } + }, watch: { firstCate() { this.goods = []; @@ -358,15 +362,22 @@ padding: 0 24rpx; display: flex; align-items: center; - .logo { - width: 92rpx; - height: 34rpx; + >text { + font-size: 24rpx; + color: #fff; margin-right: auto; } + .logo { + width: 50rpx; + height: 50rpx; + margin-right: 10rpx; + } .tip { font-size: 22rpx; color: #fff; margin-left: 20rpx; + display: flex; + align-items: center; image { width: 26rpx; height: 26rpx; diff --git a/static/tabbar/shop-active.png b/static/tabbar/shop-active.png deleted file mode 100644 index 4cf5619..0000000 Binary files a/static/tabbar/shop-active.png and /dev/null differ diff --git a/static/tabbar/shop.png b/static/tabbar/shop.png deleted file mode 100644 index b7fc37f..0000000 Binary files a/static/tabbar/shop.png and /dev/null differ