From b2f5acdc9ed0d258e6ed453e1da7b8af3c7f37a1 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 13 May 2021 20:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Euni-load-state=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=BF=99=E6=98=AF=E4=B8=80=E4=B8=AA=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E3=80=82=E6=A0=B9=E6=8D=AEuniCloud-?=
 =?UTF-8?q?db=E7=BB=84=E4=BB=B6=E6=8F=90=E4=BE=9B=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9B=B4=E6=8E=A5=E5=93=8D=E5=BA=94=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E6=95=88=E6=9E=9C=E3=80=82=E5=8C=85=E6=8B=AC=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=AD=E3=80=81=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E3=80=81=E6=B2=A1=E6=9C=89=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=EF=BC=9B=E5=8A=A0=E8=BD=BD=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E6=96=AD?=
 =?UTF-8?q?=E7=BD=91=E5=B0=B1=E5=BC=95=E5=AF=BC=E6=89=93=E5=BC=80=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=BD=91=E7=BB=9C=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=82=E6=81=A2=E5=A4=8D=E8=81=94=E7=BD=91=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=A7=A6=E5=8F=91networkResume=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   3 +-
 pages/list/list.nvue                          |  62 +++++-------
 pages/ucenter/read-news-log/read-news-log.vue |  27 +++---
 .../disconnection.png                         | Bin
 .../js_sdk/validator/opendb-news-favorite.js  |  28 ------
 uni_modules/read-news-log/package.json        |  89 ------------------
 uni_modules/read-news-log/readme.md           |   1 -
 .../changelog.md                              |   0
 .../uni-load-state/uni-load-state.vue         |  57 +++++++----
 uni_modules/uni-load-state/package.json       |  76 +++++++++++++++
 uni_modules/uni-load-state/readme.md          |   1 +
 11 files changed, 151 insertions(+), 193 deletions(-)
 rename static/{uni-network => uni-load-state}/disconnection.png (100%)
 delete mode 100644 uni_modules/read-news-log/js_sdk/validator/opendb-news-favorite.js
 delete mode 100644 uni_modules/read-news-log/package.json
 delete mode 100644 uni_modules/read-news-log/readme.md
 rename uni_modules/{read-news-log => uni-load-state}/changelog.md (100%)
 rename components/uni-network/uni-network.vue => uni_modules/uni-load-state/components/uni-load-state/uni-load-state.vue (59%)
 create mode 100644 uni_modules/uni-load-state/package.json
 create mode 100644 uni_modules/uni-load-state/readme.md

diff --git a/pages.json b/pages.json
index 4d362df..e2258d0 100644
--- a/pages.json
+++ b/pages.json
@@ -149,13 +149,12 @@
 				"navigationBarTitleText": "注册",
 				"enablePullDownRefresh": false
 			}
-
 		},
 		{
 			"path": "pages/ucenter/read-news-log/read-news-log",
 			"style": {
 				"navigationBarTitleText": "阅读记录",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		}
 	],
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
index 91bb562..629bc8d 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -7,51 +7,31 @@
 		<uni-search-bar @click="searchClick" class="uni-search-box" v-model="keyword" ref="searchBar" radius="100" cancelButton="none" disabled/>
 		<unicloud-db ref='udb' v-slot:default="{data,pagination,hasMore, loading, error, options}" @error="onqueryerror"
 			:where="where" collection="opendb-news-articles,uni-id-users" :page-size="10"
-			field="avatar,title,last_modify_date,user_id{username}">
+			field="avatar,title,last_modify_date,user_id{username}">
 			<!-- 基于 uni-list 的页面布局 -->
 			<uni-list class="uni-list" :border="false" :bounce="true" :alwaysScrollableVertical="true"  :style="{height:listHight}">
-				<uni-list-item v-if="error">
+				<uni-list-item :to="'./detail?id='+item._id+'&title='+item.title"
+					v-for="(item,index) in data" :key="index">
+					<!-- 通过header插槽定义列表左侧图片 -->
+					<template v-slot:header>
+						<image class="avatar" :src="item.avatar" mode="aspectFill"></image>
+					</template>
+					<!-- 通过body插槽定义布局 -->
+					<view slot="body" class="main">
+						<text class="title">{{ item.title }}</text>
+						<view class="info">
+							<text class="author">{{item.user_id[0].username}}</text>
+							<uni-dateformat class="last_modify_date" :date="item.last_modify_date"
+								format="yyyy-MM-dd" :threshold="[60000, 2592000000]" />
+						</view>
+					</view>
+				</uni-list-item>
+				<uni-list-item>
 					<template slot="body">
-						<!-- 设置网络 -->
-						<uni-network @change="refresh" @retry="refresh"></uni-network>
+						<uni-load-state @networkResume="refresh" :state="{data,pagination,hasMore, loading, error}"></uni-load-state>
 					</template>
-				</uni-list-item>
-				
-				<template v-else>
-					<uni-list-item class="get-data-state" v-if="data.length===0&&pagination.current===1">
-						<view class="f1" slot="body">
-							<!-- 数据为空 当前页码为1，且正在加载中;这里为了演示，更加直观的表达内部逻辑。商用项目建议将这部分封装为组件，更好的让业务逻辑与功能分离-->
-							<uni-load-more v-if="loading" status="loading"></uni-load-more>
-							<template v-else>
-								<text class="get-data-state-text">内容为空</text>
-							</template>
-						</view>
-					</uni-list-item>
-					<uni-list-item :to="'./detail?id='+item._id+'&title='+item.title"
-						v-for="(item,index) in data" :key="index">
-						<!-- 通过header插槽定义列表左侧图片 -->
-						<template v-slot:header>
-							<image class="avatar" :src="item.avatar" mode="aspectFill"></image>
-						</template>
-						<!-- 通过body插槽定义布局 -->
-						<view slot="body" class="main">
-							<text class="title">{{ item.title }}</text>
-							<view class="info">
-								<text class="author">{{item.user_id[0].username}}</text>
-								<uni-dateformat class="last_modify_date" :date="item.last_modify_date"
-									format="yyyy-MM-dd" :threshold="[60000, 2592000000]" />
-							</view>
-						</view>
-					</uni-list-item>
-
-					<!-- 存在下一页数据 && 不是正在加载中 && 已经满一页； 通过 loadMore 组件实现上拉加载效果，如需自定义显示内容，可参考：https://ext.dcloud.net.cn/plugin?id=29 -->
-					<uni-list-item v-if="!loading&&data.length>10">
-						<template slot="body">
-							<uni-load-more :status="hasMore ? 'more' : 'noMore'"></uni-load-more>
-						</template>
-					</uni-list-item>
-				</template>
-			</uni-list>
+				</uni-list-item>
+			</uni-list>
 		</unicloud-db>
 	</view>
 </template>
diff --git a/pages/ucenter/read-news-log/read-news-log.vue b/pages/ucenter/read-news-log/read-news-log.vue
index 45d6ce0..5a36240 100644
--- a/pages/ucenter/read-news-log/read-news-log.vue
+++ b/pages/ucenter/read-news-log/read-news-log.vue
@@ -3,22 +3,17 @@
 		<unicloud-db ref="udb" v-slot:default="{data, pagination, loading, hasMore, error}" :where="udbWhere"
 			collection="opendb-news-articles" @load="isLoading == false" @error="isLoading == false"
 			field="title,_id" :page-size="10">
-			<view v-if="data && data.length">
-				<uni-list>
-					<uni-list-item v-for="(item, index) in data" :key="index" :clickable="true"
-						@click="handleItemClick(item)">
-						<view slot="body">
-							<text>{{item.title}}</text>
-							<uni-dateformat class="article-date" :date="readNewsLog[index].last_time" format="yyyy-MM-dd hh:mm"
-								:threshold="[0, 0]" />
-						</view>
-					</uni-list-item>
-				</uni-list>
-			</view>
-			<view v-else>
-				<uni-load-more v-if="!loading" status="noMore"></uni-load-more>
-			</view>
-			<uni-load-more v-if="data.length>10" :status="loading?'loading':(hasMore ? 'more' : 'noMore')"></uni-load-more>
+			<uni-list>
+				<uni-list-item v-for="(item, index) in data" :key="index" :clickable="true"
+					@click="handleItemClick(item)">
+					<view slot="body">
+						<text>{{item.title}}</text>
+						<uni-dateformat class="article-date" :date="readNewsLog[index].last_time" format="yyyy-MM-dd hh:mm"
+							:threshold="[0, 0]" />
+					</view>
+				</uni-list-item>
+			</uni-list>
+			<uni-load-state @networkResume="refreshData" :state="{data,pagination,hasMore, loading, error}"></uni-load-state>
 		</unicloud-db>
 	</view>
 </template>
diff --git a/static/uni-network/disconnection.png b/static/uni-load-state/disconnection.png
similarity index 100%
rename from static/uni-network/disconnection.png
rename to static/uni-load-state/disconnection.png
diff --git a/uni_modules/read-news-log/js_sdk/validator/opendb-news-favorite.js b/uni_modules/read-news-log/js_sdk/validator/opendb-news-favorite.js
deleted file mode 100644
index d102c77..0000000
--- a/uni_modules/read-news-log/js_sdk/validator/opendb-news-favorite.js
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// 表单校验规则由 schema2code 生成，不建议直接修改校验规则，而建议通过 schema2code 生成, 详情: https://uniapp.dcloud.net.cn/uniCloud/schema
-
-
-
-const validator = {
-  "article_id": {
-    "rules": [
-      {
-        "required": true
-      },
-      {
-        "format": "string"
-      }
-    ]
-  },
-  "create_date": {
-    "rules": [
-      {
-        "format": "timestamp"
-      }
-    ]
-  }
-}
-
-const enumConverter = {}
-
-export { validator, enumConverter }
diff --git a/uni_modules/read-news-log/package.json b/uni_modules/read-news-log/package.json
deleted file mode 100644
index 8faf275..0000000
--- a/uni_modules/read-news-log/package.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "id": "opendb-news-favorite",
-  "displayName": "opendb-news-favorite",
-  "version": "1.0.0",
-  "description": "",
-  "keywords": [
-    "opendb-news-favorite"
-  ],
-  "repository": "",
-  "engines": {
-    "HBuilderX": "^3.1.0"
-  },
-  "dcloudext": {
-    "category": [
-      "uniCloud",
-      "Admin插件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [
-      "uni-dateformat",
-      "uni-badge",
-      "uni-icons",
-      "uni-link",
-      "uni-load-more",
-      "uni-forms",
-      "uni-group",
-      "uni-list",
-      "uni-fab",
-      "uni-datetime-picker",
-      "uni-file-picker",
-      "uni-easyinput"
-    ],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "u"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "u",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/read-news-log/readme.md b/uni_modules/read-news-log/readme.md
deleted file mode 100644
index 71487e6..0000000
--- a/uni_modules/read-news-log/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# opendb-news-favorite
\ No newline at end of file
diff --git a/uni_modules/read-news-log/changelog.md b/uni_modules/uni-load-state/changelog.md
similarity index 100%
rename from uni_modules/read-news-log/changelog.md
rename to uni_modules/uni-load-state/changelog.md
diff --git a/components/uni-network/uni-network.vue b/uni_modules/uni-load-state/components/uni-load-state/uni-load-state.vue
similarity index 59%
rename from components/uni-network/uni-network.vue
rename to uni_modules/uni-load-state/components/uni-load-state/uni-load-state.vue
index ec49186..190d145 100644
--- a/components/uni-network/uni-network.vue
+++ b/uni_modules/uni-load-state/components/uni-load-state/uni-load-state.vue
@@ -1,30 +1,52 @@
 <template>
-	<view class="box" v-if="networkType == 'none'">
-		<image class="icon-image" src="../../static/uni-network/disconnection.png" mode="widthFix"></image>
-		<text class="tip-text">网络异常</text>
-		<view class="btn btn-default" v-if="networkType!='none'" @click="retry">
-			<text class="btn-text">重试</text>
-		</view>
-		<view class="btn btn-default" v-if="networkType=='none'" @click="openSettings">
-			<text class="btn-text">前往设置</text>
+	<view style="flex:1">
+		<template v-if="!state.error">
+			<uni-load-more v-if="state.loading||state.pagination.current!=1||state.data.length!=0" :status="state.loading?'loading':(state.hasMore?'hasMore':'noMore')"></uni-load-more>
+			<text class="noData" v-else>暂无数据</text>
+		</template>
+		<view v-else>
+			<view class="box" v-if="networkType == 'none'">
+				<image class="icon-image" src="@/static/uni-load-state/disconnection.png" mode="widthFix"></image>
+				<text class="tip-text">网络异常</text>
+				<view class="btn btn-default" @click="openSettings">
+					<text class="btn-text">前往设置</text>
+				</view>
+			</view>
+			<view v-else>
+				错误：{{state.error}}
+			</view>
 		</view>
 	</view>
 </template>
 
-<script>
+<script>
 	export default {
-		name: "uni-network",
+		name: "uni-load-state",
 		data() {
 			return {
 				"networkType": ""
 			};
+		},
+		props: {
+			state:{
+				type: Object,
+				default(){
+					return {
+						"loading":true,
+						"hasMore":false,
+						"pagination":{"pages":0},
+						"data":[],
+						"error":{}
+					}
+				}
+			}
 		},
-		mounted() {
+		mounted() {
 			uni.onNetworkStatusChange(({
 				networkType
 			}) => {
-				if(this.networkType == 'none' && networkType != 'none'){
-					this.change()
+				if(this.networkType == 'none' && networkType != 'none'){ //之前没网现在有了
+					this.$emit('networkResume')
 				}
 				this.networkType = networkType;
 			});
@@ -54,9 +76,6 @@
 					var intent = new Intent(Settings.ACTION_SETTINGS);
 					mainActivity.startActivity(intent);
 				}
-			},
-			change(){
-				this.$emit('change')
 			}
 		}
 	}
@@ -99,5 +118,11 @@
 		border-style: solid;
 		border-width: 1px;
 		border-radius: 3px;
+	}
+	
+	.noData{
+		text-align: center;
+		padding: 30rpx;
+		flex-direction: 1;
 	}
 </style>
diff --git a/uni_modules/uni-load-state/package.json b/uni_modules/uni-load-state/package.json
new file mode 100644
index 0000000..6ab458a
--- /dev/null
+++ b/uni_modules/uni-load-state/package.json
@@ -0,0 +1,76 @@
+{
+  "id": "auni-load-state",
+  "displayName": "auni-load-state",
+  "version": "1.0.0",
+  "description": "auni-load-state",
+  "keywords": [
+    "auni-load-state"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-load-state/readme.md b/uni_modules/uni-load-state/readme.md
new file mode 100644
index 0000000..e473585
--- /dev/null
+++ b/uni_modules/uni-load-state/readme.md
@@ -0,0 +1 @@
+# auni-load-state
\ No newline at end of file
-- 
GitLab