Merge commit 'e73ef2ea' into dev

* commit 'e73ef2ea':
  服务技能恢复省市区参数
  按天工单已完成跳转

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">

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

@@ -57,7 +57,7 @@ public class OrderDoneFragment extends BaseFragment<OrderDoingPresenter, Fragmen
         mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<Order, FragmentOrderdoingItemBinding>() {
             @Override
             public void OnItemClick(Order item, FragmentOrderdoingItemBinding bind) {
-                if (7 == item.getSource()){
+                if (7 == item.getSource() || 8 == item.getSource()){
                     mPresenter.dumpDetailClock(item.getId());
                 }else{
                     mPresenter.dumpDetail(item.getId());

userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java

@@ -136,9 +136,12 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
 //                    mBind.area.setText(areaName = data.getDistrictName());
 //                    getTreeAddrData(data.getProvinceId(), 2, false);
 //                    getTreeAddrData(data.getCityId(), 3, false);
-//                    provinceId = data.getProvinceId();
-//                    cityId = data.getCityId();
-//                    areaId = data.getDistrictId();
+                    provinceId = data.getProvinceId();
+                    cityId = data.getCityId();
+                    areaId = data.getDistrictId();
+                    provinceName = data.getProvinceName();
+                    cityName = data.getCityName();
+                    areaName = data.getDistrictName();
                 }));
         //服务类型数据
         Api.getService(UserService2.class).getServiceType(1).compose(Api.applySchedulers())
@@ -392,11 +395,11 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
                 break;
             case 2:
                 cityList = datas;
-                mBind.city.setVisibility(View.VISIBLE);
+//                mBind.city.setVisibility(View.VISIBLE);
                 break;
             case 3:
                 areaList = datas;
-                mBind.area.setVisibility(View.VISIBLE);
+//                mBind.area.setVisibility(View.VISIBLE);
                 break;
         }
         if (showDialog)