diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
index 6776f77..dd64347 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/CodeLoginActivity.java
@@ -20,6 +20,7 @@ import com.fenghoo.seven.main.activity.common.storage.SharedPreferencesDao;
 import com.fenghoo.seven.main.activity.mvp.presenterImpl.ISmsCodeDialogPresenter;
 import com.fenghoo.seven.main.activity.mvp.presenterImpl.SmsCodeDialogPresenterImpl;
 import com.fenghoo.seven.main.kehu.activity.SearchActivity;
+import com.fenghoo.seven.main.kehu.activity.ShowAty;
 import com.fenghoo.seven.main.my.entity.loginInfoBean;
 import com.fenghoo.seven.utils.ToastUtils;
 import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
@@ -36,6 +37,7 @@ public class CodeLoginActivity extends BaseActivity implements  ISmsCodeDialogVi
 
 
     private String mPhone;
+    private String entertype = "";
     private TextView mResentBtn;
     private VerificationCodeInput mVerificationInput;
     private View mLoading;
@@ -75,6 +77,7 @@ public class CodeLoginActivity extends BaseActivity implements  ISmsCodeDialogVi
         initNormalBack();
         title_bar.setTitle("");
         mPhone = getIntent().getStringExtra("phone");
+        entertype = getIntent().getStringExtra("entertype");
 //        String template = "正在向%s发送短信验证码";
 //        mPhoneTv.setText(String.format(template, mPhone));
 
@@ -118,7 +121,12 @@ public class CodeLoginActivity extends BaseActivity implements  ISmsCodeDialogVi
         mVerificationInput.setOnCompleteListener(new VerificationCodeInput.Listener() {
             @Override
             public void onComplete(String code) {
+                //如果是验证码登录
+                if(entertype.equals("0")){
                 commit(code);
+                }else {
+                    ShowAty.ModifyPasActivity(CodeLoginActivity.this,code);
+                }
             }
         });
     }
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
index b8fd25b..cf452cf 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/ForgetPasActivity.java
@@ -41,7 +41,7 @@ public class ForgetPasActivity extends BaseActivity implements View.OnClickListe
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn_login:
-                ShowAty.CodeLoginActivity(ForgetPasActivity.this,mEtPhone.getText().toString().trim());
+                ShowAty.CodeLoginActivity(ForgetPasActivity.this,mEtPhone.getText().toString().trim(),"1");
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
index d52e18f..8917c49 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/LoginPasswordActivity.java
@@ -84,12 +84,7 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.btn_login://登录
-                if(longintype.equals("0")){
                 getPresenter().login();
-                }else {
-                 //   ShowAty.CodeLoginActivity(LoginPasswordActivity.this,mEtPhone.getText().toString().trim());
-                    ShowAty.CodeLoginActivity(LoginPasswordActivity.this,"18133922183");
-                }
                 break;
             case R.id.login_tv_code://验证码登录
                 if(longintype.equals("0")){
@@ -99,8 +94,7 @@ public class LoginPasswordActivity extends BaseTreeActivity<LoginPasswordContrac
                     passWordLogin();
                     longintype="0";
                 }
-
-                ShowAty.CodeLoginActivity(LoginPasswordActivity.this,"18133922183");
+                ShowAty.CodeLoginActivity(LoginPasswordActivity.this,"18133922183","0");
                 break;
             case R.id.login_tv_forgetpas://忘记密码
                 ShowAty.ForgetPasActivity(LoginPasswordActivity.this);
diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/ModifyPasActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/ModifyPasActivity.java
index 478c7d0..9430aa5 100644
--- a/app/src/main/java/com/fenghoo/seven/main/activity/ModifyPasActivity.java
+++ b/app/src/main/java/com/fenghoo/seven/main/activity/ModifyPasActivity.java
@@ -8,6 +8,7 @@ import android.widget.EditText;
 import com.fenghoo.seven.R;
 import com.fenghoo.seven.base.BaseActivity;
 import com.fenghoo.seven.main.kehu.activity.ShowAty;
+import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils;
 import com.fenghoo.seven.widget.TitleBar;
 
 public class ModifyPasActivity extends BaseActivity implements View.OnClickListener {
@@ -29,6 +30,7 @@ public class ModifyPasActivity extends BaseActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_modify_pas);
+        String code = getIntent().getStringExtra("code");
         initView();
     }
 
@@ -46,7 +48,10 @@ public class ModifyPasActivity extends BaseActivity implements View.OnClickListe
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn_login:
-                ShowAty.CodeLoginActivity(ModifyPasActivity.this, mEtPhone.getText().toString().trim());
+                //进入主页
+//                ProfileSpUtils.getInstance().saveLoginSatus(true);
+//                ProfileSpUtils.getInstance().saveProfile(data);
+//                startActivity(MainActivity.class);
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
index 74aebab..8c0eb4a 100644
--- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
+++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.fenghoo.seven.db.DbRecordBeanData;
 import com.fenghoo.seven.main.activity.CodeLoginActivity;
 import com.fenghoo.seven.main.activity.ForgetPasActivity;
+import com.fenghoo.seven.main.activity.ModifyPasActivity;
 import com.fenghoo.seven.main.find.CloundSolutionActivity;
 import com.fenghoo.seven.main.find.CommentActivity;
 import com.fenghoo.seven.main.find.ConversationActivity;
@@ -77,15 +78,32 @@ public class ShowAty {
         Intent i = new Intent(ctx, MainActivitytwot.class);
         ctx.startActivity(i);
     }
-    public static void CodeLoginActivity(Context ctx,String phone) {
+    /**
+     * @description
+     * @param entertype  0为从登录页进入  1为从忘记密码
+     * @return
+     */
+    public static void CodeLoginActivity(Context ctx,String phone,String entertype) {
         Intent i = new Intent(ctx, CodeLoginActivity.class);
         i.putExtra("phone",phone);
+        i.putExtra("entertype",entertype);
         ctx.startActivity(i);
     }
     public static void ForgetPasActivity(Context ctx) {
         Intent i = new Intent(ctx, ForgetPasActivity.class);
         ctx.startActivity(i);
     }
+    /**
+     * @description  修改密码
+     * @param
+     * @return
+     */
+    public static void ModifyPasActivity(Context ctx,String code) {
+        Intent i = new Intent(ctx, ModifyPasActivity.class);
+        i.putExtra("code",code);
+        ctx.startActivity(i);
+    }
+
 
 
 }