Merge branch 'master' of http://git.cc-lotus.info/smart-center/web-common

src/layout/detail/content.vue

@@ -15,11 +15,10 @@
               {{contentList.title}}
             </el-col>
             <el-col :span="24" class="time">
-              {{contentList.time}}
+              {{contentList.publish_time}}
             </el-col>
           </el-col>
-          <el-col :span="24" class="content">
-            {{contentList.content}}
+          <el-col :span="24" class="content" v-html="contentList.content">
           </el-col>
         </el-col>
       </el-col>