diff --git a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
index 14f1ab2..5b1b19b 100644
--- a/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
+++ b/app/src/main/java/com/shunzhi/parent/api/LoginRegisterApi.java
@@ -33,6 +33,12 @@ public interface LoginRegisterApi {
 
 
 
+    @GET("/api/Account/ReSetpass")
+    Observable<JsonObject> reSetpassResult(
+           @Field("mobile") String username, @Field("captcha") String idCode,@Field("pass") String password);
+
+
+
     @GET("api/Account/ChangePhoneCaptcha")
     Observable<JsonObject> getidCodeResult(
            @Query("mobile") String username);
diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
index 5de9726..63c5244 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
@@ -22,6 +22,8 @@ public interface LoginAndRegisterContract {
         public abstract  void idCodeResult(String phoneNumber);
 
         public abstract void getUserInfo(String mobile,int school_id,String captcha);
+
+        public abstract void reSetpassResult(String adminName,String idCode,String password);
     }
 
     interface  ILoginModel extends IBaseModel{
@@ -33,6 +35,8 @@ public interface LoginAndRegisterContract {
 
         //获取登录用户信息
         Observable<UserInfo> getUserInfo(String mobile, int school_id, String captcha);
+
+        Observable<JsonObject> reSetpass(String adminName,String idCode,String password);
     }
     interface ILoginView extends IBaseFragment {
 
diff --git a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
index 4f1862b..886027a 100644
--- a/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
+++ b/app/src/main/java/com/shunzhi/parent/model/loginandregister/LoginAndRegisterModel.java
@@ -47,4 +47,10 @@ public  class LoginAndRegisterModel extends BaseModel implements LoginAndRegiste
                 .compose(RxHelper.<UserInfo>rxSchedulerHelper());
     }
 
+    @Override
+    public Observable<JsonObject> reSetpass(String adminName, String idCode, String password) {
+        return  RetrofitCreateHelper.getInstance().createApi(LoginRegisterApi.class,LoginRegisterApi.url).reSetpassResult(adminName,idCode,password)
+                .compose(RxHelper.<JsonObject>rxSchedulerHelper());
+    }
+
 }
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index eb26288..b9c5c57 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -86,7 +86,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                 //TODO 注册成功返回
                 Log.e("1111", jsonObject.toString());
                 AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
-                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
+//                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_PWD, password);
                 mIView.getUserInfo(1);
             }
         }, new Consumer<Throwable>() {
@@ -130,7 +130,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
             @Override
             public void accept(UserInfo userInfo) throws Exception {
-                Log.d("6666","userInfo="+userInfo.toString());
                 if (userInfo != null) {
                     CurrentBean currentBean = userInfo.getData();
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
@@ -138,7 +137,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_IMAGE, currentBean.getImage());
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(currentBean.getSex()));
                     AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.PARENT_ID, String.valueOf(currentBean.getParentId()));
-                    AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID,currentBean.getUserid());
+                    AppConfig.getAppConfig(AppContext.getContext()).set(AppConfig.USER_ID, currentBean.getUserid());
                     mIView.getUserInfo(0);
 
                 } else {
@@ -155,6 +154,23 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
         }));
     }
 
+    @Override
+    public void reSetpassResult(final String adminName, String idCode, String password) {
+        mRxManager.register(mIModel.reSetpass(adminName, idCode, password).subscribe(new Consumer<JsonObject>() {
+            @Override
+            public void accept(JsonObject jsonObject) throws Exception {
+                AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, adminName);
+                mIView.getUserInfo(2);
+            }
+        }, new Consumer<Throwable>() {
+            @Override
+            public void accept(Throwable throwable) throws Exception {
+                OkHttpExceptionUtil.handOkHttpException((HttpException) throwable);
+            }
+        }));
+
+    }
+
 
     @Override
     public LoginAndRegisterContract.ILoginModel getModel() {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
index bd6f7d9..a62ba08 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/binding/CheckInfoActivity.java
@@ -151,7 +151,7 @@ public class CheckInfoActivity extends BaseMVPCompatActivity<MyChildContract.MyC
     @Override
     public void addChildSuccess() {
 //        WebViewActivity.start_show(CheckInfoActivity.this,AppConfig.BINDING_SUCCESS_HEZUO);
-        WebViewActivity.getInstance(CheckInfoActivity.this,"http://60.190.202.57:8101/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
+        WebViewActivity.getInstance(CheckInfoActivity.this,AppConfig.WAP_URL+"/ParentOrderCenter.aspx?userid="+AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_ID),AppConfig.BINDING_SUCCESS_HEZUO);
         finish();
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index f57a4c2..afa5fab 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -20,6 +20,7 @@ import android.widget.TextView;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -99,7 +100,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         passwordLayout_new = view.findViewById(R.id.passwordLayout_new);
         et_password_new = view.findViewById(R.id.et_password_new);
         et_password_new.addTextChangedListener(textWatcher);
-        mPresenter.loginResult("18358585335", "123456");
+
         if ("登录".equals(typepage)) {
             idCodeLayout.setVisibility(View.GONE);
             passwordLayout_new.setVisibility(View.GONE);
@@ -126,7 +127,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
         roundedImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startNewActivity(MainActivity.class);
+                mPresenter.loginResult("18358585335", "123456");
             }
         });
     }
@@ -166,6 +167,10 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
 
             popupWindow.setContentView(view);
             popupWindow.showAtLocation(main_login, Gravity.CENTER, 0, 0);
+        }else if(type==3){
+            startActivity(new Intent().putExtra("type", "登录").setClass(getActivity(), LoginAndRegistActivity.class));
+            phoneNumber.setText(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME));
+            password.setFocusable(true);
         }
 
 
@@ -182,6 +187,13 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
                 mPresenter.registerResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
             } else if (loginAndRegister.getText().toString().trim().equals("确定")) {
                 //修改密码
+                if(TextUtils.isEmpty(password.getText().toString())&&TextUtils.isEmpty(et_password_new.getText().toString())) {
+                    if(password.getText().toString().equals(et_password_new.getText().toString())) {
+                        mPresenter.reSetpassResult(phoneNumber.getText().toString(), idCode.getText().toString(), password.getText().toString());
+                    }else{
+                        ToastUtils.showToast("两次输入的密码不一致");
+                    }
+                }
             }
 
         } else if (v == tv_goto) {
diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml
index a73c19b..9a1bd13 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -56,7 +56,7 @@
                     android:layout_height="50dp"
                     android:background="@null"
                     android:hint="请输入手机号码"
-                    android:text="18358585335"
+                    android:text=""
                     android:maxLength="11"
                     android:textColorHint="@color/hintTextColor"
                     android:textSize="@dimen/sp_16" />
@@ -129,7 +129,7 @@
                         android:layout_weight="1"
                         android:background="@null"
                         android:hint="请设置密码：6～16个字符"
-                        android:text="123456"
+                        android:text=""
                         android:maxLength="16"
                         android:inputType="textPassword"
                         android:textColorHint="@color/hintTextColor"
--
libgit2 0.21.0