fix bug 与排序调整

ghsApp/src/admin/order/orderListByDist.vue

@@ -91,20 +91,26 @@ export default {
       if (this.$util.isEmpty(data)) {
         return [];
       }
+      let result = [];
       // 接口标准返回：{ totalNum, list, shop, shopExt }
       if (data && Array.isArray(data.list)) {
-        return data.list.map((item, index) => this.normalizeDistItem(item, index)).filter(item => !this.$util.isEmpty(item.orderList));
-      }
-      if (Array.isArray(data)) {
-        return data.map((item, index) => this.normalizeDistItem(item, index)).filter(item => !this.$util.isEmpty(item.orderList));
-      }
-      if (typeof data === 'object') {
-        return Object.keys(data)
+        result = data.list.map((item, index) => this.normalizeDistItem(item, index)).filter(item => !this.$util.isEmpty(item.orderList));
+      } else if (Array.isArray(data)) {
+        result = data.map((item, index) => this.normalizeDistItem(item, index)).filter(item => !this.$util.isEmpty(item.orderList));
+      } else if (typeof data === 'object') {
+        result = Object.keys(data)
           .filter((key) => Array.isArray(data[key]))
           .map((distName, index) => this.normalizeDistItem({ distName, orderList: data[distName] }, index))
           .filter(item => !this.$util.isEmpty(item.orderList));
       }
-      return [];
+      
+      const unpartitionedIndex = result.findIndex(item => item.distName === '未分区');
+      if (unpartitionedIndex > -1) {
+        const unpartitionedItem = result.splice(unpartitionedIndex, 1)[0];
+        result.push(unpartitionedItem);
+      }
+      
+      return result;
     },
     normalizeDistItem(item, index) {
       const orderListRaw = item.list || [];
@@ -112,7 +118,7 @@ export default {
         ? orderListRaw.map(order => this.normalizeCustomItem(order))
         : [];
       return {
-        distKey:item.distId,
+        distKey:item.distId || 999999 + index,
         distName: item.distName || '未分区',
         orderList
       };