|
...
|
...
|
@@ -88,13 +88,7 @@ App({ |
|
88
|
88
|
fail: function(res) {
|
|
89
|
89
|
console.log("login-res-fail", res);
|
|
90
|
90
|
},
|
|
91
|
|
-<<<<<<< HEAD
|
|
92
|
|
- complete: function(res) {
|
|
93
|
|
-=======
|
|
94
|
|
- complete:function(res){
|
|
95
|
|
->>>>>>> dev_无非居民
|
|
96
|
|
-
|
|
97
|
|
- }
|
|
|
91
|
+ complete: function(res) {}
|
|
98
|
92
|
})
|
|
99
|
93
|
},
|
|
100
|
94
|
|
...
|
...
|
|
