diff --git a/components/base/navbar.vue b/components/base/navbar.vue index 5bc527a..49636c4 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -2,33 +2,33 @@ + :style="{backgroundColor : bgColor,color}"> + :color="color" size="46rpx"> + :color="color" size="46rpx"> {{ title }} + :color="color" size="58rpx"> - - @@ -70,6 +70,9 @@ }, bgColor : { default : '#fff' + }, + color : { + default : '#333' } }, created() { diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 4cd0e46..a31db75 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -6,12 +6,16 @@ :class="{item : true, active : select == index}" v-for="(item, index) in list" :key="index" - v-if="!item.isNotShop || !userShop" @click="toPath(item, index)"> - + item.iconPath" class="icon-image" mode=""> --> + + {{ item.title }} @@ -27,7 +31,6 @@ name:"tabbar", props : ['select'], computed : { - ...mapGetters(['userShop']), }, data() { return { @@ -36,13 +39,15 @@ "selectedIconPath": "/static/image/tabbar/home-a.png", "iconPath": "/static/image/tabbar/home.png", "pagePath": "/pages/index/index", - "title": "首页" + "title": "首页", + icon : 'home', }, { "selectedIconPath": "/static/image/tabbar/center-a.png", "iconPath": "/static/image/tabbar/center.png", "pagePath": "/pages/index/center", - "title": "我的" + "title": "我的", + icon : 'account', } ] }; @@ -88,6 +93,9 @@ .icon{ width: 54rpx; height: 54rpx; + display: flex; + justify-content: center; + align-items: center; .icon-image{ width: 54rpx; height: 54rpx; diff --git a/components/work/WorkOrderitem.vue b/components/work/WorkOrderitem.vue index 51a393e..abd0a91 100644 --- a/components/work/WorkOrderitem.vue +++ b/components/work/WorkOrderitem.vue @@ -34,22 +34,15 @@ \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 1ad2662..1f869ba 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,7 +1,8 @@