edit

app/factory/assets/pc/html/cashier.html

@@ -268,7 +268,14 @@
   			if (!goods[key]) {
   				goods[key] = node;
   				goods[key].price = parseFloat(goods[key].price);
-  				goods[key].num = 1;
+  				goods[key].min = parseFloat(goods[key].min);
+  				if (goods[key].min) {
+  					goods[key].num = goods[key].min;
+  				} else {
+  					goods[key].min = 1;
+  					goods[key].num = 1;
+  				}
+  				
   				create(node);
   				setTotal();
   			} else {
@@ -307,8 +314,8 @@
 	function dec(id)
 	{
         goods[id].num -= 1;
-        if (goods[id].num < 1) {
-        	goods[id].num = 1;
+        if (goods[id].num < goods[id].min) {
+        	goods[id].num = goods[id].min;
         }
 
 		get(id).find('.goods_num').val(goods[id].num);

app/factory/database/goods_sku.php

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

app/factory/lib/Goods.php

@@ -18,6 +18,9 @@ class Goods
             $where['name'] = $name;
         }
         
+        $where['status'] = 1;
+        $where['state'] = 1;
+        $where['state_1'] = 1;
         $data = Dever::db($table)->$method($where);
 
         $result = array();
@@ -28,6 +31,7 @@ class Goods
                     if (!isset($result[$v['id']])) {
                         $result[$v['id']]['id'] = $v['id'];
                         $result[$v['id']]['name'] = $v['name'];
+                        $result[$v['id']]['min'] = $data[$k]['min'];
                         $result[$v['id']]['price'] = $v['p_price'];
                         $result[$v['id']]['children'] = array();
                     }
@@ -36,6 +40,7 @@ class Goods
                         (
                             'id' => $v['id'] . '-' . $data[$k]['sku_id'],
                             'name' => $v['name'] . '-' . $data[$k]['sku_name'],
+                            'min' => $data[$k]['min'],
                             'price' => $v['p_price'] ? $v['p_price'] : 0,
                             'end' => true,
                         );

app/factory/lib/Order.php

@@ -33,6 +33,11 @@ class Order
             $goods_sku = Dever::db('factory/goods_sku')->find(array('factory_id' => $factory_id, 'goods_id' => $v['id'], 'sku_id' => $s));
 
             $this->data['list'][$k] = Dever::load('goods/lib/info')->getPayInfo($v['id'], $s);
+            if (isset($this->data['list'][$k]['min']) && $this->data['list'][$k]['min'] > 0) {
+                if ($n < $this->data['list'][$k]['min']) {
+                    $n = $this->data['list'][$k]['min'];
+                }
+            }
             $this->data['list'][$k]['num'] = $n;
 
             $this->data['list'][$k]['buy_num'] = $n;
@@ -94,7 +99,7 @@ class Order
 
         Dever::load('cash/lib/order')->up($order_data, 1, 1);
 
-        return Dever::url('project/database/list&project=shop&&table=buy_order&menu=shop&menu_id=77&search_option_state=1&search_option_type=2', 'manage');
+        return Dever::url('project/database/list&project=shop&table=buy_order&menu=shop&menu_id=77&search_option_state=1&search_option_type=2', 'manage');
     }
 
     # 生成订单号

app/goods/lib/Set.php

@@ -23,7 +23,7 @@ class Set
                 $sku = Dever::db('goods/info_sku')->select(array('info_id' => $v['id']));
 
                 if ($sku) {
-                    $other = Dever::db($table)->one(array($type => $id, 'goods_id' => $v['id'], 'key' => -1));
+                    $other = Dever::db($table)->find(array($type => $id, 'goods_id' => $v['id'], 'key' => -1));
                     $result[$k]['id'] = $v['id'];
                     $result[$k]['name'] = $v['name'];
                     $result[$k]['price'] = $v['price'];
@@ -74,7 +74,7 @@ class Set
                                 'end' => true,
                             );
 
-                            $other_sku = Dever::db($table)->one(array($type => $id, 'goods_id' => $v['id'], 'sku_id' => $v1['id']));
+                            $other_sku = Dever::db($table)->find(array($type => $id, 'goods_id' => $v['id'], 'sku_id' => $v1['id']));
 
                             $children['select'] = 2;
                             if ($type == 'factory_id') {

app/mshop/src/Buy.php

@@ -80,6 +80,11 @@ class Buy extends Core
             $s = isset($sku_id[$k]) ? $sku_id[$k] : -1;
             $n = isset($num[$k]) ? $num[$k] : 1;
             $this->data['list'][$k] = Dever::load('goods/lib/info')->getPayInfo($v, $s);
+            if (isset($data['list'][$k]['min']) && $data['list'][$k]['min'] > 0) {
+                if ($n < $data['list'][$k]['min']) {
+                    $n = $data['list'][$k]['min'];
+                }
+            }
 
             $this->data['list'][$k]['buy_num'] = $n;
             $this->data['num'] += $n;

app/shop/database/buy_order.php

@@ -257,7 +257,7 @@ return array
             //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin', '{status} == 2'),
             //'delete' => array('删除', '', '{status} == 1'),
 
-            'list' => array('查看详情', '"buy_order_goods&project=shop&order_id={id}&page_type=1&type='.$search_option_type.'"'),
+            'list' => array('查看详情', '"buy_order_goods&project=shop&order_id={id}&page_type=1"'),
 
             'oper'  => array('审核', '"mshop/lib/manage.audit?order_id={id}"', '{status} == 2'),
 

app/shop/database/goods_sku.php

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

app/shop/lib/Info.php

@@ -119,7 +119,9 @@ class Info
         if ($total) {
             $where['total'] = $total;
         }
-        
+        $where['status'] = 1;
+        $where['state'] = 1;
+        $where['state_1'] = 1;
         $data = Dever::db($table)->$method($where);
 
         $result = array();

app/store/database/goods_sku.php

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

app/store/lib/Goods.php

@@ -69,6 +69,9 @@ class Goods
             $where['total'] = $total;
         }
         
+        $where['status'] = 1;
+        $where['state'] = 1;
+        $where['state_1'] = 1;
         $data = Dever::db($table)->$method($where);
 
         $result = array();
@@ -92,7 +95,9 @@ class Goods
         if ($name) {
             $where['name'] = $name;
         }
-        
+        $where['status'] = 1;
+        $where['state'] = 1;
+        $where['state_1'] = 1;
         $data = Dever::db($table)->$method($where);
 
         $result = array();