6.17(第一次提交

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'

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"},

pages/driver/home/home.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		<z-paging ref="paging" v-model="dataList" @query="queryList" default-page-size="5"
+			>
+			<view>首页</view>
+			<view slot='bottom'>
+				<tabbar-driver current="/pages/driver/home/home"></tabbar-driver>
+			</view>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

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,'小程序分享');

pages/driver/index/report_result.vue

@@ -27,7 +27,7 @@
 		methods: {
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/driver/index/index'
+					url: '/pages/driver/home/home'
 				});
 			}
 		},

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'
 				})
 			}
 		}

pages/driver/mine/car_info/unbindResult.vue

@@ -24,7 +24,7 @@
 			},
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/driver/index/index'
+					url: '/pages/driver/home/home'
 				});
 			}
 		}

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'
 				});
 			},
 			//提交

pages/driver/serve/coupons/payresult.vue

@@ -72,7 +72,7 @@
 			},
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/driver/index/index'
+					url: '/pages/driver/home/home'
 				});
 			}
 		},

pages/driver/serve/repair/bind_result.vue

@@ -89,7 +89,7 @@
 			},
 			toHomePage() {
 				uni.switchTab({
-					url: '/pages/driver/index/index'
+					url: '/pages/driver/home/home'
 				});
 			}
 		}

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'
         });
       }
     }

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()

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()

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'
 				});
 			}
 		},

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()

pages/driver/welfare/task/task.vue

@@ -124,7 +124,7 @@
 						})
 					} else {
 						uni.switchTab({
-							url: '/pages/driver/index/index'
+							url: '/pages/driver/home/home'
 						})
 					}
 				}

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 => {

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'
 					})
 				}
         }