edit

app/shop/lib/Info.php

@@ -204,6 +204,8 @@ class Info
         } else {
             $method = 'getAllData';
         }
+
+        $method = 'getAllData';
         
         $name = Dever::input('name');
         if ($name) {
@@ -219,25 +221,45 @@ class Info
         $data = Dever::db($table)->$method($where);
 
         $result = array();
+        $zero = array();
         if ($data) {
             foreach ($data as $k => $v) {
                 $data[$k] = Dever::load('goods/lib/info')->getPayInfo($v, $v['sku_id']);
-                if (!isset($result[$v['id']])) {
-                    $result[$v['id']] = $v;
+                if ($data[$k]['total'] <= 0) {
+                    if (!isset($zero[$v['id']])) {
+                        $zero[$v['id']] = $v;
+                    }
+                } else {
+                    if (!isset($result[$v['id']])) {
+                        $result[$v['id']] = $v;
+                    }
                 }
+                
                 if (isset($data[$k]['attr']) && $data[$k]['attr']) {
-                    $result[$v['id']]['price_array'][] = array
-                    (
-                        'name' => $data[$k]['sku_name'],
-                        'total' => $data[$k]['total'] <= 0 ? '0.00' : $data[$k]['total'],
-                        'price' => $data[$k]['price'],
-                        's_price' => $data[$k]['s_price'],
-                    );
+                    if ($data[$k]['total'] <= 0) {
+                        $zero[$v['id']]['price_array'][] = array
+                        (
+                            'name' => $data[$k]['sku_name'],
+                            'total' => '0.00',
+                            'price' => $data[$k]['price'],
+                            's_price' => $data[$k]['s_price'],
+                        );
+                    } else {
+                        $result[$v['id']]['price_array'][] = array
+                        (
+                            'name' => $data[$k]['sku_name'],
+                            'total' => $data[$k]['total'],
+                            'price' => $data[$k]['price'],
+                            's_price' => $data[$k]['s_price'],
+                        );
+                    }
                 }
                 
             }
         }
 
+        $result = array_merge($result, $zero);
+
         return $result;
     }