From 8113388323e9839c075d966e74fc09c31efe42c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Thu, 22 Apr 2021 17:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ucenter/ucenter.vue                     |  13 +-
 .../pages/uni-news-favorite/list.vue          | 126 +++++++++---------
 2 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 907f2cd2..a073caf8 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -181,10 +181,17 @@
 				uni.showLoading({
 					mask: true
 				})
-				db.collection(dbCollectionName).field('score,balance').get().then((res) => {
-					const data = res.result.data[0];
+				db.collection(dbCollectionName).where('user_id == $env.uid').field('score,balance').get().then((res) => {
+					const data = res.result.data[0];
+					console.log(data);
+					let msg = '';
+					if(data){
+						msg = '当前积分为' + data.balance
+					} else{
+						msg = '当前无积分';
+					}
 					uni.showToast({
-						title: '当前积分为' + data.balance,
+						title: msg,
 						icon: 'none'
 					});
 				}).catch((err) => {
diff --git a/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue b/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue
index ffae69ae..66e81004 100644
--- a/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue
+++ b/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue
@@ -1,65 +1,63 @@
-<template>
-  <view class="container">
-    <unicloud-db ref="udb" v-slot:default="{data, pagination, loading, hasMore, error}" :where="where" orderby="update_date desc" collection="opendb-news-favorite">
-      <view v-if="error">{{error.message}}</view>
-      <view v-else-if="data">
-        <uni-list>
-          <uni-list-item v-for="(item, index) in data" :key="index" :clickable="true" @click="handleItemClick(item)">
-            <view slot="body">
-              <text>{{item.article_title || item.article_id}}</text>
-			  <uni-dateformat class="article-date" :date="item.update_date" format="yyyy-MM-dd hh:mm"
-			  	:threshold="[0, 0]" />
-            </view>
-          </uni-list-item>
-        </uni-list>
-      </view>
-      <uni-load-more :status="loading?'loading':(hasMore ? 'more' : 'noMore')"></uni-load-more>
-    </unicloud-db>
-  </view>
-</template>
-
-<script>
-	import { mapGetters } from 'vuex';
-  export default {
-    data() {
-      return {
-        loadMore: {
-          contentdown: '',
-          contentrefresh: '',
-          contentnomore: '',
-        }
-      }
-    },
-    onPullDownRefresh() {
-      this.$refs.udb.loadData({
-        clear: true
-      }, () => {
-        uni.stopPullDownRefresh()
-      })
-    },
-    onReachBottom() {
-      this.$refs.udb.loadMore()
-    },
-	computed:{
-		...mapGetters({
-			userInfo:'user/info'
-		}),
-		where(){
-			return `user_id == '${this.userInfo._id}'`
-		}
-	},
-    methods: {
-      handleItemClick(item) {
-        uni.navigateTo({
-          url: '/pages/list/detail?id='+item.article_id+'&title='+(item.article_title || '')
-        })
-      }
-    }
-  }
-</script>
-
-<style>
-	.article-date{
-		color: #C8C7CC;
-	}
+<template>
+	<view class="container">
+		<unicloud-db ref="udb" v-slot:default="{data, pagination, loading, hasMore, error}" where="user_id == $env.uid"
+			orderby="update_date desc" collection="opendb-news-favorite" @load="isLoading == false" @error="isLoading == false">
+			<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.article_title || item.article_id}}</text>
+							<uni-dateformat class="article-date" :date="item.update_date" format="yyyy-MM-dd hh:mm"
+								:threshold="[0, 0]" />
+						</view>
+					</uni-list-item>
+				</uni-list>
+			</view>
+			<uni-nodata v-else :isLoading="isLoading" @retry="refreshData"></uni-nodata>
+			<uni-load-more :status="loading?'loading':(hasMore ? 'more' : 'noMore')"></uni-load-more>
+		</unicloud-db>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isLoading: true,
+				loadMore: {
+					contentdown: '',
+					contentrefresh: '',
+					contentnomore: '',
+				}
+			}
+		},
+		onPullDownRefresh() {
+			this.refreshData();
+		},
+		onReachBottom() {
+			this.$refs.udb.loadMore()
+		},
+		methods: {
+			refreshData() {
+				this.$refs.udb.loadData({
+					clear: true
+				}, (res) => {
+					console.log(res);
+					uni.stopPullDownRefresh()
+				})
+			},
+			handleItemClick(item) {
+				uni.navigateTo({
+					url: '/pages/list/detail?id=' + item.article_id + '&title=' + (item.article_title || '')
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.article-date {
+		color: #C8C7CC;
+	}
 </style>
-- 
GitLab