From 0a0f8aefac6bf138e4411ba19a88e928d7b1ca2e Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 15:56:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=BC=B9=E6=A1=86css=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=9Bapp=E9=A1=B5=E9=9D=A2meta=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/app.html      | 4 ++--
 public/stylesheets/weui/weixin.css | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html
index a3977ec5c..726755c3d 100644
--- a/public/assets/wechat/app.html
+++ b/public/assets/wechat/app.html
@@ -6,9 +6,9 @@
     <meta charset='utf-8' />
     <meta name="keywords" content="" />
     <meta name="description" content="" />
-    <meta name="apple-mobile-web-app-capable" content="no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
     <meta content='True' name='HandheldFriendly' />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
 
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
     <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 364c8a001..2172911ce 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -155,7 +155,7 @@ a.underline {text-decoration:underline;}
 .locked_btn_cir {background: url("/images/wechat/locked.png") 0 0 no-repeat; cursor: default;}
 
 /*20150612加入班级样式*/
-.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%);}
+.add-class-box {position:fixed; width:80%; max-width:300px; min-width:240px; font-size:15px; color:#444; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); border-radius:5px; top:50%; left:50%; transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); -moz-transform: translate(-50%,-50%); -webkit-transform: translate(-50%,-50%); -o-transform: translate(-50%,-50%);}
 .add-class-tip {padding-top:1.2em; padding-bottom:.5em; font-weight:400;}
 .class-number-input {width:80%; max-width:240px; height:28px; border:1px solid #ccc; padding-left:5px; margin:0 auto; display:block;}
 .cancel-btn {width:49%; height:37px; line-height:37px; text-align:center; vertical-align:middle; border-top:1px solid #ccc;}

From 00c3e880e635f87a83f819c6aff660049c0f0ee8 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 21 Jul 2016 16:21:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E5=AE=9A=E4=BD=8Djs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/controllers/activity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 1ad4b9c1e..8847e8e10 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -136,7 +136,7 @@ app.controller('ActivityController',
 
     //跳到详情页
     $scope.goDetail = function(type, act_id,id){
-        rms.save("yoffset", window.document.body.scrollTop);
+        rms.save("yoffset", document.documentElement.scrollTop);
         rms.save("activities",$scope.activities);
         rms.save("course_activities",$scope.course_activities);
         rms.save("project_activities",$scope.project_activities);