Merge branch 'dev'

src/views/logistics/logisticsTracking.vue

@@ -27,23 +27,22 @@
         <template #top>
           <el-card>
             <el-form inline :model="searchForm">
-              <el-form-item label="店铺单号">
+              <el-form-item label="物流跟踪号">
                 <el-input
-                  v-model="searchForm.shopNumber"
+                  v-model="searchForm.trackNumber"
                   style="width: 180px"
-                  placeholder="请输入店铺单号"
+                  placeholder="请输入物流跟踪号"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="物流跟踪号">
+              <el-form-item label="店铺单号">
                 <el-input
-                  v-model="searchForm.trackNumber"
+                  v-model="searchForm.shopNumber"
                   style="width: 180px"
-                  placeholder="请输入物流跟踪号"
+                  placeholder="请输入店铺单号"
                   clearable
                 ></el-input>
               </el-form-item>
-
               <el-form-item>
                 <el-button type="primary" @click="getData">查询</el-button>
                 <el-button
@@ -156,6 +155,19 @@ const pagination = ref<ILogisticsCompanyData>({
 const tableColumns = computed(() => {
   return [
     {
+      label: '物流跟踪号',
+      prop: 'trackingNumber',
+      width: 200,
+      align: 'center',
+      showOverflowTooltip: true,
+    },
+    {
+      label: '店铺单号',
+      prop: 'shopNumber',
+      width: 160,
+      align: 'center',
+    },
+    {
       label: '订单号',
       prop: 'factoryOrderNumber',
       width: 160,
@@ -168,12 +180,6 @@ const tableColumns = computed(() => {
       align: 'center',
     },
     {
-      label: '店铺单号',
-      prop: 'shopNumber',
-      width: 160,
-      align: 'center',
-    },
-    {
       label: '订单状态',
       prop: 'orderStatus',
       slot: 'orderStatus',
@@ -188,14 +194,6 @@ const tableColumns = computed(() => {
       align: 'center',
     },
     {
-      label: '物流跟踪号',
-      prop: 'trackingNumber',
-      width: 200,
-      align: 'center',
-      showOverflowTooltip: true,
-    },
-
-    {
       label: '总克重(g)',
       prop: 'weight',
       width: 100,