diff --git a/aircraft/server/index/index.vue b/aircraft/server/index/index.vue index ee1f49e..2a83f2e 100644 --- a/aircraft/server/index/index.vue +++ b/aircraft/server/index/index.vue @@ -4,9 +4,9 @@ scroll-with-animation @scroll="scroll" @refresherrefresh="refresh"> - - - + + + + v-for="(item,index) in isPilot?aNavicationList:bNavicationList" :key="index"> {{ item.name }} @@ -47,7 +47,7 @@ export default { loading: false, fileUrl: configService.fileUrl + 'aerocraft/navigation/',//导航栏图标基础路径 // 导航栏按钮 - navicationList:[ + aNavicationList:[ { name: '订单', icon: 'order.png', @@ -69,6 +69,18 @@ export default { select: 'my-select.png' } ], + bNavicationList:[ + { + name: '订单', + icon: 'order.png', + select: 'order-select.png' + }, + { + name: '我的', + icon: 'my.png', + select: 'my-select.png' + } + ], topLevel: 0,// 页面是否滚动到顶 // 滚动顶部 scrollTop: 0, @@ -77,12 +89,14 @@ export default { refs: ['order','equipment','route','my'], // 登录状态 isLogin: this.$store.state.vuex_token, + isPilot: this.$store.state.user_type == 1, } }, onLoad(){ let index = uni.getStorageSync('current'); this.current = index?index:0; this.isLogin = this.$store.state.vuex_token; + this.isPilot = this.$store.state.user_type; this.changeCurrent(this.current); }, onShow(){ diff --git a/aircraft/server/my/child_pages/login.vue b/aircraft/server/my/child_pages/login.vue index 24767cf..85a5ba6 100644 --- a/aircraft/server/my/child_pages/login.vue +++ b/aircraft/server/my/child_pages/login.vue @@ -42,7 +42,7 @@ + + \ No newline at end of file diff --git a/aircraft/server/my/child_pages/setting.vue b/aircraft/server/my/child_pages/setting.vue index a27645e..7fefd4b 100644 --- a/aircraft/server/my/child_pages/setting.vue +++ b/aircraft/server/my/child_pages/setting.vue @@ -1,13 +1,42 @@