Skip to content

ShopXO
ShopXO

alading2018 / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

体验新版 GitCode，发现更多精彩内容 >>

提交 19e3b265 编写于 作者: D devil
浏览文件
操作

细节优化

上级 0b5c5e2a
隐藏空白更改
内联 并排
Showing with 91 addition and 98 deletion
application/admin/controller/Customview.php
浏览文件 @ 19e3b265
......@@ -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();
}
......
application/admin/controller/Link.php
浏览文件 @ 19e3b265
......@@ -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();
}
......
application/admin/controller/Navigation.php
浏览文件 @ 19e3b265
......@@ -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();
}
......
application/admin/form/Customview.php
浏览文件 @ 19e3b265
......@@ -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,
......
application/admin/form/Link.php
浏览文件 @ 19e3b265
......@@ -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,
......
application/admin/form/Navigation.php
浏览文件 @ 19e3b265
......@@ -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,
......
application/admin/form/Order.php
浏览文件 @ 19e3b265
......@@ -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
......
application/admin/view/default/lib/is_footer.html
浏览文件 @ 19e3b265
......@@ -2,7 +2,7 @@
<div class="am-form-group">
<label>是否含尾部</label>
<div>
{{foreach :lang('common_is_footer_list') as $v}}
{{foreach :lang('common_is_text_list') as $v}}
<label class="am-radio-inline am-margin-right-sm">
<input type="radio" name="is_footer" value="{{$v.id}}" {{if isset($data['is_footer']) and $data['is_footer'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_footer']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
</label>
......
application/admin/view/default/lib/is_full_screen.html
浏览文件 @ 19e3b265
......@@ -2,7 +2,7 @@
<div class="am-form-group">
<label>是否满屏</label>
<div>
{{foreach :lang('common_is_full_screen_list') as $v}}
{{foreach :lang('common_is_text_list') as $v}}
<label class="am-radio-inline am-margin-right-sm">
<input type="radio" name="is_full_screen" value="{{$v.id}}" {{if isset($data['is_full_screen']) and $data['is_full_screen'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_full_screen']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
</label>
......
application/admin/view/default/lib/is_header.html
浏览文件 @ 19e3b265
......@@ -2,7 +2,7 @@
<div class="am-form-group">
<label>是否含头部</label>
<div>
{{foreach :lang('common_is_header_list') as $v}}
{{foreach :lang('common_is_text_list') as $v}}
<label class="am-radio-inline am-margin-right-sm">
<input type="radio" name="is_header" value="{{$v.id}}" {{if isset($data['is_header']) and $data['is_header'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_header']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
</label>
......
application/admin/view/default/lib/is_new_window_open.html
浏览文件 @ 19e3b265
......@@ -2,7 +2,7 @@
<div class="am-form-group">
<label>是否新窗口打开</label>
<div>
{{foreach :lang('common_is_new_window_open_list') as $v}}
{{foreach :lang('common_is_text_list') as $v}}
<label class="am-radio-inline am-margin-right-sm">
<input type="radio" name="is_new_window_open" value="{{$v.id}}" {{if isset($data['is_new_window_open']) and $data['is_new_window_open'] eq $v['id']}}checked="checked"{{else /}}{{if !isset($data['is_new_window_open']) and isset($v['checked']) and $v['checked'] eq true}}checked="checked"{{/if}}{{/if}} data-am-ucheck /> {{$v.name}}
</label>
......
application/admin/view/default/order/module/is_comments.html 0 → 100644
浏览文件 @ 19e3b265
<!-- 是否评论 -->
{{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
application/index/controller/Order.php
浏览文件 @ 19e3b265
......@@ -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();
......
application/index/form/Order.php
浏览文件 @ 19e3b265
......@@ -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
......
application/index/view/default/lib/is_new_window_open.html
浏览文件 @ 19e3b265
......@@ -2,7 +2,7 @@
<div class="am-form-group">
<label>{{:L('common_view_is_new_window_open_title')}}</label>
<div>
<foreach name="common_is_new_window_open_list" item="v">
<foreach name="common_is_text_list" item="v">
<label class="am-radio-inline am-margin-right-sm">
<input type="radio" name="is_new_window_open" value="{{$v.id}}" <if condition="isset($data['is_new_window_open']) and $data['is_new_window_open'] eq $v['id']">checked="checked"<else /><if condition="!isset($data['is_new_window_open']) and isset($v['checked']) and $v['checked'] eq true">checked="checked"</if></if> data-am-ucheck /> {{$v.name}}
</label>
......
application/index/view/default/order/module/is_comments.html
浏览文件 @ 19e3b265
<!-- 是否评价 -->
{{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
application/index/view/default/public/goods_category.html
浏览文件 @ 19e3b265
......@@ -31,7 +31,7 @@
<div class="menu-srot">
<div class="sort-side">
{{foreach $v.items as $vs}}
<dl class="dl-sort two-content">
<dl class="dl-sort {{if $category_show_level eq 2}}dl-sort-two{{/if}}">
{{if $category_show_level eq 2}}
<dd>
<a href="{{:MyUrl('index/search/index', ['category_id'=>$vs['id']])}}" title="{{$vs.name}}">
......
application/lang/zh-cn.php
浏览文件 @ 19e3b265
......@@ -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页面'),
......
public/static/index/default/css/common.css
浏览文件 @ 19e3b265
......@@ -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) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或