Merge branch 'feature/thirdlogin' into 'release/6.0.2'

Feature/thirdlogin



See merge request !861

@@ -131,13 +131,10 @@ $btnNext.on('touchstart', function() {
                             });
                         } else if (res.data.isReg === 3) {
                             dialog.showDialog({
-                                dialogText: '该手机号已注册过有货\n' + pn + '，是否进行关联？',
+                                dialogText: '绑定失败，该手机号已注册，请更换或使用该手机号直接登录',
                                 hasFooter: {
-                                    leftBtnText: '更换号码',
-                                    rightBtnText: '确定'
+                                    centerBtnText: '确定'
                                 }
-                            }, function() {
-                                nextStep(res.data.next, pn, areaCode);
                             });
                         } else {
                             nextStep(res.data.next, pn, areaCode);