diff --git a/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java b/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java
index e6706de..e566040 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/apply/ApplyReplaceCardContract.java
@@ -26,6 +26,6 @@ public interface ApplyReplaceCardContract {
     }
 
     interface IApplyReplaceCardView extends IBaseView{
-        void showTipsDialog();
+        void showTipsDialog(String string);
     }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
index 3435677..b0f0e85 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/report/ReportDetialContract.java
@@ -25,7 +25,7 @@ public interface ReportDetialContract {
     interface IReportDetialView extends IBaseView {
 //        pointNow,pointPast,sceneName
         void showDetialList(List<DeyuDetialBean> list, JsonArray pointNow, JsonArray pointPast, JsonArray sceneName);
-        void  showDetialInfo(float rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
+        void showDetialInfo(float rank, String scoree, String bijiao1,String bijiao2,String bijiao3,String bijiao4,String describe);
 
     }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java
index 8bfd5a6..f98b372 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/apply/ApplyReplaceCardPresenter.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.utils.ToastUtils;
@@ -11,6 +12,8 @@ import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract;
 import com.shunzhi.parent.model.apply.ApplyReplaceCardModel;
 import com.shunzhi.parent.views.ReplaceCardDialog;
 
+import org.json.JSONObject;
+
 import io.reactivex.functions.Consumer;
 
 /**
@@ -18,8 +21,6 @@ import io.reactivex.functions.Consumer;
  */
 public class ApplyReplaceCardPresenter extends ApplyReplaceCardContract.ApplyReplaceCardPreenter {
 
-    private JsonObject json;
-    private ReplaceCardDialog replaceCardDialog=null;
 
     @Override
     public ApplyReplaceCardContract.IApplyReplaceCardModel getModel() {
@@ -39,15 +40,9 @@ public class ApplyReplaceCardPresenter extends ApplyReplaceCardContract.ApplyRep
             public void accept(JsonObject jsonObject) throws Exception {
                 ToastUtils.showToast("data:" + jsonObject.toString());
 
-                json = jsonObject.getAsJsonObject("data");
-                String isShowTipDialog = json.get("data").getAsString();
-                if (isShowTipDialog.equals("true")) {
-                    //mIView.showTipsDialog();
-                    replaceCardDialog.setTitle("补卡提示");
-                    replaceCardDialog.setText("您已补卡成功！");
-                    replaceCardDialog.show();
-                }
-
+                String  isShowTipsDialog = jsonObject.get("data").getAsString();
+                Log.i("ApplyReplaceCard:", String.valueOf(isShowTipsDialog));
+                mIView.showTipsDialog(isShowTipsDialog);
             }
         }, new Consumer<Throwable>() {
             @Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
index 680a60a..51ceccc 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
@@ -23,12 +23,12 @@ import com.shunzhi.parent.views.ReplaceCardDialog;
  * Created by Administrator on 2018/4/10 0010.
  */
 
-public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplaceCardContract.ApplyReplaceCardPreenter, ApplyReplaceCardContract.IApplyReplaceCardModel> implements View.OnClickListener {
+public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplaceCardContract.ApplyReplaceCardPreenter, ApplyReplaceCardContract.IApplyReplaceCardModel> implements View.OnClickListener, ApplyReplaceCardContract.IApplyReplaceCardView {
     private Button bt_sure;
     private Button bt_cancel;
     ReplaceCardDialog replaceCardDialog = null;
     private EditText et_cardnum;
-    private String cardnum ="";
+    private String cardnum = "";
 
     @NonNull
     @Override
@@ -66,16 +66,27 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
                     //studentid 从成长界面获取 此处设置为“123”
                     mPresenter.ReplaceCardDetail(12, cardnum);
                 }
-
-//                cardnum = et_cardnum.getText().toString().trim();
-//                if (TextUtils.isEmpty(cardnum)) {
-//                    Toast.makeText(getActivity(), "卡号不能为空，请重新输入", Toast.LENGTH_SHORT).show();
-//                } else {
-//                    replaceCardDialog.setTitle("补卡提示");
-//                    replaceCardDialog.setText("您已补卡成功！");
-//                    replaceCardDialog.show();
-//                }
+                break;
+            default:
                 break;
         }
     }
+
+    @Override
+    public void showTipsDialog(String msg) {
+
+        if (msg.equals("true")) {
+            if (replaceCardDialog == null) {
+                replaceCardDialog = new ReplaceCardDialog(getActivity());
+            } else {
+                replaceCardDialog.setTitle("补卡提示");
+                replaceCardDialog.setText("您已补卡成功！");
+                replaceCardDialog.show();
+            }
+        } else {
+            ToastUtils.showToast("补卡失败！");
+        }
+
+
+    }
 }
diff --git a/app/src/main/res/layout/fragment_apply_replacecard.xml b/app/src/main/res/layout/fragment_apply_replacecard.xml
index ddbad9b..9e27de4 100644
--- a/app/src/main/res/layout/fragment_apply_replacecard.xml
+++ b/app/src/main/res/layout/fragment_apply_replacecard.xml
@@ -39,7 +39,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_weight="1"
+                android:layout_weight="1.2"
                 android:id="@+id/tv_carduser"
                 android:layout_margin="@dimen/dp_8"
                 android:layout_width="0dp"
@@ -50,9 +50,10 @@
 
             <TextView
                 android:id="@+id/et_carduser"
-                android:layout_weight="3"
+                android:layout_weight="2.8"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_8"
                 android:gravity="center"
                 android:text="张三"
                 android:textColor="@color/hintTextColor"
@@ -67,7 +68,7 @@
 
             <TextView
                 android:id="@+id/tv_cardnum"
-                android:layout_weight="1"
+                android:layout_weight="1.2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/dp_8"
@@ -77,9 +78,10 @@
 
             <EditText
                 android:id="@+id/et_cardnum"
-                android:layout_weight="3"
+                android:layout_weight="2.8"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_8"
                 android:gravity="center"
                 android:background="@null"
                 android:inputType="number"
@@ -101,18 +103,19 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/dp_8"
-                android:layout_weight="1"
+                android:layout_weight="1.2"
                 android:text="考勤次数:"
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
 
             <TextView
                 android:id="@+id/et_cardnumber"
-                android:layout_weight="3"
+                android:layout_weight="2.8"
                 android:layout_width="0dp"
+                android:layout_margin="@dimen/dp_8"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="5次"
+                android:text="0次"
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
         </LinearLayout>
@@ -132,7 +135,7 @@
                 android:id="@+id/bt_sure"
                 android:layout_width="80dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_60"
+                android:layout_marginLeft="@dimen/dp_40"
                 android:layout_alignParentLeft="true"
                 android:text="确定"
                 android:textColor="@color/white"
@@ -143,7 +146,7 @@
                 android:id="@+id/bt_cancle"
                 android:layout_width="80dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/dp_60"
+                android:layout_marginRight="@dimen/dp_40"
                 android:layout_alignParentRight="true"
                 android:text="取消"
                 android:textColor="@color/white"
--
libgit2 0.21.0