添加驾驶员名称

liujun001
1 parent b917e960
Showing 5 changed files with 37 additions and 16 deletions
garbage-removal/src/apis/carinfo.js
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/login/code.vue
garbage-removal/src/pages/wode-info/wode-info-choose/index.vue
garbage-removal/src/pages/wode/index.vue
@@ -4,7 +4,7 @@ import { request } from &quot;@/utils/request&quot;;
  */
 export async function queryCarList(params) {
    return await request.get(
-     `/unit/carInfo/list/group/by/carType`,
+     `/gar/car/list/group/by/carType`,
      {params:params}
   );
 }
@@ -326,7 +326,7 @@ const initOptions = async (options) =&gt; {
   await queryAddress('CURRENT').then(res => {
     try {
       if (res.data.data && res.data.data[0]) {
-        userAddress.value = res.data.data[0] ? res.data.data[0] : {}
+        userAddress.value = res.data.data[0] ? res.data.data[0] : {} 
       } else {
         userAddress.value = {};
       }
@@ -386,10 +386,6 @@ const afterRead = async (event) =&gt; {
   for (let i = 0; i < lists.length; i++) {
     let requestPath = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_BASE_FILE_UPLOAD_PREFIX;
     const result = await uploadFilePromise(requestPath, lists[i].url);
-    console.log("=====================>");
-    
-    console.log(result);
-    
     let item = fileList.value[fileListLen];
     fileList.value.splice(fileListLen, 1, {
       ...item,
@@ -421,11 +417,8 @@ const orderClick = ref(true)
  * 处理下单
  */
 const handleOderSure = async () => {
-  console.log("paramFrom.value.garEstimatedCost=======================>"+paramFrom.value.garEstimatedCost);
-    
   if(null == paramFrom.value.garEstimatedCost|| "" == paramFrom.value.garEstimatedCost || undefined == paramFrom.value.garEstimatedCost){
     jumpPrompt("预估费用不能为空");
-    console.log("----------------------->2");
  
     return;
   }
@@ -433,7 +426,6 @@ const handleOderSure = async () =&gt; {
     jumpPrompt("预估费用必须大于0");
     return;
   }
-
   let garCarInfos = [];
   for (const key in garCarInfoList.value) {
     if(garCarInfoList.value[key]&& garCarInfoList.value[key].garOrderCarNumber && garCarInfoList.value[key].garOrderCarNumber>0){
@@ -441,7 +433,6 @@ const handleOderSure = async () =&gt; {
     }
  
   }
-
     if(dayTime.value != null && dayTime.value != ""  && dayTime.value != undefined){
       if(dayTimeType.value != '2207' ){
        let length = garCarInfos.length;
@@ -449,13 +440,13 @@ const handleOderSure = async () =&gt; {
  
           if(garCarInfos[index].containerVolume  && parseFloat(garCarInfos[index].containerVolume) >=8){
             jumpPrompt("中大型车辆只能选择22:00-07:00时间段");
+          
             return;
           }
  
        }
       }
     }
-
  
  
  
@@ -519,8 +510,10 @@ const handleOderSure = async () =&gt; {
     garInCarStore: paramFrom.value.garInCarStore,
     garEstimatedCost:paramFrom.value.garEstimatedCost
   }
+  console.log("----------------------->5");
   if (!validateParams(params)) {
     console.log("未通过", params);
+    
     return;
   }
  
@@ -563,6 +556,10 @@ const handlerChooseAddress = () =&gt; {
 }
 const currentChange = (val) => {
   userAddress.value = val
+  console.log("currentChange====================>");
+  
+  console.log(userAddress.value);
+  
 }
 /**
  * 校验参数
@@ -592,8 +589,12 @@ const validateParams = (params) =&gt; {
         case "garEstimatedCost":
            jumpPrompt('请输入预估费用')
            break;
-
+        case "garOrderCompanyTel":
+          jumpPrompt('企业负责人手机号不能为空')
+          break;
       }
+      console.log("201================="+key);
+      
       return false;
     }
     if (key === "garCarInfoList") {
@@ -74,8 +74,10 @@ const checkVerifyNum = (code) =&gt; {
 		if (res.data.success) {
 			verifyFlag.value = false;
 			store.tempToken = res.data.data.token
+			
+			store.userName = res.data.data.name;
 			uni.navigateTo({
-				url: `/pages/wode-info/wode-info-choose/index?ruleVos= ${encodeURIComponent(JSON.stringify(res.data.data.ruleVos))}`
+				url: `/pages/wode-info/wode-info-choose/index?ruleVos= ${encodeURIComponent(JSON.stringify(res.data.data.ruleVos))}&userName=${encodeURIComponent(res.data.data.name)}`
 			});
 		} else {
 			verifyFlag.value = true;
@@ -154,9 +154,14 @@ const combinationImagePath=(url)=&gt;{
 onLoad((options) => {
   // let loginInfo = JSON.parse(options)
   let loginInfo = JSON.parse(decodeURIComponent(options.ruleVos))
+  let userName = decodeURIComponent(options.userName)
   for (let index = 0; index < loginInfo.length; index++) {
     const element = loginInfo[index];
+    element.userName = userName;
     unitInfo.value[element.userType] = element
+
+    
+    
   }
   let order = 999;
   let index = 0;
@@ -183,7 +188,7 @@ onLoad((options) =&gt; {
  
   typeList.value[0].imageUrl = combinationImagePath('role/user.png');
   typeList.value[1].imageUrl = combinationImagePath('role/company.png');
-  typeList.value[2].imageUrl = combinationImagePath('role/company.png');
+  typeList.value[2].imageUrl = combinationImagePath('role/handler.png');
   typeList.value[3].imageUrl = combinationImagePath('role/disposal.png');
  
  
@@ -9,7 +9,10 @@
           <view class="manager-info-transport-company-name">
             <text>{{ userInfo.transportCompanyName }}</text>
           </view>
-          <view class="choose-type-item-text-right-label">{{ userInfo.userType }}</view>
+          <view class="choose-type-item-text-right-label">{{ userInfo.userType }}
+            <view>{{userNameMrthod(userInfo.userName)}}</view>
+          </view>
+         
         </view>
       </view>
     </view>
@@ -18,6 +21,7 @@
       <wode-other v-if="userInfo.userType === '用户' || userInfo.userType === '运输企业负责人'"></wode-other>
       <wode-driver v-else-if="userInfo.userType === '清运车辆驾驶员'"></wode-driver>
       <wode-disposal v-else></wode-disposal>
+      
     </view>
     <view class="more-setting-box">
       <view class="more-setting-title">
@@ -63,12 +67,21 @@ import wodeOther from &#39;./wode-other/index.vue&#39;;
 const store = useMainStore();
 const pic = ref(headImg)
 const userInfo = computed(() => store.userInfo)
+
+
+
+
+
 const handleAddressManager = () => {
   uni.$u.route({
     url: `pages/home-info/address/index`,
   })
 }
  
+const userNameMrthod = (userName) => {
+  return null == userName?"":undefined == userName?"":"undefined"==userName?"":userName;
+}
+
  
 const handlerChangeRole = () => {
   uni.showModal({