diff --git a/pages.json b/pages.json index 19a9818c78f30bef9c1aee0a784ef51444f5ef2b..cddf02645e09478f4a7137471ff6680577ed5c6f 100644 --- a/pages.json +++ b/pages.json @@ -657,8 +657,8 @@ { "path": "pages/template/scroll-fold-nav/scroll-fold-nav", "style": { - "navigationStyle": "custom", - "navigationBarTextStyle":"black" + "navigationStyle": "custom", + "navigationBarTextStyle": "black" } }, { @@ -689,16 +689,22 @@ { "path": "pages/template/scroll-fold-nav2/scroll-fold-nav2", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + }, + { + "path": "pages/template/calendar/calendar", + "style": { + "navigationBarTitleText": "日历", + "enablePullDownRefresh": false + } + }, { + "path": "pages/template/custom-refresher/custom-refresher", + "style": { + "navigationBarTitleText": "自定义下拉刷新(原生实现)", + "enablePullDownRefresh": false } - }, - { - "path" : "pages/template/calendar/calendar", - "style" : - { - "navigationBarTitleText": "日历", - "enablePullDownRefresh": false - } } ], "globalStyle": { @@ -715,8 +721,7 @@ "selectedColor": "#007AFF", "borderStyle": "black", "backgroundColor": "#F8F8F8", - "list": [ - { + "list": [{ "pagePath": "pages/tabBar/component", "iconPath": "static/component.png", "selectedIconPath": "static/componentHL.png", @@ -745,12 +750,10 @@ "condition": { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) - "list": [ - { - "name": "", //模式名称 - "path": "", //启动页面,必选 - "query": "" //启动参数,在页面的onLoad函数里面得到 - } - ] + "list": [{ + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + }] } -} +} \ No newline at end of file diff --git a/pages/template/custom-pull-page/custom-pull-page.uvue b/pages/template/custom-pull-page/custom-pull-page.uvue index e5caf274cc79b1c640ad3a0a940800743aea9100..a15dbab47ed22e2f69bac6d27501f0e266917b3b 100644 --- a/pages/template/custom-pull-page/custom-pull-page.uvue +++ b/pages/template/custom-pull-page/custom-pull-page.uvue @@ -1,9 +1,8 @@ - item-{{i}} @@ -31,7 +29,7 @@ 继续上拉加载更多(slot) 释放立即加载更多 加载中... - 加载完成 + 加载完成 @@ -53,18 +51,18 @@ return { } }, - onLoad() { - console.log('this.$refs["custom-pull"]', this.$refs["custom-pull"]); + onReady() { + // console.log('this.$refs["custom-pull"]', this.$refs["custom-pull"] as ComponentPublicInstance); }, methods: { loading() { setTimeout(() => { - // this.$refs["custom-pull"].endLoading() //暂不支持,内部模拟实现 + (this.$refs["custom-pull"] as ComponentPublicInstance).$callMethod('endLoading') }, 1000); }, refresh() { setTimeout(() => { - // this.$refs["custom-pull"].endRefresh() //暂不支持,内部模拟实现 + (this.$refs["custom-pull"] as ComponentPublicInstance).$callMethod('endRefresh') }, 1000); } } @@ -75,13 +73,13 @@ .root { flex: 1; background-color: #FFF; - } - .top-box{ - padding: 15px 5px; - } - .top-box-text{ - font-size: 14px; - color: #888; + } + .top-box{ + padding: 15px 5px; + } + .top-box-text{ + font-size: 14px; + color: #888; } .custom-pull { @@ -97,7 +95,7 @@ .logo { width: 30px; - height: 30px; + height: 30px; margin-top: 3px; } diff --git a/pages/template/custom-pull-page/custom-pull/custom-pull.uvue b/pages/template/custom-pull-page/custom-pull/custom-pull.uvue index 5aac964eb8354c376af845127e920e0e2733e765..5401a35350a966f098cd7c4728c2ecc8a6f494d8 100644 --- a/pages/template/custom-pull-page/custom-pull/custom-pull.uvue +++ b/pages/template/custom-pull-page/custom-pull/custom-pull.uvue @@ -5,9 +5,9 @@ :style="{'height':height+loadingBoxHeight+refreshBoxHeight+'px',width,'transform':'translateY('+(y-refreshBoxHeight-3)+'px)'}"> - - - + + +