edit

app/goods/lib/Sku.php

@@ -19,6 +19,11 @@ class Sku
         'weight' => '重量（kg）',
     );
 
+    private $unit = array
+    (
+        '件','箱','盒','袋','个','桶','台','套','瓶','罐','支','条','kg','g','L','ML'
+    );
+
     # 主要价格字段
     private $main = 'price';
 
@@ -481,6 +486,17 @@ class Sku
                     if (strstr($v1, '|')) {
                         $v1 = str_replace('|', '', $v1);
                         $body .= '<td width="30">'.$value.'</td>';
+                    } elseif ($k1 == 'unit') {
+                        $select = '';
+                        foreach ($this->unit as $k9 => $v9) {
+                            if ($value == $v9) {
+                                $selected = 'selected';
+                            } else {
+                                $selected = '';
+                            }
+                            $select .= '<option value="'.$v9.'" '.$selected.'>'.$v9.'</option>';
+                        }
+                        $body .= '<td width="30"><select lay-ignore  name="'.$k1.'" >'.$select.'</select></td>';
                     } else {
                         $body .= '<td width="30"><input type="text" class="layui-input" name="'.$k1.'"  value="'.$value.'"/></td>';
                     }
@@ -548,6 +564,17 @@ class Sku
                             if (strstr($v1, '|')) {
                                 $v1 = str_replace('|', '', $v1);
                                 $body .= '<td width="30">'.$value.'</td>';
+                            } elseif ($k1 == 'unit') {
+                                $select = '';
+                                foreach ($this->unit as $k9 => $v9) {
+                                    if ($value == $v9) {
+                                        $selected = 'selected';
+                                    } else {
+                                        $selected = '';
+                                    }
+                                    $select .= '<option value="'.$v9.'" '.$selected.'>'.$v9.'</option>';
+                                }
+                                $body .= '<td width="30"><select lay-ignore  name="'.$k1.'['.$k.']" >'.$select.'</select></td>';
                             } else {
                                 $body .= '<td width="30"><input type="text" class="layui-input" name="'.$k1.'['.$k.']"  value="'.$value.'"/></td>';
                             }
@@ -619,7 +646,18 @@ class Sku
                         if (strstr($v1, '|')) {
                             $v1 = str_replace('|', '', $v1);
                             $single_body .= '<td width="30">'.$value.'</td>';
-                        } else {
+                        } elseif ($k1 == 'unit') {
+                        $select = '';
+                        foreach ($this->unit as $k9 => $v9) {
+                            if ($value == $v9) {
+                                $selected = 'selected';
+                            } else {
+                                $selected = '';
+                            }
+                            $select .= '<option value="'.$v9.'" '.$selected.'>'.$v9.'</option>';
+                        }
+                        $body .= '<td width="30"><select lay-ignore name="single_'.$k1.'['.$k.']" >'.$select.'</select></td>';
+                    } else {
                             $single_body .= '<td width="30"><input type="text" class="layui-input" name="single_'.$k1.'['.$k.']"  value="'.$value.'"/></td>';
                         }
                         

app/store/admin/Excel.php

@@ -277,7 +277,7 @@ class Excel extends Core
 
                 if ($parent_order && $parent_order['mid']) {
                     if ($parent_order['address_id']) {
-                        $address = Dever::load('agent/address')->getOne($parent_order['uid'], $parent_order['address_id']);
+                        $address = Dever::load('agent/address')->getOne($parent_order['mid'], $parent_order['address_id']);
                         $v['type_info']['name'] = $address['contact'];
                         $v['type_info']['mobile'] = $address['mobile'];
                         $v['type_info']['address'] = $address['address_info'];