| 
														
															@@ -58,7 +58,8 @@ class Set 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 $info = Dever::db($table)->find(array('type' => 3, 'type_id' => $v['id'], $col => $value));
 
														 | 
														
														 | 
														
															                 $info = Dever::db($table)->find(array('type' => 3, 'type_id' => $v['id'], $col => $value));
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 if ($info) {
 
														 | 
														
														 | 
														
															                 if ($info) {
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     if ($table == 'agent/member_goods') {
 
														 | 
														
														 | 
														
															                     if ($table == 'agent/member_goods') {
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                        $info['num'] = $info['total_num'] - $info['sell_num'];
 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        //$info['num'] = $info['total_num'] - $info['sell_num'];
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        $info['num'] = $info['total_num'];
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     }
 
														 | 
														
														 | 
														
															                     }
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     $data[0]['children'][$k]['select'] = 1;
 
														 | 
														
														 | 
														
															                     $data[0]['children'][$k]['select'] = 1;
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     $data[0]['children'][$k]['total'] = $info['num'];
 
														 | 
														
														 | 
														
															                     $data[0]['children'][$k]['total'] = $info['num'];
 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -88,7 +89,8 @@ class Set 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 $info = Dever::db($table)->find(array('type' => 2, 'type_id' => $v['id'], $col => $value));
 
														 | 
														
														 | 
														
															                 $info = Dever::db($table)->find(array('type' => 2, 'type_id' => $v['id'], $col => $value));
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 if ($info) {
 
														 | 
														
														 | 
														
															                 if ($info) {
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     if ($table == 'agent/member_goods') {
 
														 | 
														
														 | 
														
															                     if ($table == 'agent/member_goods') {
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                        $info['num'] = $info['total_num'] - $info['sell_num'];
 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        //$info['num'] = $info['total_num'] - $info['sell_num'];
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                        $info['num'] = $info['total_num'];
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         if ($info['sku_id'] > 0) {
 
														 | 
														
														 | 
														
															                         if ($info['sku_id'] > 0) {
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             $code = Dever::db('card/code')->find($info['sku_id']);
 
														 | 
														
														 | 
														
															                             $code = Dever::db('card/code')->find($info['sku_id']);
 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                             $data[1]['children'][$k]['price'] = $code['total_cash'];
 
														 | 
														
														 | 
														
															                             $data[1]['children'][$k]['price'] = $code['total_cash'];
 
														 |