Food/food_wechat
3
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
szdot 2024-05-31 02:49:48 +08:00
commit d9b8a7fb23
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/tabbar/tabbar.vue
View File

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