diff --git a/pages.json b/pages.json
index 4d362dffba55c06c341bbba8af0d40d957c8f2e0..e2258d01e9d0fec5941bd7cb382d5dfb12d56f34 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 91bb56293782bc0412450d5e6cbe89eec925db25..629bc8dc3407dc2e08715eddcbecd9fcbecd2a1d 100644
--- a/pages/list/list.nvue
+++ b/pages/list/list.nvue
@@ -7,51 +7,31 @@
+ field="avatar,title,last_modify_date,user_id{username}">
-
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{item.user_id[0].username}}
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
- 内容为空
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
- {{item.user_id[0].username}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/pages/ucenter/read-news-log/read-news-log.vue b/pages/ucenter/read-news-log/read-news-log.vue
index 45d6ce0890b359c265b869e713be36cc16529d92..5a36240af67467f56d2052ec43351ddadd86802a 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 @@
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
+
+
+
+ {{item.title}}
+
+
+
+
+
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 d102c7739a28ebacd9ec77ed2e4dd959b382213b..0000000000000000000000000000000000000000
--- 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 8faf27582b5b0395ffb56bb2facae204b85b7084..0000000000000000000000000000000000000000
--- 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 71487e63f30785a41b027469eb9bb5fd26e3df49..0000000000000000000000000000000000000000
--- 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 ec49186d366085d4c2f08c701a02e8e787a28319..190d145765fcdecd38a211f525ea7520b457cda0 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 @@
-
-
- 网络异常
-
- 重试
-
-
- 前往设置
+
+
+
+ 暂无数据
+
+
+
+
+ 网络异常
+
+ 前往设置
+
+
+
+ 错误:{{state.error}}
+
-