From d5df45e8fb79034f938e2c09b859ca768b09e3d8 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 4 Aug 2016 16:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E7=82=B9?= =?UTF-8?q?=E5=85=A5=E8=AF=A6=E6=83=85=E5=90=8E=E8=BF=94=E5=9B=9E=E9=9C=80?= =?UTF-8?q?=E5=9B=9E=E5=88=B0=E7=82=B9=E5=85=A5=E7=9A=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=A4=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/wechat/controllers/activity.js | 2 +- public/javascripts/wechat/controllers/project.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js index 678733a82..7066da4d9 100644 --- a/public/javascripts/wechat/controllers/activity.js +++ b/public/javascripts/wechat/controllers/activity.js @@ -143,7 +143,7 @@ app.controller('ActivityController', rms.save("course_activities",$scope.course_activities); rms.save("project_activities",$scope.project_activities); $location.path('/'+type+'/'+act_id); - } + }; $scope.addPraise = function(act){ for(var i in $scope.activities){ diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js index 206730486..f4a3b5c5c 100644 --- a/public/javascripts/wechat/controllers/project.js +++ b/public/javascripts/wechat/controllers/project.js @@ -111,11 +111,12 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut //跳到详情页 vm.goDetail = function(type, act_id,id){ - rms.save("yoffset", document.documentElement.scrollTop); + rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop); rms.save("project_activities",vm.project_activities); + rms.save('project_has_more', vm.project_has_more); rms.save("project",vm.project); $location.path('/'+type+'/'+act_id); - } + }; //切换 按钮 vm.tab = function(index){