diff --git a/app.json b/app.json
index a3f7e52..21171b1 100644
--- a/app.json
+++ b/app.json
@@ -34,5 +34,5 @@
     "uploadFile": 10000,
     "downloadFile": 10000
   },
-  "debug":true
+  "debug":false
 }
\ No newline at end of file
diff --git a/pages/detail/detail.js b/pages/detail/detail.js
index 834136f..7f6b37c 100644
--- a/pages/detail/detail.js
+++ b/pages/detail/detail.js
@@ -20,7 +20,7 @@ Page({
         newsid:"",
         title:"",
         imgsrc:"",
-        wxParseData:"",
+        article:"",
         comments:0,
         popularity:0,
         long_comments:0,
@@ -68,15 +68,19 @@ Page({
             },
             success: function(res) {
                 console.log(res.data)
-
+                console.log(res.data.body)
                 // //html解析
                 // var str = util.coder(res.data.body);
 
+
+                var article = res.data.body;
+                WxParse.wxParse('article', 'html', article, _this,0);
+
+            // wxParseData: WxParse('html', res.data.body)//使用WxParse组件解析html  markdow解析将html替换成md
                 _this.setData({
                     newsid:res.data.id,
                      title:res.data.title,
-                     imgsrc:res.data.image,
-                     wxParseData:WxParse('html',res.data.body)//使用WxParse组件解析html  markdow解析将html替换成md
+                     imgsrc:res.data.image
                 })
 
 
diff --git a/pages/detail/detail.json b/pages/detail/detail.json
index 049c270..eeccea4 100644
--- a/pages/detail/detail.json
+++ b/pages/detail/detail.json
@@ -1,3 +1,3 @@
 {
-    "navigationBarTitleText": "知乎日报详情"
+    "navigationBarTitleText": "日报详情"
   }
\ No newline at end of file
diff --git a/pages/detail/detail.wxml b/pages/detail/detail.wxml
index 7032148..d3c1fbe 100644
--- a/pages/detail/detail.wxml
+++ b/pages/detail/detail.wxml
@@ -5,18 +5,34 @@
 
 <view class="container">
    
-    <view style="height:240px;position:relative;">
-        <image src="{{imgsrc}}"></image>
+    <!-- <view style="position:relative;">
+        <image src="{{imgsrc}}" mode="aspectFill" style='width:100%;'></image>
         <view style="position:absolute;top:158px;color:#fff;font-size:20px;padding:10px;">{{title}}</view>
-    </view>
+    </view> -->
 
      <!--知乎内容html解析-->
-    <view class="wxParse">
-        <template is="wxParse" data="{{wxParseData}}"/>
+    <!-- <view class="wxParse">
+        
+    </view> -->
+    <template is="wxParse" data="{{wxParseData:article.nodes}}"/>
+
+
+<view style="background-color:#fff;position:fixed;right:10px;bottom:30px;padding:10px;color:#333;box-shadow:0px 0px 2px 1px #B4CDCD;font-size:14px;line-height:40px;">
+        <view id="{{newsid}}" style='text-align:center;' bindtap="doLike">
+            {{popularity}}赞
+        </view>
+        <view style='height:1px;background:#ccc;width:100%;'></view>
+        <view id="{{newsid}}" style='text-align:center;' bindtap="showComments">
+            {{comments}}评论
+        </view>
     </view>
 
+
+
+
+
     <!--额外信息-->
-    <view style="background-color:#4abdcc;position:fixed;bottom:0;width:100%;padding:5px;height:42px;color:#fff;display:flex;flex-direction:row-reverse;">
+    <!-- <view style="background-color:#4abdcc;position:fixed;bottom:0;width:100%;padding:5px;height:42px;color:#fff;display:flex;flex-direction:row-reverse;">
         <view id="{{newsid}}" class="" style="" bindtap="doLike" style="margin-right: 20px;height:42px;line-height:42px;">
             <image src="../../images/ico_like.png" style="width:22px;height:22px;"></image>
            <text>{{popularity}}</text>
@@ -25,6 +41,6 @@
             <image src="../../images/ico_answer.png" style="width:22px;height:22px;"></image>
             <text>{{comments}}</text>
         </view>
-    </view>
+    </view> -->
 
 </view>
\ No newline at end of file
diff --git a/pages/detail/detail.wxss b/pages/detail/detail.wxss
index 04f53ab..23a51fe 100644
--- a/pages/detail/detail.wxss
+++ b/pages/detail/detail.wxss
@@ -1,2 +1,928 @@
 /*引入富文本解析自定义组件*/
-@import "../../wxParse/wxParse.wxss";
\ No newline at end of file
+@import "../../wxParse/wxParse.wxss";
+
+
+.wxParse-script{display: none;}
+
+
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+  display: block;
+}
+audio,
+canvas,
+video {
+  display: inline-block;
+}
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+html {
+  font-family: sans-serif;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  font-family: 'Helvetica Neue', Helvetica, Arial, Sans-serif;
+  background: #fff;
+  padding-top: 0;
+  margin: 0;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:active,
+a:hover {
+  outline: 0;
+}
+h1 {
+  margin: .67em 0;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-size: 16px;
+}
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+hr {
+  box-sizing: content-box;
+  height: 0;
+}
+mark {
+  background: #ff0;
+  color: #000;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace,serif;
+  font-size: 1em;
+}
+pre {
+  white-space: pre-wrap;
+}
+q {
+  quotes: \201C\201D\2018\2019;
+}
+small {
+  font-size: 80%;
+}
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  border: 0;
+  vertical-align: middle;
+  color: transparent;
+  font-size: 0;
+}
+svg:not(:root) {
+  overflow: hidden;
+}
+figure {
+  margin: 0;
+}
+fieldset {
+  border: 1px solid silver;
+  margin: 0 2px;
+  padding: .35em .625em .75em;
+}
+legend {
+  border: 0;
+  padding: 0;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  overflow: hidden;
+}
+a {
+  text-decoration: none;
+}
+blockquote {
+  border-left: 3px solid #D0E5F2;
+  font-style: normal;
+  display: block;
+  vertical-align: baseline;
+  font-size: 100%;
+  margin: .5em 0;
+  padding: 0 0 0 1em;
+}
+ul,
+ol {
+  padding-left: 20px;
+}
+.main-wrap {
+  max-width: 100%;
+  min-width: 300px;
+  margin: 0 auto;
+}
+.content-wrap {
+  overflow: hidden;
+  background-color: #f9f9f9;
+}
+.content-wrap a {
+  word-break: break-all;
+}
+.headline {
+  border-bottom: 4px solid #f6f6f6;
+}
+.headline-title.onlyheading {
+  margin: 20px 0;
+}
+.headline img {
+  max-width: 100%;
+  vertical-align: top;
+}
+.headline-background-link {
+  line-height: 2em;
+  position: relative;
+  display: block;
+  padding: 20px 45px 20px 20px !important;
+}
+.icon-arrow-right {
+  position: absolute;
+  top: 50%;
+  right: 20px;
+  background-image: url(http://static.daily.zhihu.com/img/share-icons.png);
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: middle;
+  background-position: -70px -20px;
+  width: 10px;
+  height: 15px;
+  margin-top: -7.5px;
+}
+.headline-background .heading {
+  color: #999;
+  font-size: 15px!important;
+  margin-bottom: 8px;
+  line-height: 1em;
+}
+.headline-background .heading-content {
+  color: #444;
+  font-size: 17px!important;
+  line-height: 1.2em;
+}
+.headline-title {
+  line-height: 1.2em;
+  color: #000;
+  font-size: 22px;
+  margin: 20px 0 10px;
+  padding: 0 20px!important;
+  font-weight: bold;
+}
+.meta {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 16px;
+  color: #b8b8b8;
+}
+.meta .source-icon {
+  width: 20px;
+  height: 20px;
+  margin-right: 4px;
+}
+.meta .time {
+  float: right;
+  margin-top: 2px;
+}
+.content {
+  color: #444;
+  line-height: 1.6em;
+  font-size: 17px;
+  margin: 10px 0 20px;
+}
+.content img {
+  max-width: 100%;
+  display: block;
+  margin: 30px auto;
+}
+
+.content img + img {
+  margin-top: 15px;
+}
+
+.content img[src*="zhihu.com/equation"] {
+  display: inline-block;
+  margin: 0 3px;
+}
+.content a {
+  color: #259;
+}
+.content a:hover {
+  text-decoration: underline;
+}
+.view-more {
+  margin-bottom: 25px;
+  text-align: center;
+}
+.view-more a {
+  font-size: 16px;
+  display: inline-block;
+  width: 125px;
+  height: 30px;
+  line-height: 30px;
+  background: #f0f0f0;
+  color: #B8B8B8;
+}
+.question {
+  overflow: hidden;
+  padding: 0 20px!important;
+}
+.question + .question {
+  border-top: 5px solid #f6f6f6;
+}
+.question-title {
+  line-height: 1.4em;
+  color: #000;
+  font-weight: 700;
+  font-size: 18px;
+  margin: 20px 0;
+}
+.meta .author {
+  color: #444;
+  font-weight: 700;
+}
+.answer + .answer {
+  border-top: 2px solid #f6f6f6;
+  padding-top: 20px;
+}
+.footer {
+  text-align: center;
+  color: #b8b8b8;
+  font-size: 13px;
+  padding: 20px 0;
+}
+.footer a {
+  color: #b8b8b8;
+}
+.question .view-more a {
+  width: 100%;
+  display: block;
+}
+.hot-comment {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+.comment-label {
+  font-size: 16px;
+  color: #333;
+  line-height: 1.5em;
+  font-weight: 700;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
+  margin: 0;
+  padding: 9px 20px;
+}
+.comment-list {
+  margin-bottom: 20px;
+}
+.comment-item {
+  font-size: 15px;
+  color: #666;
+  border-bottom: 1px solid #eee;
+  padding: 15px 20px;
+}
+.comment-meta {
+  position: relative;
+  margin-bottom: 10px;
+}
+.comment-meta .author {
+  vertical-align: middle;
+  color: #444;
+}
+.comment-meta .vote {
+  position: absolute;
+  color: #b8b8b8;
+  font-size: 12px;
+  right: 0;
+}
+.night .comment-label {
+  color: #b8b8b8;
+  border-top: 1px solid #303030;
+  border-bottom: 1px solid #303030;
+}
+.night .comment-item {
+  color: #7f7f7f;
+  border-bottom: 1px solid #303030;
+}
+.icon-vote,
+.icon-voted {
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: 0;
+  width: 11px;
+  height: 12px;
+  margin-right: 4px;
+  background-image: url(http://static.daily.zhihu.com/img/app/Comment_Vote.png) !important;
+}
+.icon-voted {
+  background-image: url(http://static.daily.zhihu.com/img/app/Comment_Voted.png) !important;
+}
+.night .icon-vote {
+  background-image: url(http://static.daily.zhihu.com/img/app/Dark_Comment_Vote.png) !important;
+}
+.img-wrap .headline-title {
+  bottom: 5px;
+}
+.img-wrap .img-source {
+  right: 10px!important;
+  font-size: 9px;
+}
+.global-header {
+  position: static;
+}
+.button {
+  width: 60px;
+}
+.button i {
+  margin-right: 0;
+}
+/* .headline .img-place-holder {
+  height: 200px;
+} */
+.from-column {
+  width: 280px;
+  line-height: 30px;
+  height: 30px;
+  padding-left: 90px;
+  color: #2aacec;
+  background-image: url(http://static.daily.zhihu.com/img/News_Column_Entrance.png);
+  box-sizing: border-box;
+  margin: 0 20px 20px;
+}
+.from-column:active {
+  background-image: url(http://static.daily.zhihu.com/img/News_Column_Entrance_Highlight.png);
+}
+.night .headline {
+  border-bottom: 4px solid #303030;
+}
+.night img {
+  -webkit-mask-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.7)), to(rgba(0, 0, 0, 0.7)));
+}
+body.night,
+.night .content-wrap {
+  background: #343434;
+}
+.night .answer + .answer {
+  border-top: 2px solid #303030;
+}
+.night .question + .question {
+  border-top: 4px solid #303030;
+}
+.night .view-more a {
+  background: #292929;
+  color: #666;
+}
+.night .icon-arrow-right {
+  background-image: url(http://static.daily.zhihu.com/img/share-icons.png);
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: middle;
+  background-position: -70px -35px;
+  width: 10px;
+  height: 15px;
+}
+.night blockquote,
+.night sup {
+  border-left: 3px solid #666;
+}
+.night .content a {
+  color: #698ebf;
+}
+.night .from-column {
+  color: #2b82ac;
+  background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance.png);
+}
+.night .from-column:active {
+  background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance_Highlight.png);
+}
+.large .question-title {
+  font-size: 24px;
+}
+.large .meta {
+  font-size: 18px;
+}
+.large .content {
+  font-size: 20px;
+}
+.large blockquote,
+.large sup {
+  line-height: 1.6;
+}
+.meta .meta-item {
+  -o-text-overflow: ellipsis;
+  width: 39%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+  color: #929292;
+  margin-right: 7px;
+}
+.headline .meta {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 11px;
+  color: #b8b8b8;
+  margin: 15px 0;
+  padding: 0 20px;
+}
+.headline .meta a,
+.headline .meta a:hover {
+  padding-left: 1em;
+  margin-top: 2px;
+  float: right;
+  font-size: 11px;
+  color: #0066cf;
+  text-decoration: none;
+}
+.highlight {
+  width: auto;
+  overflow: auto;
+  word-wrap: normal;
+}
+.highlight::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+.highlight code {
+  overflow: auto;
+}
+.highlight::-webkit-scrollbar-thumb:horizontal {
+  border-radius: 6px;
+  background-color: rgba(0,0,0,.5);
+}
+.highlight::-webkit-scrollbar-thumb:horizontal:hover {
+  background-color: rgba(0,0,0,.6);
+}
+.highlight pre {
+  margin: 0;
+  white-space: pre;
+}
+.highlight .hll {
+  background-color: #ffc;
+}
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+.highlight .cp {
+  color: #999;
+  font-weight: 700;
+}
+.highlight .cs {
+  color: #999;
+  font-weight: 700;
+  font-style: italic;
+}
+.highlight .gd {
+  color: #000;
+  background-color: #fdd;
+}
+.highlight .gi {
+  color: #000;
+  background-color: #dfd;
+}
+.highlight .gu {
+  color: #aaa;
+}
+.highlight .ni {
+  color: purple;
+}
+.highlight .nt {
+  color: navy;
+}
+.highlight .w {
+  color: #bbb;
+}
+.highlight .sr {
+  color: olive;
+}
+[hidden],
+.button span {
+  display: none;
+}
+b,
+strong,
+.highlight .k,
+.highlight .o,
+.highlight .gs,
+.highlight .kc,
+.highlight .kd,
+.highlight .kn,
+.highlight .kp,
+.highlight .kr,
+.highlight .ow {
+  font-weight: 700;
+}
+dfn,
+.highlight .ge {
+  font-style: italic;
+}
+.meta span,
+.meta .source {
+  vertical-align: middle;
+}
+.meta .avatar,
+.comment-meta .avatar {
+  width: 20px;
+  height: 20px;
+  border-radius: 2px;
+  margin-right: 5px;
+}
+.meta .bio,
+.highlight .gh,
+.highlight .bp {
+  color: #999;
+}
+.night .comment-meta .author,
+.night .content,
+.night .meta .author,
+.highlight .go {
+  color: #888;
+}
+.night .headline-title,
+.night .headline-background .heading-content,
+.night .question-title {
+  color: #B8B8B8;
+}
+.highlight .c,
+.highlight .cm,
+.highlight .c1 {
+  color: #998;
+  font-style: italic;
+}
+.highlight .gr,
+.highlight .gt {
+  color: #a00;
+}
+.highlight .gp,
+.highlight .nn {
+  color: #555;
+}
+.highlight .kt,
+.highlight .nc {
+  color: #458;
+  font-weight: 700;
+}
+.highlight .m,
+.highlight .mf,
+.highlight .mh,
+.highlight .mi,
+.highlight .mo,
+.highlight .il {
+  color: #099;
+}
+.highlight .s,
+.highlight .sb,
+.highlight .sc,
+.highlight .sd,
+.highlight .s2,
+.highlight .se,
+.highlight .sh,
+.highlight .si,
+.highlight .sx,
+.highlight .s1,
+.highlight .ss {
+  color: #d32;
+}
+.highlight .na,
+.highlight .nb,
+.highlight .no,
+.highlight .nv,
+.highlight .vc,
+.highlight .vg,
+.highlight .vi {
+  color: teal;
+}
+.highlight .ne,
+.highlight .nf {
+  color: #900;
+  font-weight: 700;
+}
+.answer h1,
+.answer h2,
+.answer h3,
+.answer h4,
+.answer h5 {
+  font-size: 19px;
+}
+@media only screen and (-webkit-min-device-pixel-ratio2), only screen and (min-device-pixel-ratio2) {
+  .icon-arrow-right {
+    background-image: url(http://static.daily.zhihu.com/img/share-icons@2x.png);
+    -webkit-background-size: 82px 55px;
+    background-size: 82px 55px;
+  }
+  .icon-vote,
+  .icon-voted {
+    background-image: url(http://static.daily.zhihu.com/img/app/Comment_Vote@2x.png) !important;
+    background-size: 11px 12px;
+  }
+  .icon-voted {
+    background-image: url(http://static.daily.zhihu.com/img/app/Comment_Voted@2x.png) !important;
+  }
+  .night .icon-vote {
+    background-image: url(http://static.daily.zhihu.com/img/app/Dark_Comment_Vote@2x.png) !important;
+  }
+  .from-column {
+    background-image: url(http://static.daily.zhihu.com/img/News_Column_Entrance@2x.png) !important;
+    background-size: 280px 30px;
+  }
+  .from-column:active {
+    background-image: url(http://static.daily.zhihu.com/img/News_Column_Entrance_Highlight@2x.png) !important;
+  }
+  .night .from-column {
+    color: #2b82ac;
+    background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance@2x.png) !important;
+  }
+  .night .from-column:active {
+    background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance_Highlight@2x.png) !important;
+  }
+}
+.meta .meta-item {
+  width: 39%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+  color: #929292;
+  margin-right: 7px;
+}
+.headline .meta {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 11px;
+  color: #b8b8b8;
+  margin: 20px 0;
+  padding: 0 20px;
+}
+.headline .meta a,
+.headline .meta a:hover {
+  margin-top: 2px;
+  float: right;
+  font-size: 11px;
+  color: #0066cf;
+  text-decoration: none;
+}
+.answer h1,
+.answer h2,
+.answer h3,
+.answer h4,
+.answer h5 {
+  font-size: 19px;
+}
+.origin-source,
+a.origin-source:link {
+  display: block;
+  margin: 25px 0;
+  height: 50px;
+  overflow: hidden;
+  background: #f0f0f0;
+  color: #888;
+  position: relative;
+  -webkit-touch-callout: none;
+}
+.origin-source .source-logo,
+a.origin-source:link .source-logo {
+  float: left;
+  width: 50px;
+  height: 50px;
+  margin-right: 10px;
+}
+.origin-source .text,
+a.origin-source:link .text {
+  line-height: 50px;
+  height: 50px;
+  font-size: 13px;
+}
+.origin-source.with-link .text {
+  color: #333;
+}
+.origin-source.with-link:after {
+  display: block;
+  position: absolute;
+  border-color: transparent transparent transparent #f0f0f0;
+  border-width: 7px;
+  border-style: solid;
+  height: 0;
+  width: 0;
+  top: 18px;
+  right: 4px;
+  line-height: 0;
+  content: "";
+}
+.origin-source.with-link:before {
+  display: block;
+  height: 0;
+  width: 0;
+  position: absolute;
+  top: 18px;
+  right: 3px;
+  border-color: transparent transparent transparent #000;
+  border-width: 7px;
+  border-style: solid;
+  line-height: 0;
+  content: "";
+}
+.origin-source-wrap {
+  position: relative;
+  background: #f0f0f0;
+}
+.origin-source-wrap .focus-link {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 45px;
+  color: #00a2ed;
+  height: 50px;
+  display: none;
+  text-align: center;
+  font-size: 12px;
+  -webkit-touch-callout: none;
+}
+.origin-source-wrap .focus-link .btn-label {
+  text-align: center;
+  display: block;
+  margin-top: 8px;
+  border-left: solid 1px #ccc;
+  height: 34px;
+  line-height: 34px;
+}
+.origin-source-wrap.unfocused .focus-link {
+  display: block;
+}
+.origin-source-wrap.unfocused .origin-source:before,
+.origin-source-wrap.unfocused .origin-source:after {
+  display: none;
+}
+.night .origin-source-wrap {
+  background: #292929;
+}
+.night .origin-source-wrap .focus-link {
+  color: #116f9e;
+}
+.night .origin-source-wrap .btn-label {
+  border-left: solid 1px #3f3f3f;
+}
+.night .origin-source,
+.night .origin-source.with-link {
+  background: #292929;
+  color: #666;
+}
+.night .origin-source .text,
+.night .origin-source.with-link .text {
+  color: #666;
+}
+.night .origin-source.with-link:after {
+  border-color: transparent transparent transparent #292929;
+}
+.night .origin-source.with-link:before {
+  border-color: transparent transparent transparent #666;
+}
+/* ==== */
+.question-title {
+  color: #494b4d;
+}
+
+blockquote {
+  color: #9da3a6;
+  border-left: 3px solid #Dfe3e6;
+}
+
+.content a {
+  color: #4786b3;
+}
+
+.content {
+  font-size: 17px;
+  color: #616466;
+}
+
+.content-wrap {
+  background: #fff;
+}
+
+hr {
+  margin: 30px 0;
+  border-top-width: 0;
+}
+
+
+p {
+  margin: 20px 0 !important;
+}
+
+.dudu-night .content {
+  color: #797b80;
+}
+
+.dudu-night hr {
+  color: #27282b;
+  border-color: #27282b;
+}
+.dudu-night .meta .author,
+.dudu-night .meta .bio {
+  color: #555659;
+}
+.dudu-night .headline-title,
+.dudu-night .headline-background .heading-content,
+.dudu-night .question-title {
+  color: #919499;
+}
+
+.dudu-night .headline {
+  border-bottom: none;
+}
+.dudu-night img {
+  -webkit-mask-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.7)), to(rgba(0, 0, 0, 0.7)));
+}
+body.dudu-night,
+.dudu-night .content-wrap {
+  background: #1d1e1f;
+}
+.dudu-night .answer + .answer {
+  border-top: 2px solid #27282b;
+}
+.dudu-night .question + .question {
+  border-top: 4px solid #27282b;
+}
+.dudu-night .view-more a {
+  background: #1d1e1f;
+  color: #396280;
+}
+.dudu-night .icon-arrow-right {
+  background-image: url(http://static.daily.zhihu.com/img/share-icons.png);
+  background-repeat: no-repeat;
+  display: inline-block;
+  vertical-align: middle;
+  background-position: -70px -35px;
+  width: 10px;
+  height: 15px;
+}
+.dudu-night blockquote,
+.dudu-night sup {
+  border-left: 3px solid #2e3033;
+  color: #555659;
+}
+.dudu-night .content a {
+  color: #396280;
+}
+
+.dudu-night img {
+  opacity: 0.7;
+}
+
+.dudu-night .from-column {
+  color: #2b82ac;
+  background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance.png);
+}
+.dudu-night .from-column:active {
+  background-image: url(http://static.daily.zhihu.com/img/Dark_News_Column_Entrance_Highlight.png);
+}
+
+.dudu .headline {
+  border-bottom: none;
+}
+
+.dudu-night .origin-source,
+.dudu-night a.origin-source:link {
+  background: #222324;
+}
+
+.dudu-night .origin-source.with-link .text {
+  color: #797b80;
+}
+.dudu-night .origin-source.with-link:after {
+  border-color: transparent transparent transparent #797b80;
+} 
\ No newline at end of file
diff --git a/wxParse/emojis/00.gif b/wxParse/emojis/00.gif
new file mode 100644
index 0000000..5be27cb
Binary files /dev/null and b/wxParse/emojis/00.gif differ
diff --git a/wxParse/emojis/01.gif b/wxParse/emojis/01.gif
new file mode 100644
index 0000000..a2644a9
Binary files /dev/null and b/wxParse/emojis/01.gif differ
diff --git a/wxParse/emojis/02.gif b/wxParse/emojis/02.gif
new file mode 100644
index 0000000..40cfda4
Binary files /dev/null and b/wxParse/emojis/02.gif differ
diff --git a/wxParse/emojis/03.gif b/wxParse/emojis/03.gif
new file mode 100644
index 0000000..6d6f762
Binary files /dev/null and b/wxParse/emojis/03.gif differ
diff --git a/wxParse/emojis/04.gif b/wxParse/emojis/04.gif
new file mode 100644
index 0000000..6ccdaa2
Binary files /dev/null and b/wxParse/emojis/04.gif differ
diff --git a/wxParse/emojis/05.gif b/wxParse/emojis/05.gif
new file mode 100644
index 0000000..ab0b81b
Binary files /dev/null and b/wxParse/emojis/05.gif differ
diff --git a/wxParse/emojis/06.gif b/wxParse/emojis/06.gif
new file mode 100644
index 0000000..ceab122
Binary files /dev/null and b/wxParse/emojis/06.gif differ
diff --git a/wxParse/emojis/07.gif b/wxParse/emojis/07.gif
new file mode 100644
index 0000000..2f45399
Binary files /dev/null and b/wxParse/emojis/07.gif differ
diff --git a/wxParse/emojis/08.gif b/wxParse/emojis/08.gif
new file mode 100644
index 0000000..f6c8834
Binary files /dev/null and b/wxParse/emojis/08.gif differ
diff --git a/wxParse/emojis/09.gif b/wxParse/emojis/09.gif
new file mode 100644
index 0000000..c2d8450
Binary files /dev/null and b/wxParse/emojis/09.gif differ
diff --git a/wxParse/emojis/10.gif b/wxParse/emojis/10.gif
new file mode 100644
index 0000000..905c15b
Binary files /dev/null and b/wxParse/emojis/10.gif differ
diff --git a/wxParse/emojis/100.gif b/wxParse/emojis/100.gif
new file mode 100644
index 0000000..92ad35d
Binary files /dev/null and b/wxParse/emojis/100.gif differ
diff --git a/wxParse/emojis/101.gif b/wxParse/emojis/101.gif
new file mode 100644
index 0000000..1f27663
Binary files /dev/null and b/wxParse/emojis/101.gif differ
diff --git a/wxParse/emojis/102.gif b/wxParse/emojis/102.gif
new file mode 100644
index 0000000..748ded1
Binary files /dev/null and b/wxParse/emojis/102.gif differ
diff --git a/wxParse/emojis/103.gif b/wxParse/emojis/103.gif
new file mode 100644
index 0000000..be9eaa0
Binary files /dev/null and b/wxParse/emojis/103.gif differ
diff --git a/wxParse/emojis/104.gif b/wxParse/emojis/104.gif
new file mode 100644
index 0000000..d7c2066
Binary files /dev/null and b/wxParse/emojis/104.gif differ
diff --git a/wxParse/emojis/105.gif b/wxParse/emojis/105.gif
new file mode 100644
index 0000000..2f353ca
Binary files /dev/null and b/wxParse/emojis/105.gif differ
diff --git a/wxParse/emojis/106.gif b/wxParse/emojis/106.gif
new file mode 100644
index 0000000..5193534
Binary files /dev/null and b/wxParse/emojis/106.gif differ
diff --git a/wxParse/emojis/107.gif b/wxParse/emojis/107.gif
new file mode 100644
index 0000000..70d38d3
Binary files /dev/null and b/wxParse/emojis/107.gif differ
diff --git a/wxParse/emojis/108.gif b/wxParse/emojis/108.gif
new file mode 100644
index 0000000..749d500
Binary files /dev/null and b/wxParse/emojis/108.gif differ
diff --git a/wxParse/emojis/109.gif b/wxParse/emojis/109.gif
new file mode 100644
index 0000000..6f57d56
Binary files /dev/null and b/wxParse/emojis/109.gif differ
diff --git a/wxParse/emojis/11.gif b/wxParse/emojis/11.gif
new file mode 100644
index 0000000..b512dd5
Binary files /dev/null and b/wxParse/emojis/11.gif differ
diff --git a/wxParse/emojis/110.gif b/wxParse/emojis/110.gif
new file mode 100644
index 0000000..e253abc
Binary files /dev/null and b/wxParse/emojis/110.gif differ
diff --git a/wxParse/emojis/111.gif b/wxParse/emojis/111.gif
new file mode 100644
index 0000000..0c56723
Binary files /dev/null and b/wxParse/emojis/111.gif differ
diff --git a/wxParse/emojis/112.gif b/wxParse/emojis/112.gif
new file mode 100644
index 0000000..c8ddce8
Binary files /dev/null and b/wxParse/emojis/112.gif differ
diff --git a/wxParse/emojis/113.gif b/wxParse/emojis/113.gif
new file mode 100644
index 0000000..2727104
Binary files /dev/null and b/wxParse/emojis/113.gif differ
diff --git a/wxParse/emojis/114.gif b/wxParse/emojis/114.gif
new file mode 100644
index 0000000..53918e2
Binary files /dev/null and b/wxParse/emojis/114.gif differ
diff --git a/wxParse/emojis/115.gif b/wxParse/emojis/115.gif
new file mode 100644
index 0000000..4db3369
Binary files /dev/null and b/wxParse/emojis/115.gif differ
diff --git a/wxParse/emojis/116.gif b/wxParse/emojis/116.gif
new file mode 100644
index 0000000..57326bd
Binary files /dev/null and b/wxParse/emojis/116.gif differ
diff --git a/wxParse/emojis/117.gif b/wxParse/emojis/117.gif
new file mode 100644
index 0000000..14611b6
Binary files /dev/null and b/wxParse/emojis/117.gif differ
diff --git a/wxParse/emojis/118.gif b/wxParse/emojis/118.gif
new file mode 100644
index 0000000..8c25500
Binary files /dev/null and b/wxParse/emojis/118.gif differ
diff --git a/wxParse/emojis/119.gif b/wxParse/emojis/119.gif
new file mode 100644
index 0000000..65bb468
Binary files /dev/null and b/wxParse/emojis/119.gif differ
diff --git a/wxParse/emojis/12.gif b/wxParse/emojis/12.gif
new file mode 100644
index 0000000..547529c
Binary files /dev/null and b/wxParse/emojis/12.gif differ
diff --git a/wxParse/emojis/120.gif b/wxParse/emojis/120.gif
new file mode 100644
index 0000000..5ce77c0
Binary files /dev/null and b/wxParse/emojis/120.gif differ
diff --git a/wxParse/emojis/121.gif b/wxParse/emojis/121.gif
new file mode 100644
index 0000000..a021aba
Binary files /dev/null and b/wxParse/emojis/121.gif differ
diff --git a/wxParse/emojis/122.gif b/wxParse/emojis/122.gif
new file mode 100644
index 0000000..9a79e11
Binary files /dev/null and b/wxParse/emojis/122.gif differ
diff --git a/wxParse/emojis/123.gif b/wxParse/emojis/123.gif
new file mode 100644
index 0000000..b9480be
Binary files /dev/null and b/wxParse/emojis/123.gif differ
diff --git a/wxParse/emojis/124.gif b/wxParse/emojis/124.gif
new file mode 100644
index 0000000..7fed477
Binary files /dev/null and b/wxParse/emojis/124.gif differ
diff --git a/wxParse/emojis/125.gif b/wxParse/emojis/125.gif
new file mode 100644
index 0000000..e2c3c11
Binary files /dev/null and b/wxParse/emojis/125.gif differ
diff --git a/wxParse/emojis/126.gif b/wxParse/emojis/126.gif
new file mode 100644
index 0000000..24105c9
Binary files /dev/null and b/wxParse/emojis/126.gif differ
diff --git a/wxParse/emojis/127.gif b/wxParse/emojis/127.gif
new file mode 100644
index 0000000..0cead36
Binary files /dev/null and b/wxParse/emojis/127.gif differ
diff --git a/wxParse/emojis/128.gif b/wxParse/emojis/128.gif
new file mode 100644
index 0000000..3185861
Binary files /dev/null and b/wxParse/emojis/128.gif differ
diff --git a/wxParse/emojis/129.gif b/wxParse/emojis/129.gif
new file mode 100644
index 0000000..ffd7c6b
Binary files /dev/null and b/wxParse/emojis/129.gif differ
diff --git a/wxParse/emojis/13.gif b/wxParse/emojis/13.gif
new file mode 100644
index 0000000..3475300
Binary files /dev/null and b/wxParse/emojis/13.gif differ
diff --git a/wxParse/emojis/130.gif b/wxParse/emojis/130.gif
new file mode 100644
index 0000000..d828e3d
Binary files /dev/null and b/wxParse/emojis/130.gif differ
diff --git a/wxParse/emojis/131.gif b/wxParse/emojis/131.gif
new file mode 100644
index 0000000..dcb096f
Binary files /dev/null and b/wxParse/emojis/131.gif differ
diff --git a/wxParse/emojis/132.gif b/wxParse/emojis/132.gif
new file mode 100644
index 0000000..1b272a6
Binary files /dev/null and b/wxParse/emojis/132.gif differ
diff --git a/wxParse/emojis/133.gif b/wxParse/emojis/133.gif
new file mode 100644
index 0000000..0d0e864
Binary files /dev/null and b/wxParse/emojis/133.gif differ
diff --git a/wxParse/emojis/134.gif b/wxParse/emojis/134.gif
new file mode 100644
index 0000000..cf48356
Binary files /dev/null and b/wxParse/emojis/134.gif differ
diff --git a/wxParse/emojis/14.gif b/wxParse/emojis/14.gif
new file mode 100644
index 0000000..6a788f8
Binary files /dev/null and b/wxParse/emojis/14.gif differ
diff --git a/wxParse/emojis/15.gif b/wxParse/emojis/15.gif
new file mode 100644
index 0000000..debab8e
Binary files /dev/null and b/wxParse/emojis/15.gif differ
diff --git a/wxParse/emojis/16.gif b/wxParse/emojis/16.gif
new file mode 100644
index 0000000..ed5d29f
Binary files /dev/null and b/wxParse/emojis/16.gif differ
diff --git a/wxParse/emojis/17.gif b/wxParse/emojis/17.gif
new file mode 100644
index 0000000..85886fe
Binary files /dev/null and b/wxParse/emojis/17.gif differ
diff --git a/wxParse/emojis/18.gif b/wxParse/emojis/18.gif
new file mode 100644
index 0000000..b6af218
Binary files /dev/null and b/wxParse/emojis/18.gif differ
diff --git a/wxParse/emojis/19.gif b/wxParse/emojis/19.gif
new file mode 100644
index 0000000..e045ff2
Binary files /dev/null and b/wxParse/emojis/19.gif differ
diff --git a/wxParse/emojis/20.gif b/wxParse/emojis/20.gif
new file mode 100644
index 0000000..efd650f
Binary files /dev/null and b/wxParse/emojis/20.gif differ
diff --git a/wxParse/emojis/21.gif b/wxParse/emojis/21.gif
new file mode 100644
index 0000000..cb8cf6d
Binary files /dev/null and b/wxParse/emojis/21.gif differ
diff --git a/wxParse/emojis/22.gif b/wxParse/emojis/22.gif
new file mode 100644
index 0000000..96b04df
Binary files /dev/null and b/wxParse/emojis/22.gif differ
diff --git a/wxParse/emojis/23.gif b/wxParse/emojis/23.gif
new file mode 100644
index 0000000..96516b8
Binary files /dev/null and b/wxParse/emojis/23.gif differ
diff --git a/wxParse/emojis/24.gif b/wxParse/emojis/24.gif
new file mode 100644
index 0000000..5f925c7
Binary files /dev/null and b/wxParse/emojis/24.gif differ
diff --git a/wxParse/emojis/25.gif b/wxParse/emojis/25.gif
new file mode 100644
index 0000000..97f8b1a
Binary files /dev/null and b/wxParse/emojis/25.gif differ
diff --git a/wxParse/emojis/26.gif b/wxParse/emojis/26.gif
new file mode 100644
index 0000000..a7cded7
Binary files /dev/null and b/wxParse/emojis/26.gif differ
diff --git a/wxParse/emojis/27.gif b/wxParse/emojis/27.gif
new file mode 100644
index 0000000..bb46890
Binary files /dev/null and b/wxParse/emojis/27.gif differ
diff --git a/wxParse/emojis/28.gif b/wxParse/emojis/28.gif
new file mode 100644
index 0000000..f59dd58
Binary files /dev/null and b/wxParse/emojis/28.gif differ
diff --git a/wxParse/emojis/29.gif b/wxParse/emojis/29.gif
new file mode 100644
index 0000000..3c5227e
Binary files /dev/null and b/wxParse/emojis/29.gif differ
diff --git a/wxParse/emojis/30.gif b/wxParse/emojis/30.gif
new file mode 100644
index 0000000..e24a180
Binary files /dev/null and b/wxParse/emojis/30.gif differ
diff --git a/wxParse/emojis/31.gif b/wxParse/emojis/31.gif
new file mode 100644
index 0000000..073e743
Binary files /dev/null and b/wxParse/emojis/31.gif differ
diff --git a/wxParse/emojis/32.gif b/wxParse/emojis/32.gif
new file mode 100644
index 0000000..772eff2
Binary files /dev/null and b/wxParse/emojis/32.gif differ
diff --git a/wxParse/emojis/33.gif b/wxParse/emojis/33.gif
new file mode 100644
index 0000000..217c1c5
Binary files /dev/null and b/wxParse/emojis/33.gif differ
diff --git a/wxParse/emojis/34.gif b/wxParse/emojis/34.gif
new file mode 100644
index 0000000..e9d4213
Binary files /dev/null and b/wxParse/emojis/34.gif differ
diff --git a/wxParse/emojis/35.gif b/wxParse/emojis/35.gif
new file mode 100644
index 0000000..d6da2c3
Binary files /dev/null and b/wxParse/emojis/35.gif differ
diff --git a/wxParse/emojis/36.gif b/wxParse/emojis/36.gif
new file mode 100644
index 0000000..c1e6ac9
Binary files /dev/null and b/wxParse/emojis/36.gif differ
diff --git a/wxParse/emojis/37.gif b/wxParse/emojis/37.gif
new file mode 100644
index 0000000..92efec6
Binary files /dev/null and b/wxParse/emojis/37.gif differ
diff --git a/wxParse/emojis/38.gif b/wxParse/emojis/38.gif
new file mode 100644
index 0000000..489f0f9
Binary files /dev/null and b/wxParse/emojis/38.gif differ
diff --git a/wxParse/emojis/39.gif b/wxParse/emojis/39.gif
new file mode 100644
index 0000000..734f6d8
Binary files /dev/null and b/wxParse/emojis/39.gif differ
diff --git a/wxParse/emojis/40.gif b/wxParse/emojis/40.gif
new file mode 100644
index 0000000..24a8eb6
Binary files /dev/null and b/wxParse/emojis/40.gif differ
diff --git a/wxParse/emojis/41.gif b/wxParse/emojis/41.gif
new file mode 100644
index 0000000..99139e1
Binary files /dev/null and b/wxParse/emojis/41.gif differ
diff --git a/wxParse/emojis/42.gif b/wxParse/emojis/42.gif
new file mode 100644
index 0000000..f60897e
Binary files /dev/null and b/wxParse/emojis/42.gif differ
diff --git a/wxParse/emojis/43.gif b/wxParse/emojis/43.gif
new file mode 100644
index 0000000..4350491
Binary files /dev/null and b/wxParse/emojis/43.gif differ
diff --git a/wxParse/emojis/44.gif b/wxParse/emojis/44.gif
new file mode 100644
index 0000000..650d3dd
Binary files /dev/null and b/wxParse/emojis/44.gif differ
diff --git a/wxParse/emojis/45.gif b/wxParse/emojis/45.gif
new file mode 100644
index 0000000..5c8e071
Binary files /dev/null and b/wxParse/emojis/45.gif differ
diff --git a/wxParse/emojis/46.gif b/wxParse/emojis/46.gif
new file mode 100644
index 0000000..f3cb074
Binary files /dev/null and b/wxParse/emojis/46.gif differ
diff --git a/wxParse/emojis/47.gif b/wxParse/emojis/47.gif
new file mode 100644
index 0000000..5b3057a
Binary files /dev/null and b/wxParse/emojis/47.gif differ
diff --git a/wxParse/emojis/48.gif b/wxParse/emojis/48.gif
new file mode 100644
index 0000000..27a30c1
Binary files /dev/null and b/wxParse/emojis/48.gif differ
diff --git a/wxParse/emojis/49.gif b/wxParse/emojis/49.gif
new file mode 100644
index 0000000..dcfa48a
Binary files /dev/null and b/wxParse/emojis/49.gif differ
diff --git a/wxParse/emojis/50.gif b/wxParse/emojis/50.gif
new file mode 100644
index 0000000..029cf0f
Binary files /dev/null and b/wxParse/emojis/50.gif differ
diff --git a/wxParse/emojis/51.gif b/wxParse/emojis/51.gif
new file mode 100644
index 0000000..69f183f
Binary files /dev/null and b/wxParse/emojis/51.gif differ
diff --git a/wxParse/emojis/52.gif b/wxParse/emojis/52.gif
new file mode 100644
index 0000000..d41e8aa
Binary files /dev/null and b/wxParse/emojis/52.gif differ
diff --git a/wxParse/emojis/53.gif b/wxParse/emojis/53.gif
new file mode 100644
index 0000000..56352dd
Binary files /dev/null and b/wxParse/emojis/53.gif differ
diff --git a/wxParse/emojis/54.gif b/wxParse/emojis/54.gif
new file mode 100644
index 0000000..b28d848
Binary files /dev/null and b/wxParse/emojis/54.gif differ
diff --git a/wxParse/emojis/55.gif b/wxParse/emojis/55.gif
new file mode 100644
index 0000000..e18da84
Binary files /dev/null and b/wxParse/emojis/55.gif differ
diff --git a/wxParse/emojis/56.gif b/wxParse/emojis/56.gif
new file mode 100644
index 0000000..edf96f0
Binary files /dev/null and b/wxParse/emojis/56.gif differ
diff --git a/wxParse/emojis/57.gif b/wxParse/emojis/57.gif
new file mode 100644
index 0000000..3f0e2b9
Binary files /dev/null and b/wxParse/emojis/57.gif differ
diff --git a/wxParse/emojis/58.gif b/wxParse/emojis/58.gif
new file mode 100644
index 0000000..47b1aaa
Binary files /dev/null and b/wxParse/emojis/58.gif differ
diff --git a/wxParse/emojis/59.gif b/wxParse/emojis/59.gif
new file mode 100644
index 0000000..918288b
Binary files /dev/null and b/wxParse/emojis/59.gif differ
diff --git a/wxParse/emojis/60.gif b/wxParse/emojis/60.gif
new file mode 100644
index 0000000..66d2113
Binary files /dev/null and b/wxParse/emojis/60.gif differ
diff --git a/wxParse/emojis/61.gif b/wxParse/emojis/61.gif
new file mode 100644
index 0000000..034933e
Binary files /dev/null and b/wxParse/emojis/61.gif differ
diff --git a/wxParse/emojis/62.gif b/wxParse/emojis/62.gif
new file mode 100644
index 0000000..8d5c4fd
Binary files /dev/null and b/wxParse/emojis/62.gif differ
diff --git a/wxParse/emojis/63.gif b/wxParse/emojis/63.gif
new file mode 100644
index 0000000..d58fcf6
Binary files /dev/null and b/wxParse/emojis/63.gif differ
diff --git a/wxParse/emojis/64.gif b/wxParse/emojis/64.gif
new file mode 100644
index 0000000..c4e00bd
Binary files /dev/null and b/wxParse/emojis/64.gif differ
diff --git a/wxParse/emojis/65.gif b/wxParse/emojis/65.gif
new file mode 100644
index 0000000..da23bfa
Binary files /dev/null and b/wxParse/emojis/65.gif differ
diff --git a/wxParse/emojis/66.gif b/wxParse/emojis/66.gif
new file mode 100644
index 0000000..310ec65
Binary files /dev/null and b/wxParse/emojis/66.gif differ
diff --git a/wxParse/emojis/67.gif b/wxParse/emojis/67.gif
new file mode 100644
index 0000000..51761ba
Binary files /dev/null and b/wxParse/emojis/67.gif differ
diff --git a/wxParse/emojis/68.gif b/wxParse/emojis/68.gif
new file mode 100644
index 0000000..345cb43
Binary files /dev/null and b/wxParse/emojis/68.gif differ
diff --git a/wxParse/emojis/69.gif b/wxParse/emojis/69.gif
new file mode 100644
index 0000000..e0f28a0
Binary files /dev/null and b/wxParse/emojis/69.gif differ
diff --git a/wxParse/emojis/70.gif b/wxParse/emojis/70.gif
new file mode 100644
index 0000000..24284cf
Binary files /dev/null and b/wxParse/emojis/70.gif differ
diff --git a/wxParse/emojis/71.gif b/wxParse/emojis/71.gif
new file mode 100644
index 0000000..a0ccf2e
Binary files /dev/null and b/wxParse/emojis/71.gif differ
diff --git a/wxParse/emojis/72.gif b/wxParse/emojis/72.gif
new file mode 100644
index 0000000..7e113ee
Binary files /dev/null and b/wxParse/emojis/72.gif differ
diff --git a/wxParse/emojis/73.gif b/wxParse/emojis/73.gif
new file mode 100644
index 0000000..c0293c3
Binary files /dev/null and b/wxParse/emojis/73.gif differ
diff --git a/wxParse/emojis/74.gif b/wxParse/emojis/74.gif
new file mode 100644
index 0000000..1c52bde
Binary files /dev/null and b/wxParse/emojis/74.gif differ
diff --git a/wxParse/emojis/75.gif b/wxParse/emojis/75.gif
new file mode 100644
index 0000000..9cb9aa7
Binary files /dev/null and b/wxParse/emojis/75.gif differ
diff --git a/wxParse/emojis/76.gif b/wxParse/emojis/76.gif
new file mode 100644
index 0000000..27019f8
Binary files /dev/null and b/wxParse/emojis/76.gif differ
diff --git a/wxParse/emojis/77.gif b/wxParse/emojis/77.gif
new file mode 100644
index 0000000..8f882f5
Binary files /dev/null and b/wxParse/emojis/77.gif differ
diff --git a/wxParse/emojis/78.gif b/wxParse/emojis/78.gif
new file mode 100644
index 0000000..d0d0856
Binary files /dev/null and b/wxParse/emojis/78.gif differ
diff --git a/wxParse/emojis/79.gif b/wxParse/emojis/79.gif
new file mode 100644
index 0000000..61652a7
Binary files /dev/null and b/wxParse/emojis/79.gif differ
diff --git a/wxParse/emojis/80.gif b/wxParse/emojis/80.gif
new file mode 100644
index 0000000..9a77936
Binary files /dev/null and b/wxParse/emojis/80.gif differ
diff --git a/wxParse/emojis/81.gif b/wxParse/emojis/81.gif
new file mode 100644
index 0000000..2329101
Binary files /dev/null and b/wxParse/emojis/81.gif differ
diff --git a/wxParse/emojis/82.gif b/wxParse/emojis/82.gif
new file mode 100644
index 0000000..644748a
Binary files /dev/null and b/wxParse/emojis/82.gif differ
diff --git a/wxParse/emojis/83.gif b/wxParse/emojis/83.gif
new file mode 100644
index 0000000..fbf275b
Binary files /dev/null and b/wxParse/emojis/83.gif differ
diff --git a/wxParse/emojis/84.gif b/wxParse/emojis/84.gif
new file mode 100644
index 0000000..076f0c6
Binary files /dev/null and b/wxParse/emojis/84.gif differ
diff --git a/wxParse/emojis/85.gif b/wxParse/emojis/85.gif
new file mode 100644
index 0000000..d254af4
Binary files /dev/null and b/wxParse/emojis/85.gif differ
diff --git a/wxParse/emojis/86.gif b/wxParse/emojis/86.gif
new file mode 100644
index 0000000..8f09d33
Binary files /dev/null and b/wxParse/emojis/86.gif differ
diff --git a/wxParse/emojis/87.gif b/wxParse/emojis/87.gif
new file mode 100644
index 0000000..df70756
Binary files /dev/null and b/wxParse/emojis/87.gif differ
diff --git a/wxParse/emojis/88.gif b/wxParse/emojis/88.gif
new file mode 100644
index 0000000..4d8b15e
Binary files /dev/null and b/wxParse/emojis/88.gif differ
diff --git a/wxParse/emojis/89.gif b/wxParse/emojis/89.gif
new file mode 100644
index 0000000..05726dc
Binary files /dev/null and b/wxParse/emojis/89.gif differ
diff --git a/wxParse/emojis/90.gif b/wxParse/emojis/90.gif
new file mode 100644
index 0000000..adaf20e
Binary files /dev/null and b/wxParse/emojis/90.gif differ
diff --git a/wxParse/emojis/91.gif b/wxParse/emojis/91.gif
new file mode 100644
index 0000000..608d0ad
Binary files /dev/null and b/wxParse/emojis/91.gif differ
diff --git a/wxParse/emojis/92.gif b/wxParse/emojis/92.gif
new file mode 100644
index 0000000..b909e16
Binary files /dev/null and b/wxParse/emojis/92.gif differ
diff --git a/wxParse/emojis/93.gif b/wxParse/emojis/93.gif
new file mode 100644
index 0000000..7f71a8c
Binary files /dev/null and b/wxParse/emojis/93.gif differ
diff --git a/wxParse/emojis/94.gif b/wxParse/emojis/94.gif
new file mode 100644
index 0000000..4f26d7d
Binary files /dev/null and b/wxParse/emojis/94.gif differ
diff --git a/wxParse/emojis/95.gif b/wxParse/emojis/95.gif
new file mode 100644
index 0000000..5ef6d38
Binary files /dev/null and b/wxParse/emojis/95.gif differ
diff --git a/wxParse/emojis/96.gif b/wxParse/emojis/96.gif
new file mode 100644
index 0000000..2b709e1
Binary files /dev/null and b/wxParse/emojis/96.gif differ
diff --git a/wxParse/emojis/97.gif b/wxParse/emojis/97.gif
new file mode 100644
index 0000000..cf29be8
Binary files /dev/null and b/wxParse/emojis/97.gif differ
diff --git a/wxParse/emojis/98.gif b/wxParse/emojis/98.gif
new file mode 100644
index 0000000..c70e7d3
Binary files /dev/null and b/wxParse/emojis/98.gif differ
diff --git a/wxParse/emojis/99.gif b/wxParse/emojis/99.gif
new file mode 100644
index 0000000..05c1863
Binary files /dev/null and b/wxParse/emojis/99.gif differ
diff --git a/wxParse/html2json.js b/wxParse/html2json.js
index c252e79..6909559 100644
--- a/wxParse/html2json.js
+++ b/wxParse/html2json.js
@@ -1,4 +1,7 @@
 /**
+ * html2Json 改造来自: https://github.com/Jxck/html2json
+ * 
+ * 
  * author: Di (微信小程序开发工程师)
  * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
  *               垂直微信小程序开发交流社区
@@ -8,170 +11,293 @@
  * for: 微信小程序富文本解析
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */
-  var HTMLParser = require('htmlparser.js');
 
-  function q(v) {
+var __placeImgeUrlHttps = "https";
+var __emojisReg = '';
+var __emojisBaseSrc = '';
+var __emojis = {};
+var wxDiscode = require('./wxDiscode.js');
+var HTMLParser = require('./htmlparser.js');
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
+// Block Elements - HTML 5
+var block = makeMap("br,a,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
+
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
+
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
+
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
+function makeMap(str) {
+    var obj = {}, items = str.split(",");
+    for (var i = 0; i < items.length; i++)
+        obj[items[i]] = true;
+    return obj;
+}
+
+function q(v) {
     return '"' + v + '"';
-  }
+}
 
-  function removeDOCTYPE(html) {
+function removeDOCTYPE(html) {
     return html
-      .replace(/<\?xml.*\?>\n/, '')
-      .replace(/<!doctype.*\>\n/, '')
-      .replace(/<!DOCTYPE.*\>\n/, '');
-  }
+        .replace(/<\?xml.*\?>\n/, '')
+        .replace(/<.*!doctype.*\>\n/, '')
+        .replace(/<.*!DOCTYPE.*\>\n/, '');
+}
+
+function trimHtml(html) {
+  return html
+        .replace(/\r?\n+/g, '')
+        .replace(/<!--.*?-->/ig, '')
+        .replace(/\/\*.*?\*\//ig, '')
+        .replace(/[ ]+</ig, '<')
+}
 
-  function html2json(html) {
+
+function html2json(html, bindName) {
+    //处理字符串
     html = removeDOCTYPE(html);
+    html = trimHtml(html);
+    html = wxDiscode.strDiscode(html);
+    //生成node节点
     var bufArray = [];
     var results = {
-      node: 'root',
-      child: [],
+        node: bindName,
+        nodes: [],
+        images:[],
+        imageUrls:[]
     };
+    var index = 0;
     HTMLParser(html, {
-      start: function(tag, attrs, unary) {
-        //debug(tag, attrs, unary);
-        // node for this element
-        var node = {
-          node: 'element',
-          tag: tag,
-        };
-        if (attrs.length !== 0) {
-          node.attr = attrs.reduce(function(pre, attr) {
-            var name = attr.name;
-            var value = attr.value;
-
-            // has multi attibutes
-            // make it array of attribute
-            if (value.match(/ /)) {
-              value = value.split(' ');
-            }
+        start: function (tag, attrs, unary) {
+            //debug(tag, attrs, unary);
+            // node for this element
+            var node = {
+                node: 'element',
+                tag: tag,
+            };
 
-            // if attr already exists
-            // merge it
-            if (pre[name]) {
-              if (Array.isArray(pre[name])) {
-                // already array, push to last
-                pre[name].push(value);
-              } else {
-                // single value, make it array
-                pre[name] = [pre[name], value];
-              }
+            if (bufArray.length === 0) {
+                node.index = index.toString()
+                index += 1
             } else {
-              // not exist, put it
-              pre[name] = value;
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                node.index = parent.index + '.' + parent.nodes.length
             }
 
-            return pre;
-          }, {});
-        }
-        if (unary) {
-          // if this tag dosen't have end tag
-          // like <img src="hoge.png"/>
-          // add to parents
-          var parent = bufArray[0] || results;
-          if (parent.child === undefined) {
-            parent.child = [];
-          }
-          parent.child.push(node);
-        } else {
-          bufArray.unshift(node);
-        }
-      },
-      end: function(tag) {
-        //debug(tag);
-        // merge into parent tag
-        var node = bufArray.shift();
-        if (node.tag !== tag) console.error('invalid state: mismatch end tag');
-
-        if (bufArray.length === 0) {
-          results.child.push(node);
-        } else {
-          var parent = bufArray[0];
-          if (parent.child === undefined) {
-            parent.child = [];
-          }
-          parent.child.push(node);
-        }
-      },
-      chars: function(text) {
-        //debug(text);
-        var node = {
-          node: 'text',
-          text: text,
-        };
-        if (bufArray.length === 0) {
-          results.child.push(node);
-        } else {
-          var parent = bufArray[0];
-          if (parent.child === undefined) {
-            parent.child = [];
-          }
-          parent.child.push(node);
-        }
-      },
-      comment: function(text) {
-        //debug(text);
-        var node = {
-          node: 'comment',
-          text: text,
-        };
-        var parent = bufArray[0];
-        if (parent.child === undefined) {
-          parent.child = [];
-        }
-        parent.child.push(node);
-      },
-    });
-    return results;
-  };
+            if (block[tag]) {
+                node.tagType = "block";
+            } else if (inline[tag]) {
+                node.tagType = "inline";
+            } else if (closeSelf[tag]) {
+                node.tagType = "closeSelf";
+            }
 
-  function json2html(json) {
-    // Empty Elements - HTML 4.01
-    var empty = ['area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'embed'];
+            if (attrs.length !== 0) {
+                node.attr = attrs.reduce(function (pre, attr) {
+                    var name = attr.name;
+                    var value = attr.value;
+                    if (name == 'class') {
+                        console.dir(value);
+                        //  value = value.join("")
+                        node.classStr = value;
+                    }
+                    // has multi attibutes
+                    // make it array of attribute
+                    if (name == 'style') {
+                        console.dir(value);
+                        //  value = value.join("")
+                        node.styleStr = value;
+                    }
+                    if (value.match(/ /)) {
+                        value = value.split(' ');
+                    }
+                    
 
-    var child = '';
-    if (json.child) {
-      child = json.child.map(function(c) {
-        return json2html(c);
-      }).join('');
-    }
+                    // if attr already exists
+                    // merge it
+                    if (pre[name]) {
+                        if (Array.isArray(pre[name])) {
+                            // already array, push to last
+                            pre[name].push(value);
+                        } else {
+                            // single value, make it array
+                            pre[name] = [pre[name], value];
+                        }
+                    } else {
+                        // not exist, put it
+                        pre[name] = value;
+                    }
 
-    var attr = '';
-    if (json.attr) {
-      attr = Object.keys(json.attr).map(function(key) {
-        var value = json.attr[key];
-        if (Array.isArray(value)) value = value.join(' ');
-        return key + '=' + q(value);
-      }).join(' ');
-      if (attr !== '') attr = ' ' + attr;
-    }
+                    return pre;
+                }, {});
+            }
 
-    if (json.node === 'element') {
-      var tag = json.tag;
-      if (empty.indexOf(tag) > -1) {
-        // empty element
-        return '<' + json.tag + attr + '/>';
-      }
-
-      // non empty element
-      var open = '<' + json.tag + attr + '>';
-      var close = '</' + json.tag + '>';
-      return open + child + close;
-    }
+            //对img添加额外数据
+            if (node.tag === 'img') {
+                node.imgIndex = results.images.length;
+                var imgUrl = node.attr.src;
+                if (imgUrl[0] == '') {
+                    imgUrl.splice(0, 1);
+                }
+                imgUrl = wxDiscode.urlToHttpUrl(imgUrl, __placeImgeUrlHttps);
+                node.attr.src = imgUrl;
+                node.from = bindName;
+                results.images.push(node);
+                results.imageUrls.push(imgUrl);
+            }
+            
+            // 处理font标签样式属性
+            if (node.tag === 'font') {
+                var fontSize = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
+                var styleAttrs = {
+                    'color': 'color',
+                    'face': 'font-family',
+                    'size': 'font-size'
+                };
+                if (!node.attr.style) node.attr.style = [];
+                if (!node.styleStr) node.styleStr = '';
+                for (var key in styleAttrs) {
+                    if (node.attr[key]) {
+                        var value = key === 'size' ? fontSize[node.attr[key]-1] : node.attr[key];
+                        node.attr.style.push(styleAttrs[key]);
+                        node.attr.style.push(value);
+                        node.styleStr += styleAttrs[key] + ': ' + value + ';';
+                    }
+                }
+            }
 
-    if (json.node === 'text') {
-      return json.text;
-    }
+            //临时记录source资源
+            if(node.tag === 'source'){
+                results.source = node.attr.src;
+            }
+            
+            if (unary) {
+                // if this tag doesn't have end tag
+                // like <img src="hoge.png"/>
+                // add to parents
+                var parent = bufArray[0] || results;
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            } else {
+                bufArray.unshift(node);
+            }
+        },
+        end: function (tag) {
+            //debug(tag);
+            // merge into parent tag
+            var node = bufArray.shift();
+            if (node.tag !== tag) console.error('invalid state: mismatch end tag');
 
-    if (json.node === 'comment') {
-      return '<!--' + json.text + '-->';
-    }
+            //当有缓存source资源时于于video补上src资源
+            if(node.tag === 'video' && results.source){
+                node.attr.src = results.source;
+                delete results.source;
+            }
+            
+            if (bufArray.length === 0) {
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                parent.nodes.push(node);
+            }
+        },
+        chars: function (text) {
+            //debug(text);
+            var node = {
+                node: 'text',
+                text: text,
+                textArray:transEmojiStr(text)
+            };
+            
+            if (bufArray.length === 0) {
+                node.index = index.toString()
+                index += 1
+                results.nodes.push(node);
+            } else {
+                var parent = bufArray[0];
+                if (parent.nodes === undefined) {
+                    parent.nodes = [];
+                }
+                node.index = parent.index + '.' + parent.nodes.length
+                parent.nodes.push(node);
+            }
+        },
+        comment: function (text) {
+            //debug(text);
+            // var node = {
+            //     node: 'comment',
+            //     text: text,
+            // };
+            // var parent = bufArray[0];
+            // if (parent.nodes === undefined) {
+            //     parent.nodes = [];
+            // }
+            // parent.nodes.push(node);
+        },
+    });
+    return results;
+};
 
-    if (json.node === 'root') {
-      return child;
+function transEmojiStr(str){
+  // var eReg = new RegExp("["+__reg+' '+"]");
+//   str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  
+  var emojiObjs = [];
+  //如果正则表达式为空
+  if(__emojisReg.length == 0 || !__emojis){
+      var emojiObj = {}
+      emojiObj.node = "text";
+      emojiObj.text = str;
+      array = [emojiObj];
+      return array;
+  }
+  //这个地方需要调整
+  str = str.replace(/\[([^\[\]]+)\]/g,':$1:')
+  var eReg = new RegExp("[:]");
+  var array = str.split(eReg);
+  for(var i = 0; i < array.length; i++){
+    var ele = array[i];
+    var emojiObj = {};
+    if(__emojis[ele]){
+      emojiObj.node = "element";
+      emojiObj.tag = "emoji";
+      emojiObj.text = __emojis[ele];
+      emojiObj.baseSrc= __emojisBaseSrc;
+    }else{
+      emojiObj.node = "text";
+      emojiObj.text = ele;
     }
-  };
-
-  module.exports = html2json;
+    emojiObjs.push(emojiObj);
+  }
   
+  return emojiObjs;
+}
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+    __emojisReg = reg;
+    __emojisBaseSrc=baseSrc;
+    __emojis=emojis;
+}
+
+module.exports = {
+    html2json: html2json,
+    emojisInit:emojisInit
+};
+
diff --git a/wxParse/htmlparser.js b/wxParse/htmlparser.js
index 2837365..811ddac 100644
--- a/wxParse/htmlparser.js
+++ b/wxParse/htmlparser.js
@@ -1,4 +1,7 @@
 /**
+ * 
+ * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser
+ * 
  * author: Di (微信小程序开发工程师)
  * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
  *               垂直微信小程序开发交流社区
@@ -8,306 +11,182 @@
  * for: 微信小程序富文本解析
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */
-	// Regular Expressions for parsing tags and attributes
-	var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
-		endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,
-		attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
-
-	// Empty Elements - HTML 5
-	var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
-
-	// Block Elements - HTML 5
-	var block = makeMap("a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
-
-	// Inline Elements - HTML 5
-	var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
-
-	// Elements that you can, intentionally, leave open
-	// (and which close themselves)
-	var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
-
-	// Attributes that have their values filled in disabled="disabled"
-	var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
-
-	// Special Elements (can contain anything)
-	var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
-
-	function HTMLParser(html, handler) {
-		var index, chars, match, stack = [], last = html;
-		stack.last = function () {
-			return this[this.length - 1];
-		};
-
-		while (html) {
-			chars = true;
-
-			// Make sure we're not in a script or style element
-			if (!stack.last() || !special[stack.last()]) {
-
-				// Comment
-				if (html.indexOf("<!--") == 0) {
-					index = html.indexOf("-->");
-
-					if (index >= 0) {
-						if (handler.comment)
-							handler.comment(html.substring(4, index));
-						html = html.substring(index + 3);
-						chars = false;
-					}
-
-					// end tag
-				} else if (html.indexOf("</") == 0) {
-					match = html.match(endTag);
-
-					if (match) {
-						html = html.substring(match[0].length);
-						match[0].replace(endTag, parseEndTag);
-						chars = false;
-					}
-
-					// start tag
-				} else if (html.indexOf("<") == 0) {
-					match = html.match(startTag);
-
-					if (match) {
-						html = html.substring(match[0].length);
-						match[0].replace(startTag, parseStartTag);
-						chars = false;
-					}
-				}
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/,
+	endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/,
+	attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
 
-				if (chars) {
-					index = html.indexOf("<");
+// Empty Elements - HTML 5
+var empty = makeMap("area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr");
 
-					var text = index < 0 ? html : html.substring(0, index);
-					html = index < 0 ? "" : html.substring(index);
+// Block Elements - HTML 5
+var block = makeMap("a,address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video");
 
-					if (handler.chars)
-						handler.chars(text);
-				}
+// Inline Elements - HTML 5
+var inline = makeMap("abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var");
 
-			} else {
-				
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+var closeSelf = makeMap("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");
 
-				// if(special[stack.last()]){
-				// 	console.log("code");
-				// }else{
-				// 	html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
-				// 		text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
-				// 		if (handler.chars)
-				// 			handler.chars(text);
+// Attributes that have their values filled in disabled="disabled"
+var fillAttrs = makeMap("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected");
 
-				// 		return "";
-				// 	});
-				// }
+// Special Elements (can contain anything)
+var special = makeMap("wxxxcode-style,script,style,view,scroll-view,block");
 
-				html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
-						text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
-						if (handler.chars)
-							handler.chars(text);
+function HTMLParser(html, handler) {
+	var index, chars, match, stack = [], last = html;
+	stack.last = function () {
+		return this[this.length - 1];
+	};
 
-						return "";
-					});
+	while (html) {
+		chars = true;
 
-				
-				parseEndTag("", stack.last());
-			}
+		// Make sure we're not in a script or style element
+		if (!stack.last() || !special[stack.last()]) {
 
-			if (html == last)
-				throw "Parse Error: " + html;
-			last = html;
-		}
+			// Comment
+			if (html.indexOf("<!--") == 0) {
+				index = html.indexOf("-->");
 
-		// Clean up any remaining tags
-		parseEndTag();
+				if (index >= 0) {
+					if (handler.comment)
+						handler.comment(html.substring(4, index));
+					html = html.substring(index + 3);
+					chars = false;
+				}
 
-		function parseStartTag(tag, tagName, rest, unary) {
-			tagName = tagName.toLowerCase();
+				// end tag
+			} else if (html.indexOf("</") == 0) {
+				match = html.match(endTag);
 
-			if (block[tagName]) {
-				while (stack.last() && inline[stack.last()]) {
-					parseEndTag("", stack.last());
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(endTag, parseEndTag);
+					chars = false;
 				}
-			}
 
-			if (closeSelf[tagName] && stack.last() == tagName) {
-				parseEndTag("", tagName);
+				// start tag
+			} else if (html.indexOf("<") == 0) {
+				match = html.match(startTag);
+
+				if (match) {
+					html = html.substring(match[0].length);
+					match[0].replace(startTag, parseStartTag);
+					chars = false;
+				}
 			}
 
-			unary = empty[tagName] || !!unary;
+			if (chars) {
+				index = html.indexOf("<");
+				var text = ''
+				while (index === 0) {
+                                  text += "<";
+                                  html = html.substring(1);
+                                  index = html.indexOf("<");
+				}
+				text += index < 0 ? html : html.substring(0, index);
+				html = index < 0 ? "" : html.substring(index);
 
-			if (!unary)
-				stack.push(tagName);
+				if (handler.chars)
+					handler.chars(text);
+			}
 
-			if (handler.start) {
-				var attrs = [];
+		} else {
 
-				rest.replace(attr, function (match, name) {
-					var value = arguments[2] ? arguments[2] :
-						arguments[3] ? arguments[3] :
-						arguments[4] ? arguments[4] :
-						fillAttrs[name] ? name : "";
+			html = html.replace(new RegExp("([\\s\\S]*?)<\/" + stack.last() + "[^>]*>"), function (all, text) {
+				text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, "$1$2");
+				if (handler.chars)
+					handler.chars(text);
 
-					attrs.push({
-						name: name,
-						value: value,
-						escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
-					});
-				});
+				return "";
+			});
 
-				if (handler.start)
-					handler.start(tagName, attrs, unary);
-			}
-		}
 
-		function parseEndTag(tag, tagName) {
-			// If no tag name is provided, clean shop
-			if (!tagName)
-				var pos = 0;
-
-				// Find the closest opened tag of the same type
-			else
-				for (var pos = stack.length - 1; pos >= 0; pos--)
-					if (stack[pos] == tagName)
-						break;
-
-			if (pos >= 0) {
-				// Close all the open elements, up the stack
-				for (var i = stack.length - 1; i >= pos; i--)
-					if (handler.end)
-						handler.end(stack[i]);
-
-				// Remove the open elements from the stack
-				stack.length = pos;
-			}
+			parseEndTag("", stack.last());
 		}
-	};
 
-	function HTMLtoXML(html) {
-		var results = "";
-
-		HTMLParser(html, {
-			start: function (tag, attrs, unary) {
-				results += "<" + tag;
-
-				for (var i = 0; i < attrs.length; i++)
-					results += " " + attrs[i].name + '="' + attrs[i].escaped + '"';
-				results += ">";
-			},
-			end: function (tag) {
-				results += "</" + tag + ">";
-			},
-			chars: function (text) {
-				results += text;
-			},
-			comment: function (text) {
-				results += "<!--" + text + "-->";
+		if (html == last)
+			throw "Parse Error: " + html;
+		last = html;
+	}
+
+	// Clean up any remaining tags
+	parseEndTag();
+
+	function parseStartTag(tag, tagName, rest, unary) {
+		tagName = tagName.toLowerCase();
+
+		if (block[tagName]) {
+			while (stack.last() && inline[stack.last()]) {
+				parseEndTag("", stack.last());
 			}
-		});
+		}
 
-		return results;
-	};
+		if (closeSelf[tagName] && stack.last() == tagName) {
+			parseEndTag("", tagName);
+		}
 
-	function HTMLtoDOM(html, doc) {
-		// There can be only one of these elements
-		var one = makeMap("html,head,body,title");
-
-		// Enforce a structure for the document
-		var structure = {
-			link: "head",
-			base: "head"
-		};
-
-		if (!doc) {
-			if (typeof DOMDocument != "undefined")
-				doc = new DOMDocument();
-			else if (typeof document != "undefined" && document.implementation && document.implementation.createDocument)
-				doc = document.implementation.createDocument("", "", null);
-			else if (typeof ActiveX != "undefined")
-				doc = new ActiveXObject("Msxml.DOMDocument");
-
-		} else
-			doc = doc.ownerDocument ||
-				doc.getOwnerDocument && doc.getOwnerDocument() ||
-				doc;
-
-		var elems = [],
-			documentElement = doc.documentElement ||
-				doc.getDocumentElement && doc.getDocumentElement();
-
-		// If we're dealing with an empty document then we
-		// need to pre-populate it with the HTML document structure
-		if (!documentElement && doc.createElement) (function () {
-			var html = doc.createElement("html");
-			var head = doc.createElement("head");
-			head.appendChild(doc.createElement("title"));
-			html.appendChild(head);
-			html.appendChild(doc.createElement("body"));
-			doc.appendChild(html);
-		})();
-
-		// Find all the unique elements
-		if (doc.getElementsByTagName)
-			for (var i in one)
-				one[i] = doc.getElementsByTagName(i)[0];
-
-		// If we're working with a document, inject contents into
-		// the body element
-		var curParentNode = one.body;
-
-		HTMLParser(html, {
-			start: function (tagName, attrs, unary) {
-				// If it's a pre-built element, then we can ignore
-				// its construction
-				if (one[tagName]) {
-					curParentNode = one[tagName];
-					if (!unary) {
-						elems.push(curParentNode);
-					}
-					return;
-				}
+		unary = empty[tagName] || !!unary;
 
-				var elem = doc.createElement(tagName);
+		if (!unary)
+			stack.push(tagName);
 
-				for (var attr in attrs)
-					elem.setAttribute(attrs[attr].name, attrs[attr].value);
+		if (handler.start) {
+			var attrs = [];
 
-				if (structure[tagName] && typeof one[structure[tagName]] != "boolean")
-					one[structure[tagName]].appendChild(elem);
+			rest.replace(attr, function (match, name) {
+				var value = arguments[2] ? arguments[2] :
+					arguments[3] ? arguments[3] :
+						arguments[4] ? arguments[4] :
+							fillAttrs[name] ? name : "";
 
-				else if (curParentNode && curParentNode.appendChild)
-					curParentNode.appendChild(elem);
+				attrs.push({
+					name: name,
+					value: value,
+					escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') //"
+				});
+			});
 
-				if (!unary) {
-					elems.push(elem);
-					curParentNode = elem;
-				}
-			},
-			end: function (tag) {
-				elems.length -= 1;
-
-				// Init the new parentNode
-				curParentNode = elems[elems.length - 1];
-			},
-			chars: function (text) {
-				curParentNode.appendChild(doc.createTextNode(text));
-			},
-			comment: function (text) {
-				// create comment node
+			if (handler.start) {
+				handler.start(tagName, attrs, unary);
 			}
-		});
 
-		return doc;
-	};
+		}
+	}
+
+	function parseEndTag(tag, tagName) {
+		// If no tag name is provided, clean shop
+		if (!tagName)
+			var pos = 0;
 
-	function makeMap(str) {
-		var obj = {}, items = str.split(",");
-		for (var i = 0; i < items.length; i++)
-			obj[items[i]] = true;
-		return obj;
+		// Find the closest opened tag of the same type
+		else {
+			tagName = tagName.toLowerCase();
+			for (var pos = stack.length - 1; pos >= 0; pos--)
+				if (stack[pos] == tagName)
+					break;
+		}
+		if (pos >= 0) {
+			// Close all the open elements, up the stack
+			for (var i = stack.length - 1; i >= pos; i--)
+				if (handler.end)
+					handler.end(stack[i]);
+
+			// Remove the open elements from the stack
+			stack.length = pos;
+		}
 	}
+};
 
 
-	// CommonJS/nodeJS Loader
+function makeMap(str) {
+	var obj = {}, items = str.split(",");
+	for (var i = 0; i < items.length; i++)
+		obj[items[i]] = true;
+	return obj;
+}
 
-	module.exports = HTMLParser;
+module.exports = HTMLParser;
diff --git a/wxParse/showdown.js b/wxParse/showdown.js
index 6973d14..d29206d 100644
--- a/wxParse/showdown.js
+++ b/wxParse/showdown.js
@@ -1,4 +1,7 @@
 /**
+ * 
+ * showdown: https://github.com/showdownjs/showdown
+ * 
  * author: Di (微信小程序开发工程师)
  * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
  *               垂直微信小程序开发交流社区
@@ -8,11 +11,6 @@
  * for: 微信小程序富文本解析
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */
-;/*! showdown 19-08-2016 */
-(function(){
-/**
- * Created by Tivie on 13-07-2015.
- */
 
 function getDefaultOpts(simple) {
   'use strict';
@@ -2531,24 +2529,4 @@ showdown.subParser('unescapeSpecialChars', function (text) {
   });
   return text;
 });
-
-var root = this;
-
-// CommonJS/nodeJS Loader
-if (typeof module !== 'undefined' && module.exports) {
-  module.exports = showdown;
-
-// AMD Loader
-} else if (typeof define === 'function' && define.amd) {
-  define(function () {
-    'use strict';
-    return showdown;
-  });
-
-// Regular Browser loader
-} else {
-  root.showdown = showdown;
-}
-}).call(this);
-
-//# sourceMappingURL=showdown.js.map
+module.exports = showdown;
diff --git a/wxParse/wxDiscode.js b/wxParse/wxDiscode.js
index 28c3072..fca29bb 100644
--- a/wxParse/wxDiscode.js
+++ b/wxParse/wxDiscode.js
@@ -95,7 +95,7 @@ function strGreeceDiscode(str){
     str = str.replace(/&thetasym;/g, 'ϑ');
     str = str.replace(/&upsih;/g, 'ϒ');
     str = str.replace(/&piv;/g, 'ϖ');
-
+    str = str.replace(/&middot;/g, '·');
     return str;
 }
 
@@ -104,10 +104,14 @@ function strGreeceDiscode(str){
 function strcharacterDiscode(str){
     // 加入常用解析
     str = str.replace(/&nbsp;/g, ' ');
-    str = str.replace(/&quot;/g, '"');
+    str = str.replace(/&quot;/g, "'");
     str = str.replace(/&amp;/g, '&');
+    // str = str.replace(/&lt;/g, '‹');
+    // str = str.replace(/&gt;/g, '›');
+
     str = str.replace(/&lt;/g, '<');
     str = str.replace(/&gt;/g, '>');
+    str = str.replace(/&#8226;/g, '•');
 
     return str;
 }
@@ -167,13 +171,14 @@ function strOtherDiscode(str){
     str = str.replace(/&hearts;/g, '♥');
 
     str = str.replace(/&diams;/g, '♦');
-
+    str = str.replace(/&#39;/g, '\'');
     return str;
 }
 
 function strMoreDiscode(str){
     str = str.replace(/\r\n/g,"");  
-    str = str.replace(/\n\n/g,"\n");
+    str = str.replace(/\n/g,"");
+
     str = str.replace(/code/g,"wxxxcode-style");
     return str;
 }
@@ -186,7 +191,17 @@ function strDiscode(str){
     str = strMoreDiscode(str);
     return str;
 }
+function urlToHttpUrl(url,rep){
+    
+    var patt1 = new RegExp("^//");
+    var result = patt1.test(url);
+    if(result){
+        url = rep+":"+url;
+    }
+    return  url;
+}
 
 module.exports = {
-    strDiscode:strDiscode
+    strDiscode:strDiscode,
+    urlToHttpUrl:urlToHttpUrl
 }
\ No newline at end of file
diff --git a/wxParse/wxParse.js b/wxParse/wxParse.js
index a0afab0..379f2f6 100644
--- a/wxParse/wxParse.js
+++ b/wxParse/wxParse.js
@@ -9,34 +9,151 @@
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */
 
-
-var showdown = require('showdown.js');
-var HtmlToJson = require('html2json.js');
-var wxDiscode = require('wxDiscode.js');
-//type 'json','html','markdown'/'md'
-
-function wxParse(type,data){
-  var wxParseData = [];
-  if(type == 'json'){
-    var json = HtmlToJson(html);
-	  console.log(JSON.stringify(json, ' ', ' '));
-    wxParseData = json.child;
-  }else if(type == 'html'){
-    data = wxDiscode.strDiscode(data);
-    var json = HtmlToJson(data);
-	  console.log(JSON.stringify(json, ' ', ' '));
-    wxParseData = json.child;
-  }else if(type == 'md' || type == 'markdown'){
+/**
+ * utils函数引入
+ **/
+import showdown from './showdown.js';
+import HtmlToJson from './html2json.js';
+/**
+ * 配置及公有属性
+ **/
+var realWindowWidth = 0;
+var realWindowHeight = 0;
+wx.getSystemInfo({
+  success: function (res) {
+    realWindowWidth = res.windowWidth
+    realWindowHeight = res.windowHeight
+  }
+})
+/**
+ * 主函数入口区
+ **/
+function wxParse(bindName = 'wxParseData', type='html', data='<div class="color:red;">数据不能为空</div>', target,imagePadding) {
+  var that = target;
+  var transData = {};//存放转化后的数据
+  if (type == 'html') {
+    transData = HtmlToJson.html2json(data, bindName);
+    console.log(JSON.stringify(transData, ' ', ' '));
+  } else if (type == 'md' || type == 'markdown') {
     var converter = new showdown.Converter();
-    var html      = converter.makeHtml(data);
-    html = wxDiscode.strDiscode(html);
-    var json = HtmlToJson(html);
-	  console.log(JSON.stringify(json, ' ', ' '));
-    wxParseData = json.child;
+    var html = converter.makeHtml(data);
+    transData = HtmlToJson.html2json(html, bindName);
+    console.log(JSON.stringify(transData, ' ', ' '));
+  }
+  transData.view = {};
+  transData.view.imagePadding = 0;
+  if(typeof(imagePadding) != 'undefined'){
+    transData.view.imagePadding = imagePadding
+  }
+  var bindData = {};
+  bindData[bindName] = transData;
+  that.setData(bindData)
+  that.wxParseImgLoad = wxParseImgLoad;
+  that.wxParseImgTap = wxParseImgTap;
+}
+// 图片点击事件
+function wxParseImgTap(e) {
+  var that = this;
+  var nowImgUrl = e.target.dataset.src;
+  var tagFrom = e.target.dataset.from;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    wx.previewImage({
+      current: nowImgUrl, // 当前显示图片的http链接
+      urls: that.data[tagFrom].imageUrls // 需要预览的图片http链接列表
+    })
   }
+}
+
+/**
+ * 图片视觉宽高计算函数区 
+ **/
+function wxParseImgLoad(e) {
+  var that = this;
+  var tagFrom = e.target.dataset.from;
+  var idx = e.target.dataset.idx;
+  if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
+    calMoreImageInfo(e, idx, that, tagFrom)
+  } 
+}
+// 假循环获取计算图片视觉最佳宽高
+function calMoreImageInfo(e, idx, that, bindName) {
+  var temData = that.data[bindName];
+  if (!temData || temData.images.length == 0) {
+    return;
+  }
+  var temImages = temData.images;
+  //因为无法获取view宽度 需要自定义padding进行计算，稍后处理
+  var recal = wxAutoImageCal(e.detail.width, e.detail.height,that,bindName); 
+  // temImages[idx].width = recal.imageWidth;
+  // temImages[idx].height = recal.imageheight; 
+  // temData.images = temImages;
+  // var bindData = {};
+  // bindData[bindName] = temData;
+  // that.setData(bindData);
+  var index = temImages[idx].index
+  var key = `${bindName}`
+  for (var i of index.split('.')) key+=`.nodes[${i}]`
+  var keyW = key + '.width'
+  var keyH = key + '.height'
+  that.setData({
+    [keyW]: recal.imageWidth,
+    [keyH]: recal.imageheight,
+  })
+}
+
+// 计算视觉优先的图片宽高
+function wxAutoImageCal(originalWidth, originalHeight,that,bindName) {
+  //获取图片的原始长宽
+  var windowWidth = 0, windowHeight = 0;
+  var autoWidth = 0, autoHeight = 0;
+  var results = {};
+  var padding = that.data[bindName].view.imagePadding;
+  windowWidth = realWindowWidth-2*padding;
+  windowHeight = realWindowHeight;
+  //判断按照那种方式进行缩放
+  // console.log("windowWidth" + windowWidth);
+  if (originalWidth > windowWidth) {//在图片width大于手机屏幕width时候
+    autoWidth = windowWidth;
+    // console.log("autoWidth" + autoWidth);
+    autoHeight = (autoWidth * originalHeight) / originalWidth;
+    // console.log("autoHeight" + autoHeight);
+    results.imageWidth = autoWidth;
+    results.imageheight = autoHeight;
+  } else {//否则展示原来的数据
+    results.imageWidth = originalWidth;
+    results.imageheight = originalHeight;
+  }
+  return results;
+}
+
+function wxParseTemArray(temArrayName,bindNameReg,total,that){
+  var array = [];
+  var temData = that.data;
+  var obj = null;
+  for(var i = 0; i < total; i++){
+    var simArr = temData[bindNameReg+i].nodes;
+    array.push(simArr);
+  }
+
+  temArrayName = temArrayName || 'wxParseTemArray';
+  obj = JSON.parse('{"'+ temArrayName +'":""}');
+  obj[temArrayName] = array;
+  that.setData(obj);
+}
+
+/**
+ * 配置emojis
+ * 
+ */
+
+function emojisInit(reg='',baseSrc="/wxParse/emojis/",emojis){
+   HtmlToJson.emojisInit(reg,baseSrc,emojis);
+}
 
-  return wxParseData;
+module.exports = {
+  wxParse: wxParse,
+  wxParseTemArray:wxParseTemArray,
+  emojisInit:emojisInit
 }
-module.exports = wxParse;
 
 
diff --git a/wxParse/wxParse.wxml b/wxParse/wxParse.wxml
index f7fb02d..00fa568 100644
--- a/wxParse/wxParse.wxml
+++ b/wxParse/wxParse.wxml
@@ -1,4 +1,3 @@
-
 <!--**
  * author: Di (微信小程序开发工程师)
  * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
@@ -10,913 +9,959 @@
  * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
  */-->
 
-<template name="wxParse">
-    <block wx:for="{{wxParseData}}" wx:key="">
-        <template is="wxParse0" data="{{item}}"/>
-    </block>
+<!--基础元素-->
+<template name="wxParseVideo">
+  <!--增加video标签支持，并循环添加-->
+  <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+    <video class="{{item.classStr}} wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
+  </view>
 </template>
 
-<template name="wxParse0">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse1" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--li类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse1" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+<template name="wxParseImg">
+  <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;"
+  />
+</template>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
-            <!--增加video标签支持，并循环添加-->
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
+<template name="WxEmojiView">
+  <view class="WxEmojiView wxParse-inline" style="{{item.styleStr}}">
+    <block wx:for="{{item.textArray}}" wx:key="">
+      <block class="{{item.text == '\\n' ? 'wxParse-hide':''}}" wx:if="{{item.node == 'text'}}">{{item.text}}</block>
+      <block wx:elif="{{item.node == 'element'}}">
+        <image class="wxEmoji" src="{{item.baseSrc}}{{item.text}}" />
+      </block>
+    </block>
+  </view>
+</template>
 
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>
-            </view>
-        </block>
+<template name="WxParseBr">
+  <text>\n</text>
+</template>
+<!--入口模版-->
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse1" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+<template name="wxParse">
+  <block wx:for="{{wxParseData}}" wx:key="">
+    <template is="wxParse0" data="{{item}}" />
+  </block>
+</template>
 
 
+<!--循环模版-->
+<template name="wxParse0">
+  <!--<template is="wxParse1" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
+        </block>
+      </button>
     </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  ' || item.text != '\n\n'}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse1" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-</template>
-
-<template name="wxParse1">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse2" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse2" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
         </block>
-
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse2" data="{{item}}"/>                 
-                </block>
-            </view>
+      </view>
+    </block>
+    <block wx:elif="{{item.tag == 'table'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
         </block>
-
-
+      </view>
     </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse1" data="{{item}}" />
         </block>
+      </view>
     </block>
 
-</template>
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse1" data="{{item}}" />
+      </block>
+    </view>
 
-<template name="wxParse2">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse3" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse3" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+  </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+</template>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse3" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
 
 
+<!--循环模版-->
+<template name="wxParse1">
+  <!--<template is="wxParse2" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse2" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
     </block>
 
-</template>
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse3">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse4" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse4" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse2" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse2" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item">       
-                    <template is="wxParse4" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
+
+</template>
 
 
+<!--循环模版-->
+<template name="wxParse2">
+  <!--<template is="wxParse3" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse3" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
     </block>
 
-</template>
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse4">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse5" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse5" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse3" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse3" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse5" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
+</template>
 
+<!--循环模版-->
+<template name="wxParse3">
+  <!--<template is="wxParse4" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse4" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
     </block>
 
-</template>
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse5">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse6" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse6" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse4" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse4" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse6" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
+</template>
 
+<!--循环模版-->
+<template name="wxParse4">
+  <!--<template is="wxParse5" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
+        </block>
+      </button>
     </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse5" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-</template>
-
-<template name="wxParse6">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse7" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse7" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse7" data="{{item}}"/>                 
-                </block>
-            </view>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse5" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse5" data="{{item}}" />
+      </block>
+    </view>
 
-    </block>
+  </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
-    </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
 </template>
 
+<!--循环模版-->
+<template name="wxParse5">
+  <!--<template is="wxParse6" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse6" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
 
-<template name="wxParse7">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse8" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse8" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse8" data="{{item}}"/>                 
-                </block>
-            </view>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse6" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse6" data="{{item}}" />
+      </block>
+    </view>
 
-    </block>
+  </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
-    </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
 </template>
 
+<!--循环模版-->
+<template name="wxParse6">
+  <!--<template is="wxParse7" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse7" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
 
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-<template name="wxParse8">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse9" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse9" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
-
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse9" data="{{item}}"/>                 
-                </block>
-            </view>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse7" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse7" data="{{item}}" />
+      </block>
+    </view>
 
-    </block>
+  </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
-    </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
 </template>
+<!--循环模版-->
+<template name="wxParse7">
+  <!--<template is="wxParse8" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse8" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
 
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse9">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse10" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse10" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse8" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse8" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse10" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
+</template>
 
+<!--循环模版-->
+<template name="wxParse8">
+  <!--<template is="wxParse9" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
+        </block>
+      </button>
     </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse9" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-</template>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse10">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse11" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse11" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse9" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse9" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse11" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
+</template>
 
+<!--循环模版-->
+<template name="wxParse9">
+  <!--<template is="wxParse10" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
+        </block>
+      </button>
     </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse10" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-</template>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-<template name="wxParse11">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse12" data="{{item}}"/>
-                </block>
-             </button>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
         </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse12" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
+      </view>
+    </block>
+
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse10" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse10" data="{{item}}" />
+      </block>
+    </view>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
-        </block>
+  </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse12" data="{{item}}"/>                 
-                </block>
-            </view>
-        </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
+</template>
 
+<!--循环模版-->
+<template name="wxParse10">
+  <!--<template is="wxParse11" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
+        </block>
+      </button>
     </block>
-
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse11" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
     </block>
 
-</template>
-
-<template name="wxParse12">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse13" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse13" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse13" data="{{item}}"/>                 
-                </block>
-            </view>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse11" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse11" data="{{item}}" />
+      </block>
+    </view>
 
-    </block>
+  </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
-    </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
 </template>
 
+<!--循环模版-->
+<template name="wxParse11">
+  <!--<template is="wxParse12" data="{{item}}" />-->
+  <!--判断是否是标签节点-->
+  <block wx:if="{{item.node == 'element'}}">
+    <block wx:if="{{item.tag == 'button'}}">
+      <button type="default" size="mini">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
+        </block>
+      </button>
+    </block>
+    <!--li类型-->
+    <block wx:elif="{{item.tag == 'li'}}">
+      <view class="{{item.classStr}} wxParse-li" style="{{item.styleStr}}">
+        <view class="{{item.classStr}} wxParse-li-inner">
+          <view class="{{item.classStr}} wxParse-li-text">
+            <view class="{{item.classStr}} wxParse-li-circle"></view>
+          </view>
+          <view class="{{item.classStr}} wxParse-li-text">
+            <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+              <template is="wxParse12" data="{{item}}" />
+            </block>
+          </view>
+        </view>
+      </view>
+    </block>
 
-<template name="wxParse13">
-    <!--<template is="wxParse1" data="{{item}}" />-->
-    <!--判断是否是标签节点-->
-    <block wx:if="{{item.node == 'element'}}">
-        
-        <block wx:if="{{item.tag == 'button'}}">
-            <button type="default" size="mini" >
-                <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                    <template is="wxParse14" data="{{item}}"/>
-                </block>
-             </button>
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'li'}}">
-            <view class="wxParse-li">
-                <view class="wxParse-li-inner">
-                    <view class="wxParse-li-text">
-                        <text class="wxParse-li-circle"></text>
-                    </view>
-                    <view class="wxParse-li-text">
-                        <block wx:for="{{item.child}}" wx:for-item="item" wx:key="">
-                            <template is="wxParse14" data="{{item}}"/>
-                        </block>
-                    </view>
-                </view>
-            </view>
-        </block>
+    <!--video类型-->
+    <block wx:elif="{{item.tag == 'video'}}">
+      <template is="wxParseVideo" data="{{item}}" />
+    </block>
 
-        <!--video类型-->
-        <block wx:elif="{{item.tag == 'video'}}">
+    <!--img类型-->
+    <block wx:elif="{{item.tag == 'img'}}">
+      <template is="wxParseImg" data="{{item}}" />
+    </block>
 
-            <view  class="wxParse-{{item.tag}}">
-                <video class="wxParse-{{item.tag}}-video" src="{{item.attr.src}}"></video>
-            </view>
-            
-        </block>
-        <!--img类型-->
-        <block wx:elif="{{item.tag == 'img'}}">
-            <view class="wxParse-{{item.tag}}">                 
-                <image src="{{item.attr.src}}" mode="aspectFit"></image>             
-            </view>
+    <!--a类型-->
+    <block wx:elif="{{item.tag == 'a'}}">
+      <view bindtap="wxParseTagATap" class="wxParse-inline {{item.classStr}} wxParse-{{item.tag}}" data-src="{{item.attr.href}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
-        <block wx:else>
-            <view  class="wxParse-{{item.tag}}">
-                <block  wx:for="{{item.child}}" wx:for-item="item" wx:key="">       
-                    <template is="wxParse14" data="{{item}}"/>                 
-                </block>
-            </view>
+    <block wx:elif="{{item.tag == 'br'}}">
+      <template is="WxParseBr"></template>
+    </block>
+    <!--其他块级标签-->
+    <block wx:elif="{{item.tagType == 'block'}}">
+      <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">
+        <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+          <template is="wxParse12" data="{{item}}" />
         </block>
+      </view>
+    </block>
 
+    <!--内联标签-->
+    <view wx:else class="{{item.classStr}} wxParse-{{item.tag}} wxParse-{{item.tagType}}" style="{{item.styleStr}}">
+      <block wx:for="{{item.nodes}}" wx:for-item="item" wx:key="">
+        <template is="wxParse12" data="{{item}}" />
+      </block>
+    </view>
 
-    </block>
+  </block>
 
-    <!--判断是否是文本节点-->
-    <block wx:elif="{{item.node == 'text'}}">
-        <!--如果是，直接进行-->
-        <block wx:if="{{item.text != '' || item.text != ' ' || item.text != '  '}}">
-            <text>{{item.text}}</text>
-        </block>
-    </block>
+  <!--判断是否是文本节点-->
+  <block wx:elif="{{item.node == 'text'}}">
+    <!--如果是，直接进行-->
+    <template is="WxEmojiView" data="{{item}}" />
+  </block>
 
-</template>
+</template>
\ No newline at end of file
diff --git a/wxParse/wxParse.wxss b/wxParse/wxParse.wxss
index ecfa7df..6e1d604 100644
--- a/wxParse/wxParse.wxss
+++ b/wxParse/wxParse.wxss
@@ -12,11 +12,19 @@
 
 .wxParse{
     margin: 0 5px;
-    font-family:Courier, Calibri,"宋体";
+    font-family: Helvetica,sans-serif;
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.8;
 }
 view{
     word-break:break-all; overflow:auto;
 }
+.wxParse-inline{
+    display: inline;
+    margin: 0;
+    padding: 0;
+}
 /*//标题 */
 .wxParse-div{margin: 0;padding: 0;}
 .wxParse-h1{ font-size:2em; margin: .67em 0 }
@@ -26,6 +34,37 @@ view{
 .wxParse-h5 { font-size:.83em; margin: 1.5em 0 }
 .wxParse-h6{ font-size:.75em; margin: 1.67em 0 }
 
+.wxParse-h1 {
+  font-size: 18px;
+  font-weight: 400;
+  margin-bottom: .9em;
+}
+.wxParse-h2 {
+  font-size: 16px;
+  font-weight: 400;
+  margin-bottom: .34em;
+}
+.wxParse-h3 {
+  font-weight: 400;
+  font-size: 15px;
+  margin-bottom: .34em;
+}
+.wxParse-h4 {
+  font-weight: 400;
+  font-size: 14px;
+  margin-bottom: .24em;
+}
+.wxParse-h5 {
+  font-weight: 400;
+  font-size: 13px;
+  margin-bottom: .14em;
+}
+.wxParse-h6 {
+  font-weight: 400;
+  font-size: 12px;
+  margin-bottom: .04em;
+}
+
 .wxParse-h1, .wxParse-h2, .wxParse-h3, .wxParse-h4, .wxParse-h5, .wxParse-h6, .wxParse-b, .wxParse-strong  { font-weight: bolder }
 
 .wxParse-i,.wxParse-cite,.wxParse-em,.wxParse-var,.wxParse-address{font-style:italic}
@@ -38,7 +77,7 @@ view{
 .wxParse-s,.wxParse-strike,.wxParse-del{text-decoration:line-through}
 /*wxparse-自定义个性化的css样式*/
 /*增加video的css样式*/
-
+.wxParse-strong,.wxParse-s{display: inline}
 .wxParse-a{
     color: deepskyblue;
     word-break:break-all;
@@ -55,11 +94,8 @@ view{
 }
 
 .wxParse-img{
-    padding: 2px;
-    background-color: #efefef;
-    margin: 3px;
+    /*background-color: #efefef;*/
     overflow: hidden;
-    text-align: center;
 }
 
 .wxParse-blockquote {
@@ -71,23 +107,9 @@ view{
 }
 
 .wxParse-code,.wxParse-wxxxcode-style{
-    text-indent:0;
-    border-color:#000;
-    border-style:dashed;
-    border-width:1px;
-    display:block;
-    font-size:12px;
-    font-family:Courier, Calibri,"宋体";
-    margin:10px 0 0 0;
-    padding:10px 0 10px 5px;
-    border-radius:5px;
+    display: inline;
     background:#f5f5f5;
-    color:#000;
-    overflow: hidden;
 }
-
-
-
 .wxParse-ul{
     margin: 20rpx 10rpx;
 }
@@ -107,7 +129,6 @@ view{
     display: inline-flex;
     width: 5px;
     height: 5px;
-    /*border-radius: 50%;*/
     background-color: #333;
     margin-right: 5px;
 }
@@ -129,4 +150,57 @@ view{
     margin-right: 5px;
 }
 
+/*.wxParse-table{
+    width: 100%;
+    height: 400px;
+}
+.wxParse-thead,.wxParse-tfoot,.wxParse-tr{
+    display: flex;
+    flex-direction: row;
+}
+.wxParse-th,.wxParse-td{
+    display: flex;
+    width: 580px;
+    overflow: auto;
+}*/
 
+.wxParse-u {
+  text-decoration: underline;
+}
+.wxParse-hide{
+    display: none;
+}
+.WxEmojiView{
+    align-items: center;
+}
+.wxEmoji{
+    width: 16px;
+    height:16px;
+}
+.wxParse-tr{
+	display: flex;
+	border-right:1px solid #e0e0e0;
+	border-bottom:1px solid #e0e0e0;
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-th,
+.wxParse-td{
+	flex:1;
+	padding:5px;
+	font-size:28rpx;
+	border-left:1px solid #e0e0e0;
+	word-break: break-all;
+}
+.wxParse-td:last{
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-th{
+	background:#f0f0f0;
+	border-top:1px solid #e0e0e0;
+}
+.wxParse-del{
+    display: inline;
+}
+.wxParse-figure {
+  overflow: hidden;
+}