Merge remote-tracking branch 'origin/dev' into dev

orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java

@@ -195,6 +195,8 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
             mBind.tvCustomerMobile.setVisibility(View.GONE);
             mBind.customerMoblie.setVisibility(View.GONE);
             mBind.tvContactTel.setVisibility(View.GONE);
+            mBind.tvAddress.setVisibility(View.GONE);
+            mBind.navigation.setVisibility(View.GONE);
         }else{
             mBind.customerName.setVisibility(View.VISIBLE);
             mBind.tvCustomerName.setVisibility(View.VISIBLE);
@@ -202,6 +204,8 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
             mBind.tvCustomerMobile.setVisibility(View.VISIBLE);
             mBind.customerMoblie.setVisibility(View.VISIBLE);
             mBind.tvContactTel.setVisibility(View.VISIBLE);
+            mBind.tvAddress.setVisibility(View.VISIBLE);
+            mBind.navigation.setVisibility(View.VISIBLE);
         }
         mBind.customerAcceptance.setOnClickListener(v -> {
             UserInfo info = UserManager.getInstance().getUser();

orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java

@@ -76,6 +76,8 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
             mBind.twoTextFour.setVisibility(View.GONE);
             mBind.tvContactMode.setVisibility(View.GONE);
             mBind.tvContactTel.setVisibility(View.GONE);
+            mBind.twoTextFive.setVisibility(View.GONE);
+            mBind.navigation.setVisibility(View.GONE);
         }else{
             mBind.twoTextThree.setVisibility(View.VISIBLE);
             mBind.tvCustomerName.setVisibility(View.VISIBLE);
@@ -83,6 +85,8 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
             mBind.twoTextFour.setVisibility(View.VISIBLE);
             mBind.tvContactMode.setVisibility(View.VISIBLE);
             mBind.tvContactTel.setVisibility(View.VISIBLE);
+            mBind.twoTextFive.setVisibility(View.VISIBLE);
+            mBind.navigation.setVisibility(View.VISIBLE);
         }
         mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
         mBind.tvLookMore.setOnClickListener(o -> lookMore());