api

src/api/home.js

@@ -12,5 +12,5 @@ import request  from '@/utils/request.js';
  */
 // 获取地址列表
 export const ceshi =(params) => {
-      return request.get('/sys/baseDict/queryChannleDict',params,{},'pro');
+      // return request.get('/sys/baseDict/queryChannleDict',params,{},'pro');
 } 

src/components/tabbar/navbar.vue

@@ -138,6 +138,7 @@
      
         
     },
+
     methods: {
       setColor() {
         if(
@@ -152,14 +153,19 @@
       window.location.href=  `http://56carrier.com:82/#/home/index`
         }
     },
+ 
     watch: {
       '$route'(to, from) {
+        console.log(from,to,'from')
         // 路由变化时调用
         if(to.path ==='/newsHome') {
           this.color = 'white';
         }else {
           this.color = 'black';
         }
+        // if(from.path === '/developmentDocking/main'){
+        //   window.location()
+        // }
       }
     }
   };

src/router/index.js

@@ -167,5 +167,13 @@ const router = new VueRouter({
   base: process.env.BASE_URL,
   routes
 });
+// const originalPush = router.push;
 
+// // 重写 router.push 方法
+// router.push = function push(location, onResolve, onReject) {
+//   if (onResolve || onReject) {
+//     return originalPush.call(this, location, onResolve, onReject);
+//   }
+//   return originalPush.call(this, location).catch(err => err);
+// }
 export default router;

src/view/developmentDocking/index.css

@@ -1,4 +1,4 @@
-::v-deep .el-icon-arrow-down:before {
+::v-deep .mainComponents .el-icon-arrow-down:before {
     display: none;
 }
 .version-selector {

src/view/developmentDocking/index.vue

@@ -168,6 +168,14 @@ export default {
       }
     };
   },
+  beforeRouteLeave(to, from, next) {
+      // console.log('211111111',from)
+    if (from.path === '/developmentDocking/main') {
+      window.location.href = to.fullPath;
+    } else {
+      next(); 
+    }
+  },
   mounted() {
     console.log(this.selectedVersion,'this.selectedVersion')
     this.$router.push({ name: 'mainComponents', query: { api: '1-0',selectedVersion:this.selectedVersion } });

src/view/developmentDocking/mainComponents.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="box-main">
+  <div class="">
+    <div class="box-main">
     <div class="main">
       <div v-for="(item, index) in apiData" :key="index" class="mainTab">
         <div class="title main-title" style="margin-top: 0;">{{ item.mainTitle }}</div>
@@ -80,6 +81,7 @@
         </div>
        
     </div>
+  </div>
 </template>
 
 <script>
@@ -306,7 +308,7 @@ export default {
                 { id: 'forecastWeight', field: 'forecastWeight', fieldName: '预报重量', required: '是', dataType: 'number', example: '50.00', description: '重量(KG)' },
                 { id: 'forecastVolume', field: 'forecastVolume', fieldName: '预报体积', required: '是', dataType: 'number', example: '1.00', description: '体积(M³)' },
                 { id: 'isArrangeInspection', field: 'isArrangeInspection', fieldName: '是否安排商检', required: '否', dataType: 'string', example: '0', description: '0:否 1:是' },
-                { id: 'declareType', field: 'declareType', fieldName: '报关方式', required: '是', dataType: 'string', example: '1', description: '1:买单报关 2:退税报关 3:买单+退税' },
+                { id: 'declareType1', field: 'declareType', fieldName: '报关方式', required: '是', dataType: 'string', example: '1', description: '1:买单报关 2:退税报关 3:买单+退税' },
                 { id: 'taxRefundInfo', field: 'taxRefundInfo', fieldName: '退税资料url', required: '否', dataType: 'string', example: 'https://public-shenzhen-file.oss-cn-beijing.aliyuncs.com/aaf1.0/file/退税资料.zip', description: '文件下载地址' },
                 { id: 'taxRefundRemark', field: 'taxRefundRemark', fieldName: '退税资料说明', required: '是', dataType: 'string', example: '1', description: '1-一对多（单订单多份资料）, 2-一对一（单订单一份资料）, 3-多对多（合并报关，多份资料）, 4-多对一（合并报关，一份资料）；报关方式为买单+退税则必填' },
                 { id: 'taxType', field: 'taxType', fieldName: '交税方式', required: '是', dataType: 'string', example: '1', description: '1-不包税，2-包税，3-自主税号，4-自税递延' },
@@ -352,7 +354,7 @@ export default {
                     { id: 'isPowder', field: 'isPowder', fieldName: '是否粉末', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'isHazardous', field: 'isHazardous', fieldName: '是否危险品', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'isWooden', field: 'isWooden', fieldName: '是否木制品', required: '否', dataType: 'string', example: '', description: '' },
-                    { id: 'declareType', field: 'declareType', fieldName: '出口报关类型', required: '否', dataType: 'string', example: '', description: '1:买单报关 2:退税报关' },
+                    { id: 'declareType2', field: 'declareType', fieldName: '出口报关类型', required: '否', dataType: 'string', example: '', description: '1:买单报关 2:退税报关' },
                     ] 
                 },
                 { id: 'orderReceive', field: 'orderReceive', fieldName: '收件地址类型详情', required: '是', dataType: '订单收件信息', example: '{}', description: '订单收件信息',children:[
@@ -360,9 +362,9 @@ export default {
                     { id: 'tpWarehouseCode', field: 'tpWarehouseCode', fieldName: '第三方海外仓id', required: '是', dataType: 'string', example: '', description: '收件地址类型是第三方海外仓，则必填' },
                     { id: 'inBoundCode', field: 'inBoundCode', fieldName: '第三方海外仓的入仓代码', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'state', field: 'state', fieldName: '省/州地区', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
-                    { id: 'city', field: 'city', fieldName: '城市', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
+                    { id: 'city1', field: 'city', fieldName: '城市', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
                     { id: 'receivePostcode', field: 'receivePostcode', fieldName: '收件人邮编', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
-                    { id: 'address', field: 'address', fieldName: '详细地址', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
+                    { id: 'address1', field: 'address', fieldName: '详细地址', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
                     { id: 'receiveName', field: 'receiveName', fieldName: '收件人', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
                     { id: 'receivePhone', field: 'receivePhone', fieldName: '收件人电话', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
                     { id: 'receiveLandline', field: 'receiveLandline', fieldName: '收件人座机号', required: '是', dataType: 'string', example: '', description: '商业地址，住宅地址必填' },
@@ -374,9 +376,9 @@ export default {
                     { id: 'warehouseId', field: 'warehouseId', fieldName: '交货仓库Id', required: '是', dataType: 'string', example: '73d277d502024515b92ecf9e95c048df', description: '交货方式为送货到仓必填' },
                     { id: 'warehouseName', field: 'warehouseName', fieldName: '交货仓库名称', required: '是', dataType: 'string', example: '73d277d502024515b92ecf9e95c048df', description: '交货方式为送货到仓必填' },
                     { id: 'province', field: 'province', fieldName: '省/州/自治区', required: '否', dataType: 'string', example: '', description: '' },
-                    { id: 'city', field: 'city', fieldName: '市', required: '否', dataType: 'string', example: '', description: '' },
+                    { id: 'city2', field: 'city', fieldName: '市', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'district', field: 'district', fieldName: '区/县', required: '否', dataType: 'string', example: '', description: '' },
-                    { id: 'address', field: 'address', fieldName: '详细地址', required: '否', dataType: 'string', example: '', description: '' },
+                    { id: 'address2', field: 'address', fieldName: '详细地址', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'contact', field: 'contact', fieldName: '提货联系人', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'phone', field: 'phone', fieldName: '提货联系电话', required: '否', dataType: 'string', example: '', description: '' },
                     { id: 'takeTime', field: 'takeTime', fieldName: '交货时间', required: '否', dataType: 'string', example: '', description: '' }
@@ -755,9 +757,9 @@ export default {
                   data:订单轨迹数据列表
                   `.split('\n'),
               tableData:[
-                    { id: 'trackNode', field: 'trackNode', fieldName: '节点类型', required: '是', dataType: 'String', example: '1400', description: '节点类型' },
+                    { id: 'trackNode1', field: 'trackNode', fieldName: '节点类型', required: '是', dataType: 'String', example: '1400', description: '节点类型' },
-                    { id: 'trackNodeStr', field: 'trackNodeStr', fieldName: '节点类型', required: '是', dataType: 'String', example: '到港', description: '节点类型' },
+                    { id: 'trackNodeStr1', field: 'trackNodeStr', fieldName: '节点类型', required: '是', dataType: 'String', example: '到港', description: '节点类型' },
-                    { id: 'location', field: 'location', fieldName: '地点', required: '是', dataType: 'String', example: 'PRINCE RUPERT, BC', description: '地点' },
+                    { id: 'location1', field: 'location', fieldName: '地点', required: '是', dataType: 'String', example: 'PRINCE RUPERT, BC', description: '地点' },
                     { id: 'expand', field: 'expand', fieldName: '前端是否能展开子节点', required: '是', dataType: 'Boolean', example: 'false', description: '前端是否能展开子节点' },
                     { id: 'timeLessInfoVO', field: 'timeLessInfoVO', fieldName: '运输时长信息', required: '否', dataType: 'Object', example: '见下方示例', description: '运输时长信息',children:[
                         { id: 'transportTime', field: 'transportTime', fieldName: '运输时长', required: '是', dataType: 'String', example: '3天9小时45分钟', description: '运输时长' },
@@ -765,11 +767,11 @@ export default {
                         { id: 'transportTimeCompareType', field: 'transportTimeCompareType', fieldName: '预计时长对比类型', required: '否', dataType: 'String', example: '1', description: '预计时长对比类型 1、提前 2、延迟' },
                     ] },
                     { id: 'childTrackNodeList', field: 'childTrackNodeList', fieldName: '订单轨迹子节点', required: '是', dataType: 'array', example: '见下方示例', description: '订单轨迹子节点',children:[
-                        { id: 'trackNode', field: 'trackNode', fieldName: '节点类型', required: '是', dataType: 'String', example: '1401', description: '节点类型' },
+                        { id: 'trackNode2', field: 'trackNode', fieldName: '节点类型', required: '是', dataType: 'String', example: '1401', description: '节点类型' },
-                        { id: 'trackNodeStr', field: 'trackNodeStr', fieldName: '节点类型', required: '是', dataType: 'String', example: '已到港', description: '节点类型' },
+                        { id: 'trackNodeStr2', field: 'trackNodeStr', fieldName: '节点类型', required: '是', dataType: 'String', example: '已到港', description: '节点类型' },
                         { id: 'eventTime', field: 'eventTime', fieldName: '事件发生时间', required: '是', dataType: 'Date', example: '2024-05-13 00:00:00', description: '事件发生时间' },
                         { id: 'eventTimeType', field: 'eventTimeType', fieldName: '时间发生时间类型', required: '是', dataType: 'String', example: '2', description: '时间发生时间类型 1、实际发生 2、预计发生' },
-                        { id: 'location', field: 'location', fieldName: '地点', required: '是', dataType: 'String', example: 'PRINCE RUPERT, BC', description: '地点' },
+                        { id: 'location2', field: 'location', fieldName: '地点', required: '是', dataType: 'String', example: 'PRINCE RUPERT, BC', description: '地点' },
                     ] },
                    
                ]
@@ -1225,11 +1227,6 @@ export default {
     handleClose(key, keyPath) {
       // handle close
     },
-    handleSelect(key, keyPath,selectType) {
-      console.log(key, keyPath,selectType, 'select');
-      this.totalIndex = keyPath[0];
-      this.$router.push({ name: 'mainComponents', query: { api: key,selectedVersion:selectType } });
-    },
     filteredMenuItems(val) {
       this.propList = [];
       if (val === "") {

src/view/newsHome/index.vue

@@ -314,9 +314,9 @@ export default {
     let paramObj = {
         uid: "123456",
       };
-      ceshi(paramObj).then((data) => {
+      // ceshi(paramObj).then((data) => {
-        console.log(data);
+      //   console.log(data);
-      });
+      // });
       // console.log(localStorage.getItem("newsIndex"),'newsIndex');
       // this.newIndex = +localStorage.getItem("newsIndex") || 0;
   },
@@ -400,16 +400,20 @@ export default {
   },
     handleScroll() {
       this.sections.forEach(section => {
+      console.log(section,'section')
+
         const refName = `section${section}`;
         const element = this.$refs[refName];
         element.style.opacity = '0';
+        if (element && this.isElementInViewport(element)) {
+
         setTimeout(() => {
-          if (element && this.isElementInViewport(element)) {
           element.classList.add('slide-up-enter-active');
            element.style.opacity = '1';
 
-        }
         }, 500);
+      }
+
       });
     },
     isElementInViewport(el) {