diff --git a/pages/CSS/background/background-image.uvue b/pages/CSS/background/background-image.uvue index a23041251fc73b69a09db1483cb83c36e2d5aa69..8758c5cf5817f4ce63fd4ac5d428b8d1ccce7103 100644 --- a/pages/CSS/background/background-image.uvue +++ b/pages/CSS/background/background-image.uvue @@ -1,6 +1,7 @@ diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue index f5631220c2270a4a6e45fd4a3b36fe66c0657d1d..78761ea2fe18779b30da45199901d9d7e1e6576f 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 a66a52e9c6cc31cd5e0ba1a33dc8982304e681cf..bb7a68993a6b91d221cd91e46e774eeeabcebad2 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 13e6eb0beb5b86d0d81de6118bbd58b63c1ae517..5a0dbdf8184cbc57c005115f4f497135f8f8da0e 100644 --- a/pages/tabBar/template.uvue +++ b/pages/tabBar/template.uvue @@ -1,144 +1,154 @@ \ 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 d19eb2acd467fe36c24a66741f99b0aa4bd5b2f4..5a5f27812f58d7a32c3999b33e8fe270e416ee38 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 @@ - + content-{{item}} @@ -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(){