dever 3 years ago
parent
commit
46e4fe7ca1

+ 1 - 1
app/goods/database/info.php

@@ -6,7 +6,7 @@ $price_type = array
 (
     1 => '普通商品',
     2 => '多价商品',
-    3 => '套餐商品',
+    //3 => '套餐商品',
     4 => '组合商品',
 );
 

+ 1 - 0
app/goods/lib/Info.php

@@ -371,6 +371,7 @@ class Info
                     }
                 }
             }
+            $this->getGroup($info);
             if (floor($info['min']) == $info['min']) {
                 $info['min'] = intval($info['min']);
             }

+ 18 - 0
service/agent/database/member.php

@@ -26,6 +26,12 @@ $type = array
     2 => '公司',
 );
 
+$import = array
+(
+    1 => '非导入',
+    2 => '导入数据',
+);
+
 $source_id = function()
 {
     $array = array
@@ -457,6 +463,18 @@ return array
             'list'      => true,
         ),
 
+        'import'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '是否导入数据',
+            'default'   => '1',
+            'desc'      => '是否导入数据',
+            'match'     => 'is_numeric',
+            'option'    => $import,
+            'search'    => 'select',
+            'list'      => true,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

+ 1 - 1
service/setting/database/role.php

@@ -201,7 +201,7 @@ return array
 
     'manage' => array
     (
-    	'insert' => false,
+    	//'insert' => false,
         'delete' => false,
         'edit' => false,
         'list_button' => array