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

Compare commits

base: root:4d65b4bb1cf8a6849abd09830db5e109e60317b3
Branches Tags
root:master
root:Branch_ccc
root:zzw-one
..
compare: root:8d72b148bbe1e807b18a98406991570245e709e3
Branches Tags
root:master
root:Branch_ccc
root:zzw-one

No commits in common. "4d65b4bb1cf8a6849abd09830db5e109e60317b3" and "8d72b148bbe1e807b18a98406991570245e709e3" have entirely different histories.
4d65b4bb1c ... 8d72b148bb

2 changed files with 3 additions and 23 deletions
Show Stats Expand all files Collapse all files

2
sheep/components/s-order-card/s-order-card.vue
View File

@ -15,7 +15,7 @@
<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" v-for="(item, index) in orderMap" <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center" v-for="(item, index) in orderMap"
:key="item.title" @tap="sheep.$router.go(item.path, { type: item.value })"> :key="item.title" @tap="sheep.$router.go(item.path, { type: item.value })">
<uni-badge class="uni-badge-left-margin" :text="numData.orderCount[item.count]" absolute="rightTop" <uni-badge class="uni-badge-left-margin" :text="numData.orderCount[item.count]" absolute="rightTop"
size="small" :type="state.themeType"> size="small">
<image class="item-icon" :src="item.icon" mode="aspectFit" /> <image class="item-icon" :src="item.icon" mode="aspectFit" />
</uni-badge> </uni-badge>
<view class="menu-title">{{ item.title }}</view> <view class="menu-title">{{ item.title }}</view>

24
uni_modules/uni-badge/components/uni-badge/uni-badge.vue
View File

@ -202,8 +202,8 @@
line-height: 18px; line-height: 18px;
color: #fff; color: #fff;
border-radius: 100px; border-radius: 100px;
background-color: $uni-error; background-color: $uni-info;
// background-color: transparent; background-color: transparent;
border: 1px solid #fff; border: 1px solid #fff;
text-align: center; text-align: center;
font-family: 'Helvetica Neue', Helvetica, sans-serif; font-family: 'Helvetica Neue', Helvetica, sans-serif;
@ -213,26 +213,6 @@
cursor: pointer; cursor: pointer;
/* #endif */ /* #endif */
&--lv {
color: #fff;
background:rgba(72,204,82);
}
&--blue {
color: #fff;
background:rgba(28,165,233);
}
&--pink {
color: #fff;
background:#ff448f ;
}
&--orange {
color: #fff;
background:#fe5c2d;
}
&--info { &--info {
color: #fff; color: #fff;
background-color: $uni-info; background-color: $uni-info;