diff --git a/pages/blogpost/body.js b/pages/blogpost/body.js
index 020bae4101f8aa62b4c8fed6f0a95ff35acfe0d4..09d68adfc9bcc827965694d269a2381277b15828 100644
--- a/pages/blogpost/body.js
+++ b/pages/blogpost/body.js
@@ -1,15 +1,19 @@
 // pages/blogpost/body.js
 var WxParse = require('../../vendor/wxParse/wxParse.js')
-var app = getApp()
+
 Page({
     data: {
         article: '',
         comments: [],
+        postId: 0,
+        blogApp: '',
+        commentInput: '',
         pageIndex: 1,
         pageSize: 10,
     },
     onLoad: function (options) {
         this.loadArticle(options);
+        this.loadComments(options);
     },
 
     loadArticle: function (options) {
@@ -17,15 +21,17 @@ Page({
         var that = this;
         wx.request({
             url: 'https://api.cnblogs.com/api/blogposts/' + options.postId + '/body',
-            method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
+            method: 'GET',
             header: {
                 "Content-Type": "application/json; charset=utf-8",
-                "Authorization": "Bearer " + app.globalData.access_token,
+                "Authorization": "Bearer " + getApp().accessToken
             },
             success: function (res) {
                 if (res) {
                     that.setData({
-                        article: res.data
+                        article: res.data,
+                        postId: options.postId,
+                        blogApp: options.blogApp
                     })
 
                     WxParse.wxParse('article', 'html', that.data.article, that, 5);
@@ -45,21 +51,19 @@ Page({
         var that = this;
         wx.request({
             url: 'https://api.cnblogs.com/api/blogs/' + options.blogApp + '/posts/' +
-                    options.postId + '/comments?pageIndex=' + this.data.pageSize + '&pageSize=' + this.data.pageSize,
+                    options.postId + '/comments?pageIndex=' + this.data.pageIndex + '&pageSize=' + this.data.pageSize,
             method: 'GET',
             header: {
                 "Content-Type": "application/json; charset=utf-8",
-                "Authorization": "Bearer " + app.globalData.access_token,
+                "Authorization": "Bearer " + getApp().accessToken
             },
             success: function (res) {
+                
                 if (res) {
                     that.setData({
                         comments: res.data
                     })
-
-                    WxParse.wxParse('article', 'html', that.data.article, that, 5);
                 }
-
             },
             fail: function () {
                 // fail
@@ -69,6 +73,28 @@ Page({
             }
         })
     },
+
+    addComment: function (options) {
+        console.log(options);
+        wx.request({
+            url: 'https://api.cnblogs.com/api/blogs/' + this.data.blogApp + '/posts/' + this.data.postId + '/comments',
+            method: 'POST',
+            data: {
+                "content": this.data.commentInput
+            },
+            header: {
+                "Content-Type": "application/x-www-form-urlencoded",
+                'Authorization': 'Bearer ' + getApp().accessToken,
+            },
+            success: function (res) {
+                console.log(res)
+            }
+
+        });
+    },
+    listenCommontInput: function (event) {
+        this.data.commentInput = event.detail.value;
+    },
     onReady: function () {
         // 页面渲染完成
     },
diff --git a/pages/blogpost/body.wxml b/pages/blogpost/body.wxml
index 73f74b5e6758b01d9982c336fd9d156709f1fc62..b2ef185f1f65fb1db10aad0aff3f9a9c66c8b6b5 100644
--- a/pages/blogpost/body.wxml
+++ b/pages/blogpost/body.wxml
@@ -1,3 +1,34 @@
+
 <!--pages/blogpost/body.wxml-->
 <import src="../../vendor/wxParse/wxParse.wxml" />
-<template is="wxParse" data="{{wxParseData:article.nodes}}"/>
+<template is="wxParse" data="{{wxParseData:article.nodes}}" />
+<view wx:if="{{comments}}">
+  <view>热门评论</view>
+  <view wx:for="{{comments}}" wx:key="unique" wx:for-item="commont">
+    <view class="weui-panel">
+      <view class="weui-panel__bd">
+        <view class="weui-media-box weui-media-box_text">
+          <view class="weui-media-box__info">
+            <view class="weui-media-box__info__meta">
+              <image style="width:50px;height:50px" src="{{commont.FaceUrl}}"></image>
+            </view>
+            <view class="weui-media-box__info__meta">{{commont.Author}}|</view>
+            <view class="weui-media-box__info__meta weui-media-box__info__meta_extra">{{commont.DateAdded}}</view>
+          </view>
+          <view class="weui-media-box__desc">{{commont.Body}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+<view>
+  <view class="weui-cells weui-cells_after-title">
+    <view class="weui-cell">
+      <view class="weui-cell__bd">
+        <textarea class="weui-textarea" placeholder="发表评论" style="height: 3.3em" auto-focus bindinput="listenCommontInput" />
+        <view class="weui-textarea-counter">0/200</view>
+      </view>
+    </view>
+  </view>
+  <button class="weui-btn mini-btn" type="primary" size="mini" bindtap="addComment">按钮</button>
+</view>
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 69b254d292c97243fa2749702a0b4f6cd9e580cf..55e2196a37959ed88e1524eb18fe71b30cb39b54 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -41,7 +41,7 @@ Page({
     },
 
     onReachBottom: function () {
-        console.log('--------上拉刷新-------')
+        console.log('--------上拉加载-------')
         this.changeTab(this.data.activeIndex, 'reach');
     },
 
@@ -62,6 +62,7 @@ Page({
                 if (action === 'pull') {
                     this.setData({
                         siteHomeIndex: 1,
+                        blog_articles: []
                     });
                 }
                 postType = 'sitehome'; //首页博文列表
@@ -71,6 +72,7 @@ Page({
                 if (action === 'pull') {
                     this.setData({
                         pickedIndex: 1,
+                        blog_pickeds: []
                     });
                 }
                 postType = 'picked'; //精华区博文列表
@@ -80,6 +82,7 @@ Page({
                 if (action === 'pull') {
                     this.setData({
                         recommendedIndex: 1,
+                        news_recommendeds: []
                     });
                 }
                 newsType = 'recommended';//推荐新闻
@@ -89,6 +92,7 @@ Page({
                 if (action === 'pull') {
                     this.setData({
                         hotIndex: 1,
+                        news_hots: []
                     });
                 }
                 newsType = 'hot';//热门新闻
@@ -98,6 +102,7 @@ Page({
                 if (action === 'pull') {
                     this.setData({
                         hotWeekIndex: 1,
+                        news_hots_week: []
                     });
                 }
                 newsType = 'hot-week';//本周热门新闻
@@ -113,26 +118,31 @@ Page({
         }
     },
 
-    //加载博文列表
+    /**
+     * 加载博文列表
+     * @param object that 当前调用对象
+     * @param int pageIndex
+     * @param int postType 加载博文类型
+     */
     loadMoreBlogPosts: function (that, pageIndex, postType) {
         wx.request({
             url: 'https://api.cnblogs.com/api/blogposts/@' + postType + '?pageIndex=' + pageIndex + '&pageSize=' + pageSize,
             method: 'GET',
             header: {
                 "Content-Type": "application/json; charset=utf-8",
-                "Authorization": "Bearer " + app.globalData.access_token,
+                "Authorization": "Bearer " + getApp().accessToken
             },
             success: function (res) {
                 pageIndex++;
                 if (postType === 'sitehome') {
                     that.setData({
-                        blog_articles: res.data,
+                        blog_articles: that.data.blog_articles.concat(res.data),
                         siteHomeIndex: pageIndex
                     });
 
                 } else if (postType === 'picked') {
                     that.setData({
-                        blog_pickeds: res.data,
+                        blog_pickeds: that.data.blog_pickeds.concat(res.data),
                         pickedIndex: pageIndex
                     });
 
@@ -149,7 +159,12 @@ Page({
         });
     },
 
-    //加载新闻列表
+    /**
+     * 加载新闻列表
+     * @param object that 当前调用对象
+     * @param int pageIndex 当前第几页
+     * @param int newsType 加载新闻类型
+     */
     loadMoreNews: function (that, pageIndex, newsType) {
         var url = '';
         if (newsType === 'recommended' || newsType === 'hot-week') {
@@ -163,23 +178,23 @@ Page({
             method: 'GET',
             header: {
                 "Content-Type": "application/json; charset=utf-8",
-                "Authorization": "Bearer " + app.globalData.access_token,
+                "Authorization": "Bearer " + getApp().accessToken
             },
             success: function (res) {
                 pageIndex++;
                 if (newsType === 'recommended') {
                     that.setData({
-                        news_recommendeds: res.data,
+                        news_recommendeds: that.data.news_recommendeds.concat(res.data),
                         recommendedIndex: pageIndex
                     });
                 } else if (newsType === 'hot') {
                     that.setData({
-                        news_hots: res.data,
+                        news_hots: that.data.news_hots.concat(res.data),
                         hotIndex: pageIndex
                     });
                 } else if (newsType === 'hot-week') {
                     that.setData({
-                        news_hots_week: res.data,
+                        news_hots_week: that.data.news_hots_week.concat(res.data),
                         hotWeekIndex: pageIndex
                     });
                 }
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e0613b43a8c33d95d43481cf60993ab5d911480d..e150f228cfb6373bd586040a21394ad3c49c8908 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -46,7 +46,7 @@
           <!-- 标题+ 内容-->
           <block wx:for="{{blog_pickeds}}" wx:key="idx">
             <view class="weui-panel__bd">
-              <navigator url="/blogpost/body/{{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <navigator url="../blogpost/body?postId={{item.Id}}&blogApp={{item.BlogApp}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
                 <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
                   <image class="weui-media-box__thumb" src="{{item.Avatar}}" />
                 </view>
@@ -73,7 +73,7 @@
           <!-- 标题+ 内容-->
           <block wx:for="{{news_recommendeds}}" wx:key="idx">
             <view class="weui-panel__bd">
-              <navigator url="/blogpost/body/{{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <navigator url="../news/index?newsId={{item.Id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
                 <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
                   <image class="weui-media-box__thumb" src="{{item.TopicIcon}}" />
                 </view>
@@ -99,7 +99,7 @@
           <!-- 标题+ 内容-->
           <block wx:for="{{news_recommendeds}}" wx:key="idx">
             <view class="weui-panel__bd">
-              <navigator url="/blogpost/body/{{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <navigator url="../news/index?newsId={{item.Id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
                 <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
                   <image class="weui-media-box__thumb" src="{{item.TopicIcon}}" />
                 </view>
@@ -125,7 +125,7 @@
           <!-- 标题+ 内容-->
           <block wx:for="{{news_hots_week}}" wx:key="idx">
             <view class="weui-panel__bd">
-              <navigator url="/blogpost/body/{{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <navigator url="../news/index?newsId={{item.Id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
                 <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
                   <image class="weui-media-box__thumb" src="{{item.TopicIcon}}" />
                 </view>
diff --git a/pages/news/index.js b/pages/news/index.js
index 7db67da075d7341ee6281e4f51a222b8cb800982..e89c9ea6d34b3673bae056675362fbc943cb6e61 100644
--- a/pages/news/index.js
+++ b/pages/news/index.js
@@ -1,19 +1,110 @@
 // pages/news/index.js
+var WxParse = require('../../vendor/wxParse/wxParse.js')
+
 Page({
-  data:{},
-  onLoad:function(options){
-    // 页面初始化 options为页面跳转所带来的参数
-  },
-  onReady:function(){
-    // 页面渲染完成
-  },
-  onShow:function(){
-    // 页面显示
-  },
-  onHide:function(){
-    // 页面隐藏
-  },
-  onUnload:function(){
-    // 页面关闭
-  }
+    data: {
+        news: '',
+        comments: [],
+        newsId: 0,
+        blogApp: '',
+        commentInput: '',
+        pageIndex: 1,
+        pageSize: 10,
+    },
+    onLoad: function (options) {
+        this.loadNews(options);
+        this.loadComments(options);
+    },
+
+    loadNews: function (options) {
+        // 页面初始化 options为页面跳转所带来的参数
+        var that = this;
+        wx.request({
+            url: 'https://api.cnblogs.com/api/newsitems/' + options.newsId + '/body',
+            method: 'GET',
+            header: {
+                "Content-Type": "application/json; charset=utf-8",
+                "Authorization": "Bearer " + getApp().accessToken
+            },
+            success: function (res) {
+                if (res) {
+                    that.setData({
+                        news: res.data,
+                        newsId: options.newsId,
+//                        blogApp: options.blogApp
+                    })
+
+                    WxParse.wxParse('news', 'html', that.data.news, that, 5);
+                }
+
+            },
+            fail: function () {
+                // fail
+            },
+            complete: function () {
+                // complete
+            }
+        })
+    },
+
+    loadComments: function (options) {
+        var that = this;
+        wx.request({
+            url: 'https://api.cnblogs.com/api/news/' + options.newsId +
+                    '/comments?pageIndex=' + this.data.pageIndex + '&pageSize=' + this.data.pageSize,
+            method: 'GET',
+            header: {
+                "Content-Type": "application/json; charset=utf-8",
+                "Authorization": "Bearer " + getApp().accessToken
+            },
+            success: function (res) {
+                
+                if (res) {
+                    that.setData({
+                        comments: res.data
+                    })
+                }
+            },
+            fail: function () {
+                // fail
+            },
+            complete: function () {
+                // complete
+            }
+        })
+    },
+
+    addComment: function (options) {
+        console.log(options);
+        wx.request({
+            url: 'https://api.cnblogs.com/api/blogs/' + this.data.blogApp + '/posts/' + this.data.postId + '/comments',
+            method: 'POST',
+            data: {
+                "content": this.data.commentInput
+            },
+            header: {
+                "Content-Type": "application/x-www-form-urlencoded",
+                'Authorization': 'Bearer ' + getApp().accessToken,
+            },
+            success: function (res) {
+                console.log(res)
+            }
+
+        });
+    },
+    listenCommontInput: function (event) {
+        this.data.commentInput = event.detail.value;
+    },
+    onReady: function () {
+        // 页面渲染完成
+    },
+    onShow: function () {
+        // 页面显示
+    },
+    onHide: function () {
+        // 页面隐藏
+    },
+    onUnload: function () {
+        // 页面关闭
+    }
 })
\ No newline at end of file
diff --git a/pages/news/index.wxml b/pages/news/index.wxml
index 1411a3e7405ac2470ae92c26d25a998b985315c9..21a8b8f3d68365599057621ab0cf570f76524d16 100644
--- a/pages/news/index.wxml
+++ b/pages/news/index.wxml
@@ -1,2 +1,33 @@
 <!--pages/news/index.wxml-->
-<text>pages/news/index.wxml</text>
+<import src="../../vendor/wxParse/wxParse.wxml" />
+<template is="wxParse" data="{{wxParseData:news.nodes}}" />
+<view wx:if="{{comments}}">
+  <view>热门评论</view>
+  <view wx:for="{{comments}}" wx:key="unique" wx:for-item="commont">
+    <view class="weui-panel">
+      <view class="weui-panel__bd">
+        <view class="weui-media-box weui-media-box_text">
+          <view class="weui-media-box__info">
+            <view class="weui-media-box__info__meta">
+              <image style="width:50px;height:50px" src="{{commont.FaceUrl}}"></image>
+            </view>
+            <view class="weui-media-box__info__meta">{{commont.Author}}|</view>
+            <view class="weui-media-box__info__meta weui-media-box__info__meta_extra">{{commont.DateAdded}}</view>
+          </view>
+          <view class="weui-media-box__desc">{{commont.Body}}</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+<view>
+  <view class="weui-cells weui-cells_after-title">
+    <view class="weui-cell">
+      <view class="weui-cell__bd">
+        <textarea class="weui-textarea" placeholder="发表评论" style="height: 3.3em" auto-focus bindinput="listenCommontInput" />
+        <view class="weui-textarea-counter">0/200</view>
+      </view>
+    </view>
+  </view>
+  <button class="weui-btn mini-btn" type="primary" size="mini" bindtap="addComment">按钮</button>
+</view>
\ No newline at end of file
diff --git a/utils/util.js b/utils/util.js
index 6581a59c838a7e40765acf4fa9ad0fd8bc9e7796..d88310bd21c1cc0bc947ef3e5ac77359e7d12d33 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -26,5 +26,5 @@ function json2Form(json) {
 
 module.exports = {
   json2Form: json2Form,
-  formatTime: formatTime
+  formatTime: formatTime,
 }
diff --git a/vendor/wxParse/html2json.js b/vendor/wxParse/html2json.js
index 38a9cb269ff598621f3af687761e93fe0eeda1af..91b7d6abb658a717ac567d900e37c39569185af1 100644
--- a/vendor/wxParse/html2json.js
+++ b/vendor/wxParse/html2json.js
@@ -88,14 +88,14 @@ function html2json(html, bindName) {
                     var name = attr.name;
                     var value = attr.value;
                     if (name == 'class') {
-                        console.dir(value);
+//                        console.dir(value);
                         //  value = value.join("")
                         node.classStr = value;
                     }
                     // has multi attibutes
                     // make it array of attribute
                     if (name == 'style') {
-                        console.dir(value);
+//                        console.dir(value);
                         //  value = value.join("")
                         node.styleStr = value;
                     }
diff --git a/vendor/wxParse/wxParse.js b/vendor/wxParse/wxParse.js
index ea4b6b08fc60e4b7b4584ebaf938b1b06844a83b..3e340031a0e23cf8c7c53ba4a2277cc06f0b8d8d 100644
--- a/vendor/wxParse/wxParse.js
+++ b/vendor/wxParse/wxParse.js
@@ -25,12 +25,12 @@ function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:
   var transData = {};//存放转化后的数据
   if (type == 'html') {
     transData = HtmlToJson.html2json(data, bindName);
-    console.log(JSON.stringify(transData, ' ', ' '));
+//    console.log(JSON.stringify(transData, ' ', ' '));
   } else if (type == 'md' || type == 'markdown') {
     var converter = new showdown.Converter();
     var html = converter.makeHtml(data);
     transData = HtmlToJson.html2json(html, bindName);
-    console.log(JSON.stringify(transData, ' ', ' '));
+//    console.log(JSON.stringify(transData, ' ', ' '));
   }
   transData.view = {};
   transData.view.imagePadding = 0;
@@ -96,12 +96,12 @@ function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
       windowWidth = res.windowWidth-2*padding;
       windowHeight = res.windowHeight;
       //判断按照那种方式进行缩放
-      console.log("windowWidth" + windowWidth);
+//      console.log("windowWidth" + windowWidth);
       if (originalWidth > windowWidth) {//在图片width大于手机屏幕width时候
         autoWidth = windowWidth;
-        console.log("autoWidth" + autoWidth);
+//        console.log("autoWidth" + autoWidth);
         autoHeight = (autoWidth * originalHeight) / originalWidth;
-        console.log("autoHeight" + autoHeight);
+//        console.log("autoHeight" + autoHeight);
         results.imageWidth = autoWidth;
         results.imageheight = autoHeight;
       } else {//否则展示原来的数据