Merge branch 'master' into 测试

pages/login/phone.js

@@ -98,7 +98,7 @@ Page({
                     }).then(res => {
                         console.log("微信快捷登录", res)
                         if (res.code == 0) return wx.showToast({
-                            title: getApp().globalData.Language.getMapText('res.msg'),
+                            title: getApp().globalData.Language.getMapText(res.msg || '未查询到绑定账号'),
                             icon: "none"
                         })
                         require("./modules/login").loginMsg(res);