From 9b4a3a704d8c316ce33600bc2d690c659213ea92 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Wed, 8 Jun 2016 09:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=B8=96=E5=AD=90=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html        | 4 ++--
 public/assets/wechat/course_discussion.html  | 4 ++--
 public/assets/wechat/project_discussion.html | 4 ++--
 public/stylesheets/weui/weixin.css           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index b820ed591..424df2bc6 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -5,7 +5,7 @@
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
                 <div class="cl"></div>
                 <div class="f13 c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
@@ -32,7 +32,7 @@
                     </div>
                 </div>
             </div>
-            <div class="post-input-wrap">
+            <div ng-if="!blog.locked" class="post-input-wrap">
                 <div class="post-reply-row">
                     <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index f02c01ff6..e8d347a88 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -6,7 +6,7 @@
             <div loading-spinner></div>
             <div class="post-wrapper">
                 <div class="post-main">
-                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                     <table class="post-detail-info"><tr>
                         <td class="text-nowrap v-top">发布者：</td>
                         <td>{{discussion.user.realname}}</td>
@@ -39,7 +39,7 @@
                     </div>
                 </div>
                 </div>
-                <div class="post-input-wrap">
+                <div ng-if="!discussion.locked" class="post-input-wrap">
                     <div class="post-reply-row">
                         <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                         <div class="post-input-container">
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index bd863f5ed..abec64c50 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -5,7 +5,7 @@
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +38,7 @@
                     </div>
                 </div>
             </div>
-            <div class="post-input-wrap">
+            <div ng-if="!discussion.locked" class="post-input-wrap">
                 <div class="post-reply-row">
                     <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 4a88f9705..ab5695e3d 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -4,6 +4,7 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
 h1,h2,h3,h4,h5,p,pre {padding:0px; margin:0px;}
+img {max-width:100%;}
 blockquote {
     border:1px solid #d4d4d4;
     padding: 0.6em;
@@ -63,7 +64,6 @@ a.underline {text-decoration:underline;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
 .post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
-.post-content img {max-width:100%;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,