diff --git a/application/admin/controller/store/StoreProduct.php b/application/admin/controller/store/StoreProduct.php
index 96fcd7d2..b63a2811 100644
--- a/application/admin/controller/store/StoreProduct.php
+++ b/application/admin/controller/store/StoreProduct.php
@@ -146,7 +146,7 @@ class StoreProduct extends AuthController
             Form::input('keyword','产品关键字')->placeholder('多个用英文状态下的逗号隔开'),
             Form::input('unit_name','产品单位','件'),
             Form::frameImageOne('image','产品主图片(305*305px)',Url::build('admin/widget.images/index',array('fodder'=>'image')))->icon('image')->width('100%')->height('550px'),
-            Form::frameImages('slider_image','产品轮播图(640*640px)',Url::build('admin/widget.images/index',array('fodder'=>'slider_image','big'=>1)))->maxLength(5)->icon('images')->width('100%')->height('550px')->spin(0),
+            Form::frameImages('slider_image','产品轮播图(640*640px)',Url::build('admin/widget.images/index',array('fodder'=>'slider_image')))->maxLength(5)->icon('images')->width('100%')->height('550px')->spin(0),
             Form::number('price','产品售价')->min(0)->col(8),
             Form::number('ot_price','产品市场价')->min(0)->col(8),
             Form::number('give_integral','赠送积分')->min(0)->precision(0)->col(8),
@@ -279,7 +279,7 @@ class StoreProduct extends AuthController
             Form::input('keyword','产品关键字',$product->getData('keyword'))->placeholder('多个用英文状态下的逗号隔开'),
             Form::input('unit_name','产品单位',$product->getData('unit_name')),
             Form::frameImageOne('image','产品主图片(305*305px)',Url::build('admin/widget.images/index',array('fodder'=>'image')),$product->getData('image'))->icon('image')->width('100%')->height('550px'),
-            Form::frameImages('slider_image','产品轮播图(640*640px)',Url::build('admin/widget.images/index',array('fodder'=>'slider_image')),json_decode($product->getData('slider_image'),1))->maxLength(5)->icon('images'),
+            Form::frameImages('slider_image','产品轮播图(640*640px)',Url::build('admin/widget.images/index',array('fodder'=>'slider_image')),json_decode($product->getData('slider_image'),1))->maxLength(5)->icon('images')->width('100%')->height('550px'),
             Form::number('price','产品售价',$product->getData('price'))->min(0)->precision(2)->col(8),
             Form::number('ot_price','产品市场价',$product->getData('ot_price'))->min(0)->col(8),
             Form::number('give_integral','赠送积分',$product->getData('give_integral'))->min(0)->precision(0)->col(8),
diff --git a/application/admin/controller/widget/Images.php b/application/admin/controller/widget/Images.php
index 8d8a348a..6772f0c6 100644
--- a/application/admin/controller/widget/Images.php
+++ b/application/admin/controller/widget/Images.php
@@ -20,15 +20,6 @@ use service\FormBuilder as Form;
  */
 class Images extends AuthController
 {
-    const dir = [
-        0=>['tid'=>0,'name'=>'编辑器','path'=>'editor']
-        ,1=>['tid'=>1,'name'=>'产品图片','path'=>'store/product']
-        ,2=>['tid'=>2,'name'=>'拼团图片','path'=>'store/combination']
-        ,3=>['tid'=>3,'name'=>'砍价图片','path'=>'store/bargain']
-        ,4=>['tid'=>4,'name'=>'秒杀图片','path'=>'store/seckill']
-        ,5=>['tid'=>5,'name'=>'文章图片','path'=>'wechat/image']
-        ,6=>['tid'=>6,'name'=>'组合数据图','path'=>'common']
-    ];
     /**
      * 附件列表
      * @return \think\response\Json
@@ -36,6 +27,8 @@ class Images extends AuthController
    public function index()
    {
        $pid = input('pid')!=''?input('pid'):0;
+       if(!empty($pid))session('pid',$pid);
+       if(!empty(session('pid')))$pid = session('pid');
        $this->assign('pid',$pid);
        //分类标题
        $typearray = Category::getAll();
@@ -57,6 +50,10 @@ class Images extends AuthController
         $thumbPath = Upload::thumb($res->dir);
         //产品图片上传记录
         $fileInfo = $res->fileInfo->getinfo();
+        //入口是public需要替换图片路径
+        if(strpos(PUBILC_PATH,'public') == false){
+            $res->dir = str_replace('public/','',$res->dir);
+        }
         SystemAttachmentModel::attachmentAdd($res->fileInfo->getSaveName(),$fileInfo['size'],$fileInfo['type'],$res->dir,$thumbPath,$pid);
         $info = array(
 //            "originalName" => $fileInfo['name'],
@@ -92,19 +89,13 @@ class Images extends AuthController
     public function deleteimganddata($att_id){
         $attinfo = SystemAttachmentModel::get($att_id)->toArray();
         if($attinfo){
-            if(strpos($attinfo['att_dir'],'public') !== false){
-                @unlink(ROOT_PATH.ltrim($attinfo['att_dir'],'/'));
-                @unlink(ROOT_PATH.ltrim($attinfo['satt_dir'],'/'));
-            }else{
-                @unlink(ROOT_PATH.ltrim('public'.$attinfo['att_dir'],'/'));
-                @unlink(ROOT_PATH.ltrim('public'.$attinfo['satt_dir'],'/'));
-            }
-
+            @unlink(ROOT_PATH.ltrim($attinfo['att_dir'],'.'));
+            @unlink(ROOT_PATH.ltrim($attinfo['satt_dir'],'.'));
             SystemAttachmentModel::where(['att_id'=>$att_id])->delete();
         }
     }
     /**
-     * 移动图片分类
+     * 移动图片分类显示
      */
     public function moveimg($imgaes){
 
@@ -123,7 +114,7 @@ class Images extends AuthController
         return $this->fetch('public/form-builder');
     }
 
-    /**移动图片
+    /**移动图片分类操作
      * @param Request $request
      * @param $id
      */
diff --git a/application/admin/model/system/SystemAttachment.php b/application/admin/model/system/SystemAttachment.php
index aae35c07..fc16fd2e 100644
--- a/application/admin/model/system/SystemAttachment.php
+++ b/application/admin/model/system/SystemAttachment.php
@@ -38,7 +38,7 @@ class SystemAttachment extends ModelBasic
         $model = new self;
         $where['pid'] = $id;
         $model->where($where)->order('att_id desc');
-        return $model->page($model,$where,'',30);
+        return $model->page($model,$where,'',24);
     }
     /**
      * 获取单条信息
diff --git a/application/admin/view/store/store_product/index.php b/application/admin/view/store/store_product/index.php
index 8fa05ddb..be9704f2 100644
--- a/application/admin/view/store/store_product/index.php
+++ b/application/admin/view/store/store_product/index.php
@@ -71,7 +71,7 @@
                     <div class="layui-btn-container">
                         {switch name='type'}
                             {case value="1"}
-                                <button class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:760,w:900})">添加产品</button>
+                                <button class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:760,w:1100})">添加产品</button>
                             {/case}
                             {case value="2"}
                                 <button class="layui-btn layui-btn-sm" data-type="show">批量上架</button>
@@ -110,7 +110,7 @@
                         <button type="button" class="layui-btn layui-btn-xs btn-success" onclick="$eb.createModalFrame('{{d.store_name}}-属性','{:Url('attr')}?id={{d.id}}',{h:700,w:800})">
                             属性
                         </button>
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.store_name}}-编辑','{:Url('edit')}?id={{d.id}}')">
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('{{d.store_name}}-编辑','{:Url('edit')}?id={{d.id}}',{h:760,w:1100})">
                             编辑
                         </button>
                         <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span class="caret"></span></button>
diff --git a/application/admin/view/widget/images.php b/application/admin/view/widget/images.php
index 6bc91124..e5309f0d 100644
--- a/application/admin/view/widget/images.php
+++ b/application/admin/view/widget/images.php
@@ -24,17 +24,17 @@
         border-radius: 1px;
         background: #e5e5e5;
     }
-    .main .left .nav{margin:0;}
-    .main .left .nav li{padding: 4px;}
+    .main .left .nav{margin:0;padding-bottom: 100px;}
+    .main .left .nav li{padding: 4px;height: 22px;}
     .main .left .nav li.active{background-color: #293846;border-left: 2px solid #19AA8D;}
     .main .left .nav li.active a{color: #a7b1c2;}
     .main .left .nav li.child{padding: 2px;padding-left: 7px;}
     .main .right{width: calc(100% - 117px);float: right;}
     .main .right .right-top{position: fixed;background-color: #fff;  z-index: 1000;width: 100%;padding: 7px 10px 0;height: 38px;border-bottom: 1px solid #e5e5e5;border-top: 1px solid #e5e5e5;}
     .main .right .imagesbox{position: fixed;top:58px;min-height: 200px;height: calc(100% - 88px);;overflow-y: auto;}
-    .main .right .imagesbox .image-item{position: relative;display: inline-block;  width: 15%;  border: 1px solid #e5e5e5;  cursor: default;  margin: 10px 0 0 1%;padding: 0.5%;}
-    .main .right .imagesbox .image-item img{width: 100%;}
-    .main .right .imagesbox .on{background:#f8ac59;}
+    .main .right .imagesbox .image-item{position: relative;display: inline-block;  width: 112px;height: 112px;  border: 1px solid #ECECEC;background-color: #F7F6F6;  cursor: default;  margin: 10px 0 0 10px;padding: 5px;}
+    .main .right .imagesbox .image-item img{width: 112px;height: 112px;}
+    .main .right .imagesbox .on{border: 3px dashed #0092DC;padding: 3px;}
     .main .right .foot-tool{position: fixed;bottom: 0px;width: calc(100% - 117px);background-color:#fff;height: 30px;padding: 7px 10px 0;border-top: 1px solid #e5e5e5;}
     .main .right .foot-tool .page{padding: 0px 10px;float: right;}
     .main .right .foot-tool .page ul{width: 100%}
@@ -62,7 +62,9 @@
                      <li ><a href="{:Url('index',array('pid'=>$vo.id,'fodder'=>$Request.param.fodder,'big'=>$Request.param.big))}">{$vo.name}</a></li>
                 {/if}
                 {volist name="$vo.child" id="voo" key="kk"}
-                       <li class="child {if condition="$voo.id eq $pid"} active{/if}"><a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder,'big'=>$Request.param.big))}">-{$voo.name}</a></li>
+                       <li class="child {if condition="$voo.id eq $pid"} active{/if}">
+                        <a href="{:Url('index',array('pid'=>$voo.id,'fodder'=>$Request.param.fodder,'big'=>$Request.param.big))}">{if condition="$kk eq count($vo.child)"}└{else/}├{/if}{$voo.name}</a>
+                        </li>
                     {/volist}
                 {/volist}
             </ul>