更新 'lib/Manage.php'

lib/Manage.php

@@ -184,27 +184,13 @@ class Manage
   public function outProvince($data)
     {
         $file = Dever::input('excel_name');
-        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母', '区域价值', '区域状态');
+        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母');
         
         $body = array();
 
         if ($data) {
             foreach ($data as $k => $v) {
                 if (is_array($v)) {
-                    $province = Dever::db('area/province')->find($v['province_id']);
-                  if (!$province) {
-                    	$province['name'] = '';
-                  	}
-                    $status = '未占用';
-                    if ($v['status'] == 2) {
-                        $status = '已占用';
-                    }
-                    $v['name'] = $province['name'] . '' . $v['name'];
-                    if ($v['price'] < 0) {
-                        $price = Dever::load('area/api')->getPrice(1, $v['province_id'] . ',' . $v['id']);
-                    } else {
-                        $price = $v['price'] * 10000;
-                    }
                     
                     $d = array
                     (
@@ -212,8 +198,6 @@ class Manage
                         $v['name'],
                       	$v['pinyin'],
                         $v['pinyin_first'],
-                        $price,
-                        $status,
                     );
                     $body[] = $d;
                 }
@@ -241,7 +225,6 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $v['name'];
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(1, $v['province_id'] . ',' . $v['id']);
                     } else {
@@ -289,7 +272,7 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $city['name'] . '' . $v['name'];
+                    //$v['name'] = $province['name'] . '' . $city['name'] . '' . $v['name'];
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(2, $v['province_id'] . ',' . $v['city_id'] . ',' . $v['id']);
                     } else {
@@ -342,7 +325,7 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $city['name'] . '' . $county['name'] . '' . $v['name'];
+                    //$v['name'] = $province['name'] . '' . $city['name'] . '' . $county['name'] . '' . $v['name'];
                   
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(3, $v['province_id'] . ',' . $v['city_id'] . ',' . $v['county_id'] . ',' . $v['id']);