合并
This commit is contained in:
parent
68be72836a
commit
1d6e41847d
@ -53,17 +53,11 @@
|
||||
</view> -->
|
||||
<view class="newList">
|
||||
<view class="new_menu" v-for="(arr, index) in menuList" :key="index">
|
||||
<<<<<<< Updated upstream
|
||||
<view v-for="(item, index) in arr" :key="index" class="new_items"
|
||||
:style="[{ width: `${100 * (1 / data.column)}%`}]" @tap="sheep.$router.go(item.url)">
|
||||
<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
|
||||
=======
|
||||
<view v-for="(item, index) in arr" :key="index"
|
||||
class="new_items"
|
||||
:style="[{ width: `${100 * (1 / data.column)}%`}]">
|
||||
<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center"
|
||||
@tap="sheep.$router.go(item.url)" v-if="item.title !== '平台客服' || (item.title === '平台客服' && userInfo.idKefu)">
|
||||
>>>>>>> Stashed changes
|
||||
<view v-if="item.badge.show" class="tag-box">
|
||||
{{ item.badge.text }}
|
||||
</view>
|
||||
@ -408,4 +402,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
Loading…
x
Reference in New Issue
Block a user