From 4f347962c92d19450990eeb734a19a0c0e7961e9 Mon Sep 17 00:00:00 2001
From: wanganxp <wanganxp@gmail.com>
Date: Sun, 16 Jul 2023 19:27:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E4=BA=86loadFontFace?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BE=8B=20-=20=E8=A1=A5=E5=85=85=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=20-=20=E5=8E=BB=E6=8E=89=E4=BA=86css?=
 =?UTF-8?q?=E9=87=8C=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=20-=20=E6=94=B9=E4=BA=86=E6=BB=9A=E5=8A=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E7=9A=84=E8=BF=94=E5=9B=9E=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CSS/background/background-image.uvue    |   1 +
 pages/CSS/text/font-family.uvue               |   2 +-
 pages/tabBar/API.uvue                         |   5 +
 pages/tabBar/CSS.uvue                         |  11 -
 pages/tabBar/template.uvue                    | 278 +++++++++---------
 .../scroll-fold-nav/scroll-fold-nav.uvue      |  23 +-
 6 files changed, 168 insertions(+), 152 deletions(-)

diff --git a/pages/CSS/background/background-image.uvue b/pages/CSS/background/background-image.uvue
index a2304125..8758c5cf 100644
--- a/pages/CSS/background/background-image.uvue
+++ b/pages/CSS/background/background-image.uvue
@@ -1,6 +1,7 @@
 <template>
 	<view style="flex-grow: 1;">
 		<view>
+			<text>不支持背景图片，仅支持linear-gradient方法</text>
 			<text>background-image: linear-gradient(to right, red, yellow)</text>
 			<view class="common" style="background-image: linear-gradient(to right, red, yellow);"></view>
 		</view>
diff --git a/pages/CSS/text/font-family.uvue b/pages/CSS/text/font-family.uvue
index 1622e9cd..821b7ed4 100644
--- a/pages/CSS/text/font-family.uvue
+++ b/pages/CSS/text/font-family.uvue
@@ -3,7 +3,7 @@
 		<view style="height: 500rpx;background-color: gray;justify-content: center;align-items: center;">
 			<text class="common" style="font-family: monospace;">font-family: monospace</text>
 			<text class="common" style="font-family: cursive;">font-family: cursive</text>
-			<text class="common" style="font-family: AlimamaDaoLiTi;">font-family: 阿里妈妈刀隶体</text>
+			<text class="common" style="font-family: AlimamaDaoLiTi;">font-family: 阿里妈妈刀隶体（网络字体下载后生效）</text>
 		</view>
 	</view>
 </template>
diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index f5631220..78761ea2 100644
--- a/pages/tabBar/API.uvue
+++ b/pages/tabBar/API.uvue
@@ -301,6 +301,11 @@
                             name: "保存媒体到本地",
                             url: "save-media",
                         }, */
+						{
+						    name: "动态加载字体",
+						    url: "load-font-face",
+							enable:false
+						},
                     ] as Page[],
                 },
                 {
diff --git a/pages/tabBar/CSS.uvue b/pages/tabBar/CSS.uvue
index a66a52e9..bb7a6899 100644
--- a/pages/tabBar/CSS.uvue
+++ b/pages/tabBar/CSS.uvue
@@ -267,17 +267,6 @@
 							url: 'pages/CSS/transform/transform'
 						}
 					] as Page[]
-				}, {
-					id: 'iconfont',
-					name: '字体图标',
-					open: false,
-					pages: [
-						{
-							name: '字体图标',
-							enable: false,
-							url: 'pages/CSS/iconfont/iconfont'
-						},
-					] as Page[]
 				}
 				] as ListItem[],
 				arrowUpIcon: '/static/icons/arrow-up.png',
diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue
index 13e6eb0b..5a0dbdf8 100644
--- a/pages/tabBar/template.uvue
+++ b/pages/tabBar/template.uvue
@@ -1,144 +1,154 @@
 <template>
-  <view class="uni-container">
-    <view class="uni-header-logo">
-      <image class="uni-header-image" src="/static/templateIndex.png"></image>
-    </view>
-    <view class="uni-hello-text">
-      <text class="hello-text">以下是部分模板示例，更多模板见插件市场：</text>
-      <u-link class="hello-link" href="https://ext.dcloud.net.cn" :text="'https://ext.dcloud.net.cn'"
-        :inWhiteList="true"></u-link>
-    </view>
-    <view class="uni-panel" v-for="(item, index) in list" :key="item.id">
-      <view class="uni-panel-h" :class="item.open ? 'uni-panel-h-on' : ''" @click="triggerCollapse(index, item)">
-        <text class="uni-panel-text" :class="item.enable == false ? 'text-disabled' : ''">{{item.name}}</text>
-        <image :src="item.pages.length > 0 ? item.open ? arrowUpIcon : arrowDownIcon : arrowRightIcon" class="uni-icon">
-        </image>
-      </view>
-      <view class="uni-panel-c" v-if="item.open">
-        <view class="uni-navigate-item" v-for="(page,key) in item.pages" :key="key" @click="goDetailPage(page)">
-          <text class="uni-navigate-text" :class="page.enable == false ? 'text-disabled' : ''">{{page.name}}</text>
-          <image :src="arrowRightIcon" class="uni-icon"></image>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="uni-container">
+		<view class="uni-header-logo">
+			<image class="uni-header-image" src="/static/templateIndex.png"></image>
+		</view>
+		<view class="uni-hello-text">
+			<text class="hello-text">以下是部分模板示例，更多模板见插件市场：</text>
+			<u-link class="hello-link" href="https://ext.dcloud.net.cn" :text="'https://ext.dcloud.net.cn'"
+				:inWhiteList="true"></u-link>
+		</view>
+		<view class="uni-panel" v-for="(item, index) in list" :key="item.id">
+			<view class="uni-panel-h" :class="item.open ? 'uni-panel-h-on' : ''" @click="triggerCollapse(index, item)">
+				<text class="uni-panel-text" :class="item.enable == false ? 'text-disabled' : ''">{{item.name}}</text>
+				<image :src="item.pages.length > 0 ? item.open ? arrowUpIcon : arrowDownIcon : arrowRightIcon"
+					class="uni-icon">
+				</image>
+			</view>
+			<view class="uni-panel-c" v-if="item.open">
+				<view class="uni-navigate-item" v-for="(page,key) in item.pages" :key="key" @click="goDetailPage(page)">
+					<text class="uni-navigate-text"
+						:class="page.enable == false ? 'text-disabled' : ''">{{page.name}}</text>
+					<image :src="arrowRightIcon" class="uni-icon"></image>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script lang="ts">
-  type Page = {
-    name : string,
-    enable ?: boolean,
-    url : string
-  }
+	type Page = {
+		name : string,
+		enable ?: boolean,
+		url : string
+	}
 
-  type ListItem = {
-    id : string,
-    name : string,
-    open : boolean,
-    pages : Page[],
-    url ?: string,
-    enable ?: boolean
-  }
-  export default {
-    data() {
-      return {
-        list: [
-          {
-            id: "custom-navigationbar",
-            url: "custom-navigationbar",
-            name: "自定义导航栏",
-            open: false,
-            enable: false,
-            pages: [] as Page[]
-          },{
-            id: "drop-card",
-            url: "drop-card",
-            name: "划走式卡片",
-            open: false,
-            pages: [] as Page[]
-          },{
-            id: "scroll-fold-nav",
-            url: "scroll-fold-nav",
-            name: "随滚动折叠的导航栏",
-            open: false,
-            pages: [] as Page[]
-          },
-          {
-            id: "custom-pull-page",
-            url: "custom-pull-page",
-            name: "自定义上拉下拉效果",
-            open: false,
-            pages: [] as Page[]
-          },
-          {
-            id: "swiper-vertical-video",
-            url: "swiper-vertical-video",
-            name: "竖滑视频",
-            open: false,
-            pages: [] as Page[]
-          },
-          {
-            id: "sticky",
-            url: "sticky",
-            name: "吸顶",
-            open: false,
-            enable: false,
-            pages: [] as Page[]
-          },
-          {
-            id: "swiper-list",
-            url: "swiper-list",
-            name: "swiper-list",
-            open: false,
-            enable: false,
-            pages: [] as Page[]
-          }
-        ] as ListItem[],
-        arrowUpIcon: '/static/icons/arrow-up.png',
-        arrowDownIcon: '/static/icons/arrow-down.png',
-        arrowRightIcon: '/static/icons/arrow-right.png',
-      }
-    },
-    methods: {
-      triggerCollapse(index ?: number, item : ListItem) {
-        if (item.pages.length == 0) {
-          const page : Page = {
-            name: item.name,
-            enable: item.enable,
-            url: item.url!
-          }
-          this.goDetailPage(page);
-          return;
-        }
-        for (var i = 0; i < this.list.length; ++i) {
-          if (index == i) {
-            this.list[i].open = !this.list[i].open;
-          } else {
-            this.list[i].open = false;
-          }
-        }
-      },
-      goDetailPage(e : Page) {
-        if (e.enable == false) {
-          uni.showToast({
-            icon: 'none',
-            title: '暂不支持'
-          })
-          return
-        }
-        const url = e.url.indexOf('platform') > -1 ? e.url : `/pages/template/${e.url}/${e.url}`
-        uni.navigateTo({
-          url
-        })
-      }
-    }
-  }
+	type ListItem = {
+		id : string,
+		name : string,
+		open : boolean,
+		pages : Page[],
+		url ?: string,
+		enable ?: boolean
+	}
+	export default {
+		data() {
+			return {
+				list: [
+					{
+						id: "scroll-fold-nav",
+						url: "scroll-fold-nav",
+						name: "随滚动折叠的导航栏",
+						open: false,
+						pages: [] as Page[]
+					}, {
+						id: "swiper-list",
+						url: "swiper-list",
+						name: "swiper-list",
+						open: false,
+						enable: false,
+						pages: [] as Page[]

+					}, {
+						id: "custom-pull-page",
+						url: "custom-pull-page",
+						name: "自定义上拉下拉效果",
+						open: false,
+						pages: [] as Page[]
+					},
+					{
+						id: "pull-zoom-image",
+						url: "pull-zoom-image",
+						name: "下拉缩放顶部封面图",
+						open: false,
+						enable: false,
+						pages: [] as Page[]
+					},
+					{
+						id: "show-search-with-scroll",
+						url: "show-search-with-scroll",
+						name: "滚动后自动显隐的搜索框",
+						open: false,
+						enable: false,
+						pages: [] as Page[]
+					},
+					{
+						id: "swiper-vertical-video",
+						url: "swiper-vertical-video",
+						name: "竖滑视频",
+						open: false,
+						pages: [] as Page[]
+					},
+					{
+						id: "sticky",
+						url: "sticky",
+						name: "吸顶",
+						open: false,
+						enable: false,
+						pages: [] as Page[]
+					},
+					{
+						id: "drop-card",
+						url: "drop-card",
+						name: "划走式卡片",
+						open: false,
+						pages: [] as Page[]
+					}
+				] as ListItem[],
+				arrowUpIcon: '/static/icons/arrow-up.png',
+				arrowDownIcon: '/static/icons/arrow-down.png',
+				arrowRightIcon: '/static/icons/arrow-right.png',
+			}
+		},
+		methods: {
+			triggerCollapse(index ?: number, item : ListItem) {
+				if (item.pages.length == 0) {
+					const page : Page = {
+						name: item.name,
+						enable: item.enable,
+						url: item.url!
+					}
+					this.goDetailPage(page);
+					return;
+				}
+				for (var i = 0; i < this.list.length; ++i) {
+					if (index == i) {
+						this.list[i].open = !this.list[i].open;
+					} else {
+						this.list[i].open = false;
+					}
+				}
+			},
+			goDetailPage(e : Page) {
+				if (e.enable == false) {
+					uni.showToast({
+						icon: 'none',
+						title: '暂不支持'
+					})
+					return
+				}
+				const url = e.url.indexOf('platform') > -1 ? e.url : `/pages/template/${e.url}/${e.url}`
+				uni.navigateTo({
+					url
+				})
+			}
+		}
+	}
 </script>
 
 <style>
-  @import '../../common/uni-uvue.css';
+	@import '../../common/uni-uvue.css';
 
-  .uni-container {
-    flex: 1;
-  }
+	.uni-container {
+		flex: 1;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
index d19eb2ac..5a5f2781 100644
--- a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
+++ b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
@@ -5,7 +5,7 @@
         <view style="height: 110px;">
           <!-- 垫高专用 -->
         </view>
-        <view v-for="(item,index) in 100" :key="index" style="height: 100px;background-color: #FFF;">
+        <view v-for="(item,index) in 20" :key="index" style="height: 100px;background-color: #FFF;">
           content-{{item}}
         </view>
       </view>
@@ -49,12 +49,23 @@
         this.scrollTop = e.detail.scrollTop
       },
       back(){
-        // 暂不支持通过navigateBack api 返回
-        // uni.navigateBack()
+        // uni.navigateBack()  // 这么写用不了
+        // 这么写可以用
+		uni.navigateBack({
+		  success(result) {
+		    console.log('navigateBack success', result.errMsg)
+		  },
+		  fail(error) {
+		    console.log('navigateBack fail', error.errMsg)
+		  },
+		  complete(result) {
+		    console.log('navigateBack complete', result.errMsg)
+		  },
+		})
         
-        uni.switchTab({
-          url:'/pages/tabBar/template'
-        })
+        // uni.switchTab({
+        //   url:'/pages/tabBar/template'
+        // })
         
       },
       toSearchPage(){
-- 
GitLab