Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/mshop/lib/Out.php

@@ -358,7 +358,7 @@ class Out
                 'num' => $v['num'],
             );
 
-            if ($type == 2) {
+            if ($info['type'] == 2) {
                 unset($d['price']);
             }
             $body[] = $d;
@@ -370,7 +370,7 @@ class Out
 
         if ($body) {
 
-            if ($type == 2) {
+            if ($info['type'] == 2) {
                 unset($body_total['price']);
             }
             $result['出库商品清单'] = array
@@ -541,7 +541,7 @@ class Out
         }
 
         $show = Dever::input('show', 1);
-        if ($show == 2) {
+        if ($type == 2) {
             unset($header[4]);
             unset($header[6]);
         }
@@ -587,7 +587,7 @@ class Out
                     $cdate,
                 );
 
-                if ($show == 2) {
+                if ($type == 2) {
                     unset($d[4]);
                     unset($d[6]);
                 }

app/shop/database/out_order.php

@@ -140,7 +140,7 @@ return array
             'match'     => 'option',
             'update'    => 'text',
             'list_name'      => $search == 1 ? '总价' : '采购总价',
-            'list'      => true,
+            'list'      => $search == 1 ? true : false,
         ),
 
         'num'        => array