Merge remote-tracking branch 'origin/linjinhong' into dev

src/components/TableView.vue

@@ -5,9 +5,9 @@
       :data="paginatedData"
       border
       :stripe="stripe"
-      v-bind="attrs"
       header-align="center"
       height="100%"
+      v-bind="attrs"
     >
       <ElTableColumn
         v-if="selectionable"

src/components/splitDiv/splitDiv.vue

@@ -10,7 +10,7 @@ const props = defineProps({
     type: String || Number,
   },
   otherSize: {
-    default: 20,
+    default: '20',
     type: String || Number,
   },
 })
@@ -19,7 +19,7 @@ const domSize = ref<string>('0')
 function domResize() {
   const father = document.getElementsByClassName('splitpanes')[0]
   const top = document.getElementById('top')
-  if(top && father){
+  if (top && father) {
     const v = ((top.clientHeight / father?.clientHeight) * 100).toFixed(2)
 
     if (props.size === '') {
@@ -28,9 +28,8 @@ function domResize() {
       domSize.value = props.size
     }
   }
-
 }
-onUnmounted(()=>{
+onUnmounted(() => {
   window.removeEventListener('resize', domResize)
 })
 onMounted(() => {
@@ -38,7 +37,7 @@ onMounted(() => {
   domResize()
 })
 defineExpose({
-  domResize
+  domResize,
 })
 </script>
 
@@ -48,7 +47,6 @@ defineExpose({
       <div id="top">
         <slot name="top"></slot>
       </div>
-
     </pane>
     <pane style="flex: 1; flex-shrink: 0">
       <div id="bottom">
@@ -67,15 +65,15 @@ defineExpose({
 #top {
   height: fit-content;
 }
-#other-pane{
+#other-pane {
   height: 100%;
 }
 #bottom {
   height: 100%;
 }
 
-#top, #bottom {
-
+#top,
+#bottom {
   display: flex;
   flex-direction: column;
 }
@@ -99,11 +97,11 @@ defineExpose({
     transform: translate(-50%);
     width: 30px;
     height: 1px;
-    content: "";
+    content: '';
     position: absolute;
     top: 50%;
     left: 50%;
-    transition: background-color .3s;
+    transition: background-color 0.3s;
   }
 
   &::after {
@@ -112,11 +110,11 @@ defineExpose({
     transform: translate(-50%);
     width: 30px;
     height: 1px;
-    content: "";
+    content: '';
     position: absolute;
     top: 50%;
     left: 50%;
-    transition: background-color .3s;
+    transition: background-color 0.3s;
   }
 }
 

src/router/menu.ts

@@ -117,11 +117,11 @@ const menu: MenuItem[] = [
         id: 8,
         label: 'POD订单(US)',
       },
-      // {
-      //   index: '/pod-us-order/orderTracking',
-      //   id: 8,
-      //   label: 'POD(US)订单跟踪',
-      // },
+      {
+        index: '/pod-us-order/orderTracking',
+        id: 8,
+        label: 'POD(US)订单跟踪',
+      },
     ],
   },
 

src/types/api/podUsOrder.ts

@@ -8,7 +8,7 @@ export interface SearchForm {
   shopNumber: string
   shipmentType: string
   userMark: string
-  logisticsTracking: string
+  processNumber: string
   baseSku: string
   factoryOrderNumber: string
   sku: string

src/views/order/podUs/index.vue

@@ -215,7 +215,7 @@
               </ElFormItem> -->
               <ElFormItem label="物流跟踪号">
                 <ElInput
-                  v-model.trim="searchForm.logisticsTracking"
+                  v-model.trim="searchForm.processNumber"
                   placeholder="物流跟踪号"
                   clearable
                   style="width: 150px"
@@ -1958,7 +1958,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
   shopNumber: '',
   shipmentType: '',
   userMark: '',
-  logisticsTracking: '',
+  processNumber: '',
   baseSku: '',
   factoryOrderNumber: '',
   sku: '',