diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 052f1c4..08ff543 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -2,8 +2,12 @@
 	<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>
@@ -13,6 +17,7 @@
 		name: "tabbar",
 		data() {
 			return {
+<<<<<<< HEAD
 				tabList: [ //tabbar列表
 					{
 						'name': '首页',
@@ -26,6 +31,12 @@
 						'name': '我的',
 						'icon': 'account'
 					}
+=======
+				tabList:[//tabbar列表
+					{name:'首页',icon:'home'},
+					{name:'点餐',icon:'grid'},
+					{name:'我的',icon:'account'}
+>>>>>>> 461e7d19503b8bc0c8c89afefdc392d6db564fdf
 				]
 			}
 		},