Merge branch 'master' of http://111.229.174.37:9090/Bonobo.Git.Server/food_wechat

components/tabbar/tabbar.vue

@@ -2,12 +2,8 @@
 	<view>
 		<u-tabbar :value="current" @change="handleTabChange" :fixed="true" :placeholder="true"
 			:safeAreaInsetBottom="true" activeColor="#D43030">
-<<<<<<< HEAD
 			<u-tabbar-item v-for="(item,index) in tabList" :key="index" class="fz28" :text="item.name"
 				:icon="item.icon"></u-tabbar-item>
-=======
-			<u-tabbar-item v-for="item,index in tabList" :key="index" class="fz24" text="item.name" icon="item.icon"></u-tabbar-item>
->>>>>>> 461e7d19503b8bc0c8c89afefdc392d6db564fdf
 		</u-tabbar>
 	</view>
 </template>
@@ -17,7 +13,6 @@
 		name: "tabbar",
 		data() {
 			return {
-<<<<<<< HEAD
 				tabList: [ //tabbar列表
 					{
 						'name': '首页',
@@ -31,12 +26,6 @@
 						'name': '我的',
 						'icon': 'account'
 					}
-=======
-				tabList:[//tabbar列表
-					{name:'首页',icon:'home'},
-					{name:'点餐',icon:'grid'},
-					{name:'我的',icon:'account'}
->>>>>>> 461e7d19503b8bc0c8c89afefdc392d6db564fdf
 				]
 			}
 		},