提交12-3

lichao
1 parent 7b6c1777
Showing 11 changed files with 272 additions and 127 deletions
garbage-removal/src/pages/home-info/clean/company-detail/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/guest/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
garbage-removal/src/pages/order/order-disposal/swiper-list-item/index.vue
garbage-removal/src/pages/order/order-driver/swiper-list-item/index.vue
garbage-removal/src/pages/order/order-other/swiper-list-item/index.vue
garbage-removal/src/pages/wode-info/wode-info-disposal-order/index.vue
garbage-removal/src/pages/wode-info/wode-info-driver-order/index.vue
garbage-removal/src/pages/wode-info/wode-info-other-order/index.vue
garbage-removal/src/pages/wode/index.vue
@@ -2,23 +2,23 @@
   <view class="company-container">
     <view class="company-content-box">
       <view class="company-content-header">
-        <view class="company-content-left">
-          <up-image :show-loading="true"
-            :src="headerData.companyLogo ? headerData.companyLogo : '../../../../static/image/freecompress-swiper-2.jpg'"
-            width="150rpx" height="150rpx"></up-image>
-        </view>
+<!--        <view class="company-content-left">-->
+<!--          <up-image :show-loading="true"-->
+<!--            :src="headerData.companyLogo ? headerData.companyLogo : '../../../../static/image/freecompress-swiper-2.jpg'"-->
+<!--            width="150rpx" height="150rpx"></up-image>-->
+<!--        </view>-->
         <view class="company-content-right">
           <view class="company-content-right-name">
             {{ headerData.name }}
           </view>
-          <view class="company-content-right-area">
-            <view class="company-content-right-address">
-              注册区划：{{ headerData.registrationArea }}
-            </view>
-            <view class="company-content-right-button" @click="handlerClickJumpMap">
-              一键导航
-            </view>
-          </view>
+<!--          <view class="company-content-right-area">-->
+<!--            <view class="company-content-right-address">-->
+<!--              注册区划：{{ headerData.registrationArea }}-->
+<!--            </view>-->
+<!--            <view class="company-content-right-button" @click="handlerClickJumpMap">-->
+<!--              一键导航-->
+<!--            </view>-->
+<!--          </view>-->
         </view>
       </view>
       <view class="company-content-base-data">
@@ -30,13 +30,9 @@
             <view class="company-content-base-data-info-item-label">
               {{ item.label }}:
             </view>
-            <view v-if="item.label != '道路运输许可证'" class="company-content-base-data-info-item-txt">
+            <view class="company-content-base-data-info-item-txt">
               {{ item.value }}
             </view>
-            <view v-else-if="item.value" class="company-content-base-data-info-item-txt">
-              <u-upload :fileList="[item.value]" name="3" multiple :maxCount="10" :previewFullImage="true"
-                :isReadOnly="true"></u-upload>
-            </view>
           </view>
         </view>
       </view>
@@ -45,7 +41,7 @@
         <view class="company-content-car-info-sub-title">车牌号</view>
         <view class="company-content-car-info-car-list">
           <view v-for="(item, index) in  carList" :key="index" class="company-content-car-info-car-list-item">
-<!--            {{ item.carCode }}-->
+            {{ item.carCode }}
           </view>
         </view>
         <view class="company-content-remark">
@@ -101,12 +97,12 @@ import { onLoad } from &#39;@dcloudio/uni-app&#39;;
 import { computed, ref } from 'vue';
 const mainStore = useMainStore();
 const userType = computed(() => mainStore.userType)
-const baseDataList = ref([{ label: '法人' }, { label: '负责人' }, { label: '业务联系电话' }, { label: '道路运输许可证' }, { label: '核准有效期' }, { label: '注册地址' }]);
+const baseDataList = ref([{ label: '法人' }, { label: '负责人' }, { label: '业务联系电话' }, { label: '注册地址' }]);
 const customStyle = ref({
   fontSize: '30rpx',
   lineHeight: '30rpx'
 })
-const carList = ref()
+let carList = ref()
 const companyInfo = ref()
 const tel = ref()
 const userAddress = ref()
@@ -152,9 +148,9 @@ onLoad((options) =&gt; {
     })
   }
  
-  queryCarList({ companyId: companyId }).then(res => {
-    carList.value = res.data.rows
-  })
+  // queryCarList({ companyId: companyId }).then(res => {
+  //   carList.value = res.data.rows
+  // })
 })
  
 const handleCleanGarbage = (companyObj, tel, userAddress) => {
@@ -182,12 +178,12 @@ const handlerClickJumpMap = () =&gt; {
 }
  
 const initData = (baseData) => {
-  baseDataList.value[0].value = baseData.legalRepresentative
-  baseDataList.value[1].value = baseData.safetyManagerName
-  baseDataList.value[2].value = baseData.safetyManagerPhone
-  baseDataList.value[3].value = baseData.transportPermission
-  baseDataList.value[4].value = baseData.businessLicenseDate
-  baseDataList.value[5].value = baseData.officeAddress
+  console.log("数据" + JSON.stringify(baseData))
+  baseDataList.value[0].value = baseData.corporation
+  baseDataList.value[1].value = baseData.safetyOfficer
+  baseDataList.value[2].value = baseData.servicePhone
+  baseDataList.value[3].value = baseData.officeAddress
+  carList = baseData.licensePlateNos.map(plate => ({ carCode: plate }));
   headerData.value.name = baseData.name;
   headerData.value.registrationArea = baseData.registrationArea;
   headerData.value.companyLogo = import.meta.env.VITE_BASE_URL + baseData.companyLogo;
@@ -149,10 +149,10 @@
                   <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
                   <!-- 根据group.index与真实发车数比较显示状态 -->
                   <view class="car-status" :class="{
-                    'in-transit': group.index < dataGram.garCarInfoList.length,
-                    'completed': group.index >= dataGram.garCarInfoList.length
-                  }">
-                    {{ group.index < dataGram.garCarInfoList.length ? '已运完' : '已运完' }}
+									'in-transit': isInTransit(group.index),
+									'completed': isCompleted(group.index)
+								}">
+                    {{ getStatusText(group.index) }}
                   </view>
                 </view>
                 <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
@@ -193,6 +193,49 @@ const spaceStr = ref(&quot;&quot;)
 const qrCodeRef = ref()
 const qrCodeText = ref()
  
+const isInTransit = (index) => {
+  // 如果订单已完成，所有趟次都不是"清运中"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return false;
+  }
+
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  // 只有当前趟次是"清运中"
+  return index === currentTransitIndex;
+};
+
+const isCompleted = (index) => {
+  // 如果订单已完成，所有趟次都是"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return true;
+  }
+
+  // 已完成的趟次索引小于当前正在清运的趟次索引
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  return index < currentTransitIndex;
+};
+
+const getStatusText = (index) => {
+  // 如果订单已完成，显示"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return '已运完';
+  }
+
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  if (index === currentTransitIndex) {
+    return '正在清运';
+  } else if (index < currentTransitIndex) {
+    return '已运完';
+  } else {
+    return '正在清运';
+  }
+};
+
 const createQrCodeLocal = (orderId) => {
   // 获取本地地址拼接订单id
   showUQRcode.value = true;
@@ -154,10 +154,10 @@
                   <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
                   <!-- 根据group.index与真实发车数比较显示状态 -->
                   <view class="car-status" :class="{
-          'in-transit': group.index < dataGram.garCarInfoList.length,
-          'completed': group.index >= dataGram.garCarInfoList.length
-        }">
-                    {{ group.index < dataGram.garCarInfoList.length ? '已运完' : '已运完' }}
+									'in-transit': isInTransit(group.index),
+									'completed': isCompleted(group.index)
+								}">
+                    {{ getStatusText(group.index) }}
                   </view>
                 </view>
                 <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
@@ -259,6 +259,49 @@ const currentCancelName = ref(&quot;&quot;)
 const qrCodeRef = ref()
 const qrCodeText = ref()
  
+const isInTransit = (index) => {
+  // 如果订单已完成，所有趟次都不是"清运中"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return false;
+  }
+
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  // 只有当前趟次是"清运中"
+  return index === currentTransitIndex;
+};
+
+const isCompleted = (index) => {
+  // 如果订单已完成，所有趟次都是"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return true;
+  }
+
+  // 已完成的趟次索引小于当前正在清运的趟次索引
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  return index < currentTransitIndex;
+};
+
+const getStatusText = (index) => {
+  // 如果订单已完成，显示"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return '已运完';
+  }
+
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
+
+  if (index === currentTransitIndex) {
+    return '正在清运';
+  } else if (index < currentTransitIndex) {
+    return '已运完';
+  } else {
+    return '正在清运';
+  }
+};
+
 // 创建二维码
 const createQrCodeLocal = (orderId) => {
   // 获取本地地址拼接订单id
@@ -265,7 +265,7 @@
             <view class="selector-wrapper">
               <text class="selector-label">新增车辆:</text>
               <select v-model="selectedHandlerTels" class="handler-selector">
-                <option value="">请选择分配人员</option>
+                <option value="">请选择新增车型</option>
                 <option
                     v-for="car in garCarTypeList"
                     :key="car.garOrderCarType"
@@ -373,10 +373,10 @@
               <view class="image-group-header">
                 <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
                 <view class="car-status" :class="{
-									'in-transit': group.index < dataGram.garCarInfoList.length,
-									'completed': group.index >= dataGram.garCarInfoList.length
+									'in-transit': isInTransit(group.index),
+									'completed': isCompleted(group.index)
 								}">
-                  {{ group.index < dataGram.garCarInfoList.length ? '已运完' : '已运完' }}
+                  {{ getStatusText(group.index) }}
                 </view>
               </view>
               <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
@@ -396,15 +396,8 @@
     <!-- 占位符 -->
     <view class="order-detail-bottom">
       <view class="order-detail-bottom-box">
-        <view class="order-detail-bottom-left">
-          <u-button
-              v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
-              @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
-<!--          <u-button-->
-<!--              v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3 && dataGram.garAskStatus != '1'"-->
-<!--              @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆数"></u-button>-->
-        </view>
-        <view class="order-detail-bottom-center" v-show="showCenterButtons">
+        <!-- 上方按钮行 -->
+        <view class="order-detail-top-buttons" v-show="showTopButtons">
           <!-- 修改按钮组容器类名和结构 -->
           <view class="button-group-wrap" v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.handleFlag && dataGram.garCancelFlag === 0">
             <u-button @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="分配驾驶员"></u-button>
@@ -428,24 +421,32 @@
           </view>
         </view>
  
-        <view class="order-detail-bottom-right" v-show="showRightButtons">
-          <u-button
-              v-if="dataGram.garOrderHandlerStatus === 0 && userType == '用户' && dataGram.garCancelFlag === 0"
-              @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
-          <u-button @click="handleEvaluate(orderId, userType)"
-                    v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#19a97c"
-                    text="去评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-                    v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
-                    shape="square" color="#19a97c" text="查看评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-                    v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
-                    shape="square" color="#19a97c" text="查看评价"></u-button>
-          <u-button @click="handleEvaluateDetail(orderId, userType)"
-                    v-if="dataGram.garEvaluateFlag === 1 && userType === '用户'" shape="square" color="#19a97c"
-                    text="查看评价"></u-button>
-        </view>
+        <!-- 下方按钮行 -->
+        <view class="order-detail-bottom-buttons">
+          <view class="cancel-button-container">
+            <u-button
+                v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
+                @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
+            <u-button
+                v-if="dataGram.garOrderHandlerStatus === 0 && userType == '用户' && dataGram.garCancelFlag === 0"
+                @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
+          </view>
  
+          <view class="evaluation-buttons-container" v-show="showRightButtons">
+            <u-button @click="handleEvaluate(orderId, userType)"
+                      v-if="dataGram.garEvaluateFlag === 0 && userType === '用户'" shape="square" color="#19a97c"
+                      text="去评价"></u-button>
+            <u-button @click="handleEvaluateDetail(orderId, userType)"
+                      v-if="dataGram.garHandlerEvaluateFlag === 0 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
+                      shape="square" color="#19a97c" text="查看评价"></u-button>
+            <u-button @click="handleEvaluateDetail(orderId, userType)"
+                      v-if="dataGram.garHandlerEvaluateFlag === 1 && userType === '运输企业负责人'  && dataGram.haveEvaluateOfClient==1"
+                      shape="square" color="#19a97c" text="查看评价"></u-button>
+            <u-button @click="handleEvaluateDetail(orderId, userType)"
+                      v-if="dataGram.garEvaluateFlag === 1 && userType === '用户'" shape="square" color="#19a97c"
+                      text="查看评价"></u-button>
+          </view>
+        </view>
       </view>
     </view>
 		<u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
@@ -562,6 +563,50 @@
   const driverAssigned = ref(false);  // 添加这行，跟踪驾驶员是否已分配
   const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
  
+
+  const isInTransit = (index) => {
+    // 如果订单已完成，所有趟次都不是"清运中"
+    if (dataGram.value.garOrderHandlerStatus === 3) {
+      return false;
+    }
+
+    // 当前正在清运的趟次索引（从1开始）
+    const currentTransitIndex = putOnImagesGrouped.value.length;
+
+    // 只有当前趟次是"清运中"
+    return index === currentTransitIndex;
+  };
+
+  const isCompleted = (index) => {
+    // 如果订单已完成，所有趟次都是"已运完"
+    if (dataGram.value.garOrderHandlerStatus === 3) {
+      return true;
+    }
+
+    // 已完成的趟次索引小于当前正在清运的趟次索引
+    const currentTransitIndex = putOnImagesGrouped.value.length;
+
+    return index < currentTransitIndex;
+  };
+
+  const getStatusText = (index) => {
+    // 如果订单已完成，显示"已运完"
+    if (dataGram.value.garOrderHandlerStatus === 3) {
+      return '已运完';
+    }
+
+    // 当前正在清运的趟次索引（从1开始）
+    const currentTransitIndex = putOnImagesGrouped.value.length;
+
+    if (index === currentTransitIndex) {
+      return '正在清运';
+    } else if (index < currentTransitIndex) {
+      return '已运完';
+    } else {
+      return '正在清运';
+    }
+  };
+
 	const list = computed(() => {
 		let reason = [{
 				name: '订单信息填写有误',
@@ -666,6 +711,10 @@
       orderNo : orderNo.value,
       orderCarType :selectedHandlerTels.value
     };
+    if(selectedHandlerTels.value === ""){
+      uni.$u.toast(`请选择车型!`);
+      return;
+    }
     insertRandomCopyByTypeAndOrderId(params).then(res => {
       if (res.data.success) {
         uni.$u.toast(`添加成功!`);
@@ -1238,6 +1287,11 @@ const handleDriverDispatchConfirm = (val) =&gt; {
         (dataGram.value?.garEvaluateFlag === 1 && userType.value === '用户');
   });
  
+  const showTopButtons = computed(() => {
+    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
+        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && !isAllTripsCompleted()) ||
+        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
+  });
 	/**
 	 * 初始化信息
 	 */
@@ -1276,70 +1330,80 @@ const handleDriverDispatchConfirm = (val) =&gt; {
 		margin-bottom: $custom-marin-bottom;
 	}
  
-  .order-detail-bottom-box {
-    height: $custom-bottom-height;
-    padding: 50rpx;
+  .order-detail-bottom {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
+    padding: 20rpx $custom-page-padding;
     box-sizing: border-box;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
  
-    .order-detail-bottom-left {
-      min-width: 200rpx;
-    }
-
-    .order-detail-bottom-center {
-      flex: 1;
+    .order-detail-bottom-box {
       display: flex;
-      justify-content: center;
-      width: 100%; // 确保占满可用宽度
-
-      .button-group {
-        display: flex;
-        gap: 20rpx;
-        flex-wrap: nowrap;
+      flex-direction: column;
+      gap: 20rpx;
  
-        u-button {
-          white-space: nowrap;
-        }
-      }
+      .order-detail-top-buttons {
+        width: 100%;
  
-      // 修复重新分配按钮的样式（重点修改这里）
-      .button-group-spread {
-        display: flex;
-        justify-content: space-between; // 两端对齐
-        align-items: center; // 垂直居中
-        width: 100%; // 占满父容器宽度
-        padding: 0; // 移除左右内边距，让按钮更贴边
-        gap: 40rpx; // 中间间距（可根据需要调整大小）
-
-        .btn-left {
-          margin-right: auto; // 强制靠左
+        .button-group-wrap,
+        .button-group-spread {
+          display: flex;
+          gap: 20rpx;
+          width: 100%;
+
+          u-button {
+            flex: 1;
+            height: 72rpx;
+            line-height: 72rpx;
+            font-size: 26rpx;
+            padding: 0 20rpx;
+            border-radius: 36rpx;
+          }
         }
  
-        .btn-right {
-          margin-left: auto; // 强制靠右
-        }
+        .button-group-spread {
+          justify-content: space-between;
  
-        u-button {
-          min-width: 220rpx; // 固定最小宽度，确保按钮宽度一致
-          white-space: nowrap;
-          padding: 0 30rpx; // 按钮内部左右 padding，让按钮更舒展
+          .btn-left,
+          .btn-right {
+            flex: 1;
+          }
         }
       }
-    }
  
-    .order-detail-bottom-right {
-      min-width: 200rpx;
-      display: flex;
-      justify-content: flex-end;
+      .order-detail-bottom-buttons {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        gap: 20rpx;
  
-      u-button {
-        margin-left: 20rpx;
-      }
+        .cancel-button-container {
+          width: 100%;
+
+          u-button {
+            width: 100%;
+            height: 72rpx;
+            line-height: 72rpx;
+            font-size: 26rpx;
+            border-radius: 36rpx;
+          }
+        }
  
-      u-button:first-child {
-        margin-left: 0;
+        .evaluation-buttons-container {
+          display: flex;
+          gap: 20rpx;
+
+          u-button {
+            flex: 1;
+            height: 72rpx;
+            line-height: 72rpx;
+            font-size: 26rpx;
+            border-radius: 36rpx;
+          }
+        }
       }
     }
   }
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -5,7 +5,7 @@
       <view class="page-box">
         <view class="order" v-for="(item, index) in  dataList" :key="index">
           <view class="top">
-            <view class="left" @click="goDetail(item)">
+            <view class="left">
               <u-icon name="home" :size="30" color="rgb(94,94,94)"></u-icon>
               <view class="store">{{ item.garOrderCompanyName }}</view>
               <u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
@@ -7,10 +7,9 @@
       <view style="display: flex; flex-direction: column; width: 100%;">
         <view class="manager-info">
           <view class="manager-info-transport-company-name">
-            <text>{{ userInfo.transportCompanyName }}</text>
+            <text>{{ userInfo.transportCompanyName ? userInfo.transportCompanyName : userInfo.userName }}</text>
           </view>
           <view class="choose-type-item-text-right-label">{{ userInfo.userType }}
-            <view>{{userNameMrthod(userInfo.userName)}}</view>
           </view>
  
         </view>