Merge branch 'dev' into 'master'

feat: pod(us)订单添加平台字段

See merge request !307

src/views/order/orderTracking/index.vue

@@ -92,6 +92,12 @@ const tableColumns = computed(() => {
       align: 'center',
     },
     {
+      label: '平台',
+      prop: 'platform',
+      width: 160,
+      align: 'center',
+    },
+    {
       label: '订单状态',
       prop: 'status',
       slot: 'status',

src/views/order/podUs/index.vue

@@ -1681,6 +1681,12 @@
                 </el-icon>
               </div>
               <div class="order-detail-item">
+                <span class="order-detail-item-label">平台:</span>
+                <span class="order-detail-item-value" :title="row.platform">
+                  {{ row.platform }}
+                </span>
+              </div>
+              <div class="order-detail-item">
                 <span class="order-detail-item-label">自定义标签:</span>
                 <span class="order-detail-item-value" :title="getTagName(row)">
                   {{ getTagName(row) }}