From 0d69fa0cc05ac346a0e6a66032c6e7e4ac99d1a4 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 11 Aug 2016 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=A7=81=E6=9C=89=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=86=85=E5=AE=B9=E5=8A=A0=E4=B8=8A=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb         | 2 +-
 public/assets/wechat/course_discussion.html   | 2 +-
 public/assets/wechat/course_notice.html       | 2 +-
 public/assets/wechat/homework_detail.html     | 2 +-
 public/assets/wechat/issue_detail.html        | 2 +-
 public/assets/wechat/jour_message_detail.html | 1 +
 public/assets/wechat/project_discussion.html  | 2 +-
 public/javascripts/wechat/others/factory.js   | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 1a4c4d340..570c690c9 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -284,7 +284,7 @@ class WechatsController < ActionController::Base
     end
 
     news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级，开始学习吧！',
-                                                             content: "课程名称：#{course.syllabus.name}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
+                                                             content: "课程名称：#{course.syllabus.title}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
     return request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/class?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
       pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 4dc6c17b5..136ed46e4 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -5,7 +5,7 @@
         <div class="post-container">
             <div loading-spinner></div>
             <div class="post-wrapper" style="margin-top:0;">
-                <div class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
+                <div ng-show="discussion.is_public == 0" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
                 <div class="post-main">
                     <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                     <div class="post-dynamic-author hidden fl">
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 446cf50e4..a49d97cee 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -4,7 +4,7 @@
 <div ng-if="news.act_type == 'News'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
-            <div class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
+            <div ng-show="news.is_public == 0 || news.is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{news.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 6a3e91285..991bd393c 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -4,7 +4,7 @@
 <div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
-            <div class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
+            <div ng-show="homework.is_public == 0" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index ff7067ba1..0cee77c32 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -4,7 +4,7 @@
 <div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
-            <div class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
+            <div ng-show="issue.is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
 
                 <div class="post-avatar fl mr10"><img ng-src="{{issue.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 94f80cf15..5c2c8b6e3 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -3,6 +3,7 @@
 <div ng-if="message.act_type == 'JournalsForMessage'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
+            <div ng-show="message.is_public == 0 && message.is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
 
                 <div class="post-avatar fl mr10"><img ng-src="{{message.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 38f5d8f4e..39831b709 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -4,7 +4,7 @@
 <div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
         <div class="post-wrapper" style="margin-top:0;">
-            <div class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
+            <div ng-show="discussion.is_public == false" class="tac f16 fb c-black" style="padding-top:10px;">私有内容，请谨慎传播</div>
             <div class="post-main">
                 <div class="post-avatar fl mr10"><img ng-src="{{discussion.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
                 <div class="post-dynamic-author hidden fl">
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 801ad23ad..3ad11fe66 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -396,7 +396,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
         }
 
         if(imgUrl == null || imgUrl == ""){
-            imgUrl = 'http://www.trustie.net/images/wechat/wx_logo.jpg';
+            imgUrl = window.g_localhost+'/images/wechat/wx_logo.jpg';
         }
 
         wx.ready(function(){