angelo
/
web-base-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:6e34276e21d8dec0ac4b13e0aa05c62aa58722f9
Branches Tags
angelo:master
angelo:bd-test
angelo:bd-dev
angelo:specialAreaList-category
angelo:refactorPay
angelo:bd-online
angelo:lx-online
angelo:lx-mh
angelo:lx-dp
angelo:lx-test
angelo:lx-dev
angelo:sangelxiu1/shareRegist
angelo:base-dev
angelo:feat/id-card
angelo:feat/flash-sale
angelo:bd-region-select
angelo:feat/share-register
angelo:feat/bd-pay
angelo:feat/bd-index-refactor
angelo:base-online
angelo:feat/product-list
angelo:dev
angelo:feat/ywk/uni-app
..
compare: angelo:2bd4aa060199059666e8c43c392c48433888a12a
Branches Tags
angelo:bd-test
angelo:bd-dev
angelo:specialAreaList-category
angelo:refactorPay
angelo:bd-online
angelo:lx-online
angelo:lx-mh
angelo:lx-dp
angelo:lx-test
angelo:lx-dev
angelo:sangelxiu1/shareRegist
angelo:base-dev
angelo:feat/id-card
angelo:feat/flash-sale
angelo:bd-region-select
angelo:feat/share-register
angelo:feat/bd-pay
angelo:feat/bd-index-refactor
angelo:base-online
angelo:feat/product-list
angelo:dev
angelo:feat/ywk/uni-app
angelo:master

No commits in common. "6e34276e21d8dec0ac4b13e0aa05c62aa58722f9" and "2bd4aa060199059666e8c43c392c48433888a12a" have entirely different histories.
6e34276e21 ... 2bd4aa0601

1 changed files with 14 additions and 14 deletions
Show Stats Expand all files Collapse all files

28
components/RankingPopup.vue
View File

@ -26,12 +26,12 @@
<view class="member-code">{{ <view class="member-code">{{
peopleTopThree[1].memberCode peopleTopThree[1].memberCode
}}</view> }}</view>
<!-- <view <view
class="member-name" class="member-name"
:class="{ highlight: peopleTopThree[1].isLoginMember == 1 }" :class="{ highlight: peopleTopThree[1].isLoginMember == 1 }"
> >
{{ peopleTopThree[1].memberName | formatMemberName }} {{ peopleTopThree[1].memberName | formatMemberName }}
</view> --> </view>
<view class="score">{{ peopleTopThree[1].count }}人</view> <view class="score">{{ peopleTopThree[1].count }}人</view>
</view> </view>
@ -47,12 +47,12 @@
<view class="member-code"> <view class="member-code">
{{ peopleTopThree[0].memberCode }} {{ peopleTopThree[0].memberCode }}
</view> </view>
<!-- <view <view
class="member-name" class="member-name"
:class="{ highlight: peopleTopThree[0].isLoginMember == 1 }" :class="{ highlight: peopleTopThree[0].isLoginMember == 1 }"
> >
{{ peopleTopThree[0].memberName | formatMemberName }} {{ peopleTopThree[0].memberName | formatMemberName }}
</view> --> </view>
<view class="score">{{ peopleTopThree[0].count }}人</view> <view class="score">{{ peopleTopThree[0].count }}人</view>
</view> </view>
</view> </view>
@ -66,12 +66,12 @@
<view class="member-code">{{ <view class="member-code">{{
peopleTopThree[2].memberCode peopleTopThree[2].memberCode
}}</view> }}</view>
<!-- <view <view
class="member-name" class="member-name"
:class="{ highlight: peopleTopThree[2].isLoginMember == 1 }" :class="{ highlight: peopleTopThree[2].isLoginMember == 1 }"
> >
{{ peopleTopThree[2].memberName | formatMemberName }} {{ peopleTopThree[2].memberName | formatMemberName }}
</view> --> </view>
<view class="score">{{ peopleTopThree[2].count }}人</view> <view class="score">{{ peopleTopThree[2].count }}人</view>
</view> </view>
@ -93,7 +93,7 @@
> >
<view class="item-rank">{{ index + 4 }}</view> <view class="item-rank">{{ index + 4 }}</view>
<view class="item-info"> <view class="item-info">
<!-- <view class="item-code">{{ item.memberCode }}</view> --> <view class="item-code">{{ item.memberCode }}</view>
<view <view
class="item-name" class="item-name"
:class="{ highlight: item.isLoginMember == 1 }" :class="{ highlight: item.isLoginMember == 1 }"
@ -152,9 +152,9 @@
> >
{{ amountTopThree[1].memberName | formatMemberName }} {{ amountTopThree[1].memberName | formatMemberName }}
</view> </view>
<!-- <view class="member-code">{{ <view class="member-code">{{
amountTopThree[1].memberCode amountTopThree[1].memberCode
}}</view> --> }}</view>
<view class="score">{{ <view class="score">{{
formatAmount(amountTopThree[1].amount) formatAmount(amountTopThree[1].amount)
}}</view> }}</view>
@ -173,9 +173,9 @@
> >
{{ amountTopThree[0].memberName | formatMemberName }} {{ amountTopThree[0].memberName | formatMemberName }}
</view> </view>
<!-- <view class="member-code">{{ <view class="member-code">{{
amountTopThree[0].memberCode amountTopThree[0].memberCode
}}</view> --> }}</view>
<view class="score">{{ <view class="score">{{
formatAmount(amountTopThree[0].amount) formatAmount(amountTopThree[0].amount)
}}</view> }}</view>
@ -194,9 +194,9 @@
> >
{{ amountTopThree[2].memberName | formatMemberName }} {{ amountTopThree[2].memberName | formatMemberName }}
</view> </view>
<!-- <view class="member-code">{{ <view class="member-code">{{
amountTopThree[2].memberCode amountTopThree[2].memberCode
}}</view> --> }}</view>
<view class="score">{{ <view class="score">{{
formatAmount(amountTopThree[2].amount) formatAmount(amountTopThree[2].amount)
}}</view> }}</view>
@ -222,7 +222,7 @@
> >
<view class="item-rank">{{ index + 4 }}</view> <view class="item-rank">{{ index + 4 }}</view>
<view class="item-info"> <view class="item-info">
<!-- <view class="item-code">{{ item.memberCode }}</view> --> <view class="item-code">{{ item.memberCode }}</view>
<view <view
class="item-name" class="item-name"
:class="{ highlight: item.isLoginMember == 1 }" :class="{ highlight: item.isLoginMember == 1 }"