Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

* 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen:
  1

src/wx/pages/index/index.js

@@ -175,6 +175,12 @@ Page({
       method: 'GET',
       dataType: 'json',
       success: function (res) {
+        var role=res.data.result.role;
+        if((role==4||role==5||role==6)&&res.data.result.childAge==0){
+          wx.navigateTo({
+            url: '/pages/ageChange/ageChange',
+          })
+        }
         //设定页面数据
         that.setData({
           volunteerEventList: res.data.result.volunteerEventList,
@@ -291,7 +297,7 @@ Page({
   classDetails(e) {
     let medidaId = e.currentTarget.dataset['index']
     wx.navigateTo({
-      url: '../classDetails/classDetails?medidaId=' + medidaId,
+      url: '../classDetails/classDetails?mediaId=' + medidaId,
     });
     wx.setNavigationBarTitle({
       title: '公益课堂'