sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化

feat/task1-c-wallet
devil_gong 2019-08-15 18:56:05 +08:00
parent f06aff4fb9
commit c9c97d14fd
42 changed files with 481 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Admin.php
View File

@ -149,7 +149,7 @@ class Admin extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
'admin_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
@ -241,7 +241,7 @@ class Admin extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
]));
return $this->fetch();

2
application/admin/controller/Article.php
View File

@ -137,7 +137,7 @@ class Article extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
'article_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,

17
application/admin/controller/Brand.php
View File

@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
use think\facade\Hook;
use app\service\BrandService;
/**
@ -120,7 +121,6 @@ class Brand extends Common
$ret = BrandService::BrandList($data_params);
$data = empty($ret['data'][0]) ? [] : $ret['data'][0];
}
$this->assign('data', $data);
// 是否启用
$this->assign('common_is_enable_list', lang('common_is_enable_list'));
@ -129,12 +129,23 @@ class Brand extends Common
$brand_category = BrandService::BrandCategoryList(['field'=>'id,name']);
$this->assign('brand_category', $brand_category['data']);
// 参数
$this->assign('params', $params);
// 品牌编辑页面钩子
$hook_name = 'plugins_view_admin_brand_save';
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'brand_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
]));
// 编辑器文件存放地址
$this->assign('editor_path_type', 'brand');
// 数据
$this->assign('data', $data);
$this->assign('params', $params);
return $this->fetch();
}

12
application/admin/controller/Common.php
View File

@ -76,22 +76,22 @@ class Common extends Controller
private function CommonPluginsInit()
{
// css钩子
$this->assign('plugins_admin_css_data', Hook::listen('plugins_admin_css', ['hook_name'=>'plugins_admin_css', 'is_backend'=>false]));
$this->assign('plugins_admin_css_data', Hook::listen('plugins_admin_css', ['hook_name'=>'plugins_admin_css', 'is_backend'=>true]));
// js钩子
$this->assign('plugins_admin_js_data', Hook::listen('plugins_admin_js', ['hook_name'=>'plugins_admin_js', 'is_backend'=>false]));
$this->assign('plugins_admin_js_data', Hook::listen('plugins_admin_js', ['hook_name'=>'plugins_admin_js', 'is_backend'=>true]));
// 公共header内钩子
$this->assign('plugins_admin_common_header_data', Hook::listen('plugins_admin_common_header', ['hook_name'=>'plugins_admin_common_header', 'is_backend'=>false, 'admin'=>$this->admin]));
$this->assign('plugins_admin_common_header_data', Hook::listen('plugins_admin_common_header', ['hook_name'=>'plugins_admin_common_header', 'is_backend'=>true, 'admin'=>$this->admin]));
// 公共页面底部钩子
$this->assign('plugins_admin_common_page_bottom_data', Hook::listen('plugins_admin_common_page_bottom', ['hook_name'=>'plugins_admin_common_page_bottom', 'is_backend'=>false, 'admin'=>$this->admin]));
$this->assign('plugins_admin_common_page_bottom_data', Hook::listen('plugins_admin_common_page_bottom', ['hook_name'=>'plugins_admin_common_page_bottom', 'is_backend'=>true, 'admin'=>$this->admin]));
// 公共顶部钩子
$this->assign('plugins_admin_view_common_top_data', Hook::listen('plugins_admin_view_common_top', ['hook_name'=>'plugins_admin_view_common_top', 'is_backend'=>false, 'admin'=>$this->admin]));
$this->assign('plugins_admin_view_common_top_data', Hook::listen('plugins_admin_view_common_top', ['hook_name'=>'plugins_admin_view_common_top', 'is_backend'=>true, 'admin'=>$this->admin]));
// 公共底部钩子
$this->assign('plugins_admin_view_common_bottom_data', Hook::listen('plugins_admin_view_common_bottom', ['hook_name'=>'plugins_admin_view_common_bottom', 'is_backend'=>false, 'admin'=>$this->admin]));
$this->assign('plugins_admin_view_common_bottom_data', Hook::listen('plugins_admin_view_common_bottom', ['hook_name'=>'plugins_admin_view_common_bottom', 'is_backend'=>true, 'admin'=>$this->admin]));
}
/**

10
application/admin/controller/Goods.php
View File

@ -83,6 +83,12 @@ class Goods extends Common
];
$ret = GoodsService::GoodsList($data_params);
// 商品分类
$this->assign('goods_category_list', GoodsService::GoodsCategoryAll());
// 品牌分类
$this->assign('brand_list', BrandService::CategoryBrand());
// 是否上下架
$this->assign('common_is_shelves_list', lang('common_is_shelves_list'));
@ -135,7 +141,7 @@ class Goods extends Common
$this->assign('region_province_list', RegionService::RegionItems(['pid'=>0]));
// 商品分类
$this->assign('category_list', GoodsService::GoodsCategoryAll());
$this->assign('goods_category_list', GoodsService::GoodsCategoryAll());
// 品牌分类
$this->assign('brand_list', BrandService::CategoryBrand());
@ -149,7 +155,7 @@ class Goods extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
'goods_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,

6
application/admin/controller/Index.php
View File

@ -86,15 +86,15 @@ class Index extends Common
$order_complete_money = StatisticalService::OrderCompleteMoneyYesterdayTodayTotal();
$this->assign('order_complete_money', $order_complete_money['data']);
// 近7日订单交易走势
// 近15日订单交易走势
$order_trading_trend = StatisticalService::OrderTradingTrendSevenTodayTotal();
$this->assign('order_trading_trend', $order_trading_trend['data']);
// 近7日订单支付方式
// 近15日订单支付方式
$order_type_number = StatisticalService::OrderPayTypeSevenTodayTotal();
$this->assign('order_type_number', $order_type_number['data']);
// 近7日热销商品
// 近15日热销商品
$goods_hot_sale = StatisticalService::GoodsHotSaleSevenTodayTotal();
$this->assign('goods_hot_sale', $goods_hot_sale['data']);

2
application/admin/controller/Power.php
View File

@ -161,7 +161,7 @@ class Power extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
'role_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,

2
application/admin/controller/User.php
View File

@ -156,7 +156,7 @@ class User extends Common
$this->assign($hook_name.'_data', Hook::listen($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => false,
'is_backend' => true,
'user_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,

2
application/admin/view/default/admin/save_info.html
View File

@ -30,7 +30,7 @@
{{if !isset($data['id']) or $admin['id'] neq $data['id']}}
<div class="am-form-group">
<label>权限组</label>
<select class="am-radius chosen-select c-p" name="role_id" data-validation-message="请选择所属角色组" required>
<select class="am-radius chosen-select" name="role_id" data-validation-message="请选择所属角色组" required>
<option value="">可选择...</option>
{{foreach $role as $v}}
<option value="{{$v.id}}" {{if isset($data['role_id']) and $data['role_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>

21
application/admin/view/default/answer/index.html
View File

@ -220,6 +220,27 @@
<button class="am-btn am-btn-success am-btn-xs am-radius am-btn-block submit-reply am-icon-gavel" data-am-modal="{target: '#my-popup-reply'}" data-json='{{:str_replace("'", '', json_encode($v))}}'> 回复</button>
{{/if}}
<button class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/answer/delete')}}" data-id="{{$v.id}}"> 删除</button>
<!-- 问答列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_answer_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_answer_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

16
application/admin/view/default/appconfig/app.html
View File

@ -11,7 +11,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'app'])}}" enctype="multipart/form-data">
<div class="am-form-group">
<label>{{$data.common_app_is_use_mobile_detail.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_use_mobile_detail.describe}}</span></label>
<select name="{{$data.common_app_is_use_mobile_detail.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_use_mobile_detail.error_tips}}" required>
<select name="{{$data.common_app_is_use_mobile_detail.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_use_mobile_detail.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_use_mobile_detail']['value']) and $data['common_app_is_use_mobile_detail']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -19,7 +19,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_user_is_mandatory_bind_mobile.name}}<span class="am-form-group-label-tips">{{$data.common_user_is_mandatory_bind_mobile.describe}}</span></label>
<select name="{{$data.common_user_is_mandatory_bind_mobile.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_user_is_mandatory_bind_mobile.error_tips}}" required>
<select name="{{$data.common_user_is_mandatory_bind_mobile.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_user_is_mandatory_bind_mobile.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_user_is_mandatory_bind_mobile']['value']) and $data['common_user_is_mandatory_bind_mobile']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -28,7 +28,7 @@
<div class="am-form-group">
<label>{{$data.common_app_is_enable_search.name}}</label>
<select name="{{$data.common_app_is_enable_search.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_search.error_tips}}" required>
<select name="{{$data.common_app_is_enable_search.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_enable_search.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_search']['value']) and $data['common_app_is_enable_search']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -36,7 +36,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_app_is_enable_answer.name}}</label>
<select name="{{$data.common_app_is_enable_answer.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_enable_answer.error_tips}}" required>
<select name="{{$data.common_app_is_enable_answer.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_enable_answer.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_enable_answer']['value']) and $data['common_app_is_enable_answer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -45,7 +45,7 @@
<div class="am-form-group">
<label>{{$data.common_is_app_inside_close_header.name}}<span class="am-form-group-label-tips">{{$data.common_is_app_inside_close_header.describe}}</span></label>
<select name="{{$data.common_is_app_inside_close_header.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_is_app_inside_close_header.error_tips}}" required>
<select name="{{$data.common_is_app_inside_close_header.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_app_inside_close_header.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_is_app_inside_close_header']['value']) and $data['common_is_app_inside_close_header']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -53,7 +53,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_is_app_inside_close_footer.name}}<span class="am-form-group-label-tips">{{$data.common_is_app_inside_close_footer.describe}}</span></label>
<select name="{{$data.common_is_app_inside_close_footer.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_is_app_inside_close_footer.error_tips}}" required>
<select name="{{$data.common_is_app_inside_close_footer.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_app_inside_close_footer.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_is_app_inside_close_footer']['value']) and $data['common_is_app_inside_close_footer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -62,7 +62,7 @@
<div class="am-form-group">
<label>{{$data.common_app_is_header_nav_fixed.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_header_nav_fixed.describe}}</span></label>
<select name="{{$data.common_app_is_header_nav_fixed.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_header_nav_fixed.error_tips}}" required>
<select name="{{$data.common_app_is_header_nav_fixed.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_header_nav_fixed.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_header_nav_fixed']['value']) and $data['common_app_is_header_nav_fixed']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -71,7 +71,7 @@
<div class="am-form-group">
<label>{{$data.common_app_is_limitedtimediscount.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_limitedtimediscount.describe}}</span></label>
<select name="{{$data.common_app_is_limitedtimediscount.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_limitedtimediscount.error_tips}}" required>
<select name="{{$data.common_app_is_limitedtimediscount.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_limitedtimediscount.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_limitedtimediscount']['value']) and $data['common_app_is_limitedtimediscount']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

6
application/admin/view/default/appconfig/weixinmini.html
View File

@ -11,7 +11,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'weixinmini'])}}" enctype="multipart/form-data">
<div class="am-form-group">
<label>{{$data.common_app_is_online_service.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_online_service.describe}}</span></label>
<select name="{{$data.common_app_is_online_service.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_online_service.error_tips}}" required>
<select name="{{$data.common_app_is_online_service.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_online_service.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_online_service']['value']) and $data['common_app_is_online_service']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -20,7 +20,7 @@
<div class="am-form-group">
<label>{{$data.common_app_is_good_thing.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_good_thing.describe}}</span></label>
<select name="{{$data.common_app_is_good_thing.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_good_thing.error_tips}}" required>
<select name="{{$data.common_app_is_good_thing.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_good_thing.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_good_thing']['value']) and $data['common_app_is_good_thing']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -29,7 +29,7 @@
<div class="am-form-group">
<label>{{$data.common_app_is_poster_share.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_poster_share.describe}}</span></label>
<select name="{{$data.common_app_is_poster_share.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_app_is_poster_share.error_tips}}" required>
<select name="{{$data.common_app_is_poster_share.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_poster_share.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_app_is_poster_share']['value']) and $data['common_app_is_poster_share']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

30
application/admin/view/default/article/index.html
View File

@ -138,6 +138,15 @@
<dt>是否启用</dt>
<dd>{{$v.is_enable_text}}</dd>
<dt>SEO标题</dt>
<dd>{{$v.seo_title}}</dd>
<dt>SEO关键字</dt>
<dd>{{$v.seo_keywords}}</dd>
<dt>SEO描述</dt>
<dd>{{$v.seo_desc}}</dd>
<dt>创建时间</dt>
<dd>{{$v.add_time_time}}</dd>
@ -153,6 +162,27 @@
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
</a>
<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/article/delete')}}" data-id="{{$v.id}}"> 删除</button>
<!-- 文章列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_article_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_article_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

2
application/admin/view/default/article/save_info.html
View File

@ -29,7 +29,7 @@
</div>
<div class="am-form-group">
<label>文章分类</label>
<select name="article_category_id" class="am-radius c-p chosen-select" data-placeholder="可选择..." data-validation-message="请选择文章分类" required>
<select name="article_category_id" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择文章分类" required>
<option value="">可选择...</option>
{{foreach $article_category_list as $v}}
<option value="{{$v.id}}" {{if isset($data['article_category_id']) and $data['article_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>

88
application/admin/view/default/brand/index.html
View File

@ -77,11 +77,11 @@
<thead>
<tr>
<th>名称</th>
<th>LOGO</th>
<th class="am-hide-sm-only">LOGO</th>
<th class="am-hide-sm-only">品牌分类</th>
<th class="am-hide-sm-only">官网地址</th>
<th>是否启用</th>
<th class="am-hide-sm-only">创建时间</th>
<th>更多</th>
<th>操作</th>
</tr>
</thead>
@ -90,7 +90,7 @@
{{foreach $data_list as $v}}
<tr id="data-list-{{$v.id}}" {{if $v['is_enable'] eq 0}}class="am-active"{{/if}}>
<td>{{$v.name}}</td>
<td>
<td class="am-hide-sm-only">
{{if !empty($v['logo'])}}
<a href="{{$v['logo']}}" target="_blank">
<img src="{{$v['logo']}}" class="am-radius" width="100" />
@ -111,12 +111,92 @@
<td>
<a href="javascript:;" class="am-icon-btn am-icon-check submit-state {{if $v['is_enable'] eq 1}}am-success{{else /}}am-default{{/if}}" data-url="{{:MyUrl('admin/brand/statusupdate')}}" data-id="{{$v.id}}" data-state="{{$v['is_enable']}}" data-is-update-status="1"></a>
</td>
<td class="am-hide-sm-only">{{$v.add_time_time}}</td>
<td>
<span class="am-icon-caret-down c-p" data-am-modal="{target: '#my-popup{{$v.id}}'}"> 查看更多</span>
<div class="am-popup am-radius" id="my-popup{{$v.id}}">
<div class="am-popup-inner">
<div class="am-popup-hd">
<h4 class="am-popup-title">详情内容</h4>
<span data-am-modal-close
class="am-close">&times;</span>
</div>
<div class="am-popup-bd">
<dl class="dl-content">
<dt>名称</dt>
<dd>{{$v.name}}</dd>
<dt>LOGO</dt>
<dd>
{{if !empty($v['logo'])}}
<a href="{{$v['logo']}}" target="_blank">
<img src="{{$v['logo']}}" class="am-radius" width="100" />
</a>
{{else /}}
<span class="cr-ddd">暂无图片</span>
{{/if}}
</dd>
<dt>品牌分类</dt>
<dd>{{$v.brand_category_name}}</dd>
<dt>官网地址</dt>
<dd>
{{$v.website_url}}
{{if !empty($v['website_url'])}}
<a href="{{$v.website_url}}" target="_blank">
<i class="am-icon-external-link"></i>
</a>
{{/if}}
</dd>
<dt>是否启用</dt>
<dd>{{$v.is_enable_text}}</dd>
<dt>SEO标题</dt>
<dd>{{$v.seo_title}}</dd>
<dt>SEO关键字</dt>
<dd>{{$v.seo_keywords}}</dd>
<dt>SEO描述</dt>
<dd>{{$v.seo_desc}}</dd>
<dt>创建时间</dt>
<dd>{{$v.add_time_time}}</dd>
<dt>更新时间</dt>
<dd>{{$v.upd_time_time}}</dd>
</dl>
</div>
</div>
</div>
</td>
<td class="view-operation">
<a href="{{:MyUrl('admin/brand/saveinfo', array_merge($params, ['id'=>$v['id']]))}}">
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
</a>
<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/brand/Delete')}}" data-id="{{$v.id}}"> 删除</button>
<!-- 品牌列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_brand_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_brand_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

27
application/admin/view/default/brand/save_info.html
View File

@ -21,7 +21,7 @@
</div>
<div class="am-form-group">
<label>品牌分类</label>
<select name="brand_category_id" class="am-radius c-p chosen-select" data-placeholder="可选择..." data-validation-message="请选择品牌分类" required>
<select name="brand_category_id" class="am-radius chosen-select" data-placeholder="可选择..." data-validation-message="请选择品牌分类" required>
<option value="">可选择...</option>
{{foreach $brand_category as $v}}
<option value="{{$v.id}}" {{if isset($data['brand_category_id']) and $data['brand_category_id'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
@ -55,6 +55,31 @@
<label class="block">是否启用</label>
<input name="is_enable" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="50" data-am-switch {{if (isset($data['is_enable']) and $data['is_enable'] eq 1) or !isset($data['is_enable'])}}checked="true"{{/if}} />
</div>
<!-- 插件扩展数据 start -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
<div class="plugins-tag">
<span>plugins_view_admin_brand_save</span>
</div>
{{/if}}
{{if !empty($plugins_view_admin_brand_save_data) and is_array($plugins_view_admin_brand_save_data)}}
<div class="am-alert am-alert-secondary">
<label class="am-text-sm am-text-warning">该区域为插件扩展数据，请按照插件文档填写相应的值</label>
<div>
{{foreach $plugins_view_admin_brand_save_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
{{/foreach}}
</div>
</div>
{{/if}}
<!-- 插件扩展数据 end -->
<div class="am-alert am-alert-secondary">
{{include file="lib/seo" /}}
</div>
<div class="am-form-group am-form-group-refreshing">
<input type="hidden" name="id" {{if !empty($data)}} value="{{$data.id}}"{{/if}} />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'处理中...'}">保存</button>

8
application/admin/view/default/config/index.html
View File

@ -7,7 +7,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/config/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/config/index')}}">
<div class="am-form-group">
<label>{{$data.admin_excel_charset.name}}<span class="am-form-group-label-tips">{{$data.admin_excel_charset.describe}}</span></label>
<select name="{{$data.admin_excel_charset.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.admin_excel_charset.error_tips}}" required>
<select name="{{$data.admin_excel_charset.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.admin_excel_charset.error_tips}}" required>
{{foreach $common_excel_charset_list as $v}}
<option value="{{$v.id}}" {{if isset($data['admin_excel_charset']['value']) and $data['admin_excel_charset']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -20,7 +20,7 @@
<div class="am-form-group">
<label>{{$data.common_is_deduction_inventory.name}}<span class="am-form-group-label-tips">{{$data.common_is_deduction_inventory.describe}}</span></label>
<select name="{{$data.common_is_deduction_inventory.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_is_deduction_inventory.error_tips}}" required>
<select name="{{$data.common_is_deduction_inventory.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_deduction_inventory.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_is_deduction_inventory']['value']) and $data['common_is_deduction_inventory']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -28,7 +28,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_deduction_inventory_rules.name}}<span class="am-form-group-label-tips">{{$data.common_deduction_inventory_rules.describe}}</span></label>
<select name="{{$data.common_deduction_inventory_rules.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_deduction_inventory_rules.error_tips}}" required>
<select name="{{$data.common_deduction_inventory_rules.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_deduction_inventory_rules.error_tips}}" required>
{{foreach $common_deduction_inventory_rules_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_deduction_inventory_rules']['value']) and $data['common_deduction_inventory_rules']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -36,7 +36,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_order_is_booking.name}}<span class="am-form-group-label-tips">{{$data.common_order_is_booking.describe}}</span></label>
<select name="{{$data.common_order_is_booking.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_order_is_booking.error_tips}}" required>
<select name="{{$data.common_order_is_booking.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_order_is_booking.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_order_is_booking']['value']) and $data['common_order_is_booking']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

2
application/admin/view/default/email/index.html
View File

@ -31,7 +31,7 @@
</div>
<div class="am-form-group">
<label>{{$data.common_email_is_use_ssl.name}}</label>
<select name="{{$data.common_email_is_use_ssl.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_email_is_use_ssl.error_tips}}" required>
<select name="{{$data.common_email_is_use_ssl.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_email_is_use_ssl.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_email_is_use_ssl']['value']) and $data['common_email_is_use_ssl']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

63
application/admin/view/default/goods/index.html
View File

@ -26,6 +26,46 @@
<table class="so-list more-where {{if !isset($params['is_more'])}}none{{/if}}">
<tbody>
<tr>
<td>
<span>分类：</span>
<select class="am-radius chosen-select" name="category_id" data-placeholder="商品分类...">
<option value="0">商品分类...</option>
{{if !empty($goods_category_list)}}
{{foreach $goods_category_list as $v}}
<option value="{{$v.id}}" {{if !empty($params['category_id']) and $v['id'] eq $params['category_id']}}selected{{/if}}>一级 - {{$v.name}}</option>
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
<option style="padding-left: 30px;" value="{{$vs.id}}" {{if !empty($params['category_id']) and $vs['id'] eq $params['category_id']}}selected{{/if}}>二级 - {{$vs.name}}</option>
{{if !empty($vs['items'])}}
{{foreach $vs.items as $vss}}
<option style="padding-left: 60px;" value="{{$vss.id}}" {{if !empty($params['category_id']) and $vss['id'] eq $params['category_id']}}selected{{/if}}>三级 - {{$vss.name}}</option>
{{/foreach}}
{{/if}}
{{/foreach}}
{{/if}}
{{/foreach}}
{{/if}}
</select>
</td>
<td>
<span>品牌：</span>
<select name="brand_id" class="am-radius chosen-select" data-placeholder="品牌...">
{{if !empty($brand_list)}}
<option value="0">品牌...</option>
{{foreach $brand_list as $v}}
<optgroup label="{{$v.name}}">
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
<option style="padding-left: 30px;" value="{{$vs.id}}" {{if isset($params['brand_id']) and $params['brand_id'] eq $vs['id']}}selected{{/if}}>{{$vs.name}}</option>
{{/foreach}}
{{/if}}
</optgroup>
{{/foreach}}
{{/if}}
</select>
</td>
</tr>
<tr>
<td>
<span>状态：</span>
<select name="is_shelves" class="chosen-select" data-placeholder="上下架...">
@ -44,7 +84,7 @@
{{/foreach}}
</select>
</td>
</tr>
</tr>
<tr>
<td class="time">
<span>时间：</span>
@ -199,6 +239,27 @@
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
</a>
<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/goods/delete')}}" data-id="{{$v.id}}"> 删除</button>
<!-- 商品列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_goods_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_goods_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

10
application/admin/view/default/goods/save_info.html
View File

@ -71,9 +71,9 @@
<div class="am-form-group">
<label>商品分类</label>
<br />
<select name="category_id" class="am-radius chosen-select c-p" multiple="multiple" minchecked="1" data-placeholder="请选择..." data-validation-message="请至少选择一个商品分类" required>
{{if !empty($category_list)}}
{{foreach $category_list as $v}}
<select name="category_id" class="am-radius chosen-select" multiple="multiple" minchecked="1" data-placeholder="请选择..." data-validation-message="请至少选择一个商品分类" required>
{{if !empty($goods_category_list)}}
{{foreach $goods_category_list as $v}}
<option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
@ -92,7 +92,7 @@
<div class="am-form-group">
<label>品牌</label>
<br />
<select name="brand_id" class="am-radius chosen-select c-p" data-placeholder="请选择..." data-validation-message="请至少选择一个商品分类">
<select name="brand_id" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请至少选择一个商品分类">
{{if !empty($brand_list)}}
<option value="0">请选择...</option>
{{foreach $brand_list as $v}}
@ -110,7 +110,7 @@
<div class="am-form-group">
<label>生产地</label>
<br />
<select name="place_origin" class="am-radius chosen-select c-p" data-placeholder="请选择..." data-validation-message="请选择生产地">
<select name="place_origin" class="am-radius chosen-select" data-placeholder="请选择..." data-validation-message="请选择生产地">
<option value="0">请选择...</option>
{{if !empty($region_province_list)}}
{{foreach $region_province_list as $v}}

2
application/admin/view/default/goodscategory/index.html
View File

@ -21,7 +21,7 @@
<form class="am-form form-validation admin-save" action="{{:MyUrl('admin/goodscategory/save')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label class="block">父级</label>
<select name="pid" class="am-radius c-p chosen-select forth-selection-form-category" data-placeholder="可选择..." data-validation-message="请选择商品分类">
<select name="pid" class="am-radius chosen-select forth-selection-form-category" data-placeholder="可选择..." data-validation-message="请选择商品分类">
<option value="0">可选择...</option>
{{if !empty($goods_category_list)}}
{{foreach $goods_category_list as $v}}

30
application/admin/view/default/index/init.html
View File

@ -74,11 +74,11 @@
</div>
<!-- 近7日订单交易走势 -->
<!-- 近15日订单交易走势 -->
<div class="echarts-container">
<div class="echarts-title">
<span class="icon"></span>
<span class="title">近7日订单交易走势</span>
<span class="title">近15日订单交易走势</span>
</div>
<div id="echarts-order-trading"></div>
</div>
@ -86,19 +86,19 @@
<!-- 组合 -->
<ul class="am-avg-sm-1 am-avg-sm-2 am-avg-lg-2 echarts-combination-container-2">
<li>
<!-- 近7日热销商品 -->
<!-- 近15日热销商品 -->
<div class="echarts-title">
<span class="icon"></span>
<span class="title">近7日热销商品</span>
<span class="title">近15日热销商品</span>
</div>
<div id="echarts-goods-hot"></div>
</li>
<li>
<!-- 近7日订单支付方式 -->
<!-- 近15日订单支付方式 -->
<div class="echarts-title">
<span class="icon"></span>
<span class="title">近7日订单支付方式</span>
<span class="title">近15日订单支付方式</span>
</div>
<div id="echarts-order-pay-type"></div>
</li>
@ -159,7 +159,7 @@
<script type="text/javascript">
$(function()
{
// 近7日订单交易走势
// 近15日订单交易走势
var order_trading_chart = echarts.init(document.getElementById('echarts-order-trading'), 'macarons');
var option = {
tooltip : {
@ -175,13 +175,13 @@ $(function()
data: {{:json_encode($order_trading_trend.title_arr)}}
},
toolbox: {
show : true,
show : {{if IsMobile()}}false{{else}}true{{/if}},
feature : {
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar', 'stack', 'tiled']},
restore : {show: true},
saveAsImage : {name:'近7日订单交易走势', show: true}
saveAsImage : {name:'近15日订单交易走势', show: true}
}
},
grid: {
@ -207,7 +207,7 @@ $(function()
order_trading_chart.setOption(option);
// 近7日热销商品
// 近15日热销商品
var goods_hot_chart = echarts.init(document.getElementById('echarts-goods-hot'), 'macarons');
var option = {
title : {
@ -219,7 +219,7 @@ $(function()
formatter: "{b} : {c} ({d}%)"
},
toolbox: {
show : true,
show : {{if IsMobile()}}false{{else}}true{{/if}},
feature : {
mark : {show: true},
dataView : {show: true, readOnly: false},
@ -236,7 +236,7 @@ $(function()
}
},
restore : {show: false},
saveAsImage : {name:'近7日热销商品', show: true}
saveAsImage : {name:'近15日热销商品', show: true}
}
},
calculable : true,
@ -251,7 +251,7 @@ $(function()
};
goods_hot_chart.setOption(option);
// 近7日订单支付方式
// 近15日订单支付方式
var order_pay_type_chart = echarts.init(document.getElementById('echarts-order-pay-type'), 'macarons');
var option = {
tooltip : {
@ -261,13 +261,13 @@ $(function()
data: {{:json_encode($order_type_number.title_arr)}}
},
toolbox: {
show : true,
show : {{if IsMobile()}}false{{else}}true{{/if}},
feature : {
mark : {show: true},
dataView : {show: true, readOnly: false},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: false},
saveAsImage : {name:'近7日订单支付方式', show: true}
saveAsImage : {name:'近15日订单支付方式', show: true}
}
},
calculable : true,

2
application/admin/view/default/lib/user_status.html
View File

@ -1,7 +1,7 @@
<!-- 用户状态 开始 -->
<div class="am-form-group">
<label>用户状态</label>
<select name="status" class="am-radius chosen-select c-p" data-validation-message="请选择用户状态" required>
<select name="status" class="am-radius chosen-select" data-validation-message="请选择用户状态" required>
{{foreach :lang('common_user_status_list') as $v}}
<option value="{{$v.id}}" {{if isset($data['status']) and $data['status'] eq $v['id']}}selected{{else /}}{{if !isset($data['status']) and isset($v['checked']) and $v['checked'] eq true}}selected{{/if}}{{/if}}>{{$v.name}}</option>
{{/foreach}}

14
application/admin/view/default/navigation/index.html
View File

@ -84,7 +84,7 @@
<form class="am-form form-validation" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label>导航级别</label>
<select class="am-radius c-p chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<option value="">一级栏目...</option>
{{foreach $nav_header_pid_list as $v}}
<option value="{{$v.id}}">{{$v.name}}</option>
@ -130,7 +130,7 @@
<form class="am-form form-validation-article" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label>导航级别</label>
<select class="am-radius c-p chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<option value="">一级栏目...</option>
{{foreach $nav_header_pid_list as $v}}
<option value="{{$v.id}}">{{$v.name}}</option>
@ -139,7 +139,7 @@
</div>
<div class="am-form-group">
<label>文章</label>
<select class="am-radius c-p chosen-select" name="value" data-placeholder="请选择..." data-validation-message="文章选择有误" required>
<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="文章选择有误" required>
<option value="">请选择...</option>
{{foreach $article_list as $v}}
<optgroup label="{{$v.name}}">
@ -188,7 +188,7 @@
<form class="am-form form-validation-customview" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label>导航级别</label>
<select class="am-radius c-p chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<option value="">一级栏目...</option>
{{foreach $nav_header_pid_list as $v}}
<option value="{{$v.id}}">{{$v.name}}</option>
@ -197,7 +197,7 @@
</div>
<div class="am-form-group">
<label>自定义页面</label>
<select class="am-radius c-p chosen-select" name="value" data-placeholder="请选择..." data-validation-message="自定义页面选择有误" required>
<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="自定义页面选择有误" required>
<option value="">请选择...</option>
{{foreach $customview_list as $v}}
<option value="{{$v.id}}">{{$v.title}}</option>
@ -239,7 +239,7 @@
<form class="am-form form-validation-goods_category" action="{{:MyUrl('admin/navigation/save')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label>导航级别</label>
<select class="am-radius c-p chosen-select" name="pid" data-placeholder="一级栏目..." data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<select class="am-radius chosen-select" name="pid" data-placeholder="一级栏目..." data-placeholder="一级栏目..." data-validation-message="导航级别选择错误">
<option value="">一级栏目...</option>
{{foreach $nav_header_pid_list as $v}}
<option value="{{$v.id}}">{{$v.name}}</option>
@ -248,7 +248,7 @@
</div>
<div class="am-form-group">
<label>商品分类</label>
<select class="am-radius c-p chosen-select" name="value" data-placeholder="请选择..." data-validation-message="商品分类选择有误" required>
<select class="am-radius chosen-select" name="value" data-placeholder="请选择..." data-validation-message="商品分类选择有误" required>
<option value="">请选择...</option>
{{foreach $goods_category_list as $v}}
<option value="{{$v.id}}" {{if !empty($data['category_ids']) and in_array($v['id'], $data['category_ids'])}}selected{{/if}}>一级 - {{$v.name}}</option>

26
application/admin/view/default/order/index.html
View File

@ -389,14 +389,26 @@
<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o am-btn-block submit-ajax" data-url="{{:MyUrl('admin/order/delete')}}" data-id="{{$v.id}}" data-value="{{$v.user_id}}" data-view="delete" data-msg="删除后无法恢复，确定继续吗？"> 删除</button>
{{/if}}
<!-- 钩子订单操作 -->
{{if !empty($v['plugins_service_order_handle_operation_html']) and is_array($v['plugins_service_order_handle_operation_html'])}}
{{foreach $v.plugins_service_order_handle_operation_html as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
{{/foreach}}
<!-- 订单列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_order_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_order_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

21
application/admin/view/default/orderaftersale/index.html
View File

@ -290,6 +290,27 @@
{{if in_array($v['status'], [4,5])}}
<button class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/orderaftersale/delete')}}" data-id="{{$v.id}}"> 删除</button>
{{/if}}
<!-- 订单售后列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_orderaftersale_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_orderaftersale_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

2
application/admin/view/default/payment/save_info.html
View File

@ -15,7 +15,7 @@
</div>
<div class="am-form-group">
<label>适用终端</label>
<select name="apply_terminal" class="am-radius c-p chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用终端" required>
<select name="apply_terminal" class="am-radius chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用终端" required>
{{foreach $common_platform_type as $v}}
<option value="{{$v.value}}" {{if isset($data['apply_terminal']) and in_array($v['value'], $data['apply_terminal'])}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

4
application/admin/view/default/pluginsadmin/save_info.html
View File

@ -59,7 +59,7 @@
<div class="am-form-group">
<label>适用终端</label>
<select name="apply_terminal" class="am-radius c-p chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用终端" required>
<select name="apply_terminal" class="am-radius chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用终端" required>
{{foreach :lang('common_platform_type') as $v}}
<option value="{{$v.value}}" {{if isset($data['apply_terminal']) and in_array($v['value'], $data['apply_terminal'])}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -68,7 +68,7 @@
<div class="am-form-group">
<label>适用系统版本</label>
<select name="apply_version" class="am-radius c-p chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用系统版本" required>
<select name="apply_version" class="am-radius chosen-select" multiple="multiple" minchecked="1" data-placeholder="可选择..." data-validation-message="至少选择一个适用系统版本" required>
{{foreach :lang('common_system_version_list') as $v}}
<option value="{{$v.value}}" {{if isset($data['apply_version']) and in_array($v['value'], $data['apply_version'])}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

2
application/admin/view/default/power/index.html
View File

@ -21,7 +21,7 @@
<form class="am-form form-validation admin-save" action="{{:MyUrl('admin/power/powersave')}}" method="POST" request-type="ajax-reload" request-value="">
<div class="am-form-group">
<label>栏目级别</label>
<select class="am-radius c-p chosen-select" name="pid" data-validation-message="栏目级别选择错误">
<select class="am-radius chosen-select" name="pid" data-validation-message="栏目级别选择错误">
<option value="0">一级栏目...</option>
{{foreach $data as $v}}
<option value="{{$v.id}}">{{$v.name}}</option>

2
application/admin/view/default/seo/index.html
View File

@ -7,7 +7,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/seo/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/seo/index')}}">
<div class="am-form-group">
<label>{{$data.home_seo_url_model.name}}<span class="am-form-group-label-tips">{{$data.home_seo_url_model.describe}}</span></label>
<select name="{{$data.home_seo_url_model.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_seo_url_model.error_tips}}" required>
<select name="{{$data.home_seo_url_model.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_seo_url_model.error_tips}}" required>
{{foreach $seo_url_model_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_seo_url_model']['value']) and $data['home_seo_url_model']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

4
application/admin/view/default/site/base.html
View File

@ -54,7 +54,7 @@
<div class="am-form-group">
<label>{{$data.common_timezone.name}}<span class="am-form-group-label-tips">{{$data.common_timezone.describe}}</span></label>
<select name="{{$data.common_timezone.only_tag}}" class="am-radius chosen-select c-p" data-placeholder="{{$data.common_timezone.name}}" data-validation-message="{{$data.common_timezone.error_tips}}" required>
<select name="{{$data.common_timezone.only_tag}}" class="am-radius chosen-select" data-placeholder="{{$data.common_timezone.name}}" data-validation-message="{{$data.common_timezone.error_tips}}" required>
{{foreach $site_timezone_list as $k=>$v}}
<option value="{{$k}}" {{if isset($data['common_timezone']['value']) and $data['common_timezone']['value'] eq $k}}selected{{/if}}>{{$v}}</option>
{{/foreach}}
@ -63,7 +63,7 @@
<div class="am-form-group">
<label>{{$data.home_site_state.name}}<span class="am-form-group-label-tips">{{$data.home_site_state.describe}}</span></label>
<select name="{{$data.home_site_state.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_site_state.error_tips}}" required>
<select name="{{$data.home_site_state.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_site_state.error_tips}}" required>
{{foreach $site_site_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_site_state']['value']) and $data['home_site_state']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

2
application/admin/view/default/site/extends.html
View File

@ -11,7 +11,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'extends'])}}" enctype="multipart/form-data">
<div class="am-form-group">
<label>{{$data.common_is_login_answer.name}}<span class="am-form-group-label-tips">{{$data.common_is_login_answer.describe}}</span></label>
<select name="{{$data.common_is_login_answer.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_is_login_answer.error_tips}}" required>
<select name="{{$data.common_is_login_answer.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_is_login_answer.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_is_login_answer']['value']) and $data['common_is_login_answer']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

4
application/admin/view/default/site/login.html
View File

@ -116,7 +116,7 @@
<div class="am-form-group">
<label>{{$data.home_user_login_state.name}}<span class="am-form-group-label-tips">{{$data.home_user_login_state.describe}}</span></label>
<select name="{{$data.home_user_login_state.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_user_login_state.error_tips}}" required>
<select name="{{$data.home_user_login_state.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_user_login_state.error_tips}}" required>
{{foreach $site_user_login_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_user_login_state']['value']) and $data['home_user_login_state']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -125,7 +125,7 @@
<div class="am-form-group">
<label>{{$data.home_user_login_img_verify_state.name}}<span class="am-form-group-label-tips">{{$data.home_user_login_img_verify_state.describe}}</span></label>
<select name="{{$data.home_user_login_img_verify_state.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_user_login_img_verify_state.error_tips}}" required>
<select name="{{$data.home_user_login_img_verify_state.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_user_login_img_verify_state.error_tips}}" required>
{{foreach $site_img_verify_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_user_login_img_verify_state']['value']) and $data['home_user_login_img_verify_state']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

8
application/admin/view/default/site/register.html
View File

@ -25,7 +25,7 @@
<div class="am-form-group">
<label>{{$data.home_user_reg_state.name}}<span class="am-form-group-label-tips">{{$data.home_user_reg_state.describe}}</span></label>
<select name="{{$data.home_user_reg_state.only_tag}}" multiple="multiple" class="am-radius chosen-select c-p" data-placeholder="{{$data.home_user_reg_state.name}}" >
<select name="{{$data.home_user_reg_state.only_tag}}" multiple="multiple" class="am-radius chosen-select" data-placeholder="{{$data.home_user_reg_state.name}}" >
{{foreach $common_user_reg_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_user_reg_state']['value']) and in_array($v['value'], explode(',', $data['home_user_reg_state']['value']))}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -34,7 +34,7 @@
<div class="am-form-group">
<label>{{$data.home_user_register_img_verify_state.name}}<span class="am-form-group-label-tips">{{$data.home_user_register_img_verify_state.describe}}</span></label>
<select name="{{$data.home_user_register_img_verify_state.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_user_register_img_verify_state.error_tips}}" required>
<select name="{{$data.home_user_register_img_verify_state.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_user_register_img_verify_state.error_tips}}" required>
{{foreach $site_img_verify_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_user_register_img_verify_state']['value']) and $data['home_user_register_img_verify_state']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -43,7 +43,7 @@
<div class="am-form-group">
<label>{{$data.common_register_is_enable_audit.name}}<span class="am-form-group-label-tips">{{$data.common_register_is_enable_audit.describe}}</span></label>
<select name="{{$data.common_register_is_enable_audit.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_register_is_enable_audit.error_tips}}" required>
<select name="{{$data.common_register_is_enable_audit.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_register_is_enable_audit.error_tips}}" required>
{{foreach $common_is_text_list as $v}}
<option value="{{$v.id}}" {{if isset($data['common_register_is_enable_audit']['value']) and $data['common_register_is_enable_audit']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
@ -52,7 +52,7 @@
<div class="am-form-group">
<label>{{$data.home_is_enable_userregister_agreement.name}}</label>
<select name="{{$data.home_is_enable_userregister_agreement.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_is_enable_userregister_agreement.error_tips}}" required>
<select name="{{$data.home_is_enable_userregister_agreement.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_is_enable_userregister_agreement.error_tips}}" required>
{{foreach $site_img_verify_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_is_enable_userregister_agreement']['value']) and $data['home_is_enable_userregister_agreement']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

2
application/admin/view/default/site/search.html
View File

@ -11,7 +11,7 @@
<form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'search'])}}" enctype="multipart/form-data">
<div class="am-form-group">
<label>{{$data.home_search_keywords_type.name}}</label>
<select name="{{$data.home_search_keywords_type.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.home_search_keywords_type.error_tips}}">
<select name="{{$data.home_search_keywords_type.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_search_keywords_type.error_tips}}">
{{foreach $common_search_keywords_type_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_search_keywords_type']['value']) and $data['home_search_keywords_type']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}

21
application/admin/view/default/user/index.html
View File

@ -191,6 +191,27 @@
<button class="am-btn am-btn-secondary am-btn-xs am-radius am-icon-edit"> 编辑</button>
</a>
<button class="am-btn am-btn-danger am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:MyUrl('admin/user/delete')}}" data-id="{{$v.id}}"> 删除</button>
<!-- 用户列表操作钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_admin_user_list_operation</span>
</div>
{{/if}}
{{php}}
$hook_name = 'plugins_view_admin_user_list_operation';
$hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]);
if(!empty($hook_data) && is_array($hook_data))
{
foreach($hook_data as $hook)
{
if(is_string($hook) || is_int($hook))
{
echo htmlspecialchars_decode($hook);
}
}
}
{{/php}}
</td>
</tr>
{{/foreach}}

6
application/index/view/default/lib/region_linkage.html
View File

@ -1,12 +1,12 @@
<div class="am-form-group region-linkage" data-url="{{:MyUrl('index/region/index')}}">
<label class="block">省市区</label>
<select name="province" data-next="city" class="am-radius c-p chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" required>
<select name="province" data-next="city" class="am-radius chosen-select" data-placeholder="省份" data-validation-message="请选择省份" data-value="{{if isset($data['province'])}}{{$data.province}}{{else /}}0{{/if}}" required>
<option value="">省份</option>
</select>
<select name="city" data-next="county" class="am-radius c-p chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" required>
<select name="city" data-next="county" class="am-radius chosen-select" data-placeholder="城市" data-validation-message="请选择城市" data-value="{{if isset($data['city'])}}{{$data.city}}{{else /}}0{{/if}}" required>
<option value="">城市</option>
</select>
<select name="county" class="am-radius c-p chosen-select" data-placeholder="区/县" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}" required>
<select name="county" class="am-radius chosen-select" data-placeholder="区/县" data-validation-message="请选择区/县" data-value="{{if isset($data['county'])}}{{$data.county}}{{else /}}0{{/if}}" required>
<option value="">区/县</option>
</select>
</div>

24
application/service/BrandService.php
View File

@ -276,6 +276,27 @@ class BrandService
'checked_data' => '3',
'error_msg' => '顺序 0~255 之间的数值',
],
[
'checked_type' => 'length',
'key_name' => 'seo_title',
'checked_data' => '100',
'is_checked' => 1,
'error_msg' => 'SEO标题格式 最多100个字符',
],
[
'checked_type' => 'length',
'key_name' => 'seo_keywords',
'checked_data' => '130',
'is_checked' => 1,
'error_msg' => 'SEO关键字格式 最多130个字符',
],
[
'checked_type' => 'length',
'key_name' => 'seo_desc',
'checked_data' => '230',
'is_checked' => 1,
'error_msg' => 'SEO描述格式 最多230个字符',
],
];
$ret = ParamsChecked($params, $p);
if($ret !== true)
@ -295,6 +316,9 @@ class BrandService
'website_url' => empty($params['website_url']) ? '' : $params['website_url'],
'sort' => intval($params['sort']),
'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0,
'seo_title' => empty($params['seo_title']) ? '' : $params['seo_title'],
'seo_keywords' => empty($params['seo_keywords']) ? '' : $params['seo_keywords'],
'seo_desc' => empty($params['seo_desc']) ? '' : $params['seo_desc'],
];
if(empty($params['id']))

20
application/service/GoodsService.php
View File

@ -964,6 +964,26 @@ class GoodsService
{
$where[] = ['add_time', '<', strtotime($params['time_end'])];
}
// 商品分类
if(!empty($params['category_id']) && $params['category_id'] > 0)
{
$category_ids = self::GoodsCategoryItemsIds([intval($params['category_id'])], 1);
$goods_ids = Db::name('GoodsCategoryJoin')->where(['category_id'=>$category_ids])->column('goods_id');
if(!empty($goods_ids))
{
$where[] = ['id', 'in', $goods_ids];
} else {
// 避免空条件造成无效的错觉
$where[] = ['id', '=', 0];
}
}
// 品牌
if(!empty($params['brand_id']) && $params['brand_id'] > 0)
{
$where[] = ['brand_id', '=', intval($params['brand_id'])];
}
}
return $where;
}

2
application/service/SearchService.php
View File

@ -128,7 +128,7 @@ class SearchService
// 分页计算
$page = intval(input('page', 1));
$n = 10;
$n = 20;
$m = intval(($page-1)*$n);
$goods = GoodsService::CategoryGoodsList(['where'=>$where, 'm'=>$m, 'n'=>$n, 'order_by'=>$order_by]);
$result['data'] = $goods['data'];

18
application/service/StatisticalService.php
View File

@ -27,6 +27,10 @@ class StatisticalService
private static $nearly_fifteen_days;
private static $nearly_thirty_days;
// 近15天日期
private static $fifteen_time_start;
private static $fifteen_time_end;
// 近7天日期
private static $seven_time_start;
private static $seven_time_end;
@ -56,6 +60,10 @@ class StatisticalService
// 初始化标记对象，避免重复初始化
$object = (object) [];
// 近7天日期
self::$fifteen_time_start = strtotime(date('Y-m-d 00:00:00', strtotime('-15 day')));
self::$fifteen_time_end = time();
// 近7天日期
self::$seven_time_start = strtotime(date('Y-m-d 00:00:00', strtotime('-7 day')));
self::$seven_time_end = time();
@ -87,7 +95,7 @@ class StatisticalService
'name' => date('Y-m-d', time()-$i*3600*24),
];
}
self::${$name} = $date;
self::${$name} = array_reverse($date);
}
}
}
@ -295,7 +303,7 @@ class StatisticalService
$name_arr = [];
if(!empty($status_arr))
{
foreach(self::$nearly_seven_days as $day)
foreach(self::$nearly_fifteen_days as $day)
{
// 当前日期名称
$name_arr[] = $day['name'];
@ -360,7 +368,7 @@ class StatisticalService
$name_arr = [];
if(!empty($pay_name_arr))
{
foreach(self::$nearly_seven_days as $day)
foreach(self::$nearly_fifteen_days as $day)
{
// 当前日期名称
$name_arr[] = date('m-d', strtotime($day['name']));
@ -416,8 +424,8 @@ class StatisticalService
// 获取订单id
$where = [
['status', '<=', 4],
['add_time', '>=', self::$seven_time_start],
['add_time', '<=', self::$seven_time_end],
['add_time', '>=', self::$fifteen_time_start],
['add_time', '<=', self::$fifteen_time_end],
];
$order_ids = Db::name('Order')->where($where)->column('id');

45
application/tags.php
View File

@ -32,18 +32,37 @@ return array (
'log_write' =>
array (
),
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\answers\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
),
'plugins_css' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
),
'plugins_js' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\answers\\Hook',
2 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_service_goods_spec_base' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_view_goods_detail_base_top' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_view_home_floor_top' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
),
'plugins_service_users_center_left_menu_handle' =>
array (
@ -69,5 +88,17 @@ return array (
array (
0 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_buy_order_insert_success' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_order_status_change_history_success_handle' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
),
'plugins_service_user_register_end' =>
array (
0 => 'app\\plugins\\coupon\\Hook',
),
);
?>