From de652b2cb6c212c27c3ed27b0cd25170a85fb9fd Mon Sep 17 00:00:00 2001
From: yanyilin <yanyilin@dcloud.io>
Date: Tue, 12 Nov 2024 14:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E4=BD=93=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=A4=BA=E4=BE=8B=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=8F=8A=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 61b6099aae93babf6883fc0071707bdf151dc474)
---
 pages.json                                       |  9 ++-------
 .../{font-icon.uvue => font-family-icon.uvue}    | 16 ++++++++--------
 pages/CSS/text/font-family.uvue                  | 12 +++++++++++-
 3 files changed, 21 insertions(+), 16 deletions(-)
 rename pages/CSS/text/{font-icon.uvue => font-family-icon.uvue} (99%)

diff --git a/pages.json b/pages.json
index 97447e0b..d788a1a6 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 e937d22b..2a422d5e 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 62a151ad..b84f30fe 100644
--- a/pages/CSS/text/font-family.uvue
+++ b/pages/CSS/text/font-family.uvue
@@ -6,7 +6,10 @@
     <text class="common" style="font-family: AlimamaDaoLiTiOTF">font-family: 阿里妈妈刀隶体-otf</text>
     <text style="font-family: UniFontFamily;">style 加载非 static 目录字体文件：{{uniIcon}}</text>
     <!--    <text class="common" style="font-family: AlimamaDaoLiTiWOFF">font-family: 阿里妈妈刀隶体-woff</text>
-    <text class="common" style="font-family: AlimamaDaoLiTiWOFF2">font-family: 阿里妈妈刀隶体-woff2</text> -->
+    <text class="common" style="font-family: AlimamaDaoLiTiWOFF2">font-family: 阿里妈妈刀隶体-woff2</text> -->
+  </view>
+  <view style="margin: 24px 12px;">
+    <button type="default" @click="openUniIcon">内置字体图标uni-icon示例</button>
   </view>
 </template>
 
@@ -16,6 +19,13 @@
       return {
         uniIcon: '\ue100',
       }
+    },
+    methods: {
+      openUniIcon() {
+        uni.navigateTo({
+          url: '/pages/CSS/text/font-family-icon'
+        })
+      }
     }
   }
 </script>
-- 
GitLab