From 32ffd2a5b5372aab6c8d8802b63e0f1763de5ae7 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=98=E5=8C=96=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/activity.rb  | 1 +
 public/assets/wechat/activities.html | 2 +-
 public/javascripts/wechat/app.js     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index a90ff323d..9e2a39a5a 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -98,6 +98,7 @@ module Mobile
       end
       expose :act_type    #缺陷/作业/讨论区/留言等类型
       expose :act_id
+      expose :id
       expose :container_type     #课程/项目/博客/个人
       expose :author, using: Mobile::Entities::User do |a, opt|    #用户信息
         if a.is_a? ::UserActivity
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index ab0e85faf..85cfad7e4 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -118,7 +118,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="mb5" dataID = "{{act.act_id}}" onclick="goDetail('issues',act.act_id)" id="{{act.act_id}}">
+                <div class="mb5" dataID = "{{act.act_id}}" ng-click="goDetail('issues',act.act_id, act.id)" id="act_{{act.id}}">
                   <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
                   <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
                   <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 4c17027e0..51c91d152 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -117,9 +117,9 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
     $scope.loadActData = loadActData;
 
     //跳到详情页
-    $scope.goDetail = function(type, id){
-        rms.save("yoffset", id);
-        $location.path('/'+type+'/'+id);
+    $scope.goDetail = function(type, act_id,id){
+        rms.save("yoffset", 'act_'+id);
+        $location.path('/'+type+'/'+act_id);
     }
 
     $scope.addPraise = function(act){