diff --git a/application/goods/controller/Brand.php b/application/goods/controller/Brand.php
deleted file mode 100644
index 5327a3419..000000000
--- a/application/goods/controller/Brand.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | Think.Admin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/Think.Admin
-// +----------------------------------------------------------------------
-
-namespace app\goods\controller;
-
-use controller\BasicAdmin;
-use service\DataService;
-use think\Db;
-
-/**
- * 商店品牌管理
- * Class Brand
- * @package app\store\controller
- * @author Anyon <zoujingli@qq.com>
- * @date 2017/03/27 14:43
- */
-class Brand extends BasicAdmin
-{
-
-    /**
-     * 定义当前操作表名
-     * @var string
-     */
-    public $table = 'GoodsBrand';
-
-    /**
-     * 品牌列表
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->title = '品牌管理';
-        $get = $this->request->get();
-        $db = Db::name($this->table)->where(['is_deleted' => '0']);
-        if (isset($get['brand_title']) && $get['brand_title'] !== '') {
-            $db->whereLike('brand_title', "%{$get['brand_title']}%");
-        }
-        if (isset($get['create_at']) && $get['create_at'] !== '') {
-            list($start, $end) = explode(' - ', $get['create_at']);
-            $db->whereBetween('create_at', ["{$start} 00:00:00", "{$end} 23:59:59"]);
-        }
-        return parent::_list($db->order('sort asc,id desc'));
-    }
-
-    /**
-     * 添加品牌
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\Exception
-     */
-    public function add()
-    {
-        $this->title = '添加品牌';
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 编辑品牌
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\Exception
-     */
-    public function edit()
-    {
-        $this->title = '编辑品牌';
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单提交数据处理
-     * @param array $data
-     */
-    protected function _form_filter($data)
-    {
-        if ($this->request->isPost()) {
-            empty($data['brand_logo']) && $this->error('请上传品牌Logo图片');
-            empty($data['brand_cover']) && $this->error('请上传品牌封面图片');
-        }
-    }
-
-    /**
-     * 添加成功回跳处理
-     * @param bool $result
-     */
-    protected function _form_result($result)
-    {
-        if ($result !== false) {
-            list($base, $spm, $url) = [url('@admin'), $this->request->get('spm'), url('goods/brand/index')];
-            $this->success('数据保存成功！', "{$base}#{$url}?spm={$spm}");
-        }
-    }
-
-    /**
-     * 删除品牌
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("品牌删除成功！", '');
-        }
-        $this->error("品牌删除失败，请稍候再试！");
-    }
-
-    /**
-     * 品牌禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("品牌禁用成功！", '');
-        }
-        $this->error("品牌禁用失败，请稍候再试！");
-    }
-
-    /**
-     * 品牌签禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("品牌启用成功！", '');
-        }
-        $this->error("品牌启用失败，请稍候再试！");
-    }
-
-}
diff --git a/application/goods/controller/Cate.php b/application/goods/controller/Cate.php
deleted file mode 100644
index 51787d7f9..000000000
--- a/application/goods/controller/Cate.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\goods\controller;
-
-use controller\BasicAdmin;
-use service\DataService;
-use service\ToolsService;
-use think\Db;
-
-/**
- * 商店产品分类管理
- * Class Cate
- * @package app\store\controller
- * @author Anyon <zoujingli@qq.com>
- * @date 2017/03/27 14:43
- */
-class Cate extends BasicAdmin
-{
-
-    /**
-     * 定义当前操作表名
-     * @var string
-     */
-    public $table = 'GoodsCate';
-
-    /**
-     * 产品分类列表
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->title = '产品分类';
-        $db = Db::name($this->table)->where(['is_deleted' => '0']);
-        return parent::_list($db->order('sort asc,id asc'), false);
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_data_filter(&$data)
-    {
-        foreach ($data as &$vo) {
-            $vo['ids'] = join(',', ToolsService::getArrSubIds($data, $vo['id']));
-        }
-        $data = ToolsService::arr2table($data);
-    }
-
-    /**
-     * 添加菜单
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function add()
-    {
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 编辑菜单
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function edit()
-    {
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单数据前缀方法
-     * @param array $vo
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _form_filter(&$vo)
-    {
-        if ($this->request->isGet()) {
-            // 读取上级分类
-            $where = ['status' => '1', 'is_deleted' => '0'];
-            $_cates = (array)Db::name($this->table)->where($where)->order('sort desc,id desc')->select();
-            array_unshift($_cates, ['id' => 0, 'pid' => -1, 'cate_title' => '--- 顶级分类 ---']);
-            $cates = ToolsService::arr2table($_cates);
-            foreach ($cates as $key => &$cate) {
-                if (isset($vo['pid'])) {
-                    $path = "-{$vo['pid']}-{$vo['id']}";
-                    if ($vo['pid'] !== '' && (stripos("{$cate['path']}-", "{$path}-") !== false || $cate['path'] === $path)) {
-                        unset($cates[$key]);
-                    }
-                }
-            }
-            $this->assign('cates', $cates);
-        }
-    }
-
-    /**
-     * 删除产品分类
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品分类删除成功！", '');
-        }
-        $this->error("产品分类删除失败，请稍候再试！");
-    }
-
-    /**
-     * 产品分类禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品分类禁用成功！", '');
-        }
-        $this->error("产品分类禁用失败，请稍候再试！");
-    }
-
-    /**
-     * 产品分类禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品分类启用成功！", '');
-        }
-        $this->error("产品分类启用失败，请稍候再试！");
-    }
-
-}
diff --git a/application/goods/controller/Product.php b/application/goods/controller/Product.php
deleted file mode 100644
index 74f96e6cf..000000000
--- a/application/goods/controller/Product.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\goods\controller;
-
-use app\goods\service\ProductService;
-use controller\BasicAdmin;
-use service\DataService;
-use service\ToolsService;
-use think\Db;
-use think\exception\HttpResponseException;
-
-/**
- * 商店产品管理
- * Class Goods
- * @package app\store\controller
- * @author Anyon <zoujingli@qq.com>
- * @date 2017/03/27 14:43
- */
-class Product extends BasicAdmin
-{
-
-    /**
-     * 定义当前操作表名
-     * @var string
-     */
-    public $table = 'Goods';
-
-    /**
-     * 普通产品
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->title = '产品管理';
-        $get = $this->request->get();
-        $db = Db::name($this->table)->where(['is_deleted' => '0']);
-        if (isset($get['tags_id']) && $get['tags_id'] !== '') {
-            $db->whereLike('tags_id', "%,{$get['tags_id']},%");
-        }
-        if (isset($get['goods_title']) && $get['goods_title'] !== '') {
-            $db->whereLike('goods_title', "%{$get['goods_title']}%");
-        }
-        foreach (['cate_id', 'brand_id'] as $field) {
-            (isset($get[$field]) && $get[$field] !== '') && $db->where($field, $get[$field]);
-        }
-        if (isset($get['create_at']) && $get['create_at'] !== '') {
-            list($start, $end) = explode(' - ', $get['create_at']);
-            $db->whereBetween('create_at', ["{$start} 00:00:00", "{$end} 23:59:59"]);
-        }
-        return parent::_list($db->order('status desc,sort asc,id desc'));
-    }
-
-    /**
-     * 商城数据处理
-     * @param array $data
-     */
-    protected function _data_filter(&$data)
-    {
-        $result = ProductService::buildGoodsList($data);
-        $this->assign([
-            'brands' => $result['brand'],
-            'cates'  => ToolsService::arr2table($result['cate']),
-        ]);
-    }
-
-    /**
-     * 添加产品
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\Exception
-     */
-    public function add()
-    {
-        if ($this->request->isGet()) {
-            $this->title = '添加产品';
-            $this->_form_assign();
-            return $this->_form($this->table, 'form');
-        }
-        try {
-            $data = $this->_form_build_data();
-            Db::transaction(function () use ($data) {
-                $goodsID = Db::name($this->table)->insertGetId($data['main']);
-                foreach ($data['list'] as &$vo) {
-                    $vo['goods_id'] = $goodsID;
-                }
-                Db::name('GoodsList')->insertAll($data['list']);
-            });
-        } catch (HttpResponseException $exception) {
-            return $exception->getResponse();
-        } catch (\Exception $e) {
-            $this->error('产品添加失败，请稍候再试！');
-        }
-        list($base, $spm, $url) = [url('@admin'), $this->request->get('spm'), url('goods/product/index')];
-        $this->success('添加产品成功！', "{$base}#{$url}?spm={$spm}");
-    }
-
-    /**
-     * 编辑产品
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function edit()
-    {
-        if (!$this->request->isPost()) {
-            $goods_id = $this->request->get('id');
-            $goods = Db::name($this->table)->where(['id' => $goods_id, 'is_deleted' => '0'])->find();
-            empty($goods) && $this->error('需要编辑的产品不存在！');
-            $goods['list'] = Db::name('GoodsList')->where(['goods_id' => $goods_id, 'is_deleted' => '0'])->select();
-            $this->_form_assign();
-            return $this->fetch('form', ['vo' => $goods, 'title' => '编辑产品']);
-        }
-        try {
-            $data = $this->_form_build_data();
-            $goods_id = $this->request->post('id');
-            $goods = Db::name($this->table)->where(['id' => $goods_id, 'is_deleted' => '0'])->find();
-            empty($goods) && $this->error('产品编辑失败，请稍候再试！');
-            foreach ($data['list'] as &$vo) {
-                $vo['goods_id'] = $goods_id;
-            }
-            Db::transaction(function () use ($data, $goods_id, $goods) {
-                // 更新产品主表
-                $where = ['id' => $goods_id, 'is_deleted' => '0'];
-                Db::name('Goods')->where($where)->update(array_merge($goods, $data['main']));
-                // 更新产品详细
-                Db::name('GoodsList')->where(['goods_id' => $goods_id])->delete();
-                Db::name('GoodsList')->insertAll($data['list']);
-            });
-        } catch (HttpResponseException $exception) {
-            return $exception->getResponse();
-        } catch (\Exception $e) {
-            $this->error('产品编辑失败，请稍候再试！' . $e->getMessage());
-        }
-        list($base, $spm, $url) = [url('@admin'), $this->request->get('spm'), url('goods/product/index')];
-        $this->success('产品编辑成功！', "{$base}#{$url}?spm={$spm}");
-    }
-
-    /**
-     * 表单数据处理
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _form_assign()
-    {
-        list($where, $order) = [['status' => '1', 'is_deleted' => '0'], 'sort asc,id desc'];
-        $specs = (array)Db::name('GoodsSpec')->where($where)->order($order)->select();
-        $brands = (array)Db::name('GoodsBrand')->where($where)->order($order)->select();
-        $cates = (array)Db::name('GoodsCate')->where($where)->order($order)->select();
-        // 所有的产品信息
-        $where = ['is_deleted' => '0', 'status' => '1'];
-        $goodsListField = 'goods_id,goods_spec,goods_stock,goods_sale';
-        $goods = Db::name('Goods')->field('id,goods_title')->where($where)->select();
-        $list = Db::name('GoodsList')->field($goodsListField)->where($where)->select();
-        foreach ($goods as $k => $g) {
-            $goods[$k]['list'] = [];
-            foreach ($list as $v) {
-                ($g['id'] === $v['goods_id']) && $goods[$k]['list'][] = $v;
-            }
-        }
-        array_unshift($specs, ['spec_title' => ' - 不使用规格模板 -', 'spec_param' => '[]', 'id' => '0']);
-        $this->assign([
-            'specs'  => $specs,
-            'cates'  => ToolsService::arr2table($cates),
-            'brands' => $brands,
-            'all'    => $goods,
-        ]);
-    }
-
-    /**
-     * 读取POST表单数据
-     * @return array
-     */
-    protected function _form_build_data()
-    {
-        list($main, $list, $post, $verify) = [[], [], $this->request->post(), false];
-        empty($post['goods_logo']) && $this->error('产品LOGO不能为空，请上传后再提交数据！');
-        // 产品主数据组装
-        $main['cate_id'] = $this->request->post('cate_id', '0');
-        $main['spec_id'] = $this->request->post('spec_id', '0');
-        $main['brand_id'] = $this->request->post('brand_id', '0');
-        $main['goods_logo'] = $this->request->post('goods_logo', '');
-        $main['goods_title'] = $this->request->post('goods_title', '');
-        $main['goods_video'] = $this->request->post('goods_video', '');
-        $main['goods_image'] = $this->request->post('goods_image', '');
-        $main['goods_desc'] = $this->request->post('goods_desc', '', null);
-        $main['goods_content'] = $this->request->post('goods_content', '');
-        $main['tags_id'] = ',' . join(',', isset($post['tags_id']) ? $post['tags_id'] : []) . ',';
-        // 产品从数据组装
-        if (!empty($post['goods_spec'])) {
-            foreach ($post['goods_spec'] as $key => $value) {
-                $goods = [];
-                $goods['goods_spec'] = $value;
-                $goods['market_price'] = $post['market_price'][$key];
-                $goods['selling_price'] = $post['selling_price'][$key];
-                $goods['status'] = intval(!empty($post['spec_status'][$key]));
-                !empty($goods['status']) && $verify = true;
-                $list[] = $goods;
-            }
-        } else {
-            $this->error('没有产品规格或套餐信息哦！');
-        }
-        !$verify && $this->error('没有设置有效的产品规格！');
-        return ['main' => $main, 'list' => $list];
-    }
-
-    /**
-     * 删除产品
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品删除成功！", '');
-        }
-        $this->error("产品删除失败，请稍候再试！");
-    }
-
-    /**
-     * 产品禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品下架成功！", '');
-        }
-        $this->error("产品下架失败，请稍候再试！");
-    }
-
-    /**
-     * 产品禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品上架成功！", '');
-        }
-        $this->error("产品上架失败，请稍候再试！");
-    }
-
-}
diff --git a/application/goods/controller/Spec.php b/application/goods/controller/Spec.php
deleted file mode 100644
index ae32595df..000000000
--- a/application/goods/controller/Spec.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\goods\controller;
-
-use controller\BasicAdmin;
-use service\DataService;
-use think\Db;
-
-/**
- * 商店规格管理
- * Class Spec
- * @package app\store\controller
- * @author Anyon <zoujingli@qq.com>
- * @date 2017/03/27 14:43
- */
-class Spec extends BasicAdmin
-{
-
-    /**
-     * 定义当前操作表名
-     * @var string
-     */
-    public $table = 'GoodsSpec';
-
-    /**
-     * 产品列表
-     * @return array|string
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    public function index()
-    {
-        $this->title = '规格管理（请勿随意修改或删除）';
-        $get = $this->request->get();
-        $db = Db::name($this->table)->where(['is_deleted' => '0']);
-        if (isset($get['spec_title']) && $get['spec_title'] !== '') {
-            $db->whereLike('spec_title', "%{$get['spec_title']}%");
-        }
-        if (isset($get['date']) && $get['date'] !== '') {
-            list($start, $end) = explode(' - ', $get['date']);
-            $db->whereBetween('create_at', ["{$start} 00:00:00", "{$end} 23:59:59"]);
-        }
-        return parent::_list($db->order('sort asc,id desc'));
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_data_filter(&$data)
-    {
-        foreach ($data as &$vo) {
-            $vo['spec_param'] = json_decode($vo['spec_param'], true);
-            $vo['spec_param'] = is_array($vo['spec_param']) ? $vo['spec_param'] : [];
-        }
-    }
-
-    /**
-     * 添加产品
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\Exception
-     */
-    public function add()
-    {
-        $this->title = '添加规格';
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 编辑产品
-     * @return array|string
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\Exception
-     */
-    public function edit()
-    {
-        $this->title = '编辑规格';
-        return $this->_form($this->table, 'form');
-    }
-
-    /**
-     * 表单数据处理
-     * @param array $vo
-     */
-    protected function _form_filter(&$vo)
-    {
-        if ($this->request->isPost()) {
-            $param = json_decode($this->request->post('spec_param', '[]', null), true);
-            foreach ($param as &$v) {
-                $count = 1;
-                while ($count) {
-                    $v['value'] = trim(str_replace(['  ', '_', ',', '，', ';', '；'], ' ', $v['value'], $count));
-                }
-            }
-            $vo['spec_param'] = json_encode($param, JSON_UNESCAPED_UNICODE);
-        }
-    }
-
-    /**
-     * 删除产品规格
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品规格删除成功！", '');
-        }
-        $this->error("产品规格删除失败，请稍候再试！");
-    }
-
-    /**
-     * 产品规格禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品规格禁用成功！", '');
-        }
-        $this->error("产品规格禁用失败，请稍候再试！");
-    }
-
-    /**
-     * 产品规格禁用
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        if (DataService::update($this->table)) {
-            $this->success("产品规格启用成功！", '');
-        }
-        $this->error("产品规格启用失败，请稍候再试！");
-    }
-
-}
diff --git a/application/goods/service/ProductService.php b/application/goods/service/ProductService.php
deleted file mode 100644
index 9ef8535f9..000000000
--- a/application/goods/service/ProductService.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://think.ctolog.com
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\goods\service;
-
-use think\Db;
-
-/**
- * 产品数据服务支持
- * Class ProductService
- * @package app\goods\service
- */
-class ProductService
-{
-
-    /**
-     * 主产品表数据处理
-     * @param array $goodsList
-     * @return array
-     */
-    public static function buildGoodsList(&$goodsList)
-    {
-        // 产品分类处理
-        $cateField = 'id,pid,cate_title,cate_desc';
-        $cateWhere = ['status' => '1', 'is_deleted' => '0'];
-        $cateList = Db::name('GoodsCate')->where($cateWhere)->order('sort asc,id desc')->column($cateField);
-        // 产品品牌处理
-        $brandWhere = ['status' => '1', 'is_deleted' => '0'];
-        $brandField = 'id,brand_logo,brand_cover,brand_title,brand_desc,brand_detail';
-        $brandList = Db::name('GoodsBrand')->where($brandWhere)->order('sort asc,id desc')->column($brandField);
-        // 无产品列表时
-        if (empty($goodsList)) {
-            return ['list' => $goodsList, 'cate' => $cateList, 'brand' => $brandList];
-        }
-        // 读取产品详情列表
-        $specWhere = [['status', 'eq', '1'], ['is_deleted', 'eq', '0'], ['goods_id', 'in', array_column($goodsList, 'id')]];
-        $specField = 'id,goods_id,goods_spec,goods_number,market_price,selling_price,goods_stock,goods_sale';
-        $specList = Db::name('GoodsList')->where($specWhere)->column($specField);
-        foreach ($specList as $key => $spec) {
-            foreach ($goodsList as $goods) {
-                if ($goods['id'] === $spec['goods_id']) {
-                    $specList[$key]['goods_title'] = $goods['goods_title'];
-                }
-            }
-            if ($spec['goods_spec'] === 'default:default') {
-                $specList[$key]['goods_spec_alias'] = '<span class="color-desc">默认规格</span>';
-            } else {
-                $specList[$key]['goods_spec_alias'] = str_replace([':', ','], [': ', ', '], $spec['goods_spec']);
-            }
-        }
-        // 产品数据组装
-        foreach ($goodsList as $key => $vo) {
-            // 产品内容处理
-            $goodsList[$key]['goods_content'] = $vo['goods_content'];
-            // 产品品牌处理
-            $goodsList[$key]['brand'] = isset($brandList[$vo['brand_id']]) ? $brandList[$vo['brand_id']] : [];
-            // 产品分类关联
-            $goodsList[$key]['cate'] = [];
-            if (isset($cateList[$vo['cate_id']])) {
-                $goodsList[$key]['cate'][] = ($tcate = $cateList[$vo['cate_id']]);
-                while (isset($tcate['pid']) && $tcate['pid'] > 0 && isset($cateList[$tcate['pid']])) {
-                    $goodsList[$key]['cate'][] = ($tcate = $cateList[$tcate['pid']]);
-                }
-                $goodsList[$key]['cate'] = array_reverse($goodsList[$key]['cate']);
-            }
-            // 产品详细列表关联
-            $goodsList[$key]['spec'] = [];
-            foreach ($specList as $spec) {
-                if ($vo['id'] === $spec['goods_id']) {
-                    $goodsList[$key]['spec'][] = $spec;
-                }
-            }
-        }
-        return ['list' => $goodsList, 'cate' => $cateList, 'brand' => $brandList];
-    }
-
-    /**
-     * 同步更新产品库存及售出（@todo 需要重新做库存统计）
-     * @param int $goods_id 产品ID
-     * @return array
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public static function syncGoodsStock($goods_id)
-    {
-        // 检查产品是否需要更新库存
-        $map = ['id' => $goods_id, 'is_deleted' => '0'];
-        if (!($goods = Db::name('Goods')->where($map)->find())) {
-            return ['code' => 0, 'msg' => '指定产品信息无法同步库存！'];
-        }
-        // 统计入库信息
-        $stockField = 'goods_id,goods_spec,ifnull(sum(goods_stock), 0) goods_stock';
-        $stockWhere = ['status' => '1', 'is_deleted' => '0', 'goods_id' => $goods_id, 'mch_id' => $mch_id];
-        $stockList = (array)Db::name('GoodsStock')->field($stockField)->where($stockWhere)->group('goods_id,goods_spec')->select();
-        // 统计销售信息
-        $saleField = 'goods_id,goods_spec,ifnull(sum(number), 0) goods_sale';
-        $saleWhere = ['status' => '1', 'is_deleted' => '0', 'goods_id' => $goods_id, 'mch_id' => $mch_id];
-        $saleList = (array)Db::name('StoreOrderList')->field($saleField)->where($saleWhere)->group('goods_id,goods_spec')->select();
-        // 库存置零
-        list($where, $total_stock, $total_sale) = [['goods_id' => $goods_id], 0, 0];
-        Db::name('GoodsList')->where($where)->update(['goods_stock' => 0, 'goods_sale' => 0, 'mch_id' => $mch_id]);
-        // 更新产品库存
-        foreach ($stockList as $stock) {
-            $total_stock += intval($stock['goods_stock']);
-            $where = ['goods_id' => $goods_id, 'goods_spec' => $stock['goods_spec'], 'mch_id' => $mch_id];
-            Db::name('GoodsList')->where($where)->update(['goods_stock' => $stock['goods_stock']]);
-        }
-        // 更新产品销量
-        foreach ($saleList as $sale) {
-            $total_sale += intval($sale['goods_sale']);
-            $where = ['goods_id' => $goods_id, 'goods_spec' => $sale['goods_spec'], 'mch_id' => $mch_id];
-            Db::name('GoodsList')->where($where)->update(['goods_sale' => $sale['goods_sale']]);
-        }
-        // 更新总库存及总销量
-        $update = ['package_stock' => $total_stock, 'package_sale' => $total_sale, 'mch_id' => $mch_id];
-        Db::name('Goods')->where(['id' => $goods_id])->update($update);
-        return ['code' => 1, 'msg' => '同步产品库存成功！'];
-    }
-
-}
\ No newline at end of file
diff --git a/application/goods/view/brand/form.html b/application/goods/view/brand/form.html
deleted file mode 100644
index 9db6c4522..000000000
--- a/application/goods/view/brand/form.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="content"}
-<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">品牌名称</label>
-        <div class='col-sm-8'>
-            <input autofocus name="brand_title" value='{$vo.brand_title|default=""}' required="required" title="请输入品牌名称" placeholder="请输入品牌名称" class="layui-input">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label label-required">品牌图片</label>
-        <div class='col-sm-8'>
-            <table class="layui-table background-item margin-none" lay-size="sm" lay-skin="nob">
-                <thead>
-                <tr>
-                    <td>品牌LOGO</td>
-                    <td>品牌图片</td>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="text-top" style="width:100px">
-                        <input type="hidden" name="brand_logo" value="{$vo.brand_logo|default=''}">
-                        <script>$('[name=brand_logo]').uploadOneImage()</script>
-                    </td>
-                    <td class="text-top">
-                        <input type="hidden" name="brand_cover" value="{$vo.brand_cover|default=''}">
-                        <script>$('[name=brand_cover]').uploadOneImage()</script>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">品牌描述</label>
-        <div class='col-sm-8'>
-            <textarea placeholder="请输入品牌描述" title="请输入品牌描述" class="layui-textarea" name="brand_desc">{$vo.brand_desc|default=""}</textarea>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">品牌内容</label>
-        <div class='col-sm-8'>
-            <textarea name="brand_detail">{$vo.brand_detail|default=''|raw}</textarea>
-        </div>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="col-sm-7 col-sm-offset-2">
-        <div class="layui-form-item text-center">
-            {if !empty($vo.id)}<input type="hidden" name="id" value="{$vo.id}">{/if}
-            <button class="layui-btn" type="submit">保存配置</button>
-            <button class="layui-btn layui-btn-danger" type='button' onclick="window.history.back()">取消编辑</button>
-        </div>
-    </div>
-
-    <script>window.form.render();</script>
-
-    <script>
-        /*! 实例富文本编辑器  */
-        require(['ckeditor'], function () {
-            window.createEditor('[name="brand_detail"]', {height: 500});
-        });
-    </script>
-    <style>
-        .background-item {
-            padding: 15px;
-            background: #efefef;
-        }
-
-        .background-item thead tr {
-            background: #e0e0e0
-        }
-    </style>
-</form>
-{/block}
\ No newline at end of file
diff --git a/application/goods/view/brand/index.html b/application/goods/view/brand/index.html
deleted file mode 100644
index 404e0a341..000000000
--- a/application/goods/view/brand/index.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="button"}
-
-<!--{if auth("$classuri/add")}-->
-<button data-open='{:url("$classuri/add")}' data-title="添加品牌" class='layui-btn layui-btn-sm layui-btn-primary'>添加品牌</button>
-<!--{/if}-->
-
-<!--{if auth("$classuri/del")}-->
-<button data-update="" data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除品牌</button>
-<!--{/if}-->
-
-{/block}
-
-{block name="content"}
-
-<!-- 表单搜索 开始 -->
-<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">品牌名称</label>
-        <div class="layui-input-inline">
-            <input name="brand_title" value="{$Think.get.brand_title}" placeholder="请输入品牌名称" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">添加时间</label>
-        <div class="layui-input-inline">
-            <input name="create_at" id="create_at" value="{$Think.get.create_at}" placeholder="请选择添加时间" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-    </div>
-
-</form>
-
-<script>
-    window.laydate.render({range: true, elem: '#create_at'});
-    window.form.render();
-</script>
-<!-- 表单搜索 结束 -->
-
-<form onsubmit="return false;" data-auto="true" method="post">
-    {if empty($list)}
-    <p class="help-block text-center well">没 有 记 录 哦！</p>
-    {else}
-    <input type="hidden" value="resort" name="action"/>
-    <table class="layui-table" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td'>
-                <input data-auto-none="none" data-check-target='.list-check-box' type='checkbox'/>
-            </th>
-            <th class='list-table-sort-td'>
-                <button type="submit" class="layui-btn layui-btn-normal layui-btn-xs">排 序</button>
-            </th>
-            <th class='text-left nowrap'>产品品牌</th>
-            <th class='text-left nowrap'>添加时间</th>
-            <th class='text-left nowrap'>品牌状态</th>
-            <th class='text-left'></th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
-            </td>
-            <td class='list-table-sort-td'>
-                <input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
-            </td>
-            <td class='text-left nowrap'>{$vo.brand_title}</td>
-            <td class='text-left nowrap'>{$vo.create_at|format_datetime}</td>
-            <td class='text-left nowrap'>
-                {if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
-            </td>
-            <td class='text-left nowrap'>
-
-                {if auth("$classuri/edit")}
-                <span class="text-explode">|</span>
-                <a data-title="编辑品牌" data-open='{:url("$classuri/edit")}?id={$vo.id}'>编辑</a>
-                {/if}
-
-                {if $vo.status eq 1 and auth("$classuri/forbid")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'>禁用</a>
-                {elseif auth("$classuri/resume")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'>启用</a>
-                {/if}
-
-                {if auth("$classuri/del")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'>删除</a>
-                {/if}
-
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {if isset($page)}<p>{$page|raw}</p>{/if}
-    {/if}
-</form>
-{/block}
\ No newline at end of file
diff --git a/application/goods/view/cate/form.html b/application/goods/view/cate/form.html
deleted file mode 100644
index bfbac66e6..000000000
--- a/application/goods/view/cate/form.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">产品主分类</label>
-        <div class="layui-input-block">
-            <select name='pid' class='layui-select full-width block'>
-                <!--{foreach cates as $cate}-->
-                <!--{eq name='cate.id' value='$vo.pid|default=0'}-->
-                <option selected value='{$cate.id}'>{$cate.spl|raw}{$cate.cate_title|default=''}</option>
-                <!--{else}-->
-                <option value='{$cate.id}'>{$cate.spl|raw}{$cate.cate_title}</option>
-                <!--{/eq}-->
-                <!--{/foreach}-->
-            </select>
-        </div>
-    </div>
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">产品分类</label>
-        <div class="layui-input-block">
-            <input autofocus name="cate_title" value='{$vo.cate_title|default=""}' required title="请输入产品分类" placeholder="请输入产品分类" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">分类描述</label>
-        <div class="layui-input-block">
-            <textarea placeholder="请输入分类描述" title="请输入分类描述" class="layui-textarea" name="cate_desc">{$vo.cate_desc|default=""}</textarea>
-        </div>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="layui-form-item text-center">
-        {if isset($vo['id'])}<input type='hidden' value='{$vo.id}' name='id'/>{/if}
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
-    </div>
-</form>
diff --git a/application/goods/view/cate/index.html b/application/goods/view/cate/index.html
deleted file mode 100644
index de1b8fb4f..000000000
--- a/application/goods/view/cate/index.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="button"}
-<!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("@$classuri/add")}' data-title="添加分类" class='layui-btn layui-btn-sm layui-btn-primary'>添加分类</button>
-<!--{/if}-->
-<!--{if auth("$classuri/del")}-->
-<button data-update="" data-field='delete' data-action='{:url("@$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除分类</button>
-<!--{/if}-->
-{/block}
-
-{block name="content"}
-<form onsubmit="return false;" data-auto="true" method="post">
-    <!--{if empty($list)}-->
-    <p class="help-block text-center well">没 有 记 录 哦！</p>
-    <!--{else}-->
-    <input type="hidden" value="resort" name="action">
-    <table class="layui-table" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td'>
-                <input data-auto-none="none" data-check-target='.list-check-box' type='checkbox'>
-            </th>
-            <th class='list-table-sort-td'>
-                <button type="submit" class="layui-btn layui-btn-normal layui-btn-xs">排 序</button>
-            </th>
-            <th class='text-left nowrap'>产品分类</th>
-            <th class='text-left nowrap'>分类描述</th>
-            <th class='text-left nowrap'>添加时间</th>
-            <th class='text-center nowrap'>分类状态</th>
-            <th class='text-center'></th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td'>
-                <input class="list-check-box" value='{$vo.ids}' type='checkbox'>
-            </td>
-            <td class='list-table-sort-td'>
-                <input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input">
-            </td>
-            <td class='text-left nowrap'>
-                <span class="color-desc">{$vo.spl|raw}</span> {$vo.cate_title}
-            </td>
-            <td class='text-left nowrap'>
-                {$vo.cate_desc|default='<span class="color-desc">未设置分类描述</span>'|raw}
-            </td>
-            <td class='text-left nowrap'>
-                {$vo.create_at|format_datetime}
-            </td>
-            <td class='text-center nowrap'>
-                {if $vo.status eq 0}<span>已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
-            </td>
-            <td class='text-center nowrap'>
-
-                {if auth("$classuri/edit")}
-                <span class="text-explode">|</span>
-                <a data-title="编辑分类" data-modal='{:url("@$classuri/edit")}?id={$vo.id}'>编辑</a>
-                {/if}
-
-                {if $vo.status eq 1 and auth("$classuri/forbid")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.ids}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'>禁用</a>
-                {elseif auth("$classuri/resume")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.ids}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'>启用</a>
-                {/if}
-
-                {if auth("$classuri/del")}
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.ids}" data-field='delete' data-action='{:url("$classuri/del")}'>删除</a>
-                {/if}
-
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {if isset($page)}<p>{$page|raw}</p>{/if}
-    <!--{/if}-->
-</form>
-{/block}
\ No newline at end of file
diff --git a/application/goods/view/product/form.html b/application/goods/view/product/form.html
deleted file mode 100644
index 382da7be2..000000000
--- a/application/goods/view/product/form.html
+++ /dev/null
@@ -1,357 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="content"}
-<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" id="ProductForm" class='form-horizontal layui-form padding-top-20'>
-
-    <!--{if !empty($brands)}-->
-    <div class="form-group">
-        <label class="col-sm-2 control-label">产品品牌</label>
-        <div class='col-sm-8'>
-            <select required class="layui-select full-width" name="brand_id">
-                {foreach $brands as $brand}
-                <!--{eq name='$brand.id' value='$vo.brand_id|default=0'}-->
-                <option selected="selected" value="{$brand.id}">{$brand.brand_title}</option>
-                <!--{else}-->
-                <option value="{$brand.id}">{$brand.brand_title}</option>
-                <!--{/eq}-->
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <!--{/if}-->
-
-    <!--{if !empty($cates)}-->
-    <div class="form-group">
-        <label class="col-sm-2 control-label">产品分类</label>
-        <div class='col-sm-8 text-top'>
-            <select required class="layui-select full-width" name="cate_id">
-                {foreach $cates as $cate}
-                <!--{if isset($vo.cate_id) and $cate.id eq $vo.cate_id}-->
-                <option selected value="{$cate.id}">{$cate.spl|raw}{$cate.cate_title}</option>
-                <!--{else}-->
-                <option value="{$cate.id}">{$cate.spl|raw}{$cate.cate_title}</option>
-                <!--{/if}-->
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <!--{/if}-->
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">产品名称</label>
-        <div class='col-sm-8'>
-            <input name="goods_title" required value="{$vo.goods_title|default=''}" class="layui-input" title="请输入产品名称" placeholder="请输入产品名称">
-        </div>
-    </div>
-
-    {if !empty($tags)}
-    <div class="form-group">
-        <label class="col-sm-2 control-label">产品标签</label>
-        <div class='col-sm-8'>
-            <div class="background-item">
-                {foreach $tags as $tag}
-                <label class="nowrap margin-right-10 line-height-18">
-                    <!--{if isset($vo.tags_id) && in_array($tag.id,$vo.tags_id)}-->
-                    <input type="checkbox" value="{$tag.id}" name="tags_id[]" checked="checked" lay-ignore>
-                    <!--{else}-->
-                    <input type="checkbox" value="{$tag.id}" name="tags_id[]" lay-ignore>
-                    <!--{/if}-->
-                    {$tag.tags_title}
-                </label>
-                {/foreach}
-            </div>
-        </div>
-    </div>
-    {/if}
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label label-required">产品图片</label>
-        <div class='col-sm-8'>
-            <table class="layui-table background-item margin-none" lay-size="sm" lay-skin="nob">
-                <thead>
-                <tr>
-                    <td>产品LOGO</td>
-                    <td>产品图片</td>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="text-top" style="width:100px">
-                        <input type="hidden" name="goods_logo" value="{$vo.goods_logo|default=''}">
-                    </td>
-                    <td class="text-top">
-                        <input type="hidden" name="goods_image" value="{$vo.goods_image|default=''}">
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <!-- 普通产品及积分产品 开始 -->
-    <div class="form-group">
-        <label class="col-sm-2 control-label">产品规格</label>
-        <div class='col-sm-8'>
-            <select required class="layui-select full-width block" name="spec_id" lay-ignore>
-                {foreach $specs as $spec}
-                {php}$param=str_replace('"',"'",$spec['spec_param']);{/php}
-                <!--{eq name='spec.id' value='$vo.spec_id|default=0'}-->
-                <option data-param="{$param}" selected="selected" value="{$spec.id}">{$spec.spec_title}</option>
-                <!--{else}-->
-                <option data-param="{$param}" value="{$spec.id}">{$spec.spec_title}</option>
-                <!--{/eq}-->
-                {/foreach}
-            </select>
-            <table class="layui-table notevent" lay-size="sm" ng-if="specs.length>0">
-                <tr>
-                    <th>可选规格</th>
-                    <th>规格内容</th>
-                </tr>
-                <tr ng-repeat="x in specs">
-                    <td ng-bind="x.name"></td>
-                    <td>
-                        <label ng-repeat="m in x.param" class="nowrap margin-right-10 line-height-18">
-                            <input data-spec="{{x.name}}_{{m.value}}" ng-model="m.checked" class="inline-block" type="checkbox" lay-ignore>
-                            <span ng-bind="m.value"></span>
-                        </label>
-                    </td>
-                </tr>
-            </table>
-            <table class="layui-table notevent" lay-size="sm">
-                <thead>
-                <tr>
-                    <th>产品规格</th>
-                    <th>市场价格</th>
-                    <th>销售价格</th>
-                    <th>规格状态</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr ng-class="x.status?'':'layui-bg-gray'" ng-repeat="x in specdata">
-                    <td class="nowrap">
-                        <input type="hidden" name="goods_spec[]" value="{{x.spec_name}}">
-                        <span ng-repeat="a in x.spec_attrs">
-                            <span class="layui-badge layui-bg-blue" ng-bind="a.name"></span>
-                            <span ng-if="b" class="layui-badge layui-bg-green" ng-repeat="b in a.value" ng-bind="b"></span>
-                        </span>
-                    </td>
-                    <td class="price-input-td">
-                        <input onblur="this.value=(parseFloat(this.value)||0).toFixed(2)" class="layui-input" placeholder="0.00" name="market_price[]" value="{{x.market_price}}">
-                    </td>
-                    <td class="price-input-td">
-                        <input onblur="this.value=(parseFloat(this.value)||0).toFixed(2)" class="layui-input" placeholder="0.00" name="selling_price[]" value="{{x.selling_price}}">
-                    </td>
-                    <td>
-                        <label class="nowrap line-height-18">
-                            <input type="hidden" name="spec_status[]" value="{{x.status?1:0}}">
-                            <input ng-checked="x.status" ng-model="x.status" value="1" lay-ignore class="inline-block" type="checkbox"/> 启用
-                        </label>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <!-- 普通产品及积分产品 结束 -->
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">视频展示</label>
-        <div class='col-sm-8'>
-            <div class="row">
-                <div class="col-sm-10 padding-right-0">
-                    <input style="border-right:none" name="goods_video" value="{$vo.goods_video|default=''}" class="layui-input" title="请输入链接或上传视频展示文件" placeholder="请输入链接或上传视频展示文件">
-                </div>
-                <div class="col-sm-2 padding-left-0">
-                    <button data-file="one" data-type="mp4" data-field="goods_video" type="button" class="layui-btn layui-btn-sm" style="height:38px;line-height:38px;width:100%">上传视频文件</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label">展示描述</label>
-        <div class='col-sm-8'>
-            <textarea class="layui-textarea" name="goods_desc" placeholder="请输入展示描述">{$vo.goods_desc|default=''}</textarea>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="col-sm-2 control-label label-required">产品内容</label>
-        <div class='col-sm-8'>
-            <textarea name="goods_content">{$vo.goods_content|default=''|htmlspecialchars_decode}</textarea>
-        </div>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="col-sm-7 col-sm-offset-2">
-        <div class="layui-form-item text-center">
-            {if !empty($vo.id)}<input type="hidden" name="id" value="{$vo.id}">{/if}
-            <button class="layui-btn" type="submit">保存配置</button>
-            <button class="layui-btn layui-btn-danger" type='button' onclick="window.history.back()">取消编辑</button>
-        </div>
-    </div>
-
-</form>
-
-<script>
-    require(['jquery', 'ckeditor', 'angular'], function () {
-        window.form.render();
-        window.createEditor('[name="goods_content"]', {height: 500});
-        var app = angular.module("ProductForm", []).run(callback);
-        angular.bootstrap(document.getElementById(app.name), [app.name]);
-
-        function callback($rootScope) {
-            // 绑定规格列表
-            $rootScope.specs = [];
-            // 规格默认数据
-            var specdata = JSON.parse('{$vo.list|default=[]|json_encode=###,256|raw}');
-            // 单图片上传处理
-            $('#ProductForm [name="goods_logo"]').uploadOneImage();
-            // 多图片上传处理
-            $('#ProductForm [name="goods_image"]').uploadMultipleImage();
-            // 规格显示切换
-            $('#ProductForm').on('click', '[data-spec]', applySpecData);
-            // 产品规格切换
-            $('#ProductForm').on('change', '[name="spec_id"]', function () {
-                var specs = eval(this.options[this.selectedIndex].getAttribute('data-param'));
-                for (var i in specs) {
-                    specs[i].param = [];
-                    var values = specs[i].value.split(' ');
-                    for (var j in values) {
-                        specs[i].param.push({
-                            name: specs[i].name, value: values[j],
-                            checked: getSpecStatus(specs[i].name, values[j])
-                        });
-                    }
-                }
-                $rootScope.$apply(function () {
-                    $rootScope.specs = specs;
-                    setTimeout(applySpecData, 10);
-                });
-            }).find('[name="spec_id"]').trigger('change');
-
-            // 规格属性切换
-            function applySpecData() {
-                var params = {};
-                for (var i in $rootScope.specs) {
-                    var isChecked = false;
-                    for (var j in $rootScope.specs[i].param) {
-                        if ($rootScope.specs[i].param[j].checked) {
-                            isChecked = true;
-                            var name = $rootScope.specs[i].param[j].name;
-                            var value = $rootScope.specs[i].param[j].value;
-                            (params[name] || (params[name] = [])).push({name: name, value: value});
-                        }
-                    }
-                    if (!isChecked) {
-                        $rootScope.specs[i].param[0].checked = true;
-                        var name = $rootScope.specs[i].param[0].name;
-                        var value = $rootScope.specs[i].param[0].value;
-                        (params[name] || (params[name] = [])).push({name: name, value: value});
-                    }
-                }
-                $rootScope.$apply(function () {
-                    $rootScope.specdata = DataArray.render(params);
-                });
-            }
-
-            // 获取规格选择状态
-            function getSpecStatus(name, spec) {
-                for (var i in specdata) {
-                    if (specdata[i].goods_spec.indexOf(name + ':' + spec) > -1) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            // 数据处理
-            var DataArray = new function () {
-                // 编译生成规格数据
-                this.render = function (data) {
-                    var specs = [], list = [];
-                    for (var i in data) {
-                        specs = this.joinArray(data[i], specs, i);
-                    }
-                    (specs.length < 1) && (specs = ['default:default']);
-                    for (var i in specs) {
-                        var specName = specs[i];
-                        var specTitle = (specName === 'default:default') ? '默认规格' : specName.replace(/,/ig, ';').replace(/:/ig, ':');
-                        var specAttrs = [], lines = specTitle.split(';');
-                        for (var j in lines) {
-                            var line = lines[j].split(':');
-                            specAttrs.push({name: line[0], value: (line[1] || '').split(',')});
-                        }
-                        list.push({
-                            spec_name: specName, spec_title: specTitle, spec_attrs: specAttrs,
-                            market_price: parseFloat(this.getData(specs[i], 'market_price') || '0').toFixed(2),
-                            selling_price: parseFloat(this.getData(specs[i], 'selling_price') || '0').toFixed(2),
-                            status: this.getData(specName, 'status') !== '0'
-                        });
-                    }
-                    return list;
-                };
-                // 读取规格默认数据
-                this.getData = function (spec, field) {
-                    for (var i in specdata) {
-                        if (specdata[i].goods_spec === spec) {
-                            return specdata[i][field] || '0';
-                        }
-                    }
-                    return '1';
-                };
-                // 数组交叉计算
-                this.joinArray = function (item, list, pk) {
-                    var _list = [];
-                    for (var i in item) {
-                        if (list.length > 0) {
-                            for (var j in list) {
-                                _list.push(list[j] + ',' + pk + ':' + item[i].value);
-                            }
-                        } else {
-                            _list.push(pk + ':' + item[i].value);
-                        }
-                    }
-                    return _list;
-                }
-            };
-        }
-    });
-</script>
-{/block}
-
-{block name="style"}
-<style>
-
-    .background-item {
-        padding: 15px;
-        background: #efefef;
-    }
-
-    .background-item thead tr {
-        background: #e0e0e0
-    }
-
-    .price-input-td {
-        padding: 0 !important;
-    }
-
-    .price-input-td:before {
-        margin: 4px;
-        width: 35px;
-        height: 22px;
-        content: "金额";
-        line-height: 20px;
-        text-align: center;
-        position: absolute;
-        background: #e2e2e2;
-    }
-
-    .price-input-td input {
-        height: 30px;
-        padding-left: 50px;
-        border: none !important;
-    }
-</style>
-{/block}
\ No newline at end of file
diff --git a/application/goods/view/product/index.html b/application/goods/view/product/index.html
deleted file mode 100644
index 3491e8479..000000000
--- a/application/goods/view/product/index.html
+++ /dev/null
@@ -1,189 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="button"}
-
-<!--{if auth("$classuri/add")}-->
-<button data-open='{:url("$classuri/add")}' data-title="添加产品" class='layui-btn layui-btn-sm layui-btn-primary'>添加产品</button>
-<!--{/if}-->
-
-<!--{if auth("$classuri/forbid")}-->
-<button data-update data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}' class='layui-btn layui-btn-sm layui-btn-primary'>批量下架</button>
-<!--{/if}-->
-
-<!--{if auth("$classuri/resume")}-->
-<button data-update data-field='status' data-value='1' data-action='{:url("$classuri/resume")}' class='layui-btn layui-btn-sm layui-btn-primary'>批量上架</button>
-<!--{/if}-->
-
-<!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
-<!--{/if}-->
-
-{/block}
-
-{block name="content"}
-
-<!-- 表单搜索 开始 -->
-<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">产品名称</label>
-        <div class="layui-input-inline">
-            <input name="goods_title" value="{$Think.get.goods_title}" placeholder="请输入产品名称" class="layui-input">
-        </div>
-    </div>
-
-    <!--{if !empty($cates)}-->
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">产品品牌</label>
-        <div class="layui-input-inline">
-            <select name="brand_id" lay-search>
-                <option value="">产品品牌</option>
-                {foreach $brands as $brand}
-                <!--{if $Think.get.brand_id eq $brand.id}-->
-                <option selected="selected" value="{$brand.id}">{$brand.brand_title}</option>
-                <!--{else}-->
-                <option value="{$brand.id}">{$brand.brand_title}</option>
-                <!--{/if}-->
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <!--{/if}-->
-
-    <!--{if !empty($cates)}-->
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">产品分类</label>
-        <div class="layui-input-inline">
-            <select name="cate_id" lay-search>
-                <option value="">所有分类</option>
-                {foreach $cates as $cate}
-                <!--{if $Think.get.cate_id eq $cate.id}-->
-                <option selected="selected" value="{$cate.id}">{$cate.spl|raw}{$cate.cate_title}</option>
-                <!--{else}-->
-                <option value="{$cate.id}">{$cate.spl|raw}{$cate.cate_title}</option>
-                <!--{/if}-->
-                {/foreach}
-            </select>
-        </div>
-    </div>
-    <!--{/if}-->
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">发布时间</label>
-        <div class="layui-input-inline">
-            <input name="create_at" id="create_at" value="{$Think.get.create_at}" placeholder="请选择发布时间" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-    </div>
-
-</form>
-<!-- 表单搜索 结束 -->
-
-<form onsubmit="return false;" data-auto="true" method="post">
-    <!--{if empty($list)}-->
-    <p class="help-block text-center well">没 有 记 录 哦！</p>
-    <!--{else}-->
-    <input type="hidden" value="resort" name="action">
-    <table class="layui-table notevent" lay-skin="line">
-        <thead>
-        <tr>
-            <th class='list-table-check-td'>
-                <input data-auto-none="none" data-check-target='.list-check-box' type='checkbox'>
-            </th>
-            <th class='list-table-sort-td'>
-                <button type="submit" class="layui-btn layui-btn-normal layui-btn-xs">排 序</button>
-            </th>
-            <th class="nowrap">品牌分类</th>
-            <th class="padding-none">
-                <table class="think-inner-table layui-table">
-                    <thead>
-                    <tr>
-                        <td>产品信息</td>
-                        <td class="text-right nowrap">售价 ( 标价 ) / 库存 ( 剩余, 已售 )</td>
-                    </tr>
-                    </thead>
-                </table>
-            </th>
-            <th class="text-left">添加时间 / 状态</th>
-            <th class='text-center'></th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td text-top'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
-            </td>
-            <td class='list-table-sort-td text-top'>
-                <input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input">
-            </td>
-            <td class="text-left nowrap text-top">
-                品牌：{$vo.brand.brand_title|default='<span class="color-desc">未配置品牌</span>'|raw}<br>
-                分类：{if empty($vo.cate)}<span class="color-desc">未配置分类</span>{else}
-                {foreach $vo.cate as $k=>$cate}{$cate.cate_title}
-                {if $k+1 < count($vo.cate)}<span class="layui-icon font-s12">&#xe602;</span>{/if}
-                {/foreach}
-                {/if}
-            </td>
-            <td class="text-left nowrap text-top" style="padding:2px">
-                <table class="think-inner-table layui-table notevent">
-                    <colgroup>
-                        <col width="60%">
-                    </colgroup>
-                    {foreach $vo.spec as $spec}
-                    <tr>
-                        <td>
-                            [{$spec.goods_id}] {$spec.goods_title|default=''|raw}
-                            <span class="layui-badge layui-bg-gray">{$spec.goods_spec_alias|raw}</span>
-                        </td>
-                        <td class="text-right nowrap">
-                            <span class="layui-badge layui-bg-gray">售 {$spec.selling_price} ( 市 {$spec.market_price} ) </span>
-                            <span class="layui-badge layui-bg-gray">存 {$spec.goods_stock} ( 剩 {$spec.goods_stock-$spec.goods_sale}, 售 {$spec.goods_sale} ) </span>
-                        </td>
-                    </tr>
-                    {/foreach}
-                </table>
-            </td>
-            <td class='text-left nowrap text-top'>
-                {$vo.create_at|format_datetime|str_replace=' ','<br>',###|raw}
-                {if $vo.status eq '0'}<span class="color-red margin-left-10">已下架</span>{elseif $vo.status eq '1'}<span class="color-green margin-left-10">销售中</span>{/if}
-            </td>
-
-            <td class='text-center nowrap text-top'>
-
-                <!--{if auth("$classuri/edit")}-->
-                <span class="text-explode">|</span>
-                <a data-open='{:url("$classuri/edit")}?id={$vo.id}'>编辑</a>
-                <!--{/if}-->
-
-                <!--{if $vo.status eq 1 and auth("$classuri/forbid")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'>下架</a>
-                <!--{elseif auth("$classuri/resume")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'>上架</a>
-                <!--{/if}-->
-
-                <!--{if auth("$classuri/del")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'>删除</a>
-                <!--{/if}-->
-
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {if isset($page)}<p>{$page|raw}</p>{/if}
-    <!--{/if}-->
-</form>
-<script>
-    (function () {
-        window.form.render();
-        window.laydate.render({range: true, elem: '#create_at'});
-    })();
-</script>
-{/block}
\ No newline at end of file
diff --git a/application/goods/view/spec/form.html b/application/goods/view/spec/form.html
deleted file mode 100644
index 9d60ff2e2..000000000
--- a/application/goods/view/spec/form.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<form class="layui-form layui-box" style='padding:25px 30px 20px 0' method="post" id="spec-form">
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">规格名称</label>
-        <div class="layui-input-block">
-            <input name="spec_title" ng-model="spec_title" required title="请输入规格名称" placeholder="请输入规格名称" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item">
-        <label class="layui-form-label label-required">规格参数</label>
-        <div class="layui-input-block">
-            <textarea class="hide" ng-model="spec_param"></textarea>
-            <div class="param-table-list">
-                <table class="layui-table margin-none">
-                    <tbody class="param-table-list">
-                    <tr ng-repeat="x in paramList" class="transition">
-                        <td class="param-input-td one nowrap">
-                            <input required placeholder="分组" title="请输入属性分组" ng-model="x.name" class="layui-input">
-                        </td>
-                        <td class="param-input-td two nowrap">
-                            <input required placeholder="名称" title="请输入属性名称" ng-model="x.value" class="layui-input">
-                        </td>
-                        <td class="param-input-td thr nowrap">
-                            <a ng-if="$index<1" class="color-desc">删除</a>
-                            <a ng-if="$index>0" ng-click="delParam($index)">删除</a>
-                            <a ng-if="$index<1" class="color-desc">上移</a>
-                            <a ng-if="$index>0" ng-click="moveToUp($index)">上移</a>
-                            <a ng-if="$index+1<paramList.length" ng-click="moveToDn($index)">下移</a>
-                            <a ng-if="$index+1>=paramList.length" class="color-desc">下移</a>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <table class="layui-table">
-                <tr>
-                    <td class="text-center notselect padding-none border-none">
-                        <button type="button" class="layui-btn full-width layui-btn-primary" ng-click="addParam()">添加属性</button>
-                    </td>
-                </tr>
-            </table>
-            <p class="help-block">设置多个内容值时请使用空格键或英文逗号隔开。</p>
-        </div>
-    </div>
-
-    <div class="layui-form-item">
-        <label class="layui-form-label">规格描述</label>
-        <div class="layui-input-block">
-            <textarea placeholder="请输入规格描述" title="请输入规格描述" class="layui-textarea" ng-model="spec_desc" name="spec_desc"></textarea>
-        </div>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="layui-form-item text-center">
-        {if isset($vo['id'])}<input type='hidden' value='{$vo.id}' name='id'/>{/if}
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
-    </div>
-
-    <script>
-        require(['angular'], function () {
-            // 应用创建与初始化
-            var app = angular.module("SpecForm", []).run(callback);
-            angular.bootstrap(document.getElementById('spec-form'), [app.name]);
-
-            // 应用事件处理
-            function callback($rootScope) {
-                // 属性参数
-                $rootScope.paramList = filterParamList(JSON.parse('{$vo.spec_param|default="[]"|raw}') || []);
-                $rootScope.spec_title = '{$vo.spec_title|default=""}';
-                $rootScope.spec_desc = '{$vo.sepc_desc|default=""}';
-
-                // 删除菜单
-                $rootScope.delParam = function (x) {
-                    var dialogIndex = $.msg.confirm('确定移除参数吗？', function () {
-                        $rootScope.$apply(function () {
-                            var tmp = [];
-                            for (var i in $rootScope.paramList) {
-                                (parseInt(i) !== parseInt(x)) && tmp.push($rootScope.paramList[i]);
-                            }
-                            $rootScope.paramList = filterParamList(tmp);
-                            $.msg.close(dialogIndex);
-                        });
-                    });
-                };
-
-                // 添加参数
-                $rootScope.addParam = function () {
-                    $rootScope.paramList.push({name: '', value: ''});
-                    setTimeout(function () {
-                        $('.param-table-list').scrollTop('10000')
-                    }, 10);
-                };
-
-                // 属性参数下移
-                $rootScope.moveToDn = function (index) {
-                    var tmp = [], cur = $rootScope.paramList[index];
-                    if (index > $rootScope.paramList.length - 2) {
-                        return false;
-                    }
-                    for (var i in $rootScope.paramList) {
-                        (parseInt(i) !== parseInt(index)) && tmp.push($rootScope.paramList[i]);
-                        (parseInt(i) === parseInt(index) + 1) && tmp.push(cur);
-                    }
-                    $rootScope.paramList = tmp;
-                };
-
-                // 属性参数上移
-                $rootScope.moveToUp = function (index) {
-                    var tmp = [], cur = $rootScope.paramList[index];
-                    if (index < 1) {
-                        return false;
-                    }
-                    for (var i in $rootScope.paramList) {
-                        (parseInt(i) === parseInt(index) - 1) && tmp.push(cur);
-                        (parseInt(i) !== parseInt(index)) && tmp.push($rootScope.paramList[i]);
-                    }
-                    $rootScope.paramList = tmp;
-                };
-
-                // 表单验证
-                $('#spec-form').vali(function (ret) {
-                    try {
-                        var spect_param = [];
-                        for (var i in $rootScope.paramList) {
-                            spect_param.push({
-                                name: $rootScope.paramList[i].name,
-                                value: $rootScope.paramList[i].value
-                            });
-                        }
-                        var data = {
-                            spec_title: $rootScope.spec_title || '',
-                            spec_desc: $rootScope.spec_desc || '',
-                            spec_param: JSON.stringify(spect_param)
-                        };
-                        var id = '{$vo.id|default=0}';
-                        id > 0 && (data.id = id);
-                        $.form.load('{:request()->url()}', data, 'post');
-                    } catch ($e) {
-                        console.log($e);
-                    }
-                    return false;
-                });
-            }
-
-            // 过滤规格参数列表
-            function filterParamList(list) {
-                return list.length < 1 ? [{name: '', value: ''}] : list;
-            }
-        });
-    </script>
-
-    <style>
-        .param-table-list {
-            overflow: auto;
-            max-height: 200px;
-            position: relative;
-            overflow-y: scroll;
-        }
-
-        .param-input-td {
-            position: relative;
-            padding: 0 !important;
-        }
-
-        .param-input-td.one {
-            width: 30%;
-        }
-
-        .param-input-td.thr {
-            width: 20%;
-            text-align: center;
-        }
-
-        .param-input-td.one:before {
-            content: '分组'
-        }
-
-        .param-input-td.two:before {
-            content: '规格'
-        }
-
-        .param-input-td:before {
-            margin: 4px;
-            width: 40px;
-            height: 30px;
-            line-height: 30px;
-            text-align: center;
-            position: absolute;
-            background: #e2e2e2;
-        }
-
-        .param-input-td input {
-            padding-left: 50px;
-            border: none !important;
-        }
-    </style>
-</form>
diff --git a/application/goods/view/spec/index.html b/application/goods/view/spec/index.html
deleted file mode 100644
index ebe56255c..000000000
--- a/application/goods/view/spec/index.html
+++ /dev/null
@@ -1,116 +0,0 @@
-{extend name='admin@public/content'}
-
-{block name="button"}
-
-<!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("$classuri/add")}' data-title="添加规格" class='layui-btn layui-btn-sm layui-btn-primary'>添加规格</button>
-<!--{/if}-->
-
-<!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除规格</button>
-<!--{/if}-->
-
-{/block}
-
-{block name="content"}
-
-<!-- 表单搜索 开始 -->
-<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">规格分组</label>
-        <div class="layui-input-inline">
-            <input name="spec_title" value="{$Think.get.spec_title|default=''}" placeholder="请输入规格分组" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">添加时间</label>
-        <div class="layui-input-inline">
-            <input name="date" id="range-date" value="{$Think.get.date}" placeholder="请选择添加时间" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-    </div>
-
-</form>
-
-<script>
-    window.laydate.render({range: true, elem: '#range-date'});
-    window.form.render();
-</script>
-<!-- 表单搜索 结束 -->
-
-<form onsubmit="return false;" data-auto="true" method="post">
-    {if empty($list)}
-    <p class="help-block text-center well">没 有 记 录 哦！</p>
-    {else}
-    <input type="hidden" value="resort" name="action"/>
-    <table class="layui-table" lay-skin="line" lay-size="sm">
-        <thead>
-        <tr>
-            <th class='list-table-check-td'>
-                <input data-auto-none="none" data-check-target='.list-check-box' type='checkbox'/>
-            </th>
-            <th class='list-table-sort-td'>
-                <button type="submit" class="layui-btn layui-btn-normal layui-btn-xs">排 序</button>
-            </th>
-            <th class='text-left nowrap'>规格分组</th>
-            <th class='text-left nowrap'>规格内容</th>
-            <th class='text-left nowrap'>添加时间</th>
-            <th class='text-left nowrap'>标签状态</th>
-            <th class='text-left'></th>
-        </tr>
-        </thead>
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td text-top'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
-            </td>
-            <td class='list-table-sort-td text-top'>
-                <input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
-            </td>
-            <td class='text-left text-top nowrap'>{$vo.spec_title}</td>
-            <td class='text-left text-top nowrap'>
-                {foreach $vo.spec_param as $param}
-                <p><b>{$param.name}</b> : {$param.value}</p>
-                {/foreach}
-            </td>
-            <td class='text-left text-top nowrap'>
-                {$vo.create_at|format_datetime|raw}
-            </td>
-            <td class='text-left text-top nowrap'>
-                {if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
-            </td>
-            <td class='text-left text-top nowrap'>
-
-                <!--{if auth("$classuri/edit")}-->
-                <span class="text-explode">|</span>
-                <a data-title="编辑规格" data-modal='{:url("$classuri/edit")}?id={$vo.id}'>编辑</a>
-                <!--{/if}-->
-
-                <!--{if $vo.status eq 1 and auth("$classuri/forbid")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'>禁用</a>
-                <!--{elseif auth("$classuri/resume")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'>启用</a>
-                <!--{/if}-->
-
-                <!--{if auth("$classuri/del")}-->
-                <span class="text-explode">|</span>
-                <a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'>删除</a>
-                <!--{/if}-->
-
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {if isset($page)}<p>{$page|raw}</p>{/if}
-    {/if}
-</form>
-{/block}
\ No newline at end of file