From fd45e8b88561436671c5626103704ed74d8f28a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Wed, 7 Apr 2021 16:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  3 ++-
 pages/list/list.vue              | 27 +++++++++++++++------------
 pages/list/news-list.vue         |  4 ++--
 pages/list/news-search-title.vue | 17 +++++++++++++++++
 4 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 pages/list/news-search-title.vue

diff --git a/pages.json b/pages.json
index 046f872b..fab19005 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,8 @@
 	"pages": [{
 		"path": "pages/list/list",
 		"style": {
-			"navigationStyle":"custom"
+			"navigationStyle":"custom",
+			"enablePullDownRefresh":true
 		}
 	}, {
 		"path":"pages/grid/grid",
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 80395bdf..68c4ee82 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,6 +1,7 @@
 <template>
-	<view style="overflow: hidden;">
-		<status-bar></status-bar>
+	<view style="overflow: hidden;">
+		<!-- 搜索栏 -->
+		<news-search-title></news-search-title>
 		<!-- 页面主列表 -->
 		<news-list ref="newsList" :searchText="searchText"></news-list>
 	</view>
@@ -8,11 +9,11 @@
 
 <script>
 	import newsList from './news-list.vue';
-	import statusBar from '@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue';
+	import newsSearchTitle from './news-search-title.vue';
 	export default {
 		components:{
 			newsList,
-			statusBar
+			newsSearchTitle
 		},
 		data() {
 			return {
@@ -25,6 +26,13 @@
 		},
 		onShow(options) {
 			this.searchText = getApp().globalData.searchText;
+		},
+		/**
+		 * 下拉刷新回调函数
+		 */
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.$refs.newsList.refresh();
 		},
 		methods: {
 			/**
@@ -33,17 +41,12 @@
 			select() {
 				this.formData.waterfall = !this.formData.waterfall;
 			},
-			/**
-			 * 下拉刷新回调函数
-			 */
-			onPullDownRefresh() {
-				this.$refs.newsList.onPullDownRefresh();
-			},
 			/**
 			 * 上拉加载回调函数
 			 */
-			onReachBottom() {
-				this.$refs.newsList.onReachBottom();
+			onReachBottom() {
+				console.log('load_more');
+				this.$refs.newsList.loadMore();
 			}
 		},
 		watch: {
diff --git a/pages/list/news-list.vue b/pages/list/news-list.vue
index e564239e..092c4f0a 100644
--- a/pages/list/news-list.vue
+++ b/pages/list/news-list.vue
@@ -89,7 +89,7 @@
 			/**
 			 * 下拉刷新回调函数
 			 */
-			onPullDownRefresh() {
+			refresh() {
 				this.tipShow = true
 				this.formData.status = 'more'
 				this.$refs.udb.loadData({
@@ -102,7 +102,7 @@
 			/**
 			 * 上拉加载回调函数
 			 */
-			onReachBottom() {
+			loadMore() {
 				this.$refs.udb.loadMore()
 			},
 			load(data, ended) {
diff --git a/pages/list/news-search-title.vue b/pages/list/news-search-title.vue
new file mode 100644
index 00000000..d1379d3e
--- /dev/null
+++ b/pages/list/news-search-title.vue
@@ -0,0 +1,17 @@
+<template>
+	<view>
+		<status-bar></status-bar>
+	</view>
+</template>
+
+<script>
+	import statusBar from '@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue';
+	export default {
+		components: {
+			statusBar
+		},
+	}
+</script>
+
+<style>
+</style>
-- 
GitLab