Merge branch 'feature-zyw' into 'dev'

update

See merge request !16

src/utils/util.js

@@ -2,7 +2,6 @@ const wxService = require('./wxService')
 const moment = require('../lib/moment.min')
 const Promise = require('../lib/bluebird')
 const _ = require('../lib/underscore.min')
-const app = getApp()
 const formatTime = date => {
   const year = date.getFullYear()
   const month = date.getMonth() + 1
@@ -247,6 +246,7 @@ class Logger {
 // 通过点击按钮 获取用户信息并登陆注册到crm系统中
 function getUserInfoByBtn(userInfo) {
   const logger = new Logger()
+  const app = getApp()
   if (Object.keys(userInfo).length === 1) {
     return wxService.Promise.reject(userInfo.errMsg)
   }