root/zyejMAll-mobile
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
peak 2025-06-09 12:10:46 +08:00
parent 68be72836a
commit 1d6e41847d
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sheep/components/s-menu-button/s-menu-button.vue
View File

@ -53,17 +53,11 @@
</view> --> </view> -->
<view class="newList"> <view class="newList">
<view class="new_menu" v-for="(arr, index) in menuList" :key="index"> <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" <view v-for="(item, index) in arr" :key="index"
class="new_items" class="new_items"
:style="[{ width: `${100 * (1 / data.column)}%`}]"> :style="[{ width: `${100 * (1 / data.column)}%`}]">
<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center" <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)"> @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"> <view v-if="item.badge.show" class="tag-box">
{{ item.badge.text }} {{ item.badge.text }}
</view> </view>