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

---
 public/assets/wechat/activities.html |  2 +-
 public/javascripts/wechat/app.js     | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 30b4dafaa..ab0e85faf 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="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="goDetail('issues',act.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 59605271c..4c17027e0 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -7,6 +7,7 @@ if(debug===true){
     apiUrl = 'https://www.trustie.net/api/v1/';
 }
 
+
 app.factory('auth', function($http,$routeParams, $cookies, $q){
     var _openid = '';
 
@@ -66,7 +67,7 @@ app.factory('rms', function(){
     return {save: save, get: get};
 });
 
-app.controller('ActivityController',function($scope, $http, auth, rms, common){
+app.controller('ActivityController',function($anchorScroll, $location,$scope, $http, auth, rms, common){
     $scope.replaceUrl = function(url){
         return url;
     };
@@ -76,6 +77,12 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
     $scope.page = 0;
 
     var loadActData = function(page){
+        if (page <= 0 && $scope.activities.length >0){
+            var yOffset = rms.get("yoffset");
+            $location.hash(yOffset);
+            return;
+        }
+
         $scope.page = page;
         $http({
             method: 'POST',
@@ -109,6 +116,12 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
 
     $scope.loadActData = loadActData;
 
+    //跳到详情页
+    $scope.goDetail = function(type, id){
+        rms.save("yoffset", id);
+        $location.path('/'+type+'/'+id);
+    }
+
     $scope.addPraise = function(act){
         common.addCommonPraise(act);
     };
@@ -117,6 +130,8 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
         common.decreaseCommonPraise(act);
     };
 
+
+
 });
 
 app.factory('common', function($http, auth, $routeParams){