diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index 1ec7acb9..741d629a 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -8,7 +8,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class Goods extends HD_Controller
 {
-    private $statusAry = array( 1 => '未售', 2 => '已售');
+    private $statusAry = array( 1 => '未售', 2 => '已售', 0 => '下架');
 
     public function __construct()
     {
@@ -373,12 +373,14 @@ class Goods extends HD_Controller
                 );
             }
         }
+        $statusAry = $this->statusAry;
+        unset($statusAry[0]);
         $this->data['lists'] = $lists;
         $this->data['fine_ids'] = $fine_ids;
         $this->data['pager'] = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count);
         $this->data['params'] = $params;
         $this->data['autoList'] = $autoList;
-        $this->data['statusAry'] = $this->statusAry;
+        $this->data['statusAry'] = $statusAry;
         $this->data['_title'] = $_title;
         return $this->show_view($view, true);
     }
@@ -752,7 +754,6 @@ class Goods extends HD_Controller
     public function export()
     {
         $params = $this->input->get();
-        $where = $where_1 = $where_2 = array();
         $where = $where_1 = $where_2 = $where_3 = $autoList = array();
         $search_type = 0;//0不连表，1联表筛选精品，2联表筛选销售，3联表筛选精品和销售
         if ($params['brand_id']) {
@@ -824,6 +825,10 @@ class Goods extends HD_Controller
             $where_3['m.status'] = $params['status'];
         } else {
             $params['status'] = '';
+            $where['status >'] = 0;
+            $where_1['m.status >'] = 0;
+            $where_2['m.status >'] = 0;
+            $where_3['m.status >'] = 0;
         }
 
         if(1 == $params['sold']){//已售
diff --git a/admin/views/items/goods/edit.php b/admin/views/items/goods/edit.php
index dd8fef91..e739f348 100644
--- a/admin/views/items/goods/edit.php
+++ b/admin/views/items/goods/edit.php
@@ -109,15 +109,15 @@
                         <td class="table-td" colspan="2">
                             <div class="input-group">
                                 <div class="input-group-addon">精品加装</div>
-                                <div class="label-group-wrap label-group-sortable" style="display: inline">
-                                    <div class="label-group" v-for="(v,i) in fines">
+                                <button type="button" class="am-btn am-btn-default am-btn-sm" @click="fine_modal">+</button>
+                                <div class="label-group-wrap label-group-sortable ml10" style="display: inline">
+                                    <div class="label-group" v-for="(v,i) in fines" style="margin-bottom:0px;">
                                             <span class="label label-default sort-shop-list" :data-id="v.id" :data-name="v.title"
                                                   :data-sort="i">{{v.title}}</span>
                                         <a href="javascript:void(0);" @click="rm_fine(i)" class="label label-default"><i
                                                     class="fa fa-remove"></i></a>
                                     </div>
                                 </div>
-                                <button type="button" class="am-btn am-btn-default am-btn-sm" @click="fine_modal">+</button>
                             </div>
                         </td>
                     </tr>
@@ -140,11 +140,11 @@
                                     <option value="">选择城市</option>
                                     <option :value="v.id" v-for="(v,i) in cityAry">{{v.name}}</option>
                                 </select>
-                                <select title="行政区" name="county_id" style="display: inline;width: 20%" v-model="info.county_id">
+                                <select title="行政区" name="county_id" style="display: inline;width: 20%;margin-left: 5px;" v-model="info.county_id">
                                     <option value="">选择行政区</option>
                                     <option :value="v.id" v-for="(v,i) in countyAry">{{v.name}}</option>
                                 </select>
-                                <select title="地址" name="addr_id" style="display: inline;width: 50%" v-model="info.addr_id">
+                                <select title="地址" name="addr_id" style="display: inline;width: 50%;margin-left: 5px;" v-model="info.addr_id">
                                     <option value="">选择地址</option>
                                     <option :value="v.id" v-for="(v,i) in addrAry">{{v.title}}</option>
                                 </select>
diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php
index c42129fd..164d78a0 100644
--- a/admin/views/items/goods/lists.php
+++ b/admin/views/items/goods/lists.php
@@ -225,7 +225,7 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%">
+                <th width="7%">
                     <span :class="'order'+('id'==params.order?' order-on':' order-none')">
                         <a href="javascript:void(0)" @click="set_order('id')">
                             <span class="mr10">ID</span>