From 19e3b265b21dfb549c15e60ab8e59dca9d2d154e Mon Sep 17 00:00:00 2001 From: devil Date: Fri, 21 Aug 2020 10:22:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Customview.php | 7 --- application/admin/controller/Link.php | 7 --- application/admin/controller/Navigation.php | 6 -- application/admin/form/Customview.php | 6 +- application/admin/form/Link.php | 2 +- application/admin/form/Navigation.php | 2 +- application/admin/form/Order.php | 56 +++++++++++++++++++ .../admin/view/default/lib/is_footer.html | 2 +- .../view/default/lib/is_full_screen.html | 2 +- .../admin/view/default/lib/is_header.html | 2 +- .../view/default/lib/is_new_window_open.html | 2 +- .../default/order/module/is_comments.html | 2 + application/index/controller/Order.php | 3 + application/index/form/Order.php | 16 ++++-- .../view/default/lib/is_new_window_open.html | 2 +- .../default/order/module/is_comments.html | 4 +- .../view/default/public/goods_category.html | 2 +- application/lang/zh-cn.php | 55 ------------------ public/static/index/default/css/common.css | 11 ++-- 19 files changed, 91 insertions(+), 98 deletions(-) create mode 100644 application/admin/view/default/order/module/is_comments.html diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index de81bf574..9ec480955 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -133,13 +133,6 @@ class CustomView extends Common $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } $this->assign('data', $data); - - // 静态资源 - $this->assign('common_is_enable_list', lang('common_is_enable_list')); - $this->assign('common_is_header_list', lang('common_is_header_list')); - $this->assign('common_is_footer_list', lang('common_is_footer_list')); - $this->assign('common_is_full_screen_list', lang('common_is_full_screen_list')); - return $this->fetch(); } diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php index 5e9b1b97f..1cc2321e2 100755 --- a/application/admin/controller/Link.php +++ b/application/admin/controller/Link.php @@ -52,13 +52,6 @@ class Link extends Common // 获取导航列表 $ret = LinkService::LinkList(['where'=>$this->form_where]); $this->assign('data_list', $ret['data']); - - // 是否新窗口打开 - $this->assign('common_is_new_window_open_list', lang('common_is_new_window_open_list')); - - // 是否启用 - $this->assign('common_is_enable_list', lang('common_is_enable_list')); - return $this->fetch(); } diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php index 263a078d0..b1e81a45c 100755 --- a/application/admin/controller/Navigation.php +++ b/application/admin/controller/Navigation.php @@ -75,12 +75,6 @@ class Navigation extends Common // 自定义页面 $this->assign('customview_list', db('CustomView')->field(array('id', 'title'))->where(array('is_enable'=>1))->select()); - // 是否新窗口打开 - $this->assign('common_is_new_window_open_list', lang('common_is_new_window_open_list')); - - // 是否显示 - $this->assign('common_is_show_list', lang('common_is_show_list')); - $this->assign('nav_type', $this->nav_type); return $this->fetch(); } diff --git a/application/admin/form/Customview.php b/application/admin/form/Customview.php index 60249f696..deac7e87b 100644 --- a/application/admin/form/Customview.php +++ b/application/admin/form/Customview.php @@ -92,7 +92,7 @@ class Customview 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_header_list'), + 'data' => lang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -107,7 +107,7 @@ class Customview 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_footer_list'), + 'data' => lang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -122,7 +122,7 @@ class Customview 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_full_screen_list'), + 'data' => lang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/application/admin/form/Link.php b/application/admin/form/Link.php index ed6ead086..948d9ddb4 100644 --- a/application/admin/form/Link.php +++ b/application/admin/form/Link.php @@ -113,7 +113,7 @@ class Link 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_new_window_open_list'), + 'data' => lang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/application/admin/form/Navigation.php b/application/admin/form/Navigation.php index 35f1bcfa6..815aa16a1 100644 --- a/application/admin/form/Navigation.php +++ b/application/admin/form/Navigation.php @@ -110,7 +110,7 @@ class Navigation 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_new_window_open_list'), + 'data' => lang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/application/admin/form/Order.php b/application/admin/form/Order.php index 67e1803ee..a9b63296f 100644 --- a/application/admin/form/Order.php +++ b/application/admin/form/Order.php @@ -313,6 +313,22 @@ class Order 'view_key' => 'order/module/aftersale', 'grid_size' => 'sm', ], + [ + 'label' => '用户是否评论', + 'view_type' => 'module', + 'view_key' => 'order/module/is_comments', + 'search_config' => [ + 'form_type' => 'select', + 'where_type' => 'in', + 'form_name' => 'user_is_comments', + 'data' => lang('common_is_text_list'), + 'data_key' => 'id', + 'data_name' => 'name', + 'where_type_custom' => 'WhereTypyUserIsComments', + 'where_value_custom' => 'WhereValueUserIsComments', + 'is_multiple' => 1, + ], + ], [ 'label' => '确认时间', 'view_type' => 'field', @@ -388,6 +404,46 @@ class Order ]; } + /** + * 评论条件符号处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $form_key [表单数据key] + * @param [array] $params [输入参数] + */ + public function WhereTypyUserIsComments($form_key, $params = []) + { + if(isset($params[$form_key])) + { + // 条件值是 0,1 + // 解析成数组，都存在则返回null，则1 >， 0 = + $value = explode(',', urldecode($params[$form_key])); + if(count($value) == 1) + { + return in_array(1, $value) ? '>' : '='; + } + } + return null; + } + + /** + * 评论条件值处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $form_key [表单数据key] + * @param [array] $params [输入参数] + */ + public function WhereValueUserIsComments($value, $params = []) + { + return (count($value) == 2) ? null : 0; + } + /** * 订单仓库列表 * @author Devil diff --git a/application/admin/view/default/lib/is_footer.html b/application/admin/view/default/lib/is_footer.html index 62689d439..0eed5b089 100755 --- a/application/admin/view/default/lib/is_footer.html +++ b/application/admin/view/default/lib/is_footer.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_footer_list') as $v}} + {{foreach :lang('common_is_text_list') as $v}} diff --git a/application/admin/view/default/lib/is_full_screen.html b/application/admin/view/default/lib/is_full_screen.html index 23f09c4a4..eb760022e 100755 --- a/application/admin/view/default/lib/is_full_screen.html +++ b/application/admin/view/default/lib/is_full_screen.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_full_screen_list') as $v}} + {{foreach :lang('common_is_text_list') as $v}} diff --git a/application/admin/view/default/lib/is_header.html b/application/admin/view/default/lib/is_header.html index dcaddd65a..be7f2885d 100755 --- a/application/admin/view/default/lib/is_header.html +++ b/application/admin/view/default/lib/is_header.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_header_list') as $v}} + {{foreach :lang('common_is_text_list') as $v}} diff --git a/application/admin/view/default/lib/is_new_window_open.html b/application/admin/view/default/lib/is_new_window_open.html index dbca28f09..6f4047f4d 100755 --- a/application/admin/view/default/lib/is_new_window_open.html +++ b/application/admin/view/default/lib/is_new_window_open.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_new_window_open_list') as $v}} + {{foreach :lang('common_is_text_list') as $v}} diff --git a/application/admin/view/default/order/module/is_comments.html b/application/admin/view/default/order/module/is_comments.html new file mode 100644 index 000000000..73da05d85 --- /dev/null +++ b/application/admin/view/default/order/module/is_comments.html @@ -0,0 +1,2 @@ + +{{if !empty($module_data) and isset($module_data['user_is_comments']) and $module_data['user_is_comments'] gt 1}}已{{else /}}未{{/if}}评论 \ No newline at end of file diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php index 192f82a9d..9ed83778d 100755 --- a/application/index/controller/Order.php +++ b/application/index/controller/Order.php @@ -139,6 +139,9 @@ class Order extends Common $this->assign('referer_url', empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : $_SERVER['HTTP_REFERER']); $this->assign('data', $data); + // 浏览器名称 + $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('订单评论', 1)); + // 编辑器文件存放地址 $this->assign('editor_path_type', 'order_comments-'.$this->user['id'].'-'.$data['id']); return $this->fetch(); diff --git a/application/index/form/Order.php b/application/index/form/Order.php index 32554f0a8..e0eed4995 100644 --- a/application/index/form/Order.php +++ b/application/index/form/Order.php @@ -307,7 +307,7 @@ class Order ], ], [ - 'label' => '是否评价', + 'label' => '是否评论', 'view_type' => 'module', 'view_key' => 'order/module/is_comments', 'search_config' => [ @@ -398,7 +398,7 @@ class Order } /** - * 取货码条件处理 + * 评论条件符号处理 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -407,17 +407,23 @@ class Order * @param [string] $form_key [表单数据key] * @param [array] $params [输入参数] */ - public function WhereTypyUserIsComments($form_key, $params) + public function WhereTypyUserIsComments($form_key, $params = []) { if(isset($params[$form_key])) { - return ($params[$form_key] == 0) ? '=' : '>'; + // 条件值是 0,1 + // 解析成数组，都存在则返回null，则1 >， 0 = + $value = explode(',', urldecode($params[$form_key])); + if(count($value) == 1) + { + return in_array(1, $value) ? '>' : '='; + } } return null; } /** - * 取货码条件处理 + * 评论条件值处理 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 diff --git a/application/index/view/default/lib/is_new_window_open.html b/application/index/view/default/lib/is_new_window_open.html index 3a8b3f880..ed1ffded3 100755 --- a/application/index/view/default/lib/is_new_window_open.html +++ b/application/index/view/default/lib/is_new_window_open.html @@ -2,7 +2,7 @@
- + diff --git a/application/index/view/default/order/module/is_comments.html b/application/index/view/default/order/module/is_comments.html index 53a87908c..73da05d85 100644 --- a/application/index/view/default/order/module/is_comments.html +++ b/application/index/view/default/order/module/is_comments.html @@ -1,2 +1,2 @@ - -{{if !empty($module_data) and isset($module_data['user_is_comments']) and $module_data['user_is_comments'] gt 1}}已{{else /}}未{{/if}}评价 \ No newline at end of file + +{{if !empty($module_data) and isset($module_data['user_is_comments']) and $module_data['user_is_comments'] gt 1}}已{{else /}}未{{/if}}评论 \ No newline at end of file diff --git a/application/index/view/default/public/goods_category.html b/application/index/view/default/public/goods_category.html index bdcb01474..493d3914b 100755 --- a/application/index/view/default/public/goods_category.html +++ b/application/index/view/default/public/goods_category.html @@ -31,7 +31,7 @@
{{foreach $v.items as $vs}} -
+
{{if $category_show_level eq 2}}
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index d6fb24819..880584c75 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -67,12 +67,6 @@ return array( 1 => array('id' => 1, 'name' => '可用', 'checked' => true), ), - // 是否满屏 - 'common_is_full_screen_list' => array( - 0 => array('id' => 0, 'name' => '否', 'checked' => true), - 1 => array('id' => 1, 'name' => '是'), - ), - // excel编码列表 'common_excel_charset_list' => array( 0 => array('id' => 0, 'value' => 'utf-8', 'name' => 'utf-8', 'checked' => true), @@ -169,25 +163,12 @@ return array( 0 => array('id' => 0, 'name' => '默认', 'checked' => true), ), - // 支付类型 - 'common_pay_type_list' => array( - 0 => array('id' => 0, 'name' => '支付宝', 'checked' => true), - 1 => array('id' => 1, 'name' => '微信'), - ), - // 用户积分 - 操作类型 'common_integral_log_type_list' => array( 0 => array('id' => 0, 'name' => '减少', 'checked' => true), 1 => array('id' => 1, 'name' => '增加'), ), - // 用户投诉状态 - 'common_complaint_status_list' => array( - 0 => array('id' => 0, 'name' => '未处理', 'checked' => true), - 1 => array('id' => 1, 'name' => '已处理'), - 2 => array('id' => 2, 'name' => '异常'), - ), - // 是否上架/下架 'common_is_shelves_list' => array( 0 => array('id' => 0, 'name' => '下架'), @@ -200,24 +181,6 @@ return array( 1 => array('id' => 1, 'name' => '是'), ), - // 是否新窗口打开 - 'common_is_new_window_open_list' => array( - 0 => array('id' => 0, 'name' => '否', 'checked' => true), - 1 => array('id' => 1, 'name' => '是'), - ), - - // 是否含头部 - 'common_is_header_list' => array( - 0 => array('id' => 0, 'name' => '否'), - 1 => array('id' => 1, 'name' => '是', 'checked' => true), - ), - - // 是否含尾部 - 'common_is_footer_list' => array( - 0 => array('id' => 0, 'name' => '否'), - 1 => array('id' => 1, 'name' => '是', 'checked' => true), - ), - // 用户状态 'common_user_status_list' => array( 0 => array('id' => 0, 'name' => '正常', 'checked' => true), @@ -226,12 +189,6 @@ return array( 3 => array('id' => 3, 'name' => '待审核', 'tips' => '用户等待审核中'), ), - // 是否已评价 - 'common_comments_status_list' => array( - 0 => array('value' => 0, 'name' => '待评价'), - 1 => array('value' => 1, 'name' => '已评价'), - ), - // 导航数据类型 'common_nav_type_list' => array( 'custom' => array('value'=>'custom', 'name'=>'自定义'), @@ -283,18 +240,6 @@ return array( 4 => array('value' => 4, 'out_value' => 'consumption', 'name' => '点击查看用户与生活号'), ), - // 支付宝生活号菜单类型 - 'common_alipay_life_menu_type_list' => array( - 0 => array('value' => 0, 'name' => '文字'), - 1 => array('value' => 1, 'name' => '文字+图标'), - ), - - // 上下架选择 - 'common_shelves_select_list' => array( - 0 => array('value' => 0, 'name' => '下架'), - 1 => array('value' => 1, 'name' => '上架', 'checked' => true), - ), - // app事件类型 'common_app_event_type' => array( 0 => array('value' => 0, 'name' => 'WEB页面'), diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 38f535353..675e0e302 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -160,9 +160,11 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .category-content .menu-item .area-in{ position: relative; z-index: 1; } .category-content .menu-item .area-bg{ padding: 10px 0 10px 20px;} .category-content .category-list li.hover .b-category-name a{ color:#4c4c4c; } - .category-content .menu-srot{width: 100%; overflow:hidden;} - .category-content .menu-srot .sort-side{ overflow:hidden } - .category-content .sort-side .dl-sort{ float:left; width:100%; } + .category-content .menu-srot .sort-side, + .category-content .sort-side .dl-sort, + .category-content .menu-srot { overflow:hidden } + .category-content .sort-side .dl-sort, + .category-content .menu-srot { width:100%; } .category-content .sort-side dt { margin-top: 5px; font-size: 14px; font-weight: bold; color: #db3e54; text-align: left;} .category-content .sort-side dd { float:left; margin: 2px 6px 4px 0;} .category-content .sort-side dd a{ float:left; width: auto; letter-spacing:0.5px; line-height: 14px; color:#888; white-space:nowrap; overflow: hidden; text-overflow:ellipsis; padding: 3px 10px; border:1px solid #e6e6e6; } @@ -170,9 +172,8 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .category-content .menu-srot .brand-side{ float: left; position: relative;margin-left: -10px; padding-top: 10px; } .category-content .menu-item.top{top:0px;} .category-content .menu-item.bottom{bottom: -2px;*bottom: -6px;_*bottom: -7px;} - .category-content .sort-side .dl-sort{ float:left; width:50%; } .category-list li.hover .menu-in { border: 1px solid #333; } - .category-content .sort-side .two-content { width: auto; } + .category-content .sort-side .dl-sort-two { float: left; width: auto; } } @media only screen and (min-width: 1025px) {