Skip to content

Commit f79c31d

Browse files
author
wangyaqi
committed
fix: 图标显示修复
1 parent fb40af9 commit f79c31d

20 files changed

Lines changed: 65 additions & 709 deletions

File tree

‎components/uni-collapse-item/uni-collapse-item.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<view class="uni-collapse-cell__title-text">{{ title }}</view>
99
</view>
1010
<view :class="{ 'uni-active': isOpen, 'uni-collapse-cell--animation': showAnimation === true }" class="uni-collapse-cell__title-arrow">
11-
<uni-icon color="#bbb" size="20" type="arrowdown" />
11+
<uni-icons color="#bbb" size="20" type="arrowdown" />
1212
</view>
1313
</view>
1414
<view :class="{ 'uni-collapse-cell--animation': showAnimation === true }" :style="{ height: isOpen ? height : '0px' }" class="uni-collapse-cell__content">
@@ -20,11 +20,11 @@
2020
</template>
2121

2222
<script>
23-
import uniIcon from '../uni-icon/uni-icon.vue'
23+
import uniIcons from '../uni-icons/uni-icons.vue'
2424
export default {
2525
name: 'UniCollapseItem',
2626
components: {
27-
uniIcon
27+
uniIcons
2828
},
2929
props: {
3030
title: {

‎components/uni-icon/uni-icon.1.vue‎

Lines changed: 0 additions & 649 deletions
This file was deleted.

components/uni-icon/uni-icon.vue renamed to components/uni-icons/uni-icons.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
export default {
7-
name: 'UniIcon',
7+
name: 'UniIcons',
88
props: {
99
type: {
1010
type: String,

‎components/uni-indexed-list/uni-indexed-list.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<view v-for="(item, index) in list.items" :key="index" class="uni-list-item" hover-class="uni-list-item--hover">
88
<view class="uni-list-item__container" @click="onClick(idx, index)">
99
<view v-if="showSelect" style="margin-right: 20upx;">
10-
<uni-icon :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#aaa'" size="24" />
10+
<uni-icons :type="item.checked ? 'checkbox-filled' : 'circle'" :color="item.checked ? '#007aff' : '#aaa'" size="24" />
1111
</view>
1212
<view class="uni-list-item__content">{{ item.name }}</view>
1313
</view>
@@ -24,11 +24,11 @@
2424
</view>
2525
</template>
2626
<script>
27-
import uniIcon from '../uni-icon/uni-icon.vue'
27+
import uniIcons from '../uni-icons/uni-icons.vue'
2828
export default {
2929
name: 'UniIndexedList',
3030
components: {
31-
uniIcon
31+
uniIcons
3232
},
3333
props: {
3434
options: {

‎components/uni-list-item/uni-list-item.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<image :src="thumb" class="uni-list-item__icon-img" />
66
</view>
77
<view v-else-if="showExtraIcon" class="uni-list-item__icon">
8-
<uni-icon :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" class="uni-icon-wrapper" />
8+
<uni-icons :color="extraIcon.color" :size="extraIcon.size" :type="extraIcon.type" class="uni-icon-wrapper" />
99
</view>
1010
<view class="uni-list-item__content">
1111
<view class="uni-list-item__content-title">{{ title }}</view>
@@ -14,19 +14,19 @@
1414
<view v-if="showBadge || showArrow || showSwitch" class="uni-list-item__extra">
1515
<uni-badge v-if="showBadge" :type="badgeType" :text="badgeText" />
1616
<switch v-if="showSwitch" :disabled="disabled" :checked="switchChecked" @change="onSwitchChange" />
17-
<uni-icon v-if="showArrow" :size="20" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
17+
<uni-icons v-if="showArrow" :size="20" class="uni-icon-wrapper" color="#bbb" type="arrowright" />
1818
</view>
1919
</view>
2020
</view>
2121
</template>
2222

2323
<script>
24-
import uniIcon from '../uni-icon/uni-icon.vue'
24+
import uniIcons from '../uni-icons/uni-icons.vue'
2525
import uniBadge from '../uni-badge/uni-badge.vue'
2626
export default {
2727
name: 'UniListItem',
2828
components: {
29-
uniIcon,
29+
uniIcons,
3030
uniBadge
3131
},
3232
props: {

‎components/uni-nav-bar/uni-nav-bar.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<view :style="{color:color}" class="uni-navbar__header uni-navbar__content_view">
77
<view class="uni-navbar__header-btns uni-navbar__content_view" @tap="onClickLeft">
88
<view v-if="leftIcon.length" class="uni-navbar__content_view">
9-
<uni-icon :type="leftIcon" :color="color" size="24" />
9+
<uni-icons :type="leftIcon" :color="color" size="24" />
1010
</view>
1111
<view v-if="leftText.length" :class="{'uni-navbar-btn-icon-left':!leftIcon.length}" class="uni-navbar-btn-text uni-navbar__content_view">{{ leftText }}</view>
1212
<slot name="left" />
@@ -18,7 +18,7 @@
1818
</view>
1919
<view class="uni-navbar__header-btns uni-navbar__content_view" @tap="onClickRight">
2020
<view v-if="rightIcon.length" class="uni-navbar__content_view">
21-
<uni-icon :type="rightIcon" :color="color" size="24" />
21+
<uni-icons :type="rightIcon" :color="color" size="24" />
2222
</view>
2323
<!-- 优先显示图标 -->
2424
<view v-if="rightText.length&&!rightIcon.length" class="uni-navbar-btn-text uni-navbar__content_view">{{ rightText }}</view>
@@ -35,13 +35,13 @@
3535

3636
<script>
3737
import uniStatusBar from '../uni-status-bar/uni-status-bar.vue'
38-
import uniIcon from '../uni-icon/uni-icon.vue'
38+
import uniIcons from '../uni-icons/uni-icons.vue'
3939
4040
export default {
4141
name: 'UniNavBar',
4242
components: {
4343
uniStatusBar,
44-
uniIcon
44+
uniIcons
4545
},
4646
props: {
4747
title: {

‎components/uni-notice-bar/uni-notice-bar.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<template>
22
<view v-if="show" :style="{ backgroundColor: backgroundColor, color: color }" class="uni-noticebar" @click="onClick">
33
<view v-if="showClose === 'true' || showClose === true" class="uni-noticebar__close">
4-
<uni-icon type="closefill" size="12" />
4+
<uni-icons type="closefill" size="12" />
55
</view>
66
<view :class="{ 'uni-noticebar--flex': scrollable || single || moreText }" class="uni-noticebar__content">
77
<view v-if="showIcon === 'true' || showIcon === true" :style="{ backgroundColor: backgroundColor, color: color }" class="uni-noticebar__content-icon">
8-
<uni-icon :color="color" type="sound" size="14" />
8+
<uni-icons :color="color" type="sound" size="14" />
99
</view>
1010
<view :class="{ 'uni-noticebar--scrollable': scrollable, 'uni-noticebar--single': !scrollable && (single || moreText) }" class="uni-noticebar__content-text">
1111
<view :id="elId" :style="{ animation: animation, '-webkit-animation': animation }" class="uni-noticebar__content-inner">{{ text }}</view>
1212
</view>
1313
<view v-if="showGetMore === 'true' || showGetMore === true" :style="{ width: moreText ? '180upx' : '20px' }" class="uni-noticebar__content-more" @click="clickMore">
1414
<view v-if="moreText" class="uni-noticebar__content-more-text">{{ moreText }}</view>
15-
<uni-icon type="arrowright" size="14" />
15+
<uni-icons type="arrowright" size="14" />
1616
</view>
1717
</view>
1818
</view>
1919
</template>
2020

2121
<script>
22-
import uniIcon from '../uni-icon/uni-icon.vue'
22+
import uniIcons from '../uni-icons/uni-icons.vue'
2323
export default {
2424
name: 'UniNoticeBar',
2525
components: {
26-
uniIcon
26+
uniIcons
2727
},
2828
props: {
2929
text: {

‎components/uni-pagination/uni-pagination.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<view class="uni-pagination__btns">
44
<view :class="['uni-pagination__btn',{'uni-pagination--disabled':currentIndex === 1}]" :hover-class="currentIndex === 1 ? '' : 'uni-pagination--hover'" :hover-start-time="20" :hover-stay-time="70" @click="clickLeft">
55
<template v-if="showIcon===true || showIcon === 'true'">
6-
<uni-icon color="#000" size="20" type="arrowleft" />
6+
<uni-icons color="#000" size="20" type="arrowleft" />
77
</template>
88
<template v-else>
99
{{ prevText }}
1010
</template>
1111
</view>
1212
<view :class="['uni-pagination__btn',{'uni-pagination--disabled':currentIndex === maxPage}]" :hover-class="currentIndex === maxPage ? '' : 'uni-pagination--hover'" :hover-start-time="20" :hover-stay-time="70" @click="clickRight">
1313
<template v-if="showIcon===true || showIcon === 'true'">
14-
<uni-icon color="#000" size="20" type="arrowright" />
14+
<uni-icons color="#000" size="20" type="arrowright" />
1515
</template>
1616
<template v-else>
1717
{{ nextText }}
@@ -25,11 +25,11 @@
2525
</template>
2626

2727
<script>
28-
import uniIcon from '../uni-icon/uni-icon.vue'
28+
import uniIcons from '../uni-icons/uni-icons.vue'
2929
export default {
3030
name: 'UniPagination',
3131
components: {
32-
uniIcon
32+
uniIcons
3333
},
3434
props: {
3535
prevText: {

‎components/uni-rate/uni-rate.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<template>
22
<view class="uni-rate">
33
<view v-for="(star, index) in stars" :key="index" :style="{ marginLeft: margin + 'px' }" class="uni-rate-icon" @click="_onClick(index)">
4-
<uni-icon :size="size" :color="color" :type="isFill ? 'star-filled' : 'star'" />
4+
<uni-icons :size="size" :color="color" :type="isFill ? 'star-filled' : 'star'" />
55
<view :style="{ width: star.activeWitch }" class="uni-rate-icon-on">
6-
<uni-icon :size="size" :color="activeColor" type="star-filled" />
6+
<uni-icons :size="size" :color="activeColor" type="star-filled" />
77
</view>
88
</view>
99
</view>
1010
</template>
1111

1212
<script>
13-
import uniIcon from '../uni-icon/uni-icon.vue'
13+
import uniIcons from '../uni-icons/uni-icons.vue'
1414
export default {
1515
name: 'UniRate',
1616
components: {
17-
uniIcon
17+
uniIcons
1818
},
1919
props: {
2020
isFill: {

‎components/uni-steps/uni-steps.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</view>
99
<view class="uni-steps-item-circle-container">
1010
<view v-if="index !== active" :style="{ backgroundColor: index < active ? activeColor : '' }" class="uni-steps-item-circle" />
11-
<uni-icon v-else :color="activeColor" type="checkbox-filled" size="14" />
11+
<uni-icons v-else :color="activeColor" type="checkbox-filled" size="14" />
1212
</view>
1313
<view v-if="index !== options.length - 1" :style="{ backgroundColor: index < active ? activeColor : '' }" class="uni-steps-item-line" />
1414
</view>
@@ -17,11 +17,11 @@
1717
</template>
1818

1919
<script>
20-
import uniIcon from '../uni-icon/uni-icon.vue'
20+
import uniIcons from '../uni-icons/uni-icons.vue'
2121
export default {
2222
name: 'UniSteps',
2323
components: {
24-
uniIcon
24+
uniIcons
2525
},
2626
props: {
2727
direction: {

0 commit comments

Comments
 (0)