diff --git a/data/tabbar.js b/data/tabbar.js index b1c1026..65a4807 100644 --- a/data/tabbar.js +++ b/data/tabbar.js @@ -52,22 +52,23 @@ export const carShopList = [ export const driverList = [ { - text: '发现', + text: '首页', iconPath: '../../../static/images/driver/tabbar/index.png', activeIconPath: '../../../static/images/driver/tabbar/index_active.png', - path: '/pages/driver/index/index' + path: '/pages/driver/home/home' }, { - text: '惊喜', + text: '滴友圈', iconPath: '../../../static/images/driver/tabbar/welfare.png', activeIconPath: '../../../static/images/driver/tabbar/welfare_active.png', - path: '/pages/driver/welfare/index' + // path: '/pages/driver/welfare/index' + path: '/pages/driver/index/index' }, { - text: '展厅', + text: '租买车', iconPath: '../../../static/images/driver/tabbar/showroom.png', activeIconPath: '../../../static/images/driver/tabbar/showroom_active.png', path: '/pages/driver/showroom/index' }, { - text: '服务', + text: '享服务', iconPath: '../../../static/images/driver/tabbar/serve.png', activeIconPath: '../../../static/images/driver/tabbar/serve_active.png', path: '/pages/driver/serve/index' diff --git a/pages.json b/pages.json index 962eb6e..1b52ea9 100644 --- a/pages.json +++ b/pages.json @@ -1,8 +1,18 @@ { - "pages": [{ + "pages": [ + { + "path" : "pages/driver/home/home", + "style": { + "navigationBarTitleText": "首页", + "navigationStyle": "custom", + "app-plus": { + "bounce": "none" + } + } + },{ "path": "pages/driver/index/index", "style": { - "navigationBarTitleText": "发现", + "navigationBarTitleText": "滴友圈", "navigationStyle": "custom", "app-plus": { "bounce": "none" @@ -1436,16 +1446,20 @@ "color": "#000000", "selectedColor": "#000000", "list": [ + //车商 {"pagePath": "pages/carShop/community/community"}, {"pagePath": "pages/carShop/maintain_order/maintain_order"}, {"pagePath": "pages/carShop/order/order"}, {"pagePath": "pages/carShop/message/message"}, {"pagePath": "pages/carShop/mine/mine"}, + //司机 + {"pagePath": "pages/driver/home/home"}, {"pagePath": "pages/driver/index/index"}, - {"pagePath": "pages/driver/welfare/index"}, + // {"pagePath": "pages/driver/welfare/index"}, {"pagePath": "pages/driver/showroom/index"}, {"pagePath": "pages/driver/serve/index"}, {"pagePath": "pages/driver/mine/index"}, + //维修店 {"pagePath": "pages/repair/tabbar/repair"}, {"pagePath": "pages/repair/tabbar/accessory"}, {"pagePath": "pages/repair/tabbar/procure"}, diff --git a/pages/driver/home/home.vue b/pages/driver/home/home.vue new file mode 100644 index 0000000..55557b2 --- /dev/null +++ b/pages/driver/home/home.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/pages/driver/index/consult_detail.vue b/pages/driver/index/consult_detail.vue index 331ff67..c77b209 100644 --- a/pages/driver/index/consult_detail.vue +++ b/pages/driver/index/consult_detail.vue @@ -648,20 +648,6 @@ onShow() { this.getUserInfo1() }, - onShareAppMessage(res) { - // console.log(res,'123456'); - if (res.from === 'button') { - // 来自页面内分享按钮 - getNoteShare(this.noteId).then(res => { - console.log(res, '分享成功'); - }) - } - return { - title: this.shareItem.content, //分享的名称 - path: '/pages/driver/index/index', - imageUrl: this.shareItem.image.length ? this.shareItem.image[0] : '', - }; - }, methods: { shareBtnInfo(item) { // console.log(item,'小程序分享'); diff --git a/pages/driver/index/report_result.vue b/pages/driver/index/report_result.vue index 7326a03..9b0a593 100644 --- a/pages/driver/index/report_result.vue +++ b/pages/driver/index/report_result.vue @@ -27,7 +27,7 @@ methods: { toHomePage() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } }, diff --git a/pages/driver/mine/business_cooperation/submit.vue b/pages/driver/mine/business_cooperation/submit.vue index efed727..d23bc35 100644 --- a/pages/driver/mine/business_cooperation/submit.vue +++ b/pages/driver/mine/business_cooperation/submit.vue @@ -20,7 +20,7 @@ methods: { navBackFn() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } } diff --git a/pages/driver/mine/car_info/unbindResult.vue b/pages/driver/mine/car_info/unbindResult.vue index 3e0ebb0..1f65d94 100644 --- a/pages/driver/mine/car_info/unbindResult.vue +++ b/pages/driver/mine/car_info/unbindResult.vue @@ -24,7 +24,7 @@ }, toHomePage() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } } diff --git a/pages/driver/mine/my_order/rentCars/in_advance.vue b/pages/driver/mine/my_order/rentCars/in_advance.vue index c0990b7..d16c895 100644 --- a/pages/driver/mine/my_order/rentCars/in_advance.vue +++ b/pages/driver/mine/my_order/rentCars/in_advance.vue @@ -86,7 +86,7 @@ //返回首页 returnIndexFn() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); }, //提交 diff --git a/pages/driver/serve/coupons/payresult.vue b/pages/driver/serve/coupons/payresult.vue index 7bdd73b..333ed75 100644 --- a/pages/driver/serve/coupons/payresult.vue +++ b/pages/driver/serve/coupons/payresult.vue @@ -72,7 +72,7 @@ }, toHomePage() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } }, diff --git a/pages/driver/serve/repair/bind_result.vue b/pages/driver/serve/repair/bind_result.vue index 6d37cd2..ff2ae17 100644 --- a/pages/driver/serve/repair/bind_result.vue +++ b/pages/driver/serve/repair/bind_result.vue @@ -89,7 +89,7 @@ }, toHomePage() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } } diff --git a/pages/driver/serve/repair/re_create/result.vue b/pages/driver/serve/repair/re_create/result.vue index 427fa43..86bc5e8 100644 --- a/pages/driver/serve/repair/re_create/result.vue +++ b/pages/driver/serve/repair/re_create/result.vue @@ -50,7 +50,7 @@ this.$store.dispatch('WorkingDay', '') this.$store.dispatch('WorkingTime', '') uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } } diff --git a/pages/driver/showroom/carBuy/index.vue b/pages/driver/showroom/carBuy/index.vue index 5bee307..ad25a78 100644 --- a/pages/driver/showroom/carBuy/index.vue +++ b/pages/driver/showroom/carBuy/index.vue @@ -146,7 +146,7 @@ navBackFn(type) { if (type == 'tabbar') { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } else { uni.navigateBack() diff --git a/pages/driver/showroom/carRental/index.vue b/pages/driver/showroom/carRental/index.vue index 593d2a3..4e940ae 100644 --- a/pages/driver/showroom/carRental/index.vue +++ b/pages/driver/showroom/carRental/index.vue @@ -503,7 +503,7 @@ navBackFn(type) { if (type == 'tabbar') { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } else { uni.navigateBack() diff --git a/pages/driver/welfare/payment_state/payment_state.vue b/pages/driver/welfare/payment_state/payment_state.vue index 0f4fdf8..01be716 100644 --- a/pages/driver/welfare/payment_state/payment_state.vue +++ b/pages/driver/welfare/payment_state/payment_state.vue @@ -46,7 +46,7 @@ }, toHomePage() { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); } }, diff --git a/pages/driver/welfare/rightsInterests/rightsInterests_particulars.vue b/pages/driver/welfare/rightsInterests/rightsInterests_particulars.vue index ca15cea..188c334 100644 --- a/pages/driver/welfare/rightsInterests/rightsInterests_particulars.vue +++ b/pages/driver/welfare/rightsInterests/rightsInterests_particulars.vue @@ -203,7 +203,7 @@ navBackFn(type) { if (type == 'tabbar') { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } else { uni.navigateBack() diff --git a/pages/driver/welfare/task/task.vue b/pages/driver/welfare/task/task.vue index c22428a..84733d2 100644 --- a/pages/driver/welfare/task/task.vue +++ b/pages/driver/welfare/task/task.vue @@ -124,7 +124,7 @@ }) } else { uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } } diff --git a/pages/login/driver-login.vue b/pages/login/driver-login.vue index 169fdc5..992ab0b 100644 --- a/pages/login/driver-login.vue +++ b/pages/login/driver-login.vue @@ -133,15 +133,13 @@ }, // 登录 loginSumbit() { - // uni.$u.toast('司机模块开发中') - // return if (this.agree) { this.$refs.uForm.validate().then(res => { userLogin(this.form).then(res => { setToken(res.data.token) uni.setStorageSync('userType', 'driver') uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }); }) }).catch(err => { diff --git a/permission.js b/permission.js index fd7aaa3..02b9106 100644 --- a/permission.js +++ b/permission.js @@ -37,7 +37,7 @@ list.forEach(item => { }) }else if(userType == 'driver'){ uni.switchTab({ - url: '/pages/driver/index/index' + url: '/pages/driver/home/home' }) } } diff --git a/static/images/driver/tabbar/index.png b/static/images/driver/tabbar/index.png index 4bf3d23..91efa08 100644 Binary files a/static/images/driver/tabbar/index.png and b/static/images/driver/tabbar/index.png differ diff --git a/static/images/driver/tabbar/index_active.png b/static/images/driver/tabbar/index_active.png index 5889628..6a3af5e 100644 Binary files a/static/images/driver/tabbar/index_active.png and b/static/images/driver/tabbar/index_active.png differ diff --git a/static/images/driver/tabbar/mine.png b/static/images/driver/tabbar/mine.png index ef74efc..a6a24d2 100644 Binary files a/static/images/driver/tabbar/mine.png and b/static/images/driver/tabbar/mine.png differ diff --git a/static/images/driver/tabbar/mine_active.png b/static/images/driver/tabbar/mine_active.png index 26e411b..a56c09c 100644 Binary files a/static/images/driver/tabbar/mine_active.png and b/static/images/driver/tabbar/mine_active.png differ diff --git a/static/images/driver/tabbar/serve.png b/static/images/driver/tabbar/serve.png index 9a54d57..732cd8a 100644 Binary files a/static/images/driver/tabbar/serve.png and b/static/images/driver/tabbar/serve.png differ diff --git a/static/images/driver/tabbar/serve_active.png b/static/images/driver/tabbar/serve_active.png index e4188d2..d26a0b1 100644 Binary files a/static/images/driver/tabbar/serve_active.png and b/static/images/driver/tabbar/serve_active.png differ diff --git a/static/images/driver/tabbar/showroom.png b/static/images/driver/tabbar/showroom.png index 2527131..6e83885 100644 Binary files a/static/images/driver/tabbar/showroom.png and b/static/images/driver/tabbar/showroom.png differ diff --git a/static/images/driver/tabbar/showroom_active.png b/static/images/driver/tabbar/showroom_active.png index e6dc096..3e18d77 100644 Binary files a/static/images/driver/tabbar/showroom_active.png and b/static/images/driver/tabbar/showroom_active.png differ diff --git a/static/images/driver/tabbar/welfare.png b/static/images/driver/tabbar/welfare.png index 1123cdb..94f093a 100644 Binary files a/static/images/driver/tabbar/welfare.png and b/static/images/driver/tabbar/welfare.png differ diff --git a/static/images/driver/tabbar/welfare_active.png b/static/images/driver/tabbar/welfare_active.png index 9122bff..2d462a6 100644 Binary files a/static/images/driver/tabbar/welfare_active.png and b/static/images/driver/tabbar/welfare_active.png differ