diff --git a/pages/about/about.js b/pages/about/about.js index 1c3fc54..6d4555a 100644 --- a/pages/about/about.js +++ b/pages/about/about.js @@ -27,249 +27,250 @@ Page({ pagesList: {}, display: 'none', wxParseData: [], - praiseList:[], + praiseList: [], dialog: { - title: '', - content: '', - hidden: true + title: '', + content: '', + hidden: true }, userInfo: {}, isLoginPopup: false, - openid:"", - system:"" - - + openid: "", + system: "" + + }, - onLoad: function (options) { + onLoad: function(options) { var self = this; wx.setNavigationBarTitle({ title: config.getWebsiteName + '-关于站长', - success: function (res) { + success: function(res) { // success } }); - Auth.setUserInfoData(self); + Auth.setUserInfoData(self); Auth.checkLogin(self); this.fetchData(config.getAboutId); wx.getSystemInfo({ - success: function (t) { - var system = t.system.indexOf('iOS') != -1 ? 'iOS' : 'Android'; - self.setData({ system: system }); + success: function(t) { + var system = t.system.indexOf('iOS') != -1 ? 'iOS' : 'Android'; + self.setData({ + system: system + }); - } - }) + } + }) }, - praise: function () { - - var self = this; - var minAppType = config.getMinAppType; - var system =self.data.system; - if (minAppType == "0" && system=='Android') { - if (self.data.openid) { - wx.navigateTo({ - url: '../pay/pay?flag=2&openid=' + self.data.openid + '&postid=' + config.getAboutId - }) - } - else { - Auth.checkSession(self,'isLoginNow'); - } + praise: function() { + + var self = this; + var minAppType = config.getMinAppType; + var system = self.data.system; + if (minAppType == "0" && system == 'Android') { + if (self.data.openid) { + wx.navigateTo({ + url: '../pay/pay?flag=2&openid=' + self.data.openid + '&postid=' + config.getAboutId + }) + } else { + Auth.checkSession(self, 'isLoginNow'); } - else { + } else { - var src = config.getZanImageUrl; - wx.previewImage({ - urls: [src], - }); + var src = config.getZanImageUrl; + wx.previewImage({ + urls: [src], + }); + + } - } - }, - onPullDownRefresh: function () { - var self = this; - self.setData({ - display:'none' , - pageData:{}, - wxParseData:{}, + onPullDownRefresh: function() { + var self = this; + self.setData({ + display: 'none', + pageData: {}, + wxParseData: {}, - }); + }); - this.fetchData(config.getAboutId); - //消除下刷新出现空白矩形的问题。 - wx.stopPullDownRefresh() + this.fetchData(config.getAboutId); + //消除下刷新出现空白矩形的问题。 + wx.stopPullDownRefresh() - }, - onShareAppMessage: function () { + }, + onShareAppMessage: function() { return { - title: '关于“' + config.getWebsiteName +'”官方小程序', + title: '关于“' + config.getWebsiteName + '”官方小程序', path: 'pages/about/about', - success: function (res) { + success: function(res) { // 转发成功 }, - fail: function (res) { + fail: function(res) { // 转发失败 } } }, - gotowebpage:function() - { - var self=this; - var minAppType = config.getMinAppType; - var url = ''; - if (minAppType == "0") { - url = '../webpage/webpage?'; - wx.navigateTo({ - url: url - }) - } - else { - self.copyLink(config.getDomain); - } + gotowebpage: function() { + var self = this; + var minAppType = config.getMinAppType; + var url = ''; + if (minAppType == "0") { + url = '../webpage/webpage?'; + wx.navigateTo({ + url: url + }) + } else { + self.copyLink(config.getDomain); + } }, - copyLink: function (url) { - //this.ShowHideMenu(); - wx.setClipboardData({ - data: url, - success: function (res) { - wx.getClipboardData({ - success: function (res) { - wx.showToast({ - title: '链接已复制', - image: '../../images/link.png', - duration: 2000 - }) - } - }) - } + copyLink: function(url) { + //this.ShowHideMenu(); + wx.setClipboardData({ + data: url, + success: function(res) { + wx.getClipboardData({ + success: function(res) { + wx.showToast({ + title: '链接已复制', + image: '../../images/link.png', + duration: 2000 + }) + } }) - }, + } + }) + }, //给a标签添加跳转和复制链接事件 - wxParseTagATap: function (e) { - var self = this; - var href = e.currentTarget.dataset.src; - console.log(href); - var domain = config.getDomain; - //我们可以在这里进行一些路由处理 - if (href.indexOf(domain) == -1) { - wx.setClipboardData({ - data: href, - success: function (res) { - wx.getClipboardData({ - success: function (res) { - wx.showToast({ - title: '链接已复制', - //icon: 'success', - image: '../../images/link.png', - duration: 2000 - }) - } - }) - } + wxParseTagATap: function(e) { + var self = this; + var href = e.currentTarget.dataset.src; + console.log(href); + var domain = config.getDomain; + //我们可以在这里进行一些路由处理 + if (href.indexOf(domain) == -1) { + wx.setClipboardData({ + data: href, + success: function(res) { + wx.getClipboardData({ + success: function(res) { + wx.showToast({ + title: '链接已复制', + //icon: 'success', + image: '../../images/link.png', + duration: 2000 + }) + } }) - } - else { + } + }) + } else { - var slug = util.GetUrlFileName(href, domain); - if (slug == 'index') { - wx.switchTab({ - url: '../index/index' + var slug = util.GetUrlFileName(href, domain); + if (slug == 'index') { + wx.switchTab({ + url: '../index/index' + }) + } else { + var getPostSlugRequest = wxRequest.getRequest(Api.getPostBySlug(slug)); + getPostSlugRequest + .then(res => { + var postID = res.data[0].id; + var openLinkCount = wx.getStorageSync('openLinkCount') || 0; + if (openLinkCount > 4) { + wx.redirectTo({ + url: '../detail/detail?id=' + postID }) - } - else { - var getPostSlugRequest = wxRequest.getRequest(Api.getPostBySlug(slug)); - getPostSlugRequest - .then(res => { - var postID = res.data[0].id; - var openLinkCount = wx.getStorageSync('openLinkCount') || 0; - if (openLinkCount > 4) { - wx.redirectTo({ - url: '../detail/detail?id=' + postID - }) - } - else { - wx.navigateTo({ - url: '../detail/detail?id=' + postID - }) - openLinkCount++; - wx.setStorageSync('openLinkCount', openLinkCount); - } - - }) + } else { + wx.navigateTo({ + url: '../detail/detail?id=' + postID + }) + openLinkCount++; + wx.setStorageSync('openLinkCount', openLinkCount); + } - } + }) } + } + }, - agreeGetUser: function (e) { - var userInfo = e.detail.userInfo; - var self = this; - if (userInfo) { - auth.getUsreInfo(e.detail); - self.setData({ userInfo: userInfo }); - } - setTimeout(function () { - self.setData({ isLoginPopup: false }) - }, 1200); + agreeGetUser: function(e) { + var userInfo = e.detail.userInfo; + var self = this; + if (userInfo) { + auth.getUsreInfo(e.detail); + self.setData({ + userInfo: userInfo + }); + } + setTimeout(function() { + self.setData({ + isLoginPopup: false + }) + }, 1200); }, closeLoginPopup() { - this.setData({ isLoginPopup: false }); + this.setData({ + isLoginPopup: false + }); }, openLoginPopup() { - this.setData({ isLoginPopup: true }); - } - , - fetchData: function (id) { - var self = this; + this.setData({ + isLoginPopup: true + }); + }, + fetchData: function(id) { + var self = this; var getPageRequest = wxRequest.getRequest(Api.getPageByID(id)); - getPageRequest.then(response =>{ + getPageRequest.then(response => { console.log(response); WxParse.wxParse('article', 'html', response.data.content.rendered, self, 5); self.setData({ - pageData: response.data, - // wxParseData: WxParse('md',response.data.content.rendered) - //wxParseData: WxParse.wxParse('article', 'html', response.data.content.rendered, self, 5) + pageData: response.data, + // wxParseData: WxParse('md',response.data.content.rendered) + //wxParseData: WxParse.wxParse('article', 'html', response.data.content.rendered, self, 5) }); self.setData({ - display: 'block' + display: 'block' }); - - - }).then(res =>{ - var getAllPraiseRequest = wxRequest.getRequest(Api.getAllPraiseUrl()); - getAllPraiseRequest.then(response =>{ - if (response.data.status == '200') { - var _avatarurls = response.data.avatarurls; - var avatarurls = []; - for (var i = 0; i < _avatarurls.length; i++) { - var avatarurl = "../../images/gravatar.png"; - if (_avatarurls[i].avatarurl.indexOf('wx.qlogo.cn') != -1) { - avatarurl = _avatarurls[i].avatarurl; - } - avatarurls[i] = avatarurl; - } - - self.setData({ - praiseList: avatarurls - }); + }).then(res => { + var getAllPraiseRequest = wxRequest.getRequest(Api.getAllPraiseUrl()); + getAllPraiseRequest.then(response => { + + if (response.data.status == '200') { - } - else { - console.log(response); + var _avatarurls = response.data.avatarurls; + var avatarurls = []; + for (var i = 0; i < _avatarurls.length; i++) { + var avatarurl = "../../images/gravatar.png"; + if (_avatarurls[i].avatarurl.indexOf('wx.qlogo.cn') != -1) { + avatarurl = _avatarurls[i].avatarurl; + } + avatarurls[i] = avatarurl; } + self.setData({ + praiseList: avatarurls + }); + + } else { + console.log(response); + } + }) - }) - .then(res =>{ + }) + .then(res => { if (!app.globalData.isGetOpenid) { - // auth.getUsreInfo(); + // auth.getUsreInfo(); } - }) + }) } }) \ No newline at end of file diff --git a/pages/comments/comments.js b/pages/comments/comments.js index 6bdcff2..0a3e5a1 100644 --- a/pages/comments/comments.js +++ b/pages/comments/comments.js @@ -20,109 +20,105 @@ import config from '../../utils/config.js' var pageCount = config.getPageCount; Page({ - data: { - title: '最新评论列表', - showerror: "none", - showallDisplay: "block", - readLogs: [] + data: { + title: '最新评论列表', + showerror: "none", + showallDisplay: "block", + readLogs: [] - }, - onShareAppMessage: function () { - var title = "分享"+config.getWebsiteName+"的最新评论"; - var path = "pages/comments/comments"; - return { - title: title, - path: path, - success: function (res) { - // 转发成功 - }, - fail: function (res) { - // 转发失败 - } - } - }, - reload: function (e) { - var self = this; - this.setData({ - readLogs: [] - }); - self.setData({ - showallDisplay: "none", - showerror: "none", + }, + onShareAppMessage: function() { + var title = "分享" + config.getWebsiteName + "的最新评论"; + var path = "pages/comments/comments"; + return { + title: title, + path: path, + success: function(res) { + // 转发成功 + }, + fail: function(res) { + // 转发失败 + } + } + }, + reload: function(e) { + var self = this; + this.setData({ + readLogs: [] + }); + self.setData({ + showallDisplay: "none", + showerror: "none", - }); - self.fetchCommentsData(); - }, - onLoad: function (options) { - var self = this; - self.fetchCommentsData(); - }, - //获取文章列表数据 - fetchCommentsData: function () { - var self = this; - wx.showLoading({ - title: '正在加载', - mask: true - }); - var getNewComments = wxRequest.getRequest(Api.getNewComments()); - getNewComments.then(response => { - if (response.statusCode == 200) { - this.setData({ - readLogs: self.data.readLogs.concat(response.data.map(function (item) { - item[0] = item.post; - item[1] = util.removeHTML(item.content.rendered + '(' + item.author_name + ')'); - item[2] = "0"; - return item; - })) - }); - self.setData({ - showallDisplay: "block" - }); - - } - else { - console.log(response); - this.setData({ - showerror: 'block' - }); + }); + self.fetchCommentsData(); + }, + onLoad: function(options) { + var self = this; + self.fetchCommentsData(); + }, + //获取文章列表数据 + fetchCommentsData: function() { + var self = this; + wx.showLoading({ + title: '正在加载', + mask: true + }); + var getNewComments = wxRequest.getRequest(Api.getNewComments()); + getNewComments.then(response => { + if (response.statusCode == 200) { + this.setData({ + readLogs: self.data.readLogs.concat(response.data.map(function(item) { + item[0] = item.post; + item[1] = util.removeHTML(item.content.rendered + '(' + item.author_name + ')'); + item[2] = "0"; + return item; + })) + }); + self.setData({ + showallDisplay: "block" + }); - } - }).catch(function () { - self.setData({ - showerror: "block", - floatDisplay: "none" - }); + } else { + console.log(response); + this.setData({ + showerror: 'block' + }); - }) - .finally(function () { - wx.hideLoading(); - }) - }, - // 跳转至查看文章详情 - redictDetail: function (e) { - // console.log('查看文章'); - var id = e.currentTarget.id, - url = '../detail/detail?id=' + id; - wx.navigateTo({ - url: url - }) - }, - onPullDownRefresh: function () { - var self = this; - this.setData({ - readLogs: [] - }); + } + }).catch(function() { self.setData({ - showallDisplay: "none", - showerror: "none", - + showerror: "block", + floatDisplay: "none" }); - self.fetchCommentsData(); - //消除下刷新出现空白矩形的问题。 - wx.stopPullDownRefresh(); - - } -}) + }) + .finally(function() { + wx.hideLoading(); + }) + }, + // 跳转至查看文章详情 + redictDetail: function(e) { + // console.log('查看文章'); + var id = e.currentTarget.id, + url = '../detail/detail?id=' + id; + wx.navigateTo({ + url: url + }) + }, + onPullDownRefresh: function() { + var self = this; + this.setData({ + readLogs: [] + }); + self.setData({ + showallDisplay: "none", + showerror: "none", + }); + self.fetchCommentsData(); + //消除下刷新出现空白矩形的问题。 + wx.stopPullDownRefresh(); + } +}) \ No newline at end of file diff --git a/pages/hot/hot.js b/pages/hot/hot.js index 60a3daf..e3e8f42 100644 --- a/pages/hot/hot.js +++ b/pages/hot/hot.js @@ -30,26 +30,42 @@ Page({ page: 1, search: '', categories: 0, - categoriesName:'', - categoriesImage:"", - showerror:"none", - isCategoryPage:"none", - isSearchPage:"none", + categoriesName: '', + categoriesImage: "", + showerror: "none", + isCategoryPage: "none", + isSearchPage: "none", showallDisplay: "block", displaySwiper: "block", floatDisplay: "none", - searchKey:"", + searchKey: "", topBarItems: [ - // id name selected 选中状态 - { id: '1', name: '评论数', selected: true }, - { id: '2', name: '浏览数', selected: false }, - { id: '3', name: '点赞数', selected: false }, - { id: '4', name: '鼓励数', selected: false } + // id name selected 选中状态 + { + id: '1', + name: '评论数', + selected: true + }, + { + id: '2', + name: '浏览数', + selected: false + }, + { + id: '3', + name: '点赞数', + selected: false + }, + { + id: '4', + name: '鼓励数', + selected: false + } ], tab: '1', }, - formSubmit: function (e) { + formSubmit: function(e) { var url = '../list/list' if (e.detail.value.input != '') { url = url + '?search=' + e.detail.value.input; @@ -58,27 +74,26 @@ Page({ url: url }) }, - onShareAppMessage: function () { - var title = "分享“"+ config.getWebsiteName +"”的文章排行。"; - var path ="pages/hot/hot"; + onShareAppMessage: function() { + var title = "分享“" + config.getWebsiteName + "”的文章排行。"; + var path = "pages/hot/hot"; return { title: title + '-排行榜', path: path, - success: function (res) { + success: function(res) { // 转发成功 }, - fail: function (res) { + fail: function(res) { // 转发失败 } } }, - reload:function(e) - { - var self = this; + reload: function(e) { + var self = this; self.fetchPostsData(self.data); }, - onTapTag: function (e) { + onTapTag: function(e) { var self = this; var tab = e.currentTarget.id; var topBarItems = self.data.topBarItems; @@ -91,8 +106,8 @@ Page({ } } self.setData({ - topBarItems: topBarItems, - tab: tab + topBarItems: topBarItems, + tab: tab }) if (tab !== 0) { @@ -101,80 +116,79 @@ Page({ this.fetchPostsData("1"); } }, - - onLoad: function (options) { + + onLoad: function(options) { var self = this; this.fetchPostsData("1"); - + }, //获取文章列表数据 - fetchPostsData: function (tab) { - var self = this; + fetchPostsData: function(tab) { + var self = this; self.setData({ - postsList: [] + postsList: [] }); - + wx.showLoading({ title: '正在加载', - mask:true + mask: true }); var getTopHotPostsRequest = wxRequest.getRequest(Api.getTopHotPosts(tab)); - getTopHotPostsRequest.then(response =>{ + getTopHotPostsRequest.then(response => { if (response.statusCode === 200) { - self.setData({ - showallDisplay: "block", - floatDisplay: "block", - postsList: self.data.postsList.concat(response.data.map(function (item) { - var strdate = item.post_date - if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { - item.post_thumbnail_image = '../../images/logo700.png'; - } - item.post_date = util.cutstr(strdate, 10, 1); - return item; - })), - - }); - - } else if (response.statusCode === 404) { - - // wx.showModal({ - // title: '加载失败', - // content: '加载数据失败,可能缺少相应的数据', - // showCancel: false, - // }); - - console.log('加载数据失败,可能缺少相应的数据'); + self.setData({ + showallDisplay: "block", + floatDisplay: "block", + postsList: self.data.postsList.concat(response.data.map(function(item) { + var strdate = item.post_date + if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { + item.post_thumbnail_image = '../../images/logo700.png'; + } + item.post_date = util.cutstr(strdate, 10, 1); + return item; + })), + + }); + + } else if (response.statusCode === 404) { + + // wx.showModal({ + // title: '加载失败', + // content: '加载数据失败,可能缺少相应的数据', + // showCancel: false, + // }); + + console.log('加载数据失败,可能缺少相应的数据'); } - }) - .catch(function () { + }) + .catch(function() { wx.hideLoading(); if (data.page == 1) { - self.setData({ - showerror: "block", - floatDisplay: "block" - }); - + self.setData({ + showerror: "block", + floatDisplay: "block" + }); + + } else { + // wx.showModal({ + // title: '加载失败', + // content: '加载数据失败,请重试.', + // showCancel: false, + // }); } - else { - // wx.showModal({ - // title: '加载失败', - // content: '加载数据失败,请重试.', - // showCancel: false, - // }); - } - }) - .finally(function () { + }) + .finally(function() { - setTimeout(function () { - wx.hideLoading(); + setTimeout(function() { + wx.hideLoading(); }, 1500); - }); - }, + }); + }, // 跳转至查看文章详情 - redictDetail: function (e) { + redictDetail: function(e) { // console.log('查看文章'); var id = e.currentTarget.id, url = '../detail/detail?id=' + id; @@ -184,7 +198,4 @@ Page({ }, -}) - - - +}) \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index b27f2e6..442b53a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -20,45 +20,41 @@ var pageCount = config.getPageCount; Page({ - data: { + data: { postsList: [], - postsShowSwiperList:[], - isLastPage:false, + postsShowSwiperList: [], + isLastPage: false, page: 1, search: '', categories: 0, - showerror:"none", - showCategoryName:"", - categoryName:"", - showallDisplay:"block", - displayHeader:"none", + showerror: "none", + showCategoryName: "", + categoryName: "", + showallDisplay: "block", + displayHeader: "none", displaySwiper: "none", floatDisplay: "none", - displayfirstSwiper:"none", + displayfirstSwiper: "none", topNav: [] - + }, - formSubmit: function (e) { + formSubmit: function(e) { var url = '../list/list' - var key =''; - if (e.currentTarget.id =="search-input") - { - key = e.detail.value; - } - else{ + var key = ''; + if (e.currentTarget.id == "search-input") { + key = e.detail.value; + } else { - key = e.detail.value.input; + key = e.detail.value.input; } if (key != '') { - url = url + '?search=' +key; + url = url + '?search=' + key; wx.navigateTo({ url: url }) - } - else - { + } else { wx.showModal({ title: '提示', content: '请输入内容', @@ -68,108 +64,105 @@ Page({ } }, - onShareAppMessage: function () { + onShareAppMessage: function() { return { - title: '“' + config.getWebsiteName+'”网站微信小程序,基于WordPress版小程序构建.技术支持：www.watch-life.net', + title: '“' + config.getWebsiteName + '”网站微信小程序,基于WordPress版小程序构建.技术支持：www.watch-life.net', path: 'pages/index/index', - success: function (res) { + success: function(res) { // 转发成功 }, - fail: function (res) { + fail: function(res) { // 转发失败 } } }, - onPullDownRefresh: function () { + onPullDownRefresh: function() { var self = this; self.setData({ showerror: "none", - showallDisplay:"block", - displaySwiper:"none", - floatDisplay:"none", - isLastPage:false, - page:1, - postsShowSwiperList:[] + showallDisplay: "block", + displaySwiper: "none", + floatDisplay: "none", + isLastPage: false, + page: 1, + postsShowSwiperList: [] }); - this.fetchTopFivePosts(); + this.fetchTopFivePosts(); this.fetchPostsData(self.data); - + }, - onReachBottom: function () { - var self = this; - if (!self.data.isLastPage) { - self.setData({ - page: self.data.page + 1 - }); - console.log('当前页' + self.data.page); - this.fetchPostsData(self.data); - } - else { - console.log('最后一页'); - } - + onReachBottom: function() { + var self = this; + if (!self.data.isLastPage) { + self.setData({ + page: self.data.page + 1 + }); + console.log('当前页' + self.data.page); + this.fetchPostsData(self.data); + } else { + console.log('最后一页'); + } + }, - onLoad: function (options) { - var self = this; + onLoad: function(options) { + var self = this; self.fetchTopFivePosts(); self.fetchPostsData(self.data); self.setData({ - topNav: config.getIndexNav + topNav: config.getIndexNav }); - + + }, + onShow: function(options) { + wx.setStorageSync('openLinkCount', 0); }, - onShow: function (options){ - wx.setStorageSync('openLinkCount', 0); - }, - fetchTopFivePosts: function () { + fetchTopFivePosts: function() { var self = this; //取置顶的文章 var getPostsRequest = wxRequest.getRequest(Api.getSwiperPosts()); getPostsRequest.then(response => { - if (response.data.status =='200' && response.data.posts.length > 0) { - self.setData({ - // postsShowSwiperList: response.data.posts, - postsShowSwiperList: self.data.postsShowSwiperList.concat(response.data.posts.map(function (item) { - //item.firstImage = Api.getContentFirstImage(item.content.rendered); - if (item.post_medium_image_300 == null || item.post_medium_image_300 == '') { - if (item.content_first_image != null && item.content_first_image != '') { - item.post_medium_image_300 = item.content_first_image; - } - else { - item.post_medium_image_300 = "../../images/logo700.png"; - } + if (response.data.status == '200' && response.data.posts.length > 0) { + self.setData({ + // postsShowSwiperList: response.data.posts, + postsShowSwiperList: self.data.postsShowSwiperList.concat(response.data.posts.map(function(item) { + //item.firstImage = Api.getContentFirstImage(item.content.rendered); + if (item.post_medium_image_300 == null || item.post_medium_image_300 == '') { + if (item.content_first_image != null && item.content_first_image != '') { + item.post_medium_image_300 = item.content_first_image; + } else { + item.post_medium_image_300 = "../../images/logo700.png"; + } - } - return item; - })), - displaySwiper: "block" - }); - - } - else { - self.setData({ - displaySwiper: "none" - }); - - } - - }).catch(function (response){ - console.log(response); - self.setData({ - showerror: "block", - floatDisplay: "none" - }); + } + return item; + })), + displaySwiper: "block" + }); + + } else { + self.setData({ + displaySwiper: "none" + }); + + } + + }).catch(function(response) { + console.log(response); + self.setData({ + showerror: "block", + floatDisplay: "none" + }); + + }) + .finally(function() { + + }); - }) - .finally(function () { - - }); - }, //获取文章列表数据 - fetchPostsData: function (data) { - var self = this; + fetchPostsData: function(data) { + var self = this; if (!data) data = {}; if (!data.page) data.page = 1; if (!data.categories) data.categories = 0; @@ -181,108 +174,100 @@ Page({ }; wx.showLoading({ title: '正在加载', - mask:true - }); + mask: true + }); var getPostsRequest = wxRequest.getRequest(Api.getPosts(data)); getPostsRequest - .then(response => { - if (response.statusCode === 200) { - for (var i = 0; i < response.data.length; i++) { - // console.log(response.data[i].excerpt.rendered); - var rendered = response.data[i].excerpt.rendered; - if (rendered === '') { - continue - } - var res = WxParse.wxParse('rendered', 'html', rendered, self, 5, true); - // console.log(res); - response.data[i].excerpt.rendered = res; - } - if (response.data.length < pageCount) { - self.setData({ - isLastPage: true - }); - } - self.setData({ - floatDisplay: "block", - postsList: self.data.postsList.concat(response.data.map(function (item) { - var strdate = item.date - if (item.category_name != null) { - item.categoryImage = "../../images/category.png"; - } - else { - item.categoryImage = ""; - } - if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { - item.post_thumbnail_image = "../../images/logo700.png"; - } - item.date = util.cutstr(strdate, 10, 1); - // console.log(item); - return item; - })), - }); - setTimeout(function () { - wx.hideLoading(); - }, 900); - } - else { - if (response.data.code == "rest_post_invalid_page_number") { - self.setData({ - isLastPage: true - }); - wx.showToast({ - title: '没有更多内容', - mask: false, - duration: 1500 - }); - } - else { - wx.showToast({ - title: response.data.message, - duration: 1500 - }) - } - } - }) - .catch(function (response) - { - if (data.page == 1) { - self.setData({ - showerror: "block", - floatDisplay: "none" - }); - - } - else { - console.log(response); - wx.showModal({ - title: '加载失败', - content: '加载数据失败,请重试.', - showCancel: false, - }); - self.setData({ - page: data.page - 1 - }); + .then(response => { + if (response.statusCode === 200) { + for (var i = 0; i < response.data.length; i++) { + // console.log(response.data[i].excerpt.rendered); + var rendered = response.data[i].excerpt.rendered; + if (rendered === '') { + continue } - }) - .finally(function (response) { + var res = WxParse.wxParse('rendered', 'html', rendered, self, 5, true); + // console.log(res); + response.data[i].excerpt.rendered = res; + } + if (response.data.length < pageCount) { + self.setData({ + isLastPage: true + }); + } + self.setData({ + floatDisplay: "block", + postsList: self.data.postsList.concat(response.data.map(function(item) { + var strdate = item.date + if (item.category_name != null) { + item.categoryImage = "../../images/category.png"; + } else { + item.categoryImage = ""; + } + if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { + item.post_thumbnail_image = "../../images/logo700.png"; + } + item.date = util.cutstr(strdate, 10, 1); + // console.log(item); + return item; + })), + }); + setTimeout(function() { wx.hideLoading(); - wx.stopPullDownRefresh(); - }); + }, 900); + } else { + if (response.data.code == "rest_post_invalid_page_number") { + self.setData({ + isLastPage: true + }); + wx.showToast({ + title: '没有更多内容', + mask: false, + duration: 1500 + }); + } else { + wx.showToast({ + title: response.data.message, + duration: 1500 + }) + } + } + }) + .catch(function(response) { + if (data.page == 1) { + self.setData({ + showerror: "block", + floatDisplay: "none" + }); + + } else { + console.log(response); + wx.showModal({ + title: '加载失败', + content: '加载数据失败,请重试.', + showCancel: false, + }); + self.setData({ + page: data.page - 1 + }); + } + }) + .finally(function(response) { + wx.hideLoading(); + wx.stopPullDownRefresh(); + }); }, //加载分页 - loadMore: function (e) { - + loadMore: function(e) { + var self = this; - if (!self.data.isLastPage) - { + if (!self.data.isLastPage) { self.setData({ page: self.data.page + 1 }); //console.log('当前页' + self.data.page); this.fetchPostsData(self.data); - } - else - { + } else { wx.showToast({ title: '没有更多内容', mask: false, @@ -291,7 +276,7 @@ Page({ } }, // 跳转至查看文章详情 - redictDetail: function (e) { + redictDetail: function(e) { // console.log('查看文章'); var id = e.currentTarget.id, url = '../detail/detail?id=' + id; @@ -300,84 +285,80 @@ Page({ }) }, //首页图标跳转 - onNavRedirect:function(e){ - var redicttype = e.currentTarget.dataset.redicttype; - var url = e.currentTarget.dataset.url == null ? '' : e.currentTarget.dataset.url; - var appid = e.currentTarget.dataset.appid == null ? '' : e.currentTarget.dataset.appid; - var extraData = e.currentTarget.dataset.extraData == null ? '' : e.currentTarget.dataset.extraData; - if (redicttype == 'apppage') {//跳转到小程序内部页面 - wx.navigateTo({ - url: url - }) - } - else if (redicttype == 'webpage')//跳转到web-view内嵌的页面 - { - url = '../webpage/webpage?url=' + url; - wx.navigateTo({ - url: url - }) - } - else if (redicttype == 'miniapp')//跳转到其他app - { - wx.navigateToMiniProgram({ - appId: appid, - envVersion: 'release', - path: url, - extraData: extraData, - success(res) { - // 打开成功 - }, - fail: function (res) { - console.log(res); - } - }) - } - + onNavRedirect: function(e) { + var redicttype = e.currentTarget.dataset.redicttype; + var url = e.currentTarget.dataset.url == null ? '' : e.currentTarget.dataset.url; + var appid = e.currentTarget.dataset.appid == null ? '' : e.currentTarget.dataset.appid; + var extraData = e.currentTarget.dataset.extraData == null ? '' : e.currentTarget.dataset.extraData; + if (redicttype == 'apppage') { //跳转到小程序内部页面 + wx.navigateTo({ + url: url + }) + } else if (redicttype == 'webpage') //跳转到web-view内嵌的页面 + { + url = '../webpage/webpage?url=' + url; + wx.navigateTo({ + url: url + }) + } else if (redicttype == 'miniapp') //跳转到其他app + { + wx.navigateToMiniProgram({ + appId: appid, + envVersion: 'release', + path: url, + extraData: extraData, + success(res) { + // 打开成功 + }, + fail: function(res) { + console.log(res); + } + }) + } + }, // 跳转至查看小程序列表页面或文章详情页 - redictAppDetail: function (e) { - // console.log('查看文章'); - var id = e.currentTarget.id; - var redicttype = e.currentTarget.dataset.redicttype; - var url = e.currentTarget.dataset.url == null ? '':e.currentTarget.dataset.url; - var appid = e.currentTarget.dataset.appid == null ? '' : e.currentTarget.dataset.appid; - - if (redicttype == 'detailpage')//跳转到内容页 - { - url = '../detail/detail?id=' + id; - wx.navigateTo({ - url: url - }) - } - if (redicttype == 'apppage') {//跳转到小程序内部页面 - wx.navigateTo({ - url: url - }) - } - else if (redicttype == 'webpage')//跳转到web-view内嵌的页面 - { - url = '../webpage/webpage?url=' + url; - wx.navigateTo({ - url: url - }) - } - else if (redicttype == 'miniapp')//跳转到其他app - { - wx.navigateToMiniProgram({ - appId: appid, - envVersion: 'release', - path: url, - success(res) { - // 打开成功 - }, - fail: function (res) { - console.log(res); - } - }) - } + redictAppDetail: function(e) { + // console.log('查看文章'); + var id = e.currentTarget.id; + var redicttype = e.currentTarget.dataset.redicttype; + var url = e.currentTarget.dataset.url == null ? '' : e.currentTarget.dataset.url; + var appid = e.currentTarget.dataset.appid == null ? '' : e.currentTarget.dataset.appid; + + if (redicttype == 'detailpage') //跳转到内容页 + { + url = '../detail/detail?id=' + id; + wx.navigateTo({ + url: url + }) + } + if (redicttype == 'apppage') { //跳转到小程序内部页面 + wx.navigateTo({ + url: url + }) + } else if (redicttype == 'webpage') //跳转到web-view内嵌的页面 + { + url = '../webpage/webpage?url=' + url; + wx.navigateTo({ + url: url + }) + } else if (redicttype == 'miniapp') //跳转到其他app + { + wx.navigateToMiniProgram({ + appId: appid, + envVersion: 'release', + path: url, + success(res) { + // 打开成功 + }, + fail: function(res) { + console.log(res); + } + }) + } }, //返回首页 - redictHome: function (e) { + redictHome: function(e) { //console.log('查看某类别下的文章'); var id = e.currentTarget.dataset.id, url = '/pages/index/index'; @@ -385,4 +366,4 @@ Page({ url: url }); } -}) +}) \ No newline at end of file diff --git a/pages/list/list.js b/pages/list/list.js index f9aa8e1..c26182f 100644 --- a/pages/list/list.js +++ b/pages/list/list.js @@ -30,17 +30,17 @@ Page({ page: 1, search: '', categories: 0, - categoriesName:'', - categoriesImage:"", - showerror:"none", - isCategoryPage:"none", - isSearchPage:"none", + categoriesName: '', + categoriesImage: "", + showerror: "none", + isCategoryPage: "none", + isSearchPage: "none", showallDisplay: "block", displaySwiper: "block", floatDisplay: "none", - searchKey:"", + searchKey: "", }, - formSubmit: function (e) { + formSubmit: function(e) { var url = '../list/list' if (e.detail.value.input != '') { url = url + '?search=' + e.detail.value.input; @@ -49,57 +49,52 @@ Page({ url: url }) }, - onShareAppMessage: function () { + onShareAppMessage: function() { var title = "分享“泽林博客”"; - var path ="" + var path = "" - if (this.data.categories && this.data.categories != 0) - { + if (this.data.categories && this.data.categories != 0) { title += "的专题：" + this.data.categoriesList.name; path = 'pages/list/list?categoryID=' + this.data.categoriesList.id; - } - else - { + } else { title += "的搜索内容：" + this.data.searchKey; path = 'pages/list/list?search=' + this.data.searchKey; - } + } return { title: title, path: path, - success: function (res) { + success: function(res) { // 转发成功 }, - fail: function (res) { + fail: function(res) { // 转发失败 } } }, - onReachBottom: function () { + onReachBottom: function() { + + var self = this; + if (!self.data.isLastPage) { + self.setData({ + page: self.data.page + 1 + }); + console.log('当前页' + self.data.page); + this.fetchPostsData(self.data); + } else { + console.log('最后一页'); + } - var self = this; - if (!self.data.isLastPage) { - self.setData({ - page: self.data.page + 1 - }); - console.log('当前页' + self.data.page); - this.fetchPostsData(self.data); - } - else { - console.log('最后一页'); - } - }, - reload:function(e) - { + reload: function(e) { var self = this; if (self.data.categories && self.data.categories != 0) { - + self.setData({ - // categories: options.categoryID, + // categories: options.categoryID, isCategoryPage: "block", showallDisplay: "none", showerror: "none", @@ -119,7 +114,7 @@ Page({ self.fetchPostsData(self.data); }, //加载分页 - loadMore: function (e) { + loadMore: function(e) { var self = this; if (!self.data.isLastPage) { self.setData({ @@ -127,8 +122,7 @@ Page({ }); console.log('当前页' + self.data.page); this.fetchPostsData(self.data); - } - else { + } else { wx.showToast({ title: '没有更多内容', mask: false, @@ -136,36 +130,36 @@ Page({ }); } }, - onLoad: function (options) { + onLoad: function(options) { var self = this; if (options.categoryID && options.categoryID != 0) { self.setData({ categories: options.categoryID, - isCategoryPage:"block" - - + isCategoryPage: "block" + + }); self.fetchCategoriesData(options.categoryID); } if (options.search && options.search != '') { wx.setNavigationBarTitle({ - title: "搜索关键字："+options.search, - success: function (res) { + title: "搜索关键字：" + options.search, + success: function(res) { // success } }); self.setData({ search: options.search, - isSearchPage:"block", + isSearchPage: "block", searchKey: options.search }) this.fetchPostsData(self.data); - } + } }, //获取文章列表数据 - fetchPostsData: function (data) { - var self = this; + fetchPostsData: function(data) { + var self = this; if (!data) data = {}; if (!data.page) data.page = 1; if (!data.categories) data.categories = 0; @@ -175,100 +169,96 @@ Page({ postsList: [] }); }; - + wx.showLoading({ title: '正在加载', - mask:true + mask: true }); var getPostsRequest = wxRequest.getRequest(Api.getPosts(data)); - getPostsRequest.then(response =>{ + getPostsRequest.then(response => { if (response.statusCode === 200) { for (let i = 0; i < response.data.length; i++) { var rendered = response.data[i].excerpt.rendered; let res = WxParse.wxParse('rendered', 'html', rendered, this, 5, true); response.data[i].excerpt.rendered = res; } - if (response.data.length < pageCount) { - self.setData({ - isLastPage: true - }); - }; + if (response.data.length < pageCount) { self.setData({ - floatDisplay: "block", - showallDisplay: "block", - postsList: self.data.postsList.concat(response.data.map(function (item) { - var strdate = item.date - if (item.category_name != null) { - - item.categoryImage = "../../images/topic.png"; - } - else { - item.categoryImage = ""; - } - - if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { - item.post_thumbnail_image = '../../images/logo700.png'; - } - item.date = util.cutstr(strdate, 10, 1); - return item; - })), - + isLastPage: true }); - // setTimeout(function () { - // wx.hideLoading(); + }; + self.setData({ + floatDisplay: "block", + showallDisplay: "block", + postsList: self.data.postsList.concat(response.data.map(function(item) { + var strdate = item.date + if (item.category_name != null) { + + item.categoryImage = "../../images/topic.png"; + } else { + item.categoryImage = ""; + } + + if (item.post_thumbnail_image == null || item.post_thumbnail_image == '') { + item.post_thumbnail_image = '../../images/logo700.png'; + } + item.date = util.cutstr(strdate, 10, 1); + return item; + })), - // }, 1500); + }); + // setTimeout(function () { + // wx.hideLoading(); + // }, 1500); - } - else { - if (response.data.code == "rest_post_invalid_page_number") { - self.setData({ - isLastPage: true - }); - - } - else { - wx.showToast({ - title: response.data.message, - duration: 1500 - }) - } - } - - }) - .catch(function(){ - if (data.page == 1) { + } else { + if (response.data.code == "rest_post_invalid_page_number") { self.setData({ - showerror: "block", - floatDisplay: "none" + isLastPage: true }); + } else { + wx.showToast({ + title: response.data.message, + duration: 1500 + }) + } } - else { - wx.showModal({ - title: '加载失败', - content: '加载数据失败,请重试.', - showCancel: false, - }); - self.setData({ - page: data.page - 1 - }); + + }) + .catch(function() { + if (data.page == 1) { + + self.setData({ + showerror: "block", + floatDisplay: "none" + }); + + } else { + wx.showModal({ + title: '加载失败', + content: '加载数据失败,请重试.', + showCancel: false, + }); + self.setData({ + page: data.page - 1 + }); } - }) - .finally(function () { - wx.hideLoading(); + }) + .finally(function() { + wx.hideLoading(); - }) - }, + }) + }, // 跳转至查看文章详情 - redictDetail: function (e) { + redictDetail: function(e) { // console.log('查看文章'); var id = e.currentTarget.id, url = '../detail/detail?id=' + id; @@ -278,7 +268,7 @@ Page({ }, //获取分类列表 - fetchCategoriesData: function (id) { + fetchCategoriesData: function(id) { var self = this; self.setData({ categoriesList: [] @@ -286,35 +276,31 @@ Page({ var getCategoryRequest = wxRequest.getRequest(Api.getCategoryByID(id)); - getCategoryRequest.then(response =>{ + getCategoryRequest.then(response => { - var catImage = ""; - if (typeof (response.data.category_thumbnail_image) == "undefined" || response.data.category_thumbnail_image == "") { - catImage = "../../images/website.png"; - } - else { - catImage = response.data.category_thumbnail_image; - } + var catImage = ""; + if (typeof(response.data.category_thumbnail_image) == "undefined" || response.data.category_thumbnail_image == "") { + catImage = "../../images/website.png"; + } else { + catImage = response.data.category_thumbnail_image; + } - self.setData({ - categoriesList: response.data, - categoriesImage: catImage, - categoriesName: response.data.name - }); + self.setData({ + categoriesList: response.data, + categoriesImage: catImage, + categoriesName: response.data.name + }); - wx.setNavigationBarTitle({ - title: response.data.name, - success: function (res) { - // success - } - }); + wx.setNavigationBarTitle({ + title: response.data.name, + success: function(res) { + // success + } + }); - self.fetchPostsData(self.data); + self.fetchPostsData(self.data); }) }, -}) - - - +}) \ No newline at end of file diff --git a/pages/logs/logs.js b/pages/logs/logs.js index 137edb1..a3d801a 100644 --- a/pages/logs/logs.js +++ b/pages/logs/logs.js @@ -15,11 +15,11 @@ Page({ data: { logs: [] }, - onLoad: function () { + onLoad: function() { this.setData({ - logs: (wx.getStorageSync('logs') || []).map(function (log) { + logs: (wx.getStorageSync('logs') || []).map(function(log) { return util.formatTime(new Date(log)) }) }) } -}) +}) \ No newline at end of file diff --git a/pages/page/page.js b/pages/page/page.js index 53002b3..edb47ec 100644 --- a/pages/page/page.js +++ b/pages/page/page.js @@ -22,25 +22,27 @@ Page({ hidden: false, wxParseData: [] }, - onLoad: function (options) { + onLoad: function(options) { this.fetchData(options.id), this.fetchPagesData() }, - fetchData: function (id) { + fetchData: function(id) { var self = this; self.setData({ hidden: false }); wx.request({ - url: Api.getPageByID(id, { mdrender: false }), - success: function (response) { + url: Api.getPageByID(id, { + mdrender: false + }), + success: function(response) { console.log(response); self.setData({ pageData: response.data, // wxParseData: WxParse('md',response.data.content.rendered) wxParseData: WxParse.wxParse('article', 'html', response.data.content.rendered, self, 5) }); - setTimeout(function () { + setTimeout(function() { self.setData({ hidden: true }); @@ -48,15 +50,15 @@ Page({ } }); }, - fetchPagesData: function () { + fetchPagesData: function() { var self = this; wx.request({ url: Api.getPages(), - success: function (response) { + success: function(response) { self.setData({ pagesList: response.data }); - setTimeout(function () { + setTimeout(function() { self.setData({ hidden: true }); @@ -64,4 +66,4 @@ Page({ } }); } -}) +}) \ No newline at end of file diff --git a/pages/pay/pay.js b/pages/pay/pay.js index 282791f..7525f8d 100644 --- a/pages/pay/pay.js +++ b/pages/pay/pay.js @@ -20,23 +20,23 @@ import config from '../../utils/config.js' var app = getApp(); Page({ - data: { + data: { prices: [ - 6, 8, 18, 66, 88,188 + 6, 8, 18, 66, 88, 188 ], - openid:'', - postid:'', - total_fee:'', + openid: '', + postid: '', + total_fee: '', template_id: config.getPayTemplateId, - flag:'1' + flag: '1' }, /** * 进入页面 */ - onLoad: function (options) { + onLoad: function(options) { - var that=this; + var that = this; var openid = options.openid; var postid = options.postid; @@ -45,12 +45,11 @@ Page({ that.setData({ openid: openid, postid: postid, - flag:flag - }); + flag: flag + }); }, - cancel:function() - { + cancel: function() { wx.navigateBack({ delta: 1 }) @@ -60,11 +59,11 @@ Page({ /** * 选中鼓励金额 */ - selectItem: function (event) { + selectItem: function(event) { var totalfee = event.currentTarget.dataset.item; - var money = totalfee ; + var money = totalfee; totalfee = totalfee; - var that = this; + var that = this; var url = Api.postPraiseUrl(); var data = { openid: that.data.openid, @@ -72,89 +71,85 @@ Page({ } var postPraiseRequest = wxRequest.postRequest(url, data); postPraiseRequest.then(response => { - if (response.data) { - var temp = response.data; - wx.requestPayment({ - 'timeStamp': response.data.timeStamp, - 'nonceStr': response.data.nonceStr, - 'package': response.data.package, - 'signType': 'MD5', - 'paySign': response.data.paySign, - 'success': function (res) { - var url = Api.updatePraiseUrl(); - var data ={ - openid: that.data.openid, - postid: that.data.postid, - orderid: response.data.nonceStr, - money: totalfee - } - var form_id = response.data.package; - form_id = form_id.substring(10); - var updatePraiseRequest = wxRequest.postRequest(url, data); //更新鼓励数据 - updatePraiseRequest.then(response => { - console.log(response.data.message); - }) + if (response.data) { + var temp = response.data; + wx.requestPayment({ + 'timeStamp': response.data.timeStamp, + 'nonceStr': response.data.nonceStr, + 'package': response.data.package, + 'signType': 'MD5', + 'paySign': response.data.paySign, + 'success': function(res) { + var url = Api.updatePraiseUrl(); + var data = { + openid: that.data.openid, + postid: that.data.postid, + orderid: response.data.nonceStr, + money: totalfee + } + var form_id = response.data.package; + form_id = form_id.substring(10); + var updatePraiseRequest = wxRequest.postRequest(url, data); //更新鼓励数据 + updatePraiseRequest.then(response => { + console.log(response.data.message); + }) .then(res => { - wx.showToast({ - title: '谢谢鼓励！', - uration: 2000, - success: function () { - data = - { - openid: that.data.openid, - postid: that.data.postid, - template_id: that.data.template_id, - form_id: form_id, - total_fee: money, - flag: that.data.flag - }; - url = Api.sendMessagesUrl(); - var sendMessageRequest = wxRequest.postRequest(url, data); - sendMessageRequest.then(response => { - if (response.data.status == '200') { - console.log(response.data.message); - wx.navigateBack({ - delta: 1 - }) - - } - else { - console.log(response.data.message); - - } - - }); - - } - }); - }) - - }, - 'fail': function (res) { + wx.showToast({ + title: '谢谢鼓励！', + uration: 2000, + success: function() { + data = { + openid: that.data.openid, + postid: that.data.postid, + template_id: that.data.template_id, + form_id: form_id, + total_fee: money, + flag: that.data.flag + }; + url = Api.sendMessagesUrl(); + var sendMessageRequest = wxRequest.postRequest(url, data); + sendMessageRequest.then(response => { + if (response.data.status == '200') { + console.log(response.data.message); + wx.navigateBack({ + delta: 1 + }) + + } else { + console.log(response.data.message); + + } + + }); + + } + }); + }) + + }, + 'fail': function(res) { + wx.showToast({ + title: res.errMsg, + icon: 'success' + }); + }, + complete: function(res) { + + if (res.errMsg == 'requestPayment:fail cancel') { wx.showToast({ - title: res.errMsg, + title: '取消鼓励', icon: 'success' }); - }, - complete: function (res) { - - if (res.errMsg =='requestPayment:fail cancel') - { - wx.showToast({ - title: '取消鼓励', - icon: 'success' - }); - } - } - }); - } - else { - console.log(response.data.message); - } - }) + } + }); + } else { + console.log(response.data.message); + + } + }) + - } -}) +}) \ No newline at end of file diff --git a/pages/poster/poster.js b/pages/poster/poster.js index 36984e9..1f4cbaf 100644 --- a/pages/poster/poster.js +++ b/pages/poster/poster.js @@ -20,66 +20,66 @@ import config from '../../utils/config.js' var app = getApp(); Page({ - data: { - posterImageUrl:"", - dialog: { - title: '', - content: '', - hidden: true - }, + data: { + posterImageUrl: "", + dialog: { + title: '', + content: '', + hidden: true + }, - }, - onLoad: function (options) { - var self = this; - - wx.setNavigationBarTitle({ - title: '海报', - success: function (res) { - // success - } - }); - self.setData({ - posterImageUrl: options.posterImageUrl - }); - - - }, - savePosterImage:function() - { - var self=this; - wx.downloadFile({ - url: self.data.posterImageUrl, - success: function (res) { - wx.saveImageToPhotosAlbum({ - filePath: res.tempFilePath, - success(result) { - console.log(result) - wx.showModal({ - title: '提示', - content: '二维码海报已存入手机相册，赶快分享到朋友圈吧', - showCancel: false, - success: function (res) { - if (res.confirm) { - - wx.navigateBack({ - delta: 1 - }) - } - } - }) - } - }); - }, fail: function (res) { - console.log(res) - } - }); - }, - posterImageClick:function(e){ - var src = e.currentTarget.dataset.src; - wx.previewImage({ - urls: [src], + }, + onLoad: function(options) { + var self = this; + + wx.setNavigationBarTitle({ + title: '海报', + success: function(res) { + // success + } + }); + self.setData({ + posterImageUrl: options.posterImageUrl + }); + + + }, + savePosterImage: function() { + var self = this; + wx.downloadFile({ + url: self.data.posterImageUrl, + success: function(res) { + wx.saveImageToPhotosAlbum({ + filePath: res.tempFilePath, + success(result) { + console.log(result) + wx.showModal({ + title: '提示', + content: '二维码海报已存入手机相册，赶快分享到朋友圈吧', + showCancel: false, + success: function(res) { + if (res.confirm) { + + wx.navigateBack({ + delta: 1 + }) + } + } + }) + } }); - } + }, + fail: function(res) { + console.log(res) + } + }); + }, + posterImageClick: function(e) { + var src = e.currentTarget.dataset.src; + wx.previewImage({ + urls: [src], + }); + } }) \ No newline at end of file diff --git a/pages/readlog/readlog.js b/pages/readlog/readlog.js index 092ed1a..c92a354 100644 --- a/pages/readlog/readlog.js +++ b/pages/readlog/readlog.js @@ -19,333 +19,340 @@ var wxRequest = require('../../utils/wxRequest.js'); var app = getApp(); Page({ - data: { + data: { readLogs: [], topBarItems: [ - // id name selected 选中状态 - { id: '1', name: '浏览', selected: true }, - { id: '2', name: '评论', selected: false}, - { id: '3', name: '点赞', selected: false }, - { id: '4', name: '鼓励', selected: false }, - { id: '5', name: '订阅', selected: false }, - { id: '6', name: '言论', selected: false } + // id name selected 选中状态 + { + id: '1', + name: '浏览', + selected: true + }, + { + id: '2', + name: '评论', + selected: false + }, + { + id: '3', + name: '点赞', + selected: false + }, + { + id: '4', + name: '鼓励', + selected: false + }, + { + id: '5', + name: '订阅', + selected: false + }, + { + id: '6', + name: '言论', + selected: false + } ], tab: '1', showerror: "none", - shownodata:"none", - subscription:"", - userInfo:{}, - openid:'', - isLoginPopup: false + shownodata: "none", + subscription: "", + userInfo: {}, + openid: '', + isLoginPopup: false }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { - var self = this; + onLoad: function(options) { + var self = this; self.fetchPostsData('1'); - Auth.setUserInfoData(self); + Auth.setUserInfoData(self); Auth.checkLogin(self); wx.setNavigationBarTitle({ title: config.getWebsiteName + '-个人中心', - success: function (res) { + success: function(res) { // success } }); - + }, - onReady: function () { - var self = this; - Auth.checkSession(self,'isLoginNow'); + onReady: function() { + var self = this; + Auth.checkSession(self, 'isLoginNow'); + }, + agreeGetUser: function(e) { + let self = this; + Auth.checkAgreeGetUser(e, app, self, '0'); + }, - agreeGetUser:function(e) - { - let self= this; - Auth.checkAgreeGetUser(e,app,self,'0'); - - }, // 跳转至查看文章详情 - redictDetail: function (e) { + redictDetail: function(e) { // console.log('查看文章'); var id = e.currentTarget.id; var itemtype = e.currentTarget.dataset.itemtype; - var url =""; - if (itemtype=="1") - { - url = '../list/list?categoryID=' + id; - } - else - { - url = '../detail/detail?id=' + id; + var url = ""; + if (itemtype == "1") { + url = '../list/list?categoryID=' + id; + } else { + url = '../detail/detail?id=' + id; } - + wx.navigateTo({ url: url }) }, - onTapTag: function (e) { - var self = this; - var tab = e.currentTarget.id; - var topBarItems = self.data.topBarItems; - // 切换topBarItem - for (var i = 0; i < topBarItems.length; i++) { - if (tab == topBarItems[i].id) { - topBarItems[i].selected = true; - } else { - topBarItems[i].selected = false; - } - } - self.setData({ - topBarItems: topBarItems, - tab: tab - - }) - if (tab !== 0) { - this.fetchPostsData(tab); + onTapTag: function(e) { + var self = this; + var tab = e.currentTarget.id; + var topBarItems = self.data.topBarItems; + // 切换topBarItem + for (var i = 0; i < topBarItems.length; i++) { + if (tab == topBarItems[i].id) { + topBarItems[i].selected = true; } else { - this.fetchPostsData("1"); + topBarItems[i].selected = false; } + } + self.setData({ + topBarItems: topBarItems, + tab: tab + + }) + if (tab !== 0) { + this.fetchPostsData(tab); + } else { + this.fetchPostsData("1"); + } }, - onShareAppMessage: function () { - var title = "分享我在“" + config.getWebsiteName + "浏览、评论、点赞、鼓励的文章"; - var path = "pages/readlog/readlog"; - return { - title: title, - path: path, - success: function (res) { - // 转发成功 - }, - fail: function (res) { - // 转发失败 - } + onShareAppMessage: function() { + var title = "分享我在“" + config.getWebsiteName + "浏览、评论、点赞、鼓励的文章"; + var path = "pages/readlog/readlog"; + return { + title: title, + path: path, + success: function(res) { + // 转发成功 + }, + fail: function(res) { + // 转发失败 } + } }, - fetchPostsData: function (tab) { - self = this; - self.setData({ - showerror: 'none', - shownodata:'none' - }); - var count =0; - var openid = ""; - if(tab !='1') - { - if (self.data.openid) { - var openid = self.data.openid; - } - else - { - Auth.checkSession(self,'isLoginNow'); - return; - } + fetchPostsData: function(tab) { + self = this; + self.setData({ + showerror: 'none', + shownodata: 'none' + }); + var count = 0; + var openid = ""; + if (tab != '1') { + if (self.data.openid) { + var openid = self.data.openid; + } else { + Auth.checkSession(self, 'isLoginNow'); + return; + } + } + if (tab == '1') { + self.setData({ + readLogs: (wx.getStorageSync('readLogs') || []).map(function(log) { + count++; + return log; + }) + }); + if (count == 0) { + self.setData({ + shownodata: 'block' + }); } - if (tab == '1') - { + } else if (tab == '2') { + self.setData({ + readLogs: [] + }); + var getMyCommentsPosts = wxRequest.getRequest(Api.getWeixinComment(openid)); + getMyCommentsPosts.then(response => { + if (response.statusCode == 200) { self.setData({ - readLogs: (wx.getStorageSync('readLogs') || []).map(function (log) { - count++; - return log; - }) + readLogs: self.data.readLogs.concat(response.data.data.map(function(item) { + count++; + item[0] = item.post_id; + item[1] = item.post_title; + return item; + })) }); if (count == 0) { - self.setData({ - shownodata: 'block' - }); + self.setData({ + shownodata: 'block' + }); } - } - else if (tab == '2') - { + } else { + console.log(response); self.setData({ - readLogs: [] + showerror: 'block' }); - var getMyCommentsPosts = wxRequest.getRequest(Api.getWeixinComment(openid)); - getMyCommentsPosts.then(response => { - if (response.statusCode == 200) { - self.setData({ - readLogs: self.data.readLogs.concat(response.data.data.map(function (item) { - count++; - item[0] = item.post_id; - item[1] = item.post_title; - return item; - })) - }); - if (count == 0) { - self.setData({ - shownodata: 'block' - }); - } - } - else { - console.log(response); - self.setData({ - showerror: 'block' - }); - } - }) - } - else if (tab == '3') { + } + }) + } else if (tab == '3') { + self.setData({ + readLogs: [] + }); + var getMylikePosts = wxRequest.getRequest(Api.getMyLikeUrl(openid)); + getMylikePosts.then(response => { + if (response.statusCode == 200) { self.setData({ - readLogs: [] + readLogs: self.data.readLogs.concat(response.data.data.map(function(item) { + count++; + item[0] = item.post_id; + item[1] = item.post_title; + item[2] = "0"; + return item; + })) }); - var getMylikePosts = wxRequest.getRequest(Api.getMyLikeUrl(openid)); - getMylikePosts.then(response => { - if (response.statusCode == 200) { - self.setData({ - readLogs: self.data.readLogs.concat(response.data.data.map(function (item) { - count++; - item[0] = item.post_id; - item[1] = item.post_title; - item[2] = "0"; - return item; - })) - }); - if (count == 0) { - self.setData({ - shownodata: 'block' - }); - } - } - else { - console.log(response); - self.setData({ - showerror: 'block' - }); + if (count == 0) { + self.setData({ + shownodata: 'block' + }); + } + } else { + console.log(response); + self.setData({ + showerror: 'block' + }); - } - }) + } + }) - } - else if (tab == '4') { + } else if (tab == '4') { + self.setData({ + readLogs: [] + }); + + var getMyPraisePosts = wxRequest.getRequest(Api.getMyPraiseUrl(openid)); + getMyPraisePosts.then(response => { + if (response.statusCode == 200) { self.setData({ - readLogs: [] - }); - - var getMyPraisePosts = wxRequest.getRequest(Api.getMyPraiseUrl(openid)); - getMyPraisePosts.then(response => { - if (response.statusCode == 200) { - self.setData({ - readLogs: self.data.readLogs.concat(response.data.data.map(function (item) { - count++; - item[0] = item.post_id; - item[1] = item.post_title; - item[2] = "0"; - return item; - })) - }); - if (count == 0) { - self.setData({ - shownodata: 'block' - }); - } - } - else { - console.log(response); - this.setData({ - showerror: 'block' - }); + readLogs: self.data.readLogs.concat(response.data.data.map(function(item) { + count++; + item[0] = item.post_id; + item[1] = item.post_title; + item[2] = "0"; + return item; + })) + }); + if (count == 0) { + self.setData({ + shownodata: 'block' + }); + } + } else { + console.log(response); + this.setData({ + showerror: 'block' + }); - } - }) + } + }) - } - else if (tab == '5') { - self.setData({ - readLogs: [] + } else if (tab == '5') { + self.setData({ + readLogs: [] + }); + var url = Api.getSubscription() + '?openid=' + openid; + var getMysubPost = wxRequest.getRequest(url); + getMysubPost.then(response => { + if (response.statusCode == 200) { + var usermetaList = response.data.usermetaList; + if (usermetaList) { + self.setData({ + readLogs: self.data.readLogs.concat(usermetaList.map(function(item) { + count++; + item[0] = item.ID; + item[1] = item.post_title; + item[2] = "0"; + return item; + })) + }); + + } + if (count == 0) { + self.setData({ + shownodata: 'block' + }); + } + } else { + console.log(response); + this.setData({ + showerror: 'block' }); - var url = Api.getSubscription() + '?openid=' + openid; - var getMysubPost = wxRequest.getRequest(url); - getMysubPost.then(response => { - if (response.statusCode == 200) { - var usermetaList = response.data.usermetaList; - if (usermetaList) - { - self.setData({ - readLogs: self.data.readLogs.concat(usermetaList.map(function (item) { - count++; - item[0] = item.ID; - item[1] = item.post_title; - item[2] = "0"; - return item; - })) - }); - } - if (count == 0) { - self.setData({ - shownodata: 'block' - }); - } - } - else { - console.log(response); - this.setData({ - showerror: 'block' - }); + } + }) - } - }) - - } - else if (tab == '6'){ + } else if (tab == '6') { + self.setData({ + readLogs: [] + }); + var getNewComments = wxRequest.getRequest(Api.getNewComments()); + getNewComments.then(response => { + if (response.statusCode == 200) { self.setData({ - readLogs: [] + readLogs: self.data.readLogs.concat(response.data.map(function(item) { + count++; + item[0] = item.post; + item[1] = util.removeHTML(item.content.rendered + '(' + item.author_name + ')'); + item[2] = "0"; + return item; + })) }); - var getNewComments = wxRequest.getRequest(Api.getNewComments()); - getNewComments.then(response => { - if (response.statusCode == 200) { - self.setData({ - readLogs: self.data.readLogs.concat(response.data.map(function (item) { - count++; - item[0] = item.post; - item[1] = util.removeHTML(item.content.rendered + '(' + item.author_name + ')'); - item[2] = "0"; - return item; - })) - }); - if (count == 0) { - self.setData({ - shownodata: 'block' - }); - } + if (count == 0) { + self.setData({ + shownodata: 'block' + }); + } - } - else { - console.log(response); - self.setData({ - showerror: 'block' - }); + } else { + console.log(response); + self.setData({ + showerror: 'block' + }); - } - }).catch(function () { - console.log(response); - self.setData({ - showerror: 'block' - }); + } + }).catch(function() { + console.log(response); + self.setData({ + showerror: 'block' + }); - }) - } - }, + }) + } + }, closeLoginPopup() { - this.setData({ isLoginPopup: false }); + this.setData({ + isLoginPopup: false + }); }, openLoginPopup() { - this.setData({ isLoginPopup: true }); + this.setData({ + isLoginPopup: true + }); + }, + confirm: function() { + this.setData({ + 'dialog.hidden': true, + 'dialog.title': '', + 'dialog.content': '' + }) } - , - confirm: function () { - this.setData({ - 'dialog.hidden': true, - 'dialog.title': '', - 'dialog.content': '' - }) - } }) \ No newline at end of file diff --git a/pages/sub/sub.js b/pages/sub/sub.js index 534487e..97f70b2 100644 --- a/pages/sub/sub.js +++ b/pages/sub/sub.js @@ -26,62 +26,62 @@ Page({ * 页面的初始数据 */ data: { - postList:[] + postList: [] }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function(options) { }, /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { + onReady: function() { }, /** * 生命周期函数--监听页面显示 */ - onShow: function () { + onShow: function() { }, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { + onHide: function() { }, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { + onUnload: function() { }, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function () { + onPullDownRefresh: function() { }, /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { + onReachBottom: function() { }, /** * 用户点击右上角分享 */ - onShareAppMessage: function () { + onShareAppMessage: function() { } }) \ No newline at end of file diff --git a/pages/topic/topic.js b/pages/topic/topic.js index 5295dc9..fa1a5ae 100644 --- a/pages/topic/topic.js +++ b/pages/topic/topic.js @@ -18,369 +18,365 @@ var wxApi = require('../../utils/wxApi.js') var wxRequest = require('../../utils/wxRequest.js'); var app = getApp(); Page({ - data: { - text: "Page topic", - categoriesList: {}, - floatDisplay: "none", - openid:"", - userInfo:{} - }, - onLoad: function (options) { - wx.setNavigationBarTitle({ - title: '我关注的专栏', - success: function (res) { - // success - } - }); - - this.fetchCategoriesData(); - Auth.setUserInfoData(this); - Auth.checkLogin(this); - }, - onShow:function(){ - - }, - //获取分类列表 - fetchCategoriesData: function () { - var self = this; - self.setData({ - categoriesList: [] - }); - console.log(Api.getCategories()); - var getCategoriesRequest = wxRequest.getRequest(Api.getCategories()); - getCategoriesRequest.then(response => { - if (response.statusCode === 200) { - self.setData({ - floatDisplay: "block", - categoriesList: self.data.categoriesList.concat(response.data.map(function (item) { - if (typeof (item.category_thumbnail_image) == "undefined" || item.category_thumbnail_image == "") { - item.category_thumbnail_image = "../../images/website.png"; - - } - item.subimg = "subscription.png"; - return item; - })), - }); - } - else { - console.log(response); - } + data: { + text: "Page topic", + categoriesList: {}, + floatDisplay: "none", + openid: "", + userInfo: {} + }, + onLoad: function(options) { + wx.setNavigationBarTitle({ + title: '我关注的专栏', + success: function(res) { + // success + } + }); - }) - .then(res=>{ - if (self.data.openid) { - setTimeout(function () { - self.getSubscription(); - }, 500); - } - - }) - .catch(function (response) { - console.log(response); + this.fetchCategoriesData(); + Auth.setUserInfoData(this); + Auth.checkLogin(this); + }, + onShow: function() { - }).finally(function () { + }, + //获取分类列表 + fetchCategoriesData: function() { + var self = this; + self.setData({ + categoriesList: [] + }); + console.log(Api.getCategories()); + var getCategoriesRequest = wxRequest.getRequest(Api.getCategories()); + getCategoriesRequest.then(response => { + if (response.statusCode === 200) { + self.setData({ + floatDisplay: "block", + categoriesList: self.data.categoriesList.concat(response.data.map(function(item) { + if (typeof(item.category_thumbnail_image) == "undefined" || item.category_thumbnail_image == "") { + item.category_thumbnail_image = "../../images/website.png"; - }) - }, - onShareAppMessage: function () { - return { - title: '分享“' + config.getWebsiteName + '”的专题栏目.', - path: 'pages/topic/topic', - success: function (res) { - // 转发成功 - }, - fail: function (res) { - // 转发失败 - } + } + item.subimg = "subscription.png"; + return item; + })), + }); + } else { + console.log(response); } - }, - getSubscription: function () { - var self= this; - wx.showLoading({ - title: '正在加载', - mask: true - }) + + }) + .then(res => { if (self.data.openid) { - var url = Api.getSubscription() + '?openid=' + self.data.openid; - var getSubscriptionRequest = wxRequest.getRequest(url); - getSubscriptionRequest.then(res => { - if (res.data.status == '200') - { - var catList = res.data.subscription; - var categoriesList = self.data.categoriesList; - var newCategoriesList = []; - if (catList && categoriesList) { - for (var i = 0; i < categoriesList.length; i++) { - var subimg = "subscription.png"; - var subflag = "0"; + setTimeout(function() { + self.getSubscription(); + }, 500); + } - for (var j = 0; j < catList.length; j++) { - if (categoriesList[i].id == catList[j]) { - subimg = "subscription-on.png"; - subflag = "1"; - } - var category_thumbnail_image = ""; - if (typeof (categoriesList[i].category_thumbnail_image) == "undefined" || categoriesList[i].category_thumbnail_image == "") { - category_thumbnail_image = "../../images/website.png"; - } - else { - category_thumbnail_image = categoriesList[i].category_thumbnail_image; - } + }) + .catch(function(response) { + console.log(response); - } - var cat = { - "category_thumbnail_image": category_thumbnail_image, - "description": categoriesList[i].description, - "name": categoriesList[i].name, - "id": categoriesList[i].id, - "subimg": subimg, - "subflag": subflag - } - newCategoriesList.push(cat); - } - if (newCategoriesList.length > 0) { - self.setData({ - floatDisplay: "block", - categoriesList: newCategoriesList - }); - } - } + }).finally(function() { + }) + }, + onShareAppMessage: function() { + return { + title: '分享“' + config.getWebsiteName + '”的专题栏目.', + path: 'pages/topic/topic', + success: function(res) { + // 转发成功 + }, + fail: function(res) { + // 转发失败 + } + } + }, + getSubscription: function() { + var self = this; + wx.showLoading({ + title: '正在加载', + mask: true + }) + if (self.data.openid) { + var url = Api.getSubscription() + '?openid=' + self.data.openid; + var getSubscriptionRequest = wxRequest.getRequest(url); + getSubscriptionRequest.then(res => { + if (res.data.status == '200') { + var catList = res.data.subscription; + var categoriesList = self.data.categoriesList; + var newCategoriesList = []; + if (catList && categoriesList) { + for (var i = 0; i < categoriesList.length; i++) { + var subimg = "subscription.png"; + var subflag = "0"; + + for (var j = 0; j < catList.length; j++) { + if (categoriesList[i].id == catList[j]) { + subimg = "subscription-on.png"; + subflag = "1"; } - else{ - console.log(res); + var category_thumbnail_image = ""; + if (typeof(categoriesList[i].category_thumbnail_image) == "undefined" || categoriesList[i].category_thumbnail_image == "") { + category_thumbnail_image = "../../images/website.png"; + } else { + category_thumbnail_image = categoriesList[i].category_thumbnail_image; } - }).finally(function () { - setTimeout(function () { - wx.hideLoading(); - }, 500) - wx.hideNavigationBarLoading(); - - }) - - } + } + var cat = { + "category_thumbnail_image": category_thumbnail_image, + "description": categoriesList[i].description, + "name": categoriesList[i].name, + "id": categoriesList[i].id, + "subimg": subimg, + "subflag": subflag + } + newCategoriesList.push(cat); + } + if (newCategoriesList.length > 0) { + self.setData({ + floatDisplay: "block", + categoriesList: newCategoriesList + }); + } + } - }, - postsub: function (e) { - var self = this; - if (!self.data.openid) { - Auth.checkSession(self,'isLoginNow'); + } else { + console.log(res); } - else { - var categoryid = e.currentTarget.dataset.id; - var openid = self.data.openid; - var url = Api.postSubscription(); - var subflag = e.currentTarget.dataset.subflag; - var data = { - categoryid: categoryid, - openid: openid - }; + }).finally(function() { + setTimeout(function() { + wx.hideLoading(); + }, 500) + wx.hideNavigationBarLoading(); - var postSubscriptionRequest = wxRequest.postRequest(url, data); - postSubscriptionRequest.then(response => { - if (response.statusCode === 200) { - if (response.data.status == '200') { - setTimeout(function () { - wx.showToast({ - title: '订阅成功', - icon: 'success', - duration: 900, - success: function () { + }) - } - }); - }, 900); - var subimg = ""; - if (subflag == "0") { - subflag = "1"; - subimg = "subscription-on.png" - } - else { - subflag = "0"; - subimg = "subscription.png" - } - self.reloadData(categoryid, subflag, subimg); + } - } - else if (response.data.status == '201') { - setTimeout(function () { - wx.showToast({ - title: '取消订阅成功', - icon: 'success', - duration: 900, - success: function () { - } - }); - }, 900); - var subimg = ""; - if (subflag == "0") { - subflag = "1"; - subimg = "subscription-on.png" - } - else { - subflag = "0"; - subimg = "subscription.png" - } - self.reloadData(categoryid, subflag, subimg); - } - else if (response.data.status == '501' || response.data.status == '501') { - console.log(response); - } + }, + postsub: function(e) { + var self = this; + if (!self.data.openid) { + Auth.checkSession(self, 'isLoginNow'); + } else { + var categoryid = e.currentTarget.dataset.id; + var openid = self.data.openid; + var url = Api.postSubscription(); + var subflag = e.currentTarget.dataset.subflag; + var data = { + categoryid: categoryid, + openid: openid + }; + var postSubscriptionRequest = wxRequest.postRequest(url, data); + postSubscriptionRequest.then(response => { + if (response.statusCode === 200) { + if (response.data.status == '200') { + setTimeout(function() { + wx.showToast({ + title: '订阅成功', + icon: 'success', + duration: 900, + success: function() { } - else { - setTimeout(function () { - wx.showToast({ - title: '操作失败,请稍后重试', - icon: 'success', - duration: 900, - success: function () { - - } - }); - }, 900); - console.log(response); - } + }); + }, 900); + var subimg = ""; + if (subflag == "0") { + subflag = "1"; + subimg = "subscription-on.png" + } else { + subflag = "0"; + subimg = "subscription.png" + } + self.reloadData(categoryid, subflag, subimg); - }).catch(function (response) { - setTimeout(function () { - wx.showToast({ - title: '操作失败,请稍后重试', - icon: 'success', - duration: 900, - success: function () { - } - }); - }, 900); - console.log(response); - }) - } - }, - reloadData: function (id, subflag, subimg) { - var self = this; - var newCategoriesList = []; - var categoriesList = self.data.categoriesList; - for (var i = 0; i < categoriesList.length; i++) { - if (categoriesList[i].id == id) { - categoriesList[i].subflag = subflag; - categoriesList[i].subimg = subimg; + } else if (response.data.status == '201') { + setTimeout(function() { + wx.showToast({ + title: '取消订阅成功', + icon: 'success', + duration: 900, + success: function() {} + }); + }, 900); + var subimg = ""; + if (subflag == "0") { + subflag = "1"; + subimg = "subscription-on.png" + } else { + subflag = "0"; + subimg = "subscription.png" } - newCategoriesList.push(categoriesList[i]); - } + self.reloadData(categoryid, subflag, subimg); - if (newCategoriesList.length > 0) { - self.setData({ - categoriesList: newCategoriesList - }); + } else if (response.data.status == '501' || response.data.status == '501') { + console.log(response); + } + + + } else { + setTimeout(function() { + wx.showToast({ + title: '操作失败,请稍后重试', + icon: 'success', + duration: 900, + success: function() { + } + }); + }, 900); + console.log(response); } - }, + }).catch(function(response) { + setTimeout(function() { + wx.showToast({ + title: '操作失败,请稍后重试', + icon: 'success', + duration: 900, + success: function() {} + }); + }, 900); + console.log(response); + }) + } + }, + reloadData: function(id, subflag, subimg) { + var self = this; + var newCategoriesList = []; + var categoriesList = self.data.categoriesList; + for (var i = 0; i < categoriesList.length; i++) { + if (categoriesList[i].id == id) { + categoriesList[i].subflag = subflag; + categoriesList[i].subimg = subimg; + } + newCategoriesList.push(categoriesList[i]); + } - //跳转至某分类下的文章列表 - redictIndex: function (e) { - //console.log('查看某类别下的文章'); - var id = e.currentTarget.dataset.id; - var name = e.currentTarget.dataset.item; - var url = '../list/list?categoryID=' + id; - wx.navigateTo({ - url: url - }); - }, - userAuthorization: function () { - var self = this; - // 判断是否是第一次授权，非第一次授权且授权失败则进行提醒 - wx.getSetting({ - success: function success(res) { - console.log(res.authSetting); - var authSetting = res.authSetting; - if (!('scope.userInfo' in authSetting)) { - //if (util.isEmptyObject(authSetting)) { - console.log('第一次授权'); - self.setData({ isLoginPopup: true }) + if (newCategoriesList.length > 0) { + self.setData({ + categoriesList: newCategoriesList + }); - } else { - console.log('不是第一次授权', authSetting); - // 没有授权的提醒 - if (authSetting['scope.userInfo'] === false) { - wx.showModal({ - title: '用户未授权', - content: '如需正常使用评论、点赞、赞赏等功能需授权获取用户信息。是否在授权管理中选中“用户信息”?', - showCancel: true, - cancelColor: '#296fd0', - confirmColor: '#296fd0', - confirmText: '设置权限', - success: function (res) { - if (res.confirm) { - console.log('用户点击确定') - wx.openSetting({ - success: function success(res) { - console.log('打开设置', res.authSetting); - var scopeUserInfo = res.authSetting["scope.userInfo"]; - if (scopeUserInfo) { - self.getUsreInfo(null); - } - } - }); - } - } - }) - } - else { - auth.getUsreInfo(null); + } + + }, + + //跳转至某分类下的文章列表 + redictIndex: function(e) { + //console.log('查看某类别下的文章'); + var id = e.currentTarget.dataset.id; + var name = e.currentTarget.dataset.item; + var url = '../list/list?categoryID=' + id; + wx.navigateTo({ + url: url + }); + }, + userAuthorization: function() { + var self = this; + // 判断是否是第一次授权，非第一次授权且授权失败则进行提醒 + wx.getSetting({ + success: function success(res) { + console.log(res.authSetting); + var authSetting = res.authSetting; + if (!('scope.userInfo' in authSetting)) { + //if (util.isEmptyObject(authSetting)) { + console.log('第一次授权'); + self.setData({ + isLoginPopup: true + }) + + } else { + console.log('不是第一次授权', authSetting); + // 没有授权的提醒 + if (authSetting['scope.userInfo'] === false) { + wx.showModal({ + title: '用户未授权', + content: '如需正常使用评论、点赞、赞赏等功能需授权获取用户信息。是否在授权管理中选中“用户信息”?', + showCancel: true, + cancelColor: '#296fd0', + confirmColor: '#296fd0', + confirmText: '设置权限', + success: function(res) { + if (res.confirm) { + console.log('用户点击确定') + wx.openSetting({ + success: function success(res) { + console.log('打开设置', res.authSetting); + var scopeUserInfo = res.authSetting["scope.userInfo"]; + if (scopeUserInfo) { + self.getUsreInfo(null); + } } + }); } - } - }); - }, - agreeGetUser: function (e) { - var userInfo = e.detail.userInfo; - var self = this; - if (userInfo) { - auth.getUsreInfo(e.detail); - self.setData({ userInfo: userInfo }) + } + }) + } else { + auth.getUsreInfo(null); + } } - setTimeout(function () { - self.setData({ isLoginPopup: false }) - }, 1200); - }, - closeLoginPopup() { - this.setData({ isLoginPopup: false }); - }, - openLoginPopup() { - this.setData({ isLoginPopup: true }); - }, - getOpenId(data) { - var url = Api.getOpenidUrl(); - var self = this; - var postOpenidRequest = wxRequest.postRequest(url, data); - //获取openid - postOpenidRequest.then(response => { - if (response.data.status == '200') { - //console.log(response.data.openid) - console.log("openid 获取成功"); - app.globalData.openid = response.data.openid; - app.globalData.isGetOpenid = true; + } + }); + }, + agreeGetUser: function(e) { + var userInfo = e.detail.userInfo; + var self = this; + if (userInfo) { + auth.getUsreInfo(e.detail); + self.setData({ + userInfo: userInfo + }) + } + setTimeout(function() { + self.setData({ + isLoginPopup: false + }) + }, 1200); + }, + closeLoginPopup() { + this.setData({ + isLoginPopup: false + }); + }, + openLoginPopup() { + this.setData({ + isLoginPopup: true + }); + }, + getOpenId(data) { + var url = Api.getOpenidUrl(); + var self = this; + var postOpenidRequest = wxRequest.postRequest(url, data); + //获取openid + postOpenidRequest.then(response => { + if (response.data.status == '200') { + //console.log(response.data.openid) + console.log("openid 获取成功"); + app.globalData.openid = response.data.openid; + app.globalData.isGetOpenid = true; - } - else { - console.log(response); - } - }).then(res=>{ - setTimeout(function () { - self.getSubscription(); - }, 500); - }) - }, - confirm: function () { - this.setData({ - 'dialog.hidden': true, - 'dialog.title': '', - 'dialog.content': '' - }) - } + } else { + console.log(response); + } + }).then(res => { + setTimeout(function() { + self.getSubscription(); + }, 500); + }) + }, + confirm: function() { + this.setData({ + 'dialog.hidden': true, + 'dialog.title': '', + 'dialog.content': '' + }) + } }) \ No newline at end of file diff --git a/pages/webpage/webpage.js b/pages/webpage/webpage.js index 42c1950..0c24dfd 100644 --- a/pages/webpage/webpage.js +++ b/pages/webpage/webpage.js @@ -22,77 +22,76 @@ var wxRequest = require('../../utils/wxRequest.js'); Page({ - /** - * 页面的初始数据 - */ - data: { - url: null, - title: "", + /** + * 页面的初始数据 + */ + data: { + url: null, + title: "", - }, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - var self = this; - //console.log(decodeURIComponent(options.url)); - console.log(options); - if (options.url != null) { - var url = decodeURIComponent(options.url); - if (url.indexOf('*') != -1) { - url = url.replace("*", "?"); - } - self.setData({ - url: url - }); - // var slug = util.GetUrlFileName(options.url, domain); - // var domain = config.getDomain; - // var title = ""; - // if (slug != 'index') { - // var getPostSlugRequest = wxRequest.getRequest(Api.getPostBySlug(slug)); - // getPostSlugRequest - // .then(res => { - // if (res.statusCode == 200) { - // if (res.data.length != 0) { - // if (res.data[0].title.rendered) { - // title = ':' + res.data[0].title.rendered; - // self.setData({ - // title: title - // }); - // console.log(title); - // } - // } - // } + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + var self = this; + //console.log(decodeURIComponent(options.url)); + console.log(options); + if (options.url != null) { + var url = decodeURIComponent(options.url); + if (url.indexOf('*') != -1) { + url = url.replace("*", "?"); + } + self.setData({ + url: url + }); + // var slug = util.GetUrlFileName(options.url, domain); + // var domain = config.getDomain; + // var title = ""; + // if (slug != 'index') { + // var getPostSlugRequest = wxRequest.getRequest(Api.getPostBySlug(slug)); + // getPostSlugRequest + // .then(res => { + // if (res.statusCode == 200) { + // if (res.data.length != 0) { + // if (res.data[0].title.rendered) { + // title = ':' + res.data[0].title.rendered; + // self.setData({ + // title: title + // }); + // console.log(title); + // } + // } + // } - // }) - // } - } - else { - self.setData({ - url: 'https://' + config.getDomain - }); - } + // }) + // } + } else { + self.setData({ + url: 'https://' + config.getDomain + }); + } - }, - onShareAppMessage: function (options) { - var self = this; - var url = options.webViewUrl; - if (url.indexOf("?") != -1) { - url = url.replace("?", "*"); - } - url = 'pages/webpage/webpage?url=' + url; - console.log(options.webViewUrl); - return { - title: '分享"' + config.getWebsiteName + '"的文章' + self.data.title, - path: url, - success: function (res) { - // 转发成功 - console.log(url); - }, - fail: function (res) { - // 转发失败 - } - } + }, + onShareAppMessage: function(options) { + var self = this; + var url = options.webViewUrl; + if (url.indexOf("?") != -1) { + url = url.replace("?", "*"); + } + url = 'pages/webpage/webpage?url=' + url; + console.log(options.webViewUrl); + return { + title: '分享"' + config.getWebsiteName + '"的文章' + self.data.title, + path: url, + success: function(res) { + // 转发成功 + console.log(url); + }, + fail: function(res) { + // 转发失败 + } } + } }) \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index 3802a7b..9781e2a 100644 --- a/utils/config.js +++ b/utils/config.js @@ -14,42 +14,97 @@ //配置域名,域名只修改此处。 //如果wordpress没有安装在网站根目录请加上目录路径,例如："www.iacblog.com" var DOMAIN = "www.iacblog.com"; -var MINAPPTYPE="1";//小程序的类型，如果是企业小程序请填：0 ，如果是个人小程序请填：1 -var WEBSITENAME="PHP开源Hub"; //网站名称 +var MINAPPTYPE = "1"; //小程序的类型，如果是企业小程序请填：0 ，如果是个人小程序请填：1 +var WEBSITENAME = "PHP开源Hub"; //网站名称 var ABOUTID = 188; //wordpress网站"页面"的id,注意这个"页面"是wordpress的"页面"，不是"文章" -var PAGECOUNT='10'; //每页文章数目 -var CATEGORIESID='all'; //专题页显示全部的分类 +var PAGECOUNT = '10'; //每页文章数目 +var CATEGORIESID = 'all'; //专题页显示全部的分类 //var CATEGORIESID = '1,1059,98,416,189,374,6,463';//指定专题页显示的分类的id -var INDEXLISTTYPE="all"; //首页显示所有分类 +var INDEXLISTTYPE = "all"; //首页显示所有分类 //var INDEXLISTTYPE ="1" //指定首页显示分类的id -var PAYTEMPPLATEID = 'hzKpxuPF2rw7O-qTElkeoE0lMwr0O4t9PJkLyt6v8rk';//鼓励消息模版id -var REPLAYTEMPPLATEID = 'gxXlK0soqCHdoFvDqBtb9u2VPum0tXLnCMuVyNDAalI';//回复评论消息模版id -var ZANIMAGEURL = 'https://oss.iacblog.com/img/wechatZanShang.jpg';//微信鼓励的图片链接，用于个人小程序的赞赏 +var PAYTEMPPLATEID = 'hzKpxuPF2rw7O-qTElkeoE0lMwr0O4t9PJkLyt6v8rk'; //鼓励消息模版id +var REPLAYTEMPPLATEID = 'gxXlK0soqCHdoFvDqBtb9u2VPum0tXLnCMuVyNDAalI'; //回复评论消息模版id +var ZANIMAGEURL = 'https://oss.iacblog.com/img/wechatZanShang.jpg'; //微信鼓励的图片链接，用于个人小程序的赞赏 var LOGO = "../../images/logo-icon.png"; // 网站的logo图片 -var POSTERIMGURL ="../../images/logo700.png"; //生成海报如果没有首图，使用此处设置的图片作为海报图片。 +var POSTERIMGURL = "../../images/logo700.png"; //生成海报如果没有首图，使用此处设置的图片作为海报图片。 //设置downloadFile合法域名,不带https ,在中括号([])里增加域名，格式：{id=**,domain:'www.**.com'}，用英文逗号分隔。 //此处设置的域名和小程序与小程序后台设置的downloadFile合法域名要一致。 -var DOWNLOADFILEDOMAIN = [ - { id: 1, domain: 'www.iacblog.com' }, - { id: 2, domain: 'www.iacblog.com' }, - { id: 3, domain: 'www.iacblog.com' } +var DOWNLOADFILEDOMAIN = [{ + id: 1, + domain: 'www.iacblog.com' + }, + { + id: 2, + domain: 'www.iacblog.com' + }, + { + id: 3, + domain: 'www.iacblog.com' + } +]; +//首页图标导航 +//参数说明：'name'为名称，'image'为图标路径，'url'为跳转的页面，'redirecttype'为跳转的类型，apppage为本小程序的页面，miniapp为其他微信小程序,webpage为web-view的页面 +//redirecttype 是 miniapp 就是跳转其他小程序 url 为其他小程序的页面 +//redirecttype 为 apppage 就是跳转本小程序的页面，url为本小程序的页面路径 +//redirecttype 为 webpage 是跳转网址，是通过web-view打开网址，url就是你要打开的网址，不过这个网址的域名要是业务域名 +//'appid' 当redirecttype为miniapp时，这个值为其他微信小程序的appid，如果redirecttype为apppage，webpage时，这个值设置为空。 +//'extraData'当redirecttype为miniapp时，这个值为提交到其他微信小程序的参数，如果redirecttype为apppage，webpage时，这个值设置为空。 +var INDEXNAV = [{ + id: '1', + name: '微慕', + image: '../../images/nav-icon1.png', + url: 'pages/index/index', + redirecttype: 'miniapp', + appid: 'wx074a216a7aabc30c', + extraData: '' + }, + { + id: '2', + name: '企业版', + image: '../../images/nav-icon2.png', + url: 'pages/index/index', + redirecttype: 'miniapp', + appid: 'wxc1771b619b83316b', + extraData: '' + }, + { + id: '3', + name: '旅游版', + image: '../../images/nav-icon3.png', + url: 'pages/index/index', + redirecttype: 'miniapp', + appid: 'wxa43aaa8416cdbd61', + extraData: '' + }, + { + id: '4', + name: '图片版', + image: '../../images/nav-icon4.png', + url: 'pages/index/index', + redirecttype: 'miniapp', + appid: 'wxe9440e3d24b04152', + extraData: '' + }, + { + id: '5', + name: '微店', + image: '../../images/nav-icon5.png', + url: 'pages/shelf/shelf', + redirecttype: 'miniapp', + appid: 'wx55ea6098e41af5c4', + extraData: '' + }, + { + id: '6', + name: '教程', + image: '../../images/app.png', + url: '../../pages/list/list?categoryID=1059', + redirecttype: 'apppage', + appid: '', + extraData: '' + } + ]; - //首页图标导航 - //参数说明：'name'为名称，'image'为图标路径，'url'为跳转的页面，'redirecttype'为跳转的类型，apppage为本小程序的页面，miniapp为其他微信小程序,webpage为web-view的页面 - //redirecttype 是 miniapp 就是跳转其他小程序 url 为其他小程序的页面 - //redirecttype 为 apppage 就是跳转本小程序的页面，url为本小程序的页面路径 - //redirecttype 为 webpage 是跳转网址，是通过web-view打开网址，url就是你要打开的网址，不过这个网址的域名要是业务域名 - //'appid' 当redirecttype为miniapp时，这个值为其他微信小程序的appid，如果redirecttype为apppage，webpage时，这个值设置为空。 - //'extraData'当redirecttype为miniapp时，这个值为提交到其他微信小程序的参数，如果redirecttype为apppage，webpage时，这个值设置为空。 -var INDEXNAV = [ - { id: '1', name: '微慕', image: '../../images/nav-icon1.png', url: 'pages/index/index', redirecttype: 'miniapp', appid: 'wx074a216a7aabc30c', extraData: '' }, - { id: '2', name: '企业版', image: '../../images/nav-icon2.png', url: 'pages/index/index', redirecttype: 'miniapp', appid: 'wxc1771b619b83316b', extraData: '' }, - { id: '3', name: '旅游版', image: '../../images/nav-icon3.png', url: 'pages/index/index', redirecttype: 'miniapp', appid: 'wxa43aaa8416cdbd61', extraData: '' }, - { id: '4', name: '图片版', image: '../../images/nav-icon4.png', url: 'pages/index/index', redirecttype: 'miniapp', appid: 'wxe9440e3d24b04152', extraData: ''}, - { id: '5', name: '微店', image: '../../images/nav-icon5.png', url: 'pages/shelf/shelf', redirecttype: 'miniapp', appid: 'wx55ea6098e41af5c4', extraData: ''}, -{ id: '6', name: '教程', image: '../../images/app.png', url: '../../pages/list/list?categoryID=1059', redirecttype: 'apppage', appid: '', extraData: ''} - - ]; export default { getDomain: DOMAIN, @@ -57,7 +112,7 @@ export default { getAboutId: ABOUTID, getPayTemplateId: PAYTEMPPLATEID, getPageCount: PAGECOUNT, - getCategoriesID :CATEGORIESID, + getCategoriesID: CATEGORIESID, getIndexNav: INDEXNAV, getReplayTemplateId: REPLAYTEMPPLATEID, getMinAppType: MINAPPTYPE, diff --git a/utils/util.js b/utils/util.js index 9de5a3f..1dda50a 100644 --- a/utils/util.js +++ b/utils/util.js @@ -28,150 +28,149 @@ function formatNumber(n) { } function obj2uri(obj) { - return Object.keys(obj).map(function (k) { + return Object.keys(obj).map(function(k) { return encodeURIComponent(k) + '=' + encodeURIComponent(obj[k]); }).join('&'); } -function getStrLength(str){ - return str.replace(/[\u0391-\uFFE5]/g, "aa").length; +function getStrLength(str) { + return str.replace(/[\u0391-\uFFE5]/g, "aa").length; } -function getDateDiff(dateStr) { - var publishTime = Date.parse(dateStr.replace(/-/gi, "/"))/ 1000, - d_seconds, - d_minutes, - d_hours, - d_days, - timeNow = parseInt(new Date().getTime() / 1000), - d, - date = new Date(publishTime * 1000), - Y = date.getFullYear(), - M = date.getMonth() + 1, - D = date.getDate(), - H = date.getHours(), - m = date.getMinutes(), - s = date.getSeconds(); - //小于10的在前面补0 - if (M < 10) { - M = '0' + M; - } - if (D < 10) { - D = '0' + D; - } - if (H < 10) { - H = '0' + H; - } - if (m < 10) { - m = '0' + m; - } - if (s < 10) { - s = '0' + s; - } +function getDateDiff(dateStr) { + var publishTime = Date.parse(dateStr.replace(/-/gi, "/")) / 1000, + d_seconds, + d_minutes, + d_hours, + d_days, + timeNow = parseInt(new Date().getTime() / 1000), + d, + date = new Date(publishTime * 1000), + Y = date.getFullYear(), + M = date.getMonth() + 1, + D = date.getDate(), + H = date.getHours(), + m = date.getMinutes(), + s = date.getSeconds(); + //小于10的在前面补0 + if (M < 10) { + M = '0' + M; + } + if (D < 10) { + D = '0' + D; + } + if (H < 10) { + H = '0' + H; + } + if (m < 10) { + m = '0' + m; + } + if (s < 10) { + s = '0' + s; + } - d = timeNow - publishTime; - d_days = parseInt(d / 86400); - d_hours = parseInt(d / 3600); - d_minutes = parseInt(d / 60); - d_seconds = parseInt(d); - - if (d_days > 0 && d_days < 3) { - return d_days + '天前'; - } else if (d_days <= 0 && d_hours > 0) { - return d_hours + '小时前'; - } else if (d_hours <= 0 && d_minutes > 0) { - return d_minutes + '分钟前'; - } else if (d_seconds < 60) { - if (d_seconds <= 0) { - return '刚刚发表'; - } else { - return d_seconds + '秒前'; - } - } else if (d_days >= 3 && d_days < 30) { - return M + '月' + D +'日'; - } else if (d_days >= 30) { - return Y + '年' + M + '月' + D + '日'; + d = timeNow - publishTime; + d_days = parseInt(d / 86400); + d_hours = parseInt(d / 3600); + d_minutes = parseInt(d / 60); + d_seconds = parseInt(d); + + if (d_days > 0 && d_days < 3) { + return d_days + '天前'; + } else if (d_days <= 0 && d_hours > 0) { + return d_hours + '小时前'; + } else if (d_hours <= 0 && d_minutes > 0) { + return d_minutes + '分钟前'; + } else if (d_seconds < 60) { + if (d_seconds <= 0) { + return '刚刚发表'; + } else { + return d_seconds + '秒前'; } + } else if (d_days >= 3 && d_days < 30) { + return M + '月' + D + '日'; + } else if (d_days >= 30) { + return Y + '年' + M + '月' + D + '日'; + } } function getDateOut(dateStr) { - var publishTime = Date.parse(dateStr.replace(/-/gi, "/")) / 1000; - var timeNow = parseInt(new Date().getTime() / 1000); - var result=false; - var d = timeNow - publishTime; - var d_days = parseInt(d / 86400); - if (d_days > 7) { - result=true; - } - return result; + var publishTime = Date.parse(dateStr.replace(/-/gi, "/")) / 1000; + var timeNow = parseInt(new Date().getTime() / 1000); + var result = false; + var d = timeNow - publishTime; + var d_days = parseInt(d / 86400); + if (d_days > 7) { + result = true; + } + return result; } -function cutstr(str, len,flag) { - var str_length = 0; - var str_len = 0; - var str_cut = new String(); - var str_len = str.length; - for (var i = 0; i < str_len; i++) { - var a = str.charAt(i); - str_length++; - if (escape(a).length > 4) { - //中文字符的长度经编码之后大于4 - str_length++; - } - str_cut = str_cut.concat(a); - if (str_length >= len) { - if (flag == 0){ - str_cut = str_cut.concat("..."); - - } - - return str_cut; - } - - } - //如果给定字符串小于指定长度，则返回源字符串； - if (str_length < len) { - return str; - } +function cutstr(str, len, flag) { + var str_length = 0; + var str_len = 0; + var str_cut = new String(); + var str_len = str.length; + for (var i = 0; i < str_len; i++) { + var a = str.charAt(i); + str_length++; + if (escape(a).length > 4) { + //中文字符的长度经编码之后大于4 + str_length++; } + str_cut = str_cut.concat(a); + if (str_length >= len) { + if (flag == 0) { + str_cut = str_cut.concat("..."); - function removeHTML (s) { - var str=s.replace(/<\/?.+?>/g,""); - str = str.replace(/[\r\n]/g, ""); //去掉回车换行 - return str.replace(/ /g,""); - } + } - function formatDateTime(s) - { - //var str = s.replace("t", " "); - return s.replace("T", " "); + return str_cut; + } } + //如果给定字符串小于指定长度，则返回源字符串； + if (str_length < len) { + return str; + } +} - var compare = function (prop) { - return function (obj1, obj2) { - var val1 = obj1[prop]; - var val2 = obj2[prop]; if (val1 > val2) { - return -1; - } else if (val1 < val2) { - return 1; - } else { - return 0; - } +function removeHTML(s) { + var str = s.replace(/<\/?.+?>/g, ""); + str = str.replace(/[\r\n]/g, ""); //去掉回车换行 + return str.replace(/ /g, ""); +} + +function formatDateTime(s) { + //var str = s.replace("t", " "); + return s.replace("T", " "); + +} + +var compare = function(prop) { + return function(obj1, obj2) { + var val1 = obj1[prop]; + var val2 = obj2[prop]; + if (val1 > val2) { + return -1; + } else if (val1 < val2) { + return 1; + } else { + return 0; } } +} - /* +/* * 判断图片类型 - */ -function checkImgType(filePath){ + */ +function checkImgType(filePath) { if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(filePath)) { - return false; - } - else{ + return false; + } else { return true; - } + } } // 是否为空对象 @@ -193,93 +192,85 @@ function CheckImgExists(imgurl) { } } -function GetUrlFileName(url,domain) { - var filename = url.substring(url.lastIndexOf("/") + 1); - if (filename == domain || filename =='') - { - filename="index"; - } - else - { - filename = filename.substring(0, filename.lastIndexOf(".")); - } - - return filename; +function GetUrlFileName(url, domain) { + var filename = url.substring(url.lastIndexOf("/") + 1); + if (filename == domain || filename == '') { + filename = "index"; + } else { + filename = filename.substring(0, filename.lastIndexOf(".")); + } + + return filename; } function json2Form(json) { - var str = []; - for (var p in json) { - str.push(encodeURIComponent(p) + "=" + encodeURIComponent(json[p])); - } - return str.join("&"); + var str = []; + for (var p in json) { + str.push(encodeURIComponent(p) + "=" + encodeURIComponent(json[p])); + } + return str.join("&"); } function getymd(dateStr, type) { - dateStr = dateStr.replace("T", " "); - var date = new Date(Date.parse(dateStr.replace(/-/g, "/"))); - var mm = date.getMonth() + 1; - //月 - var dd = date.getDate(); - //日 - var yy = date.getFullYear(); - //年 - if (type == "d") { - return dd; - } else if (type == "md") { - return mm + "-" + dd; - } else if (type == "ymd") { - return yy + "-" + mm + "-" + dd; - } + dateStr = dateStr.replace("T", " "); + var date = new Date(Date.parse(dateStr.replace(/-/g, "/"))); + var mm = date.getMonth() + 1; + //月 + var dd = date.getDate(); + //日 + var yy = date.getFullYear(); + //年 + if (type == "d") { + return dd; + } else if (type == "md") { + return mm + "-" + dd; + } else if (type == "ymd") { + return yy + "-" + mm + "-" + dd; + } } //绘制文字：文章题目、摘要、扫码阅读 function drawTitleExcerpt(context, title, excerpt) { - context.setFillStyle("#000000"); - context.setTextAlign('left'); + context.setFillStyle("#000000"); + context.setTextAlign('left'); - if (getStrLength(title) <= 14) { - //14字以内绘制成一行，美观一点 - context.setFontSize(40); - context.fillText(title, 40, 460); - } - else { - //题目字数很多的，只绘制前36个字（如果题目字数在15到18个字则也是一行，不怎么好看） - context.setFontSize(30); - context.fillText(title.substring(0, 19), 40, 460); - context.fillText(title.substring(19, 36), 40, 510); - } - context.setFontSize(24); - context.setTextAlign('left'); - context.setGlobalAlpha(0.7); - for (var i = 0; i <= 50; i += 20) { - //摘要只绘制前50个字，这里是用截取字符串 - if (getStrLength(excerpt)>50) - { - if ( i == 40) { - context.fillText(excerpt.substring(i, i + 20) + "...", 40, 570 + i * 2); - } - else { - context.fillText(excerpt.substring(i, i + 20), 40, 570 + i * 2); - } - } - else - { - context.fillText(excerpt.substring(i, i + 20), 40, 570 + i * 2); - } + if (getStrLength(title) <= 14) { + //14字以内绘制成一行，美观一点 + context.setFontSize(40); + context.fillText(title, 40, 460); + } else { + //题目字数很多的，只绘制前36个字（如果题目字数在15到18个字则也是一行，不怎么好看） + context.setFontSize(30); + context.fillText(title.substring(0, 19), 40, 460); + context.fillText(title.substring(19, 36), 40, 510); + } + context.setFontSize(24); + context.setTextAlign('left'); + context.setGlobalAlpha(0.7); + for (var i = 0; i <= 50; i += 20) { + //摘要只绘制前50个字，这里是用截取字符串 + if (getStrLength(excerpt) > 50) { + if (i == 40) { + context.fillText(excerpt.substring(i, i + 20) + "...", 40, 570 + i * 2); + } else { + context.fillText(excerpt.substring(i, i + 20), 40, 570 + i * 2); + } + } else { + context.fillText(excerpt.substring(i, i + 20), 40, 570 + i * 2); } + } - context.stroke(); - context.save(); + context.stroke(); + context.save(); } module.exports = { formatTime: formatTime, getDateDiff: getDateDiff, - cutstr:cutstr, - removeHTML:removeHTML, + cutstr: cutstr, + removeHTML: removeHTML, formatDateTime: formatDateTime, compare: compare, checkImgType: checkImgType, @@ -288,9 +279,8 @@ module.exports = { GetUrlFileName: GetUrlFileName, json2Form: json2Form, getymd: getymd, - getDateOut:getDateOut, + getDateOut: getDateOut, drawTitleExcerpt: drawTitleExcerpt, getStrLength: getStrLength - -} +} \ No newline at end of file diff --git a/utils/wxApi.js b/utils/wxApi.js index 6d19c44..1bc25ff 100644 --- a/utils/wxApi.js +++ b/utils/wxApi.js @@ -10,13 +10,13 @@ * */ function wxPromisify(fn) { - return function (obj = {}) { + return function(obj = {}) { return new Promise((resolve, reject) => { - obj.success = function (res) { + obj.success = function(res) { //成功 resolve(res) } - obj.fail = function (res) { + obj.fail = function(res) { //失败 reject(res) } @@ -25,11 +25,13 @@ function wxPromisify(fn) { } } //无论promise对象最后状态如何都会执行 -Promise.prototype.finally = function (callback) { +Promise.prototype.finally = function(callback) { let P = this.constructor; return this.then( value => P.resolve(callback()).then(() => value), - reason => P.resolve(callback()).then(() => { throw reason }) + reason => P.resolve(callback()).then(() => { + throw reason + }) ); }; /** @@ -75,4 +77,4 @@ module.exports = { wxGetSystemInfo: wxGetSystemInfo, -} +} \ No newline at end of file diff --git a/utils/wxRequest.js b/utils/wxRequest.js index aa09a96..d5d6210 100644 --- a/utils/wxRequest.js +++ b/utils/wxRequest.js @@ -10,27 +10,29 @@ * */ function wxPromisify(fn) { - return function (obj = {}) { - return new Promise((resolve, reject) => { - obj.success = function (res) { - //成功 - resolve(res) - } - obj.fail = function (res) { - //失败 - reject(res) - } - fn(obj) - }) - } + return function(obj = {}) { + return new Promise((resolve, reject) => { + obj.success = function(res) { + //成功 + resolve(res) + } + obj.fail = function(res) { + //失败 + reject(res) + } + fn(obj) + }) + } } //无论promise对象最后状态如何都会执行 -Promise.prototype.finally = function (callback) { - let P = this.constructor; - return this.then( - value => P.resolve(callback()).then(() => value), - reason => P.resolve(callback()).then(() => { throw reason }) - ); +Promise.prototype.finally = function(callback) { + let P = this.constructor; + return this.then( + value => P.resolve(callback()).then(() => value), + reason => P.resolve(callback()).then(() => { + throw reason + }) + ); }; /** * 微信请求get方法 @@ -38,15 +40,15 @@ Promise.prototype.finally = function (callback) { * data 以对象的格式传入 */ function getRequest(url, data) { - var getRequest = wxPromisify(wx.request) - return getRequest({ - url: url, - method: 'GET', - data: data, - header: { - 'Content-Type': 'application/json' - } - }) + var getRequest = wxPromisify(wx.request) + return getRequest({ + url: url, + method: 'GET', + data: data, + header: { + 'Content-Type': 'application/json' + } + }) } /** @@ -55,18 +57,18 @@ function getRequest(url, data) { * data 以对象的格式传入 */ function postRequest(url, data) { - var postRequest = wxPromisify(wx.request) - return postRequest({ - url: url, - method: 'POST', - data: data, - header: { - "content-type": "application/json" - }, - }) + var postRequest = wxPromisify(wx.request) + return postRequest({ + url: url, + method: 'POST', + data: data, + header: { + "content-type": "application/json" + }, + }) } module.exports = { - postRequest: postRequest, - getRequest: getRequest + postRequest: postRequest, + getRequest: getRequest } \ No newline at end of file