Commit bb449d28 authored by linfeng's avatar linfeng

bug修改

parent b55d27fc
...@@ -438,7 +438,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP ...@@ -438,7 +438,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
if (mAdapter != null) { if (mAdapter != null) {
mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data); mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
} }
} }
@Override @Override
......
...@@ -664,6 +664,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> { ...@@ -664,6 +664,16 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
tvLayoutMemberHint.setVisibility(View.VISIBLE); tvLayoutMemberHint.setVisibility(View.VISIBLE);
llLayoutMemberHint.setVisibility(View.VISIBLE); llLayoutMemberHint.setVisibility(View.VISIBLE);
tvFreeCarDays.setText("(剩余" + memberData.getRentFreeDays() + "天)"); tvFreeCarDays.setText("(剩余" + memberData.getRentFreeDays() + "天)");
if (memberData.getRentFreeDays() > 0) {
swbtnMember.setChecked(true);
isMemberType = 1;
dataBean.setRentFreeDay(1);
couponAmount = 0;
getPayMoney();
}else {
dataBean.setRentFreeDay(0);
isMemberType = 0;
}
} }
if (priceBean.getData() != null) { if (priceBean.getData() != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment