Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair

# Conflicts:
#	pages/myCar/myCar.vue

pages/home/home.vue

@@ -3,7 +3,7 @@
 		<VNavigationBar leftTitle="true" backgroundColor="transparent" title="车辆检测维修"></VNavigationBar>
 		<view class="body">
 			<view class="body-top-banner">
-				<image class="banner" src="" mode="aspectFit" />
+				<image class="banner" src="@/static/images/banner.jpg" mode="aspectFit" />
 			</view>
 			<view class="menus">
 				<view @click="gotoPage(menu)" v-for="(menu, index) in menus" :key="index" class="menu-item">

pages/shopDetail/shopDetail.vue

@@ -10,7 +10,7 @@
 						</template>
 					</VNavigationBar>
 				</view>
-				<image class="shopImg" src="" mode="aspectFill"></image>
+				<image class="shopImg" src="@/static/images/outImage.jpg" mode="aspectFill"></image>
 			</view>
 			<view class="shopBody">
 				<view class="shopDetail">