소스 검색

更新 江苏汇很多

wzh 3 년 전
부모
커밋
d011db09b2
5개의 변경된 파일13개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 1
      .env.dev
  2. 1 1
      .env.release
  3. 1 1
      src/apis/fetch.js
  4. 2 2
      src/views/agencyManage/agencyCompanyList.vue
  5. 8 3
      src/views/voyage/voyageDetail.vue

+ 1 - 1
.env.dev

@@ -1,2 +1,2 @@
 VITE_PROJECT_ENV = 'dev'
-VITE_BASEURL = 'https://interface.huihenduo.com.cn/hhd-pat-dev/'
+VITE_BASEURL = 'https://interface.huihenduo.cc/hhd-cargo-dev/'

+ 1 - 1
.env.release

@@ -1,2 +1,2 @@
 VITE_PROJECT_ENV = 'release'
-VITE_BASEURL = 'https://interface.huihenduo.com.cn/hhd-pat/'
+VITE_BASEURL = 'https://interface.huihenduo.cc/hhd-cargo/'

+ 1 - 1
src/apis/fetch.js

@@ -11,7 +11,7 @@ export default {
 
   // 获取航次详情
   getVoyageDetail(data) {
-    return $http("/voyage/detail", data);
+    return $http("/voyage/wx/detail", data);
   },
 
   // 更新航次

+ 2 - 2
src/views/agencyManage/agencyCompanyList.vue

@@ -67,7 +67,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="userName"
+          prop="companyName"
           label="代理公司"
           min-width="100"
           align="center"
@@ -79,7 +79,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="phone"
+          prop="contactPhone"
           label="手机号"
           min-width="80"
           align="center"

+ 8 - 3
src/views/voyage/voyageDetail.vue

@@ -885,8 +885,8 @@
                 <br />
                 {{ item.createTime }}
                 <br />
-                天气 : {{ item.weather.weather }} - 气温 :
-                {{ item.weather.temperature }}℃
+                天气 : {{ item.weather?.weather }} - 气温 :
+                {{ item.weather?.temperature }}℃
               </div>
               <div class="medias-box mb10" style="position: relative">
                 <el-image
@@ -1031,6 +1031,7 @@ async function getVoyageDetail(isInit) {
   let res = await api.getVoyageDetail({
     type: localStorage.userType,
     voyageId: route.query.id,
+    loginAccountId: localStorage.loginAccountId,
   });
   if (res.data.status == 0) {
     ElNotification({
@@ -1123,6 +1124,7 @@ async function getDischargeList(type) {
     portId: currentDiscPortId.value,
     currentPage: dischargeCurrentPage.value,
     size: 10,
+    loginAccountId: localStorage.loginAccountId,
   });
   if (res.data.status == 0) {
     dischargeList.value = res.data.result;
@@ -1328,7 +1330,6 @@ async function finishVoyage() {
       type: "error",
       title: res.data.msg,
     });
-    console.log(res);
   }
 }
 let currentUrl = ref("");
@@ -1462,6 +1463,7 @@ async function getTruckLoadRecord() {
     portId: currentDiscPortId.value,
     currentPage: truckCurrentPage.value,
     size: 10,
+    loginAccountId: localStorage.loginAccountId,
   });
   truckTableData.value = res.data.result;
   truckTotal.value = res.data.total;
@@ -1532,6 +1534,7 @@ async function getLabList() {
     portId: currentDiscPortId.value,
     currentPage: labCurrentPage.value,
     size: 10,
+    loginAccountId: localStorage.loginAccountId,
   });
   labTableData.value = res.data.result;
   labTotal.value = res.data.total;
@@ -1554,6 +1557,8 @@ function showLab(item) {
 
   labForm.value = { ...item };
 }
+let labModalType = ref("");
+function cancelUploadLab() {}
 
 let currentPortId = ref("");
 let currentDiscPortId = ref("");