edit

app/shop/database/goods_sku.php

@@ -283,7 +283,7 @@ $config = array
                 'category_id' => array('yes-t_2.category_id'),
                 'state' => 'yes-t_2.state-1',
                 'state_1' => 'yes-t_1.state-1',
-                'status' => 'yes-t_2.status-1',
+                'status' => 'yes-t_2.status',
             ),
             # 联表
             'join' => array
@@ -318,7 +318,7 @@ $config = array
                 'category_id' => array('yes-t_2.category_id'),
                 'state' => 'yes-t_2.state-1',
                 'state_1' => 'yes-t_1.state-1',
-                'status' => 'yes-t_2.status-1',
+                'status' => 'yes-t_2.status',
 
             ),
             # 联表

app/shop/lib/Info.php

@@ -205,7 +205,7 @@ class Info
             $method = 'getAllData';
         }
 
-        $method = 'getAllData';
+        //$method = 'getAllData';
         
         $name = Dever::input('name');
         if ($name) {
@@ -225,39 +225,23 @@ class Info
         if ($data) {
             foreach ($data as $k => $v) {
                 $data[$k] = Dever::load('goods/lib/info')->getPayInfo($v, $v['sku_id']);
-                if ($data[$k]['total'] <= 0) {
-                    if (!isset($zero[$v['id']])) {
-                        $zero[$v['id']] = $v;
-                    }
-                } else {
-                    if (!isset($result[$v['id']])) {
+                if (!isset($result[$v['id']])) {
                         $result[$v['id']] = $v;
                     }
-                }
                 if (isset($data[$k]['attr']) && $data[$k]['attr']) {
-                    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
+                    $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);
+        //$result = array_merge($result, $zero);
 
         return $result;
     }