diff --git a/pages.json b/pages.json index 8e043c89e4e64959122c178bf90e5df3359b9440..9b612706175cbfed7e3080ae3ece9da5b654b880 100644 --- a/pages.json +++ b/pages.json @@ -180,7 +180,7 @@ }, { - "path": "uni_modules/uni-news-favorite/pages/uni-news-favorite/list", + "path": "pages/ucenter/read-news-log/read-news-log", "style": { "navigationBarTitleText": "阅读记录", "enablePullDownRefresh": false diff --git a/pages/list/detail.vue b/pages/list/detail.vue index 1502ca01287b726d8257df92b2ece2d43b70695d..c9d97174de3cad4cb6c464ddc6410280b80c835b 100644 --- a/pages/list/detail.vue +++ b/pages/list/detail.vue @@ -50,7 +50,7 @@ import uniShare from 'uni_modules/uni-share/js_sdk/uni-share.js'; const db = uniCloud.database(); - const newsFavoriteTable = db.collection('opendb-news-favorite') + const readNewsLog = db.collection('read-news-log') import { mapGetters } from 'vuex'; @@ -114,35 +114,26 @@ }, methods: { setFavorite() { - if (!this.hasLogin) return - newsFavoriteTable.where({ - article_id: this.id, - user_id: this.userInfo._id - }) - .get() - .then(res => { - let value = { - article_id: this.id, - article_title: this.title, - user_id: this.userInfo._id, - update_date: Date.now() - } - if (res.result.data.length == 0) { - return newsFavoriteTable.add(value) - } else { - return newsFavoriteTable.where({ - article_id: this.id, - user_id: this.userInfo._id - }) - .update(value) - } - }) - .then(res => { - // console.log(res); - }) - .catch(err => { - console.log(err); - }) + if (!this.hasLogin){ + return console.log('未登陆用户'); + } + let article_id = this.id, + last_time = Date.now(); + console.log({article_id,last_time}); + readNewsLog.where(`"article_id" == "${article_id}" && "user_id"==$env.uid`) + .update({last_time}) + .then(({result:{updated}}) => { + console.log('updated',updated); + if (!updated) { + readNewsLog.add({article_id}).then(e=>{ + console.log(e); + }).catch(err => { + console.log(err); + }) + } + }).catch(err => { + console.log(err); + }) }, loadData(data) { //如果上一页未传递标题过来(如搜索直达详情),则从新闻详情中读取标题 diff --git a/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue b/pages/ucenter/read-news-log/read-news-log.vue similarity index 66% rename from uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue rename to pages/ucenter/read-news-log/read-news-log.vue index b4b6f2cb7268deb7c47c7c922db3341bba635ad9..63dd6d3142c17e7fedb0b6065056c0e721c0300b 100644 --- a/uni_modules/uni-news-favorite/pages/uni-news-favorite/list.vue +++ b/pages/ucenter/read-news-log/read-news-log.vue @@ -1,18 +1,22 @@