From ca254b0691ab4dd6eaf19c87df37c64c8dae7eed Mon Sep 17 00:00:00 2001 From: devil Date: Tue, 15 Sep 2020 21:57:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AB=99=E7=82=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Site.php | 49 ++++-- .../admin/view/default/admin/login_info.html | 2 +- .../admin/view/default/site/goods.html | 48 ------ application/admin/view/default/site/nav.html | 9 +- .../admin/view/default/site/search.html | 37 ----- .../admin/view/default/site/siteset.html | 155 ++++++++++++++++++ .../admin/view/default/site/sitetype.html | 2 +- .../index/view/default/index/index.html | 59 +++++-- application/lang/zh-cn.php | 16 ++ application/service/ConfigService.php | 1 + application/service/GoodsService.php | 77 +++++---- application/service/SearchService.php | 4 +- config/shopxo.sql | 69 ++++---- .../static/admin/default/images/login/1.jpg | Bin 715954 -> 72156 bytes .../static/admin/default/images/login/10.jpg | Bin 194682 -> 160371 bytes .../static/admin/default/images/login/11.jpg | Bin 0 -> 337931 bytes .../static/admin/default/images/login/12.jpg | Bin 0 -> 141934 bytes .../static/admin/default/images/login/13.jpg | Bin 0 -> 294407 bytes .../static/admin/default/images/login/14.jpg | Bin 0 -> 199893 bytes .../static/admin/default/images/login/2.jpg | Bin 199893 -> 237768 bytes .../static/admin/default/images/login/3.jpg | Bin 191235 -> 204053 bytes .../static/admin/default/images/login/4.jpg | Bin 693494 -> 309984 bytes .../static/admin/default/images/login/5.jpg | Bin 204053 -> 191235 bytes .../static/admin/default/images/login/7.jpg | Bin 379355 -> 192538 bytes .../static/admin/default/images/login/8.jpg | Bin 160371 -> 194682 bytes .../static/admin/default/images/login/9.jpg | Bin 192538 -> 379355 bytes public/static/common/css/common.css | 3 +- public/static/index/default/css/common.css | 2 +- sourcecode/alipay/pages/index/index.axml | 2 +- sourcecode/baidu/pages/index/index.swan | 2 +- sourcecode/qq/pages/index/index.qml | 2 +- sourcecode/toutiao/pages/index/index.ttml | 2 +- .../weixin/components/quick-nav/quick-nav.js | 7 +- .../components/quick-nav/quick-nav.wxss | 4 +- sourcecode/weixin/pages/cart/cart.json | 1 + sourcecode/weixin/pages/cart/cart.wxml | 5 +- .../pages/goods-category/goods-category.json | 1 + .../pages/goods-category/goods-category.wxml | 5 +- sourcecode/weixin/pages/index/index.wxml | 2 +- sourcecode/weixin/pages/user/user.json | 1 + sourcecode/weixin/pages/user/user.wxml | 3 + 41 files changed, 367 insertions(+), 203 deletions(-) delete mode 100644 application/admin/view/default/site/goods.html delete mode 100644 application/admin/view/default/site/search.html create mode 100644 application/admin/view/default/site/siteset.html create mode 100644 public/static/admin/default/images/login/11.jpg create mode 100644 public/static/admin/default/images/login/12.jpg create mode 100644 public/static/admin/default/images/login/13.jpg create mode 100644 public/static/admin/default/images/login/14.jpg diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php index bfb23bf04..2da4e5236 100755 --- a/application/admin/controller/Site.php +++ b/application/admin/controller/Site.php @@ -11,6 +11,7 @@ namespace app\admin\controller; use app\service\ConfigService; +use app\service\GoodsService; /** * 站点设置 @@ -83,22 +84,45 @@ class Site extends Common // 扣除库存规则 $this->assign('common_deduction_inventory_rules_list', lang('common_deduction_inventory_rules_list')); + // 首页商品排序规则 + $this->assign('home_floor_goods_order_by_type_list', lang('home_floor_goods_order_by_type_list')); + $this->assign('home_floor_goods_order_by_rule_list', lang('home_floor_goods_order_by_rule_list')); + // 配置信息 $data = ConfigService::ConfigList(); $this->assign('data', $data); - // 自提点 - if($nav_type == 'sitetype') + // 数据处理 + switch($nav_type) { - // 地址处理 - if(!empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value'])) - { - $address = ConfigService::SiteTypeExtractionAddressList($data['common_self_extraction_address']['value']); - $this->assign('sitetype_address_list', $address['data']); - } + // 自提点 + case 'sitetype' : + // 地址处理 + if(!empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value'])) + { + $address = ConfigService::SiteTypeExtractionAddressList($data['common_self_extraction_address']['value']); + $this->assign('sitetype_address_list', $address['data']); + } + + // 加载百度地图api + $this->assign('is_load_baidu_map_api', 1); + break; - // 加载百度地图api - $this->assign('is_load_baidu_map_api', 1); + // 网站设置 + case 'siteset' : + // 获取商品一级分类 + $where = ['pid'=>0, 'is_home_recommended'=>1, 'is_enable'=>1]; + $category = GoodsService::GoodsCategoryList(['where'=>$where]); + if(!empty($category)) + { + $floor_keywords = (empty($data['home_index_floor_top_right_keywords']) || empty($data['home_index_floor_top_right_keywords']['value'])) ? [] : json_decode($data['home_index_floor_top_right_keywords']['value'], true); + foreach($category as &$c) + { + $c['config_keywords'] = isset($floor_keywords[$c['id']]) ? $floor_keywords[$c['id']] : ''; + } + } + $this->assign('goods_category_list', $category); + break; } // 编辑器文件存放地址 @@ -172,6 +196,11 @@ class Site extends Common $params['common_self_extraction_address'] = json_encode($address, JSON_UNESCAPED_UNICODE); } break; + + // 网站设置 + case 'siteset' : + $params['home_index_floor_top_right_keywords'] = empty($params['home_index_floor_top_right_keywords']) ? '' : json_encode($params['home_index_floor_top_right_keywords'], JSON_UNESCAPED_UNICODE); + break; } // 开始处理空值 diff --git a/application/admin/view/default/admin/login_info.html b/application/admin/view/default/admin/login_info.html index 865a00247..79ed1203f 100755 --- a/application/admin/view/default/admin/login_info.html +++ b/application/admin/view/default/admin/login_info.html @@ -34,7 +34,7 @@ {{if MyC('admin_login_info_bg_images_rand') eq 1}}
- {{for start="1" end="11"}} + {{for start="1" end="15"}} {{if file_exists(ROOT.'public/static/admin/default/images/login/'.$i.'.jpg')}}
{{/if}} diff --git a/application/admin/view/default/site/goods.html b/application/admin/view/default/site/goods.html deleted file mode 100644 index 1b7be358c..000000000 --- a/application/admin/view/default/site/goods.html +++ /dev/null @@ -1,48 +0,0 @@ -{{include file="public/header" /}} - - -
-
- - {{include file="site/nav" /}} - - - -
-
- - -
- -
- -
- - - - -
-
- -

1. 默认展示3级，最低1级、最高3级

-

2. 层级不一样、前端分类页样式也会不一样

-
-
- -
- - -
-
- -
-
- - - -{{include file="public/footer" /}} - \ No newline at end of file diff --git a/application/admin/view/default/site/nav.html b/application/admin/view/default/site/nav.html index bb40d1501..3e4ebb88f 100644 --- a/application/admin/view/default/site/nav.html +++ b/application/admin/view/default/site/nav.html @@ -2,6 +2,9 @@
  • 基础配置
    • +
  • + 网站设置 +
  • 备案信息
    • @@ -26,12 +29,6 @@
  • 订单售后
    • -
  • - 搜索 -
    • -
  • - 商品 -
  • 扩展项
    • diff --git a/application/admin/view/default/site/search.html b/application/admin/view/default/site/search.html deleted file mode 100644 index db44f29e8..000000000 --- a/application/admin/view/default/site/search.html +++ /dev/null @@ -1,37 +0,0 @@ -{{include file="public/header" /}} - - -
    -
    - - {{include file="site/nav" /}} - - - -
    -
    - - -
    -
    - - -
    - -
    - - -
    -
    - -
    -
    - - - -{{include file="public/footer" /}} - \ No newline at end of file diff --git a/application/admin/view/default/site/siteset.html b/application/admin/view/default/site/siteset.html new file mode 100644 index 000000000..aef40c192 --- /dev/null +++ b/application/admin/view/default/site/siteset.html @@ -0,0 +1,155 @@ +{{include file="public/header" /}} + + +
    +
    + + {{include file="site/nav" /}} + + + +
    + +
    +
    +

    首页

    +
    +
    +
    + +
    + + + + +
    +
    + +

    1. 配置每个楼层最多展示多少个商品

    +

    2. 不建议将数量修改的太大、会导致PC端左侧空白区域太大

    +
    +
    +
    + +
    + + + + +
    +
    + +

    1. 配置每个楼层左侧最多展示多少个二级商品分类

    +

    2. 不建议将数量修改的太大、如高度超出楼层容器会比较拥挤

    +
    +
    +
    + + {{if !empty($goods_category_list)}} +
      + {{foreach $goods_category_list as $category}} +
    • +

      + {{$category.name}} + {{$category.vice_name}} +

      + +
      • + {{/foreach}} +
    + {{else /}} +
    + + 暂无数据，请先到 / 商品管理->商品分类、一级分类设置首页推荐 +
    + {{/if}} +
    +
    + + +
    + +

    综合为：热度->销量->最新 进行 降序(desc)排序

    +
    +
    +
    + + +
    +
    +
    + + +
    +
    +

    商品

    +
    +
    +
    + + +
    + +
    + +
    + + + + +
    +
    + +

    1. 默认展示3级，最低1级、最高3级

    +

    2. 层级不一样、前端分类页样式也会不一样

    +
    +
    +
    +
    + + +
    +
    +

    搜索

    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    +
    + +
    +
    + + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/site/sitetype.html b/application/admin/view/default/site/sitetype.html index ccaa77ae9..fdc8f5988 100644 --- a/application/admin/view/default/site/sitetype.html +++ b/application/admin/view/default/site/sitetype.html @@ -83,7 +83,7 @@

    自提点

    -