修改merge 相关bug

@@ -88,13 +88,7 @@ App({
       fail: function(res) {
         console.log("login-res-fail", res);
       },
-<<<<<<< HEAD
-      complete: function(res) {
-=======
-      complete:function(res){
->>>>>>> dev_无非居民
-        
-      }
+      complete: function(res) {}
     })
   },