Bladeren bron

修改完成

tenggouwa 6 jaren geleden
bovenliggende
commit
902f5f8f41
4 gewijzigde bestanden met toevoegingen van 51 en 33 verwijderingen
  1. 6 6
      src/assets/js/common.js
  2. 14 7
      src/config/api-config.js
  3. 6 6
      src/views/agent/applyAgent.vue
  4. 25 14
      src/views/home/login.vue

+ 6 - 6
src/assets/js/common.js

@@ -214,9 +214,9 @@ var ajax = function(that, url, params, success, method) {
 
 /*发送短信*/
 var sendCode=function(that,params,success){
-  params.param=params.vparam;
-  delete params.vparam;
-  ajax(that,that.extendApi.phoneCheckedNum,params,function(res){
+  // params.param=params.vparam;
+  // delete params.vparam;
+  ajax(that,that.extendApi.sedMsssss,params,function(res){
     if(typeof(success)=='function'){
       success(res);
     }
@@ -244,9 +244,9 @@ var sendCode=function(that,params,success){
 
 /*发送邮件*/
 var sendEmail=function(that,params,success){
-  params.param=params.vparam;
-  delete params.vparam;
-  ajax(that,that.extendApi.sendEmail,params,function(res){
+  // params.param=params.vparam;
+  // delete params.vparam;
+  ajax(that,that.extendApi.sedEmmmmm,params,function(res){
     if(typeof(success)=='function'){
       success(res);
     }

+ 14 - 7
src/config/api-config.js

@@ -3,8 +3,8 @@
  * @type Object
  */
 var apiUrl = {
-    // basehostUrl: 'https://dev407.33.cn',
-    baseNewUrl: 'https://test.33.cn',
+  baseNewUrl: 'http://dev407.33.cn',
+    // baseNewUrl: 'https://test.33.cn',
     uploadUrl:"https://oss.33.cn",
     
     // baseNewUrl:"https://dev407.33.cn",
@@ -16,17 +16,24 @@ export default {
  *代理商接口
  *(新版)
  */
-    newRegist: apiUrl.baseNewUrl + '/api/member/brokerregister', //注册
+    // newRegist: apiUrl.baseNewUrl + '/api/member/brokerregister', //注册
+    newRegist: apiUrl.baseNewUrl + '/api/broker/register', //注册
 
-    newLogin: apiUrl.baseNewUrl + '/api/member/login',  //登录
+    sedMsssss:apiUrl.baseNewUrl + '/api/send/newsms',//短信
+
+    sedEmmmmm:apiUrl.baseNewUrl + '/api/send/newmail',//邮件
+
+    // newLogin: apiUrl.baseNewUrl + '/api/member/login',  //登录
+    newLogin: apiUrl.baseNewUrl + '/api/broker/login',  //登录
 
     applyCountry: apiUrl.baseNewUrl+'/api/data/city',//获取省市接口
 
-    applyToAgent: apiUrl.baseNewUrl+'/api/member/apply',//申请成为经纪人
+    applyToAgent: apiUrl.baseNewUrl+'/api/broker/apply',//申请成为经纪人
 
-    applyStatus: apiUrl.baseNewUrl+'/api/member/applystatus',//申请状态查询
+    applyStatus: apiUrl.baseNewUrl+'/api/broker/applystatus',//申请状态查询
 
-    resetEmailPassword: apiUrl.baseNewUrl+'/api/member/reset',//密码找回(邮件短信)发送
+    // resetEmailPassword: apiUrl.baseNewUrl+'/api/member/reset',//密码找回(邮件短信)发送
+    resetEmailPassword: apiUrl.baseNewUrl+'/api/send/newreset',//密码找回(邮件短信)发送
 /*
  *代理商接口
  *(老版)

+ 6 - 6
src/views/agent/applyAgent.vue

@@ -310,12 +310,12 @@ export default{
               this.getjindu = 2;
               this.showG = true;
               this.applyform = res.data.info;
-              // this.$notify({
-              //   title: '提示',
-              //   message: '您的申请正在审核中!',
-              //   type: 'warning',
-              //   duration:'2000'
-              // });
+              this.$notify({
+                title: '提示',
+                message: '您的申请正在审核中!',
+                type: 'warning',
+                duration:'2000'
+              });
             }else if(res.data.info.status == 1){//以通过
               this.show1 = false;
               this.show3 = true;

+ 25 - 14
src/views/home/login.vue

@@ -429,7 +429,8 @@ export default{
         return false;
       }
       let param={
-        os:'web'
+        os:'web',
+        platCode:'04031632e48cd96e',
       };
       if(this.operateType=='email'){
         param.email=this.setParam.username;
@@ -484,23 +485,26 @@ export default{
         })
         return false;
       };
-      let param={};
+      let sparam={};
       if(this.operateType=='email'){
-        param={
+        sparam={
+          // codetype:'validate',
+          param:"FzmDateTime|FzmRandom",
+          email:this.regParam.email,
           codetype:'validate',
-          vparam:"FzmDateTime|FzmRandom",
-          email:this.regParam.email
+          platkey:'zhaobi'
         };
-        sendEmail(this,param,(data)=>{});
+        sendEmail(this,sparam,(data)=>{});
       }
       else{
-        param={
+        sparam={
           codetype:'validate',
-          vparam:"FzmRandom",
+          param:'FzmRandom',
           mobile:this.regParam.email,
-          area:this.area
+          area:this.area,
+          platkey:'zhaobi',
         };       
-        sendCode(this,param,(data)=>{});
+        sendCode(this,sparam,(data)=>{});
       }
     },
     //登录时~发送验证码
@@ -579,8 +583,8 @@ export default{
           'password':this.regParam.password,
           'code':this.regParam.code,
           'type':"email",
-          'checkmethod':"data",
-          'platform':'fx66',
+          // 'checkmethod':"data",
+          // 'platform':'fx66',
         };
       }
       else{
@@ -588,10 +592,10 @@ export default{
           'mobile':this.regParam.email,
           'password':this.regParam.password,
           'code':this.regParam.code,
-          'checkmethod':"data",
+          // 'checkmethod':"data",
           'type':"sms",
           'area':this.area,
-          'platform':'fx66',
+          // 'platform':'fx66',
         };
       }
       this.regLoad=true;
@@ -638,6 +642,7 @@ export default{
         'redirect_uri':'http://33.cn',
         'os':'web',
         'platform':'fx66',
+        'broker_code':'04031632e48cd96e'
       };
       if(this.operateType=='mobile'){
         param.type="sms";
@@ -667,6 +672,12 @@ export default{
         this.buttonLoad=false;
         if(data.code==200){         
           this.getUserInfo()
+          this.$notify({
+            title: '成功',
+            message: '登录成功',
+            type: 'success',
+            duration:'1500'
+          })
           //this.$router.push("/index");
           //this.userInfo.username = localStorage.getItem('block_fxeesusername');
         }