xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-vue3' into master-vue3

Browse Source 
# Conflicts:
#	sheep/components/s-wallet-card/s-wallet-card.vue
This commit is contained in:
owen
2023-12-09 23:00:11 +08:00
parent 72998abf10 3157df8464
commit 4e3b8eccff
3 changed files with 77 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sheep/components/s-wallet-card/s-wallet-card.vue
+2 -8
View File
@@ -1,4 +1,5 @@
<template>
<!-- TODO @惠智造：代码合并有问题，可以看看 -->
<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/money')">
@@ -8,14 +9,6 @@
</view>
<view class="menu-title ss-m-t-28">账户余额</view>
</view>
<!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/commission')">
<view class="value-box ss-flex ss-col-bottom">
<view class="value-text">{{ userInfo?.commission || '0.00' }}</view>
<view class="unit-text ss-m-l-6">元</view>
</view>
<view class="menu-title ss-m-t-28">佣金</view>
</view> -->
<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
@tap="sheep.$router.go('/pages/user/wallet/score')">
<view class="value-box ss-flex ss-col-bottom">
@@ -99,3 +92,4 @@
}
}
</style>