Merge branch 'dev4.6.3.11' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.11

src/web/staticres/js/login.js

@@ -478,11 +478,9 @@ var logic = function(data,num){
 
 //登录后处理页面逻辑
 var processpage = function(shareid,num){
-  if (location.pathname.indexOf('/notin/page') !== -1) {
-    var backToUrl = getParam('backTo')
-    if (backToUrl) {
-      return location.replace(decodeURIComponent(backToUrl))
-    }
+  var backToUrl = getParam('backTo')
+  if (backToUrl) {
+    return location.replace(decodeURIComponent(backToUrl))
   }
 
 	var toHref=$("#bidLogin").attr("data-rec")
@@ -980,11 +978,11 @@ $(function(){
                     e.setAttribute('data-loading', 'false')
                     if (r && r.error_code > -1) {
                         if(r.data.state==1){
+                            var backToUrl = getParam('backTo')
+                            if (backToUrl) {
+                              return location.replace(decodeURIComponent(backToUrl))
+                            }
                             if (isBindPage) {
-                              var backToUrl = getParam('backTo')
-                              if (backToUrl) {
-                                return location.replace(decodeURIComponent(backToUrl))
-                              }
                               if (history.length === 1) {
                                 goBackOrigin()
                               } else {