diff --git a/src/components/indexWaterfallBox/indexWaterfallBox.vue b/src/components/indexWaterfallBox/indexWaterfallBox.vue index 7406f8d..2382e77 100644 --- a/src/components/indexWaterfallBox/indexWaterfallBox.vue +++ b/src/components/indexWaterfallBox/indexWaterfallBox.vue @@ -69,8 +69,9 @@ -
- +
+ +
@@ -213,7 +214,7 @@ let itemData = props.data font-weight: 400; font-style: normal; font-size: 14px; - color: #7F7F7F; + color: #AAAAAA; margin-top: 15px; padding: 0 10px; } diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue index 923c3b7..5a9f9b5 100644 --- a/src/components/pageTopBar/pageTopBar.vue +++ b/src/components/pageTopBar/pageTopBar.vue @@ -10,11 +10,13 @@ {{ item.name }}
- +
- 退出 + + 退出 +
@@ -29,9 +31,9 @@
- +
- +
@@ -56,12 +58,31 @@ + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 15c3eee..66f12c4 100644 --- a/src/main.js +++ b/src/main.js @@ -20,6 +20,9 @@ import { ElPopover, ElDatePicker, ElMessage, + ElSpace, + ElSkeleton, + ElSkeletonItem, // 其他需要的组件 } from 'element-plus' @@ -43,7 +46,6 @@ api.index().then(res => { store.state.user = res.data.user store.state.nav = res.data.nav store.state.wechat = res.data.wechat - console.log(123,res.data.recommendedTab) } }) @@ -64,6 +66,8 @@ app.use(ElDropdown) app.use(ElPopover) app.use(ElDatePicker) app.use(ElMessage) +app.use(ElSkeleton) +app.use(ElSkeletonItem) app.use(store).use(router).use(Axios).mount('#app') diff --git a/src/utils/api.js b/src/utils/api.js index 2eaa63a..e9ef7de 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -9,5 +9,11 @@ export default{ }, recommendList:(params={})=>{//首页瀑布流 return axios.get('/tenement/pc/api/home/recommendList',params) + }, + banner:(params={})=>{//轮播 + return axios.get('/tenement/pc/api/banner',params) + }, + getLocationData:(params={})=>{//地区选择数据 + return axios.get('/tenement/pc/api/home/getLocationData',params) } } \ No newline at end of file diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 20aea09..8e14bdf 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,6 +1,6 @@