Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into gyq_test

pages/dashboard/dashboard.vue

@@ -91,7 +91,7 @@
 						},
 						{
 							label: '骑行时长',
-							prop: (this.infoList.current_time / 60 /60).toFixed(2) || 0,
+							prop: (this.infoList.current_time / 60 /60).toFixed(1) || 0,
 							unit: 'h'
 						},
 						{

pages/index/index.vue

@@ -133,7 +133,7 @@
 							<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm"
 								alt="">
 						</view>
-						<view @tap="navToPage" data-url="/pages/userManagement/userManagement"
+						<view v-if="car_info.is_share != 1"  @tap="navToPage" data-url="/pages/userManagement/userManagement"
 							class="flex-row config-car-view">
 							<view class="margin_r_20"><img class="icon_style_64"
 									src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>

pages/my/set.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="set-page">
-		<navBar name="设置" left="0"></navBar>
+		<navBar name="设置" ></navBar>
 		<image @click="editAvatarFn" :src="userInfo.headimg || defaultHeadImg" class="head-img" />
 		<view class="list-wrap">
 			<view v-for="(item, index) in list" :key="index" class="item" @tap="routerLink(item.url)">
@@ -193,6 +193,7 @@
 			height: 174rpx;
 			margin: 0 auto 40rpx;
 			border-radius: 50%;
+			margin-top: 60rpx;
 		}
 
 		.list-wrap {