Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/shop/database/sell_order.php

@@ -585,6 +585,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $status_manage,
             'search'    => 'select',
+            //'search_after' => '<br />',
             'list'      => true,
             'list_order' => 14,
         ),

app/shop/lib/Area.php

@@ -53,6 +53,10 @@ class Area
             $default = $this->default;
         }
 
+        if ($level_id < 0) {
+            Dever::alert('error');
+        }
+
         # 四级联动
         if ($level_num == 1) {
             $t = 'area/province';
@@ -78,7 +82,7 @@ class Area
             Dever::alert('error');
         }
 
-        if ($level_search || $level_num > 1) {
+        if ($level_search || $level_num >= 1) {
             array_unshift($data, $default);
         }
 

service/agent/database/option_account.php

@@ -32,7 +32,7 @@ return array
     'name' => 'option_account',
     # 显示给用户看的名称
     'lang' => '期权账户管理',
-    'menu' => true,
+    'order' => 1,
     // 'config_type' => $type,
     'config_status' => $status,
     'end' => array