Merge branch 'master' of https://dev.33.cn/tenggouwa/agent

src/assets/js/common.js

@@ -275,7 +275,7 @@ var sendEmail=function(that,params,success){
 
 /*登录*/
 var sublogion=function(_this,pageindex,params,success){
-  ajax(_this, _this.extendApi.userLogin,params, function(res) {
+  ajax(_this, _this.extendApi.newLogin,params, function(res) {
     if(typeof(success)==="function"){
       success(res);
     }
@@ -355,7 +355,7 @@ var sublogion=function(_this,pageindex,params,success){
 }
 //注册
 var subloginup=function(_this,params,success){
-  ajax(_this,_this.extendApi.userLoginUp,params,function(data){
+  ajax(_this,_this.extendApi.newRegist,params,function(data){
     if(typeof(success)==="function"){
       success(data);
     }

src/views/home/login.vue

@@ -631,6 +631,7 @@ export default{
       let param={
         'redirect_uri':'http://33.cn',
         'os':'web',
+        'platform':'fx66',
       };
       if(this.operateType=='mobile'){
         param.type="sms";