Merge branch 'zjl_merge_20200821'

resources/views/detail/detail_items_info.php

@@ -25,6 +25,7 @@
                 <?php if ($order_info['order_goods_type'] == 1) { ?>
                 <?php if ($order_info['order_goods_type'] == 1) { ?>
                     <th>标准品牌</th>
                     <th>标准品牌</th>
                     <th>供应商</th>
                     <th>供应商</th>
+                    <th>商品类型</th>
                 <?php } ?>
                 <?php } ?>
 
 
                 <!-- ERP或京东订单 -->
                 <!-- ERP或京东订单 -->
@@ -83,6 +84,15 @@
                     <?php if ($order_info['order_goods_type'] == 1) { ?>
                     <?php if ($order_info['order_goods_type'] == 1) { ?>
                         <td><?= $v['standard_brand_name'] ?></td>
                         <td><?= $v['standard_brand_name'] ?></td>
                         <td><?= $v['supplier_name'] ?></td>
                         <td><?= $v['supplier_name'] ?></td>
+                        <td>
+                            <?php 
+                                if ($v['order_goods_type'] == 1) {
+                                    echo '联营';
+                                } else {
+                                    echo $v['sale_type'] == 1 ? '现货' : '预售';
+                                }
+                            ?>
+                        </td>
                     <?php } ?>
                     <?php } ?>
                 
                 
                     <td id="goods_number_<?= $v['rec_id'] ?>"><?= $v['goods_number'] ?></td>
                     <td id="goods_number_<?= $v['rec_id'] ?>"><?= $v['goods_number'] ?></td>