Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

# Conflicts:
#	496_dongfengqichen/app.js

496_dongfengqichen/app.js

     isFirstLogin:true,//是否为第一次登录
     indexData:{},//首页数据
     myCenterData:null,//个人中心数据
-    userInfoData:null
+    userInfoData:null,
+    certificationState:0,//1车主,2合伙人,3同事
   },
   // 获取openId
   getOpenid: function (code) {