diff --git a/pages.json b/pages.json
index 97447e0bf45fe4f1bb35f5f7c3fa3c3c8af1cfe3..d788a1a6b103a0dff13eec26238b83b73b6f3028 100644
--- a/pages.json
+++ b/pages.json
@@ -1614,10 +1614,9 @@
}
},
{
- "path": "pages/CSS/text/font-icon",
- "group": "2,14,15",
+ "path": "pages/CSS/text/font-family-icon",
"style": {
- "navigationBarTitleText": "font-icon"
+ "navigationBarTitleText": "font-family: uni-icon"
}
},
{
@@ -2854,10 +2853,6 @@
{
"id": "css.properties.text.letter-spacing",
"name": "letter-spacing"
- },
- {
- "id": "css.properties.text.font-icon",
- "name": "font-icon"
}
]
},
diff --git a/pages/CSS/text/font-icon.uvue b/pages/CSS/text/font-family-icon.uvue
similarity index 99%
rename from pages/CSS/text/font-icon.uvue
rename to pages/CSS/text/font-family-icon.uvue
index e937d22b20b94c8713b269f1e61b6f06d6bfab4d..2a422d5edfab173d1fbc4465df48963cd3c41dc5 100644
--- a/pages/CSS/text/font-icon.uvue
+++ b/pages/CSS/text/font-family-icon.uvue
@@ -26,14 +26,14 @@
data() {
return {
uniIcons: [ //图标数据
- {
- 'name':'forward',
- 'code':'E600',
- },
{
'name':'back',
'code':'E601',
},
+ {
+ 'name':'forward',
+ 'code':'E600',
+ },
{
'name':'share',
'code':'E602',
@@ -62,6 +62,10 @@
'name':'circle',
'code':'EA01',
},
+ {
+ 'name':'warn',
+ 'code':'EA0F',
+ },
{
'name':'info',
'code':'EA03',
@@ -86,10 +90,6 @@
'name':'cancel circle',
'code':'EA0B',
},
- {
- 'name':'warn',
- 'code':'EA0F',
- },
{
'name':'clear',
'code':'EA14',
diff --git a/pages/CSS/text/font-family.uvue b/pages/CSS/text/font-family.uvue
index 62a151ad3553c47dc8494309731683f4d31390b9..b84f30fe64847bd36f8da80d6066a9c5f10dfbfe 100644
--- a/pages/CSS/text/font-family.uvue
+++ b/pages/CSS/text/font-family.uvue
@@ -6,7 +6,10 @@
font-family: 阿里妈妈刀隶体-otf
style 加载非 static 目录字体文件:{{uniIcon}}
+ font-family: 阿里妈妈刀隶体-woff2 -->
+
+
+
@@ -16,6 +19,13 @@
return {
uniIcon: '\ue100',
}
+ },
+ methods: {
+ openUniIcon() {
+ uni.navigateTo({
+ url: '/pages/CSS/text/font-family-icon'
+ })
+ }
}
}