diff --git a/service/Application/Admin/Controller/ScreeningPriceController.class.php b/service/Application/Admin/Controller/ScreeningPriceController.class.php new file mode 100755 index 000000000..a8cfebf64 --- /dev/null +++ b/service/Application/Admin/Controller/ScreeningPriceController.class.php @@ -0,0 +1,202 @@ +Is_Login(); + + // 权限校验 + $this->Is_Power(); + } + + /** + * [Index 筛选价格列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-06T21:31:53+0800 + */ + public function Index() + { + $this->assign('common_is_enable_list', L('common_is_enable_list')); + $this->display('Index'); + } + + /** + * [GetNodeSon 获取节点子列表] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T15:19:45+0800 + */ + public function GetNodeSon() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + // 获取数据 + $field = array('id', 'name', 'sort', 'is_enable', 'min_price', 'max_price'); + $data = M('ScreeningPrice')->field($field)->where(array('pid'=>intval(I('id', 0))))->select(); + if(!empty($data)) + { + foreach($data as $k=>$v) + { + if(!empty($v['min_price']) && !empty($v['max_price'])) + { + $alias = $v['min_price'].'-'.$v['max_price']; + } + if(empty($v['min_price']) && !empty($v['max_price'])) + { + $alias = $v['max_price'].'以下'; + } + if(!empty($v['min_price']) && empty($v['max_price'])) + { + $alias = $v['min_price'].'以上'; + } + $data[$k]['name_alias'] = $v['name'].' '.$alias; + $data[$k]['is_son'] = $this->IsExistSon($v['id']); + $data[$k]['ajax_url'] = U('Admin/ScreeningPrice/GetNodeSon', array('id'=>$v['id'])); + $data[$k]['delete_url'] = U('Admin/ScreeningPrice/Delete'); + $data[$k]['json'] = json_encode($v); + } + } + $msg = empty($data) ? L('common_not_data_tips') : L('common_operation_success'); + $this->ajaxReturn($msg, 0, $data); + } + + /** + * [IsExistSon 节点是否存在子数据] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T15:22:47+0800 + * @param [int] $id [节点id] + * @return [string] [有数据ok, 则no] + */ + private function IsExistSon($id) + { + if(!empty($id)) + { + return (M('ScreeningPrice')->where(array('pid'=>$id))->count() > 0) ? 'ok' : 'no'; + } + return 'no'; + } + + /** + * [Save 筛选价格保存] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function Save() + { + // 是否ajax请求 + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + // id为空则表示是新增 + $m = D('ScreeningPrice'); + + // 公共额外数据处理 + $m->sort = intval(I('sort')); + + // 添加 + if(empty($_POST['id'])) + { + if($m->create($_POST, 1)) + { + // 额外数据处理 + $m->add_time = time(); + $m->min_price = intval(I('min_price')); + $m->max_price = intval(I('max_price')); + $m->name = I('name'); + + // 写入数据库 + if($m->add()) + { + $this->ajaxReturn(L('common_operation_add_success')); + } else { + $this->ajaxReturn(L('common_operation_add_error'), -100); + } + } + } else { + // 编辑 + if($m->create($_POST, 2)) + { + // 额外数据处理 + $m->name = I('name'); + $m->min_price = intval(I('min_price')); + $m->max_price = intval(I('max_price')); + $m->upd_time = time(); + + // 移除 id + unset($m->id); + + // 更新数据库 + if($m->where(array('id'=>I('id')))->save()) + { + $this->ajaxReturn(L('common_operation_edit_success')); + } else { + $this->ajaxReturn(L('common_operation_edit_error'), -100); + } + } + } + $this->ajaxReturn($m->getError(), -1); + } + + /** + * [Delete 筛选价格删除] + * @author Devil + * @blog http://gong.gg/ + * @version 0.0.1 + * @datetime 2016-12-25T22:36:12+0800 + */ + public function Delete() + { + if(!IS_AJAX) + { + $this->error(L('common_unauthorized_access')); + } + + $m = D('ScreeningPrice'); + if($m->create($_POST, 5)) + { + if($m->delete(I('id'))) + { + $this->ajaxReturn(L('common_operation_delete_success')); + } else { + $this->ajaxReturn(L('common_operation_delete_error'), -100); + } + } else { + $this->ajaxReturn($m->getError(), -1); + } + } +} +?> \ No newline at end of file diff --git a/service/Application/Admin/Lang/zh-cn/brandcategory.php b/service/Application/Admin/Lang/zh-cn/brandcategory.php index 2b249ac73..62ffc04b3 100755 --- a/service/Application/Admin/Lang/zh-cn/brandcategory.php +++ b/service/Application/Admin/Lang/zh-cn/brandcategory.php @@ -1,7 +1,7 @@ '品牌分类分类添加', - 'brand_category_edit_name' => '品牌分类分类编辑', + 'brand_category_add_name' => '品牌分类添加', + 'brand_category_edit_name' => '品牌分类编辑', ); ?> \ No newline at end of file diff --git a/service/Application/Admin/Lang/zh-cn/screeningprice.php b/service/Application/Admin/Lang/zh-cn/screeningprice.php new file mode 100755 index 000000000..f834077e6 --- /dev/null +++ b/service/Application/Admin/Lang/zh-cn/screeningprice.php @@ -0,0 +1,23 @@ + '筛选价格添加', + 'screening_price_edit_name' => '筛选价格编辑', + + 'screening_price_min_price_text' => '最小价格', + 'screening_price_min_price_format' => '最小价格有误', + + 'screening_price_max_price_text' => '最大价格', + 'screening_price_max_price_format' => '最大价格有误', + + 'screening_price_desc' => '最小价格0 - 最大价格100 则是小于100
最小价格1000 - 最大价格0 则是大于1000
最小价格100 - 最大价格500 则是大于等于100并且小于500
', +); +?> \ No newline at end of file diff --git a/service/Application/Admin/Model/ScreeningPriceModel.class.php b/service/Application/Admin/Model/ScreeningPriceModel.class.php new file mode 100755 index 000000000..74793e14c --- /dev/null +++ b/service/Application/Admin/Model/ScreeningPriceModel.class.php @@ -0,0 +1,38 @@ +db(0)->where(array('pid'=>I('id')))->count() == 0); + } +} +?> \ No newline at end of file diff --git a/service/Application/Admin/View/Default/ScreeningPrice/Index.html b/service/Application/Admin/View/Default/ScreeningPrice/Index.html new file mode 100755 index 000000000..2dc198ef6 --- /dev/null +++ b/service/Application/Admin/View/Default/ScreeningPrice/Index.html @@ -0,0 +1,68 @@ + + + +
+
+ +
+ +
+ + + +
+
+
+

{{:L('screening_price_add_name')}}

+ × +
+
+
{{:L('screening_price_desc')}}
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+ + +
+
+
+ + + +
+
+ +

{{:L('common_form_loading_tips')}}

+
+
+ +
+
+ + + + + + \ No newline at end of file diff --git a/service/Application/Home/Controller/SearchController.class.php b/service/Application/Home/Controller/SearchController.class.php index f3a9a0d6f..96f853fe1 100755 --- a/service/Application/Home/Controller/SearchController.class.php +++ b/service/Application/Home/Controller/SearchController.class.php @@ -3,6 +3,7 @@ namespace Home\Controller; use Service\GoodsService; +use Service\BrandService; /** * 搜索 @@ -35,8 +36,34 @@ class SearchController extends CommonController */ public function Index() { - $id = I('id'); - + // 分类id + $category_id = intval(I('category_id', 0)); + + // 搜索关键字 + $keywords = trim(I('keywords')); + + // 品牌列表 + $this->assign('brand_list', BrandService::CategoryBrandList(['category_id'=>$category_id])); + + // 根据分类id获取同级列表 + $category = GoodsService::GoodsCategoryRow(['id'=>$category_id]); + $pid = empty($category['pid']) ? 0 : $category['pid']; + $this->assign('category_list', GoodsService::GoodsCategoryList(['pid'=>$pid])); + + // 价格区间 + $price_list = [ + ['id'=>1, 'name'=>'100以下'], + ['id'=>2, 'name'=>'100-300'], + ['id'=>3, 'name'=>'300-600'], + ['id'=>4, 'name'=>'600-1000'], + ['id'=>5, 'name'=>'1000-1500'], + ['id'=>6, 'name'=>'1500-2000'], + ['id'=>7, 'name'=>'2000-3000'], + ['id'=>8, 'name'=>'3000-4000'], + ['id'=>9, 'name'=>'5000-8000'], + ['id'=>10, 'name'=>'10000y以上'], + ]; + $this->assign('price_list', $price_list); $this->display('Index'); } diff --git a/service/Application/Home/View/Default/CustomView/Index.html b/service/Application/Home/View/Default/CustomView/Index.html index 2aef85571..229bac746 100755 --- a/service/Application/Home/View/Default/CustomView/Index.html +++ b/service/Application/Home/View/Default/CustomView/Index.html @@ -1,13 +1,23 @@ - - - + + + + + + + + + + + + + -
p-20" style="{{$max_width_style}}">{{$data.content}}
+
style="{{$max_width_style}}">{{$data.content}}
diff --git a/service/Application/Home/View/Default/Public/GoodsCategory.html b/service/Application/Home/View/Default/Public/GoodsCategory.html index 6b4f79395..a580ea114 100755 --- a/service/Application/Home/View/Default/Public/GoodsCategory.html +++ b/service/Application/Home/View/Default/Public/GoodsCategory.html @@ -13,7 +13,7 @@

- {{$v.name}} + {{$v.name}}

>
@@ -26,14 +26,14 @@
- + {{$vs.name}}
- + {{$vss.name}}
diff --git a/service/Application/Home/View/Default/Public/TipsError.html b/service/Application/Home/View/Default/Public/TipsError.html index 5016d96ab..b8e06065a 100755 --- a/service/Application/Home/View/Default/Public/TipsError.html +++ b/service/Application/Home/View/Default/Public/TipsError.html @@ -1,8 +1,16 @@ - + + + + + + + - + + +
style="{{$max_width_style}}"> diff --git a/service/Application/Home/View/Default/Search/Index.html b/service/Application/Home/View/Default/Search/Index.html index 211d1dbe9..d6f3f92cb 100755 --- a/service/Application/Home/View/Default/Search/Index.html +++ b/service/Application/Home/View/Default/Search/Index.html @@ -27,53 +27,59 @@

    - 松子 - 搜索到997件相关商品 + 分类 + 复古复古 + 筛选结果

  • 已选
    -

    清除

    +

    清除

  • -
    +
    品牌
    - -
    -
    全部
    -
    百草味
    -
    良品铺子
    -
    新农哥
    -
    楼兰蜜语
    -
    口水娃
    -
    考拉兄弟
    +
    +
    不限
    + + +
    {{$brand.name}}
    +     + + 没有相关品牌 +
    -
  • -
    -
    种类
    -
    -
    全部
    -
    东北松子
    -
    巴西松子
    -
    夏威夷果
    -
    松子
    +
    +
    分类
    +
    +
    不限
    + + +
    {{$category.name}}
    +     + + 没有相关分类 +
  • -
    -
    选购热点
    -
    -
    全部
    -
    手剥松子
    -
    薄壳松子
    -
    进口零食
    -
    有机零食
    +
    +
    价格
    +
    +
    不限
    + + +
    {{$price.name}}
    +     + + 没有相关价格 +
    • diff --git a/service/Application/Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php b/service/Application/Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php old mode 100644 new mode 100755 diff --git a/service/Application/Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php b/service/Application/Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php old mode 100644 new mode 100755 diff --git a/service/Application/Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php b/service/Application/Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php old mode 100644 new mode 100755 diff --git a/service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php b/service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php index 4fe7202cb..41f4f88e4 100644 --- a/service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php +++ b/service/Application/Runtime/Temp/8cde93cbd070139d84f31d26f8ea8f4d.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/service/Application/Runtime/Temp/a58f8070835be94249ea77f3601c6647.php b/service/Application/Runtime/Temp/a58f8070835be94249ea77f3601c6647.php index a5dacfa5b..b46867e11 100644 --- a/service/Application/Runtime/Temp/a58f8070835be94249ea77f3601c6647.php +++ b/service/Application/Runtime/Temp/a58f8070835be94249ea77f3601c6647.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/service/Application/Service/BrandService.class.php b/service/Application/Service/BrandService.class.php new file mode 100755 index 000000000..150e64b67 --- /dev/null +++ b/service/Application/Service/BrandService.class.php @@ -0,0 +1,51 @@ +1]; + if(!empty($params['category_id'])) + { + // 根据分类获取品牌id + $category_ids = GoodsService::GoodsCategoryItemsIds(['category_id'=>$params['category_id']]); + $where = ['g.is_delete_time'=>0, 'g.is_shelves'=>1, 'gci.id'=>['in', $category_ids]]; + $brand_ids = M('Goods')->alias('g')->join(' INNER JOIN __GOODS_CATEGORY_JOIN__ AS gci ON g.id=gci.goods_id')->field('g.brand_id')->where($where)->group('g.brand_id')->getField('brand_id', true); + $brand_where['id'] = ['in', $brand_ids]; + } + + // 获取品牌列表 + $brand = M('Brand')->where($brand_where)->field('id,name,logo,website_url')->select(); + if(!empty($brand)) + { + $images_host = C('IMAGE_HOST'); + foreach($brand as &$v) + { + $v['logo'] = $images_host.$v['logo']; + $v['website_url'] = empty($v['website_url']) ? null : $v['website_url']; + } + } + return $brand; + } +} +?> \ No newline at end of file diff --git a/service/Application/Service/GoodsService.class.php b/service/Application/Service/GoodsService.class.php index 3d725e8d0..5dc4ecf8e 100755 --- a/service/Application/Service/GoodsService.class.php +++ b/service/Application/Service/GoodsService.class.php @@ -11,6 +11,26 @@ namespace Service; */ class GoodsService { + /** + * 根据id获取一条商品分类 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-08-29 + * @desc description + * @param [array] $params [输入参数] + */ + public static function GoodsCategoryRow($params = []) + { + if(empty($params['id'])) + { + return null; + } + $field = empty($params['field']) ? 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort,is_home_recommended' : $params['field']; + $data = self::GoodsCategoryDataDealWith([M('GoodsCategory')->field($field)->where(['is_enable'=>1, 'id'=>intval($params['id'])])->find()]); + return empty($data[0]) ? null : $data[0]; + } + /** * 获取大分类 * @author Devil @@ -25,7 +45,6 @@ class GoodsService $data = self::GoodsCategoryList(['pid'=>0]); if(!empty($data)) { - $images_host = C('IMAGE_HOST'); foreach($data as &$v) { $v['items'] = self::GoodsCategoryList(['pid'=>$v['id']]); @@ -53,15 +72,38 @@ class GoodsService public static function GoodsCategoryList($params = []) { $pid = isset($params['pid']) ? intval($params['pid']) : 0; - $images_host = C('IMAGE_HOST'); $field = 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort,is_home_recommended'; $data = M('GoodsCategory')->field($field)->where(['is_enable'=>1, 'pid'=>$pid])->order('sort asc')->select(); - if(!empty($data)) + return self::GoodsCategoryDataDealWith($data); + } + + /** + * 商品分类数据处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2018-09-06 + * @desc description + * @param [array] $data [商品分类数据 二维数组] + */ + private static function GoodsCategoryDataDealWith($data) + { + if(!empty($data) && is_array($data)) { + $images_host = C('IMAGE_HOST'); foreach($data as &$v) { - $v['icon'] = empty($v['icon']) ? null : $images_host.$v['icon']; - $v['big_images'] = empty($v['big_images']) ? null : $images_host.$v['big_images']; + if(is_array($v)) + { + if(isset($v['icon'])) + { + $v['icon'] = empty($v['icon']) ? null : $images_host.$v['icon']; + } + if(isset($v['big_images'])) + { + $v['big_images'] = empty($v['big_images']) ? null : $images_host.$v['big_images']; + } + } } } return $data; @@ -84,8 +126,8 @@ class GoodsService { foreach($goods_category as &$v) { - $category_all = self::GoodsCategoryItemsIds($v['id']); - $v['goods'] = self::GoodsList(['where'=>['gci.category_id'=>['in', $category_all], 'is_home_recommended'=>1], 'm'=>0, 'n'=>6]); + $category_ids = self::GoodsCategoryItemsIds(['category_id'=>$v['id']]); + $v['goods'] = self::GoodsList(['where'=>['gci.category_id'=>['in', $category_ids], 'is_home_recommended'=>1], 'm'=>0, 'n'=>6]); } } return $goods_category; diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css index 4448327c2..69ea88939 100755 --- a/service/Public/Home/Default/Css/Common.css +++ b/service/Public/Home/Default/Css/Common.css @@ -453,6 +453,9 @@ background:url(../Images/ibar_sprites.png) no-repeat;background-position:0px -23 /* 价格颜色 */ .price strong {color: #E4393C; font-weight: 600; } +/* 公共错误提示页面 */ +.tips-error { margin-top: 10%; } + /** * 底部 */ diff --git a/service/Public/Home/Default/Css/Search.css b/service/Public/Home/Default/Css/Search.css index 737a9309b..39e14a5d1 100755 --- a/service/Public/Home/Default/Css/Search.css +++ b/service/Public/Home/Default/Css/Search.css @@ -20,6 +20,7 @@ img{ width:100%;} .theme-popover {z-index: 1009;overflow:visible;background:#fff; width: 100%; } .sort-nav a:hover, .sort-nav a:focus { color: #d2364c; } .select .title-tips { font-size: 12px; color: #888; } +.select .title-tips strong { font-weight: 500; color: #fe90a0; } /* select */ @@ -43,7 +44,7 @@ li.select-result dt {left:-26px; top:0;font-weight:bold;width:50px;} .select-no{color:#999} .select .select-result a{padding-right:20px;background: url("../images/close.png") right 9px no-repeat} .select .select-result a:hover{background-position:right -15px} -.eliminateCriteria{display:none;line-height:21px;margin-top:4px;width:35px;float:right;color:#F00;cursor:pointer;} +.screening-remove-submit{display:none;line-height:21px;margin-top:4px;width:35px;float:right;color:#F00;cursor:pointer;} /*排序*/ @@ -95,7 +96,7 @@ dl#select3 .dd-conent{ left:-200%; right:0px;} .select-result dl dt{width:100px;} - .eliminateCriteria{width:80px;float:right;margin-right:20px;} + .screening-remove-submit{width:80px;float:right;margin-right:20px;} .am-badge{font-size:14px ;padding:0px 0px;background: none;color: #000000;} @@ -152,6 +153,8 @@ dl#select3 .dd-conent{ left:-200%; right:0px;} .data-list li:nth-child(2n+1) .i-pic.limit { margin-left: 0px; } .search-pages { display: none; } .search-pages-submit { display: block; } - .eliminateCriteria { margin-top: -28px; } + .screening-remove-submit { margin-top: -28px; } .select .title-tips { padding: 0 5px; } -} \ No newline at end of file +} + +.not-tips { color: #666; font-size: 12px; text-align: center; display: block; } diff --git a/service/Public/Home/Default/Js/Search.js b/service/Public/Home/Default/Js/Search.js index c2bd8321e..681a31263 100755 --- a/service/Public/Home/Default/Js/Search.js +++ b/service/Public/Home/Default/Js/Search.js @@ -1,83 +1,45 @@ $(function() { - $("#select1 dd").click(function() { + // 筛选操作 + $(document).on('click', '.select-list dl dd', function() + { $(this).addClass("selected").siblings().removeClass("selected"); + var selected_tag_name = $(this).parent('.dd-conent').attr('data-selected-tag'); + console.log(selected_tag_name) if ($(this).hasClass("select-all")) { - $("#selectA").remove(); + $('#'+selected_tag_name).remove(); } else { - var copyThisA = $(this).clone(); - if ($("#selectA").length > 0) { - $("#selectA a").html($(this).text()); + if ($('#'+selected_tag_name).length > 0) { + $('#'+selected_tag_name).find("a").html($(this).text()); } else { - $(".select-result dl").append(copyThisA.attr("id", "selectA")); - + var copy_html = $(this).clone(); + $(".select-result dl").append(copy_html.attr("id", selected_tag_name)); } } }); - $("#select2 dd").click(function() { - $(this).addClass("selected").siblings().removeClass("selected"); - if ($(this).hasClass("select-all")) { - $("#selectB").remove(); + $(document).on('click', '.select-result dl dd', function() { + $(this).remove(); + $('#'+$(this).attr('id')+'-dl').find('.select-all').addClass('selected').siblings().removeClass('selected'); + }); + + $(document).on('click', 'ul.select dd', function() { + if ($('.select-result dd').length > 1) { + $('.select-no').hide(); + $('.screening-remove-submit').show(); + $('.select-result').show(); } else { - var copyThisB = $(this).clone(); - if ($("#selectB").length > 0) { - $("#selectB a").html($(this).text()); - } else { - $(".select-result dl").append(copyThisB.attr("id", "selectB")); - } + $('.select-no').show(); + $('.select-result').hide(); } }); - $("#select3 dd").click(function() { - $(this).addClass("selected").siblings().removeClass("selected"); - if ($(this).hasClass("select-all")) { - $("#selectC").remove(); - } else { - var copyThisC = $(this).clone(); - if ($("#selectC").length > 0) { - $("#selectC a").html($(this).text()); - } else { - $(".select-result dl").append(copyThisC.attr("id", "selectC")); - } - } - }); - - $(document).on("click", "#selectA", function() { - $(this).remove(); - $("#select1 .select-all").addClass("selected").siblings().removeClass("selected"); - }); - - $(document).on("click", "#selectB", function() { - $(this).remove(); - $("#select2 .select-all").addClass("selected").siblings().removeClass("selected"); - }); - - $(document).on("click", "#selectC", function() { - $(this).remove(); - $("#select3 .select-all").addClass("selected").siblings().removeClass("selected"); - }); - - $(document).on("click", ".select dd", function() { - if ($(".select-result dd").length > 1) { - $(".select-no").hide(); - $(".eliminateCriteria").show(); - $(".select-result").show(); - } else { - $(".select-no").show(); - $(".select-result").hide(); - - } - }); - - $(".eliminateCriteria").on("click", function() { - $("#selectA").remove(); - $("#selectB").remove(); - $("#selectC").remove(); - $(".select-all").addClass("selected").siblings().removeClass("selected"); - $(".eliminateCriteria").hide(); - $(".select-no").show(); - $(".select-result").hide(); + $(".screening-remove-submit").on("click", function() { + $('.select-result dd.selected').remove(); + $('.select-list .select-all').addClass('selected').siblings().removeClass('selected'); + $(this).hide(); + $('.select-result .select-no').show(); + $('.select-result').hide(); }); @@ -102,7 +64,7 @@ $(function() }) - $(document).on("click", ".eliminateCriteria", function() { + $(document).on("click", ".screening-remove-submit", function() { $(".dd-conent").slideUp(300); }) diff --git a/service/Public/Upload/brand/2018/08/20180831123506659500.jpeg b/service/Public/Upload/brand/2018/08/20180831123506659500.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123612400417.jpeg b/service/Public/Upload/brand/2018/08/20180831123612400417.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123638301757.jpeg b/service/Public/Upload/brand/2018/08/20180831123638301757.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123659295462.jpeg b/service/Public/Upload/brand/2018/08/20180831123659295462.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123718129432.jpeg b/service/Public/Upload/brand/2018/08/20180831123718129432.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123739604557.jpeg b/service/Public/Upload/brand/2018/08/20180831123739604557.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123805053207.jpeg b/service/Public/Upload/brand/2018/08/20180831123805053207.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123832665998.jpeg b/service/Public/Upload/brand/2018/08/20180831123832665998.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123901892901.jpeg b/service/Public/Upload/brand/2018/08/20180831123901892901.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123923979734.jpeg b/service/Public/Upload/brand/2018/08/20180831123923979734.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831123941878091.jpeg b/service/Public/Upload/brand/2018/08/20180831123941878091.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124001306519.jpeg b/service/Public/Upload/brand/2018/08/20180831124001306519.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124028863137.jpeg b/service/Public/Upload/brand/2018/08/20180831124028863137.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124052288940.jpeg b/service/Public/Upload/brand/2018/08/20180831124052288940.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124114729313.jpeg b/service/Public/Upload/brand/2018/08/20180831124114729313.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124204852297.jpeg b/service/Public/Upload/brand/2018/08/20180831124204852297.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124220397979.jpeg b/service/Public/Upload/brand/2018/08/20180831124220397979.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124235290388.jpeg b/service/Public/Upload/brand/2018/08/20180831124235290388.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124253118694.jpeg b/service/Public/Upload/brand/2018/08/20180831124253118694.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124320138615.jpeg b/service/Public/Upload/brand/2018/08/20180831124320138615.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124338343861.jpeg b/service/Public/Upload/brand/2018/08/20180831124338343861.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124358184873.jpeg b/service/Public/Upload/brand/2018/08/20180831124358184873.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124414494883.jpeg b/service/Public/Upload/brand/2018/08/20180831124414494883.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124432799807.jpeg b/service/Public/Upload/brand/2018/08/20180831124432799807.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124447773181.jpeg b/service/Public/Upload/brand/2018/08/20180831124447773181.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124503006925.jpeg b/service/Public/Upload/brand/2018/08/20180831124503006925.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124520403239.jpeg b/service/Public/Upload/brand/2018/08/20180831124520403239.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124538167027.jpeg b/service/Public/Upload/brand/2018/08/20180831124538167027.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124555864230.jpeg b/service/Public/Upload/brand/2018/08/20180831124555864230.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124611120082.jpeg b/service/Public/Upload/brand/2018/08/20180831124611120082.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124630371456.jpeg b/service/Public/Upload/brand/2018/08/20180831124630371456.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124711269217.jpeg b/service/Public/Upload/brand/2018/08/20180831124711269217.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124726804328.jpeg b/service/Public/Upload/brand/2018/08/20180831124726804328.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124745441134.jpeg b/service/Public/Upload/brand/2018/08/20180831124745441134.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124802841044.jpeg b/service/Public/Upload/brand/2018/08/20180831124802841044.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124823875593.jpeg b/service/Public/Upload/brand/2018/08/20180831124823875593.jpeg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/brand/2018/08/20180831124920751185.png b/service/Public/Upload/brand/2018/08/20180831124920751185.png old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007832339819.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007832339819.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007832963496.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007832963496.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833158823.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833158823.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833260962.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833260962.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833301028.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833301028.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833468684.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833468684.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833587881.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833587881.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833690057.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833690057.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833882280.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007833882280.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834132134.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834132134.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834444532.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834444532.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834608884.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834608884.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834726508.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834726508.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834728266.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834728266.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834918903.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834918903.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834993360.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007834993360.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835158679.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835158679.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835304994.gif b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835304994.gif old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835448163.gif b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835448163.gif old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835533860.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835533860.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835708577.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835708577.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835825272.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835825272.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835855489.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835855489.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835858680.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007835858680.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007836498649.gif b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007836498649.gif old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837197258.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837197258.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837276391.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837276391.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837554082.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837554082.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837677801.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837677801.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837737775.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837737775.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837895226.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837895226.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837952803.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007837952803.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007999191883.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007999191883.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007999624779.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535007999624779.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000109776.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000109776.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000272750.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000272750.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000309223.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000309223.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000753156.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000753156.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000956556.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000956556.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000973782.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008000973782.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001379444.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001379444.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001413299.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001413299.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001504231.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008001504231.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002146053.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002146053.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002175430.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002175430.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002381080.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002381080.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002474780.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002474780.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002661594.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002661594.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002859632.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002859632.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002959817.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008002959817.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003118006.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003118006.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003184952.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003184952.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003213848.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003213848.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003257218.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003257218.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003501107.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003501107.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003850317.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003850317.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003863329.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003863329.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003962086.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003962086.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003980694.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008003980694.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004165390.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004165390.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004235153.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004235153.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004278047.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004278047.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004538257.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004538257.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004737669.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004737669.jpg old mode 100644 new mode 100755 diff --git a/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004867861.jpg b/service/Public/Upload/goods_pc/catchimage/2018/08/23/1535008004867861.jpg old mode 100644 new mode 100755