|
@@ -285,13 +285,33 @@ public class SendKeyBoardFragment extends Fragment {
|
|
Bundle isPayBundle = new Bundle();
|
|
Bundle isPayBundle = new Bundle();
|
|
isPayBundle.putString("isPay",data.getIsPay());
|
|
isPayBundle.putString("isPay",data.getIsPay());
|
|
activity.getBundleMap().put(SendKeyBoardFragment.class.getName(), isPayBundle);
|
|
activity.getBundleMap().put(SendKeyBoardFragment.class.getName(), isPayBundle);
|
|
- NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_sendMainFragment);
|
|
|
|
|
|
+
|
|
|
|
+ if("store".equals(finalLoginType) ){
|
|
|
|
+ if("10".equals(data.getDelType())){
|
|
|
|
+ NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_sendMainFragment);
|
|
|
|
+ } else {
|
|
|
|
+ ToastUtils.make(getContext(), "请用门店账号登录!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }else {
|
|
|
|
+ if("20".equals(data.getDelType())){
|
|
|
|
+ NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_sendMainFragment);
|
|
|
|
+ } else {
|
|
|
|
+ ToastUtils.make(getContext(), "请用快递员账号登录!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
// if ("0".equals(data.getIsPay())){
|
|
// if ("0".equals(data.getIsPay())){
|
|
// NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_paymentFragment);
|
|
// NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_paymentFragment);
|
|
// }else {
|
|
// }else {
|
|
// NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_sendMainFragment);
|
|
// NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_sendMainFragment);
|
|
// }
|
|
// }
|
|
}else{
|
|
}else{
|
|
|
|
+ if(!"20".equals(data.getDelType())){
|
|
|
|
+ ToastUtils.make(getContext(), "请用快递员账号登录!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_collectMaterialsFragment);
|
|
NavUtils.navigate(SendKeyBoardFragment.this, R.id.action_sendFragment_to_collectMaterialsFragment);
|
|
}
|
|
}
|
|
|
|
|