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

细节优化

feat/task1-c-wallet
devil 2020-08-13 18:49:46 +08:00
parent c95e75e082
commit baa079664c
11 changed files with 116 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/view/default/public/module/form.html
View File

@ -47,13 +47,13 @@
{{if !empty($form_table) and !empty($form_table['base']) and !empty($form_table['form']) and is_array($form_table['base']) and is_array($form_table['form'])}}
<form class="form-validation-search" method="post" action="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" request-type="jump" request-value="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}">
<!-- nav start -->
<div class="am-g form-table-navigation">
<div class="form-table-navigation">
{{block name="form_navigation"}}{{/block}}
</div>
<!-- nav end -->
<!-- top operate start -->
<div class="am-g form-table-operate-top">
<div class="form-table-operate-top">
{{block name="form_operate_top"}}
{{include file="public/module/form_operate_top" /}}
{{/block}}
@ -65,7 +65,7 @@
<!-- form table end -->
<!-- bottom operate start -->
<div class="am-g am-margin-top-sm form-table-operate-bottom">
<div class="am-margin-top-sm form-table-operate-bottom">
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}

20
application/index/controller/Common.php
View File

@ -296,14 +296,14 @@ class Common extends Controller
$this->assign('default_theme', $default_theme);
// 当前操作名称, 兼容插件模块名称
$module_name = strtolower(request()->module());
$controller_name = strtolower(request()->controller());
$action_name = strtolower(request()->action());
$this->module_name = strtolower(request()->module());
$this->controller_name = strtolower(request()->controller());
$this->action_name = strtolower(request()->action());
// 当前操作名称
$this->assign('module_name', $module_name);
$this->assign('controller_name', $controller_name);
$this->assign('action_name', $action_name);
$this->assign('module_name', $this->module_name);
$this->assign('controller_name', $this->controller_name);
$this->assign('action_name', $this->action_name);
// 分页信息
$this->page = max(1, isset($this->data_request['page']) ? intval($this->data_request['page']) : 1);
@ -312,12 +312,12 @@ class Common extends Controller
$this->assign('page_size', $this->page_size);
// 控制器静态文件状态css,js
$module_css = $module_name.DS.$default_theme.DS.'css'.DS.$controller_name;
$module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$action_name.'.css') ? '.'.$action_name.'.css' : '.css';
$module_css = $this->module_name.DS.$default_theme.DS.'css'.DS.$this->controller_name;
$module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$this->action_name.'.css') ? '.'.$this->action_name.'.css' : '.css';
$this->assign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : '');
$module_js = $module_name.DS.$default_theme.DS.'js'.DS.$controller_name;
$module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$action_name.'.js') ? '.'.$action_name.'.js' : '.js';
$module_js = $this->module_name.DS.$default_theme.DS.'js'.DS.$this->controller_name;
$module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$this->action_name.'.js') ? '.'.$this->action_name.'.js' : '.js';
$this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '');
// 导航

8
application/index/view/default/lib/module/category_brand.html Normal file
View File

@ -0,0 +1,8 @@
<!-- 分类下品牌 -->
{{if !empty($module_data['data']) && !empty($module_data['form_name_key'])}}
<select class="am-radius chosen-select" multiple name="{{$module_data.form_name_key}}" data-placeholder="品牌...">
{{foreach $module_data.data as $v}}
<option value="{{$v.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($v['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
{{/if}}

18
application/index/view/default/lib/module/goods_category.html Normal file
View File

@ -0,0 +1,18 @@
<!-- 商品分类 -->
{{if !empty($module_data['data']) && !empty($module_data['form_name_key'])}}
<select class="am-radius chosen-select" multiple name="{{$module_data.form_name_key}}" data-placeholder="商品分类...">
{{foreach $module_data.data as $v}}
<option value="{{$v.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($v['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$v.name}}</option>
{{if !empty($v['items'])}}
{{foreach $v.items as $vs}}
<option style="padding-left: 15px;" value="{{$vs.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vs['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$vs.name}}</option>
{{if !empty($vs['items'])}}
{{foreach $vs.items as $vss}}
<option style="padding-left: 30px;" value="{{$vss.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($vss['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$vss.name}}</option>
{{/foreach}}
{{/if}}
{{/foreach}}
{{/if}}
{{/foreach}}
</select>
{{/if}}

46
application/index/view/default/public/module/bare_form.html Normal file
View File

@ -0,0 +1,46 @@
<div class="form-table-content">
<!-- form -->
{{if !empty($form_table) and !empty($form_table['base']) and !empty($form_table['form']) and is_array($form_table['base']) and is_array($form_table['form'])}}
<form class="form-validation-search" method="post" action="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" request-type="jump" request-value="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}">
<!-- nav start -->
<div class="form-table-navigation">
{{block name="form_navigation"}}{{/block}}
</div>
<!-- nav end -->
<!-- top operate start -->
<div class="form-table-operate-top">
{{block name="form_operate_top"}}
{{include file="public/module/form_operate_top" /}}
{{/block}}
</div>
<!-- top operate end -->
<!-- form table start -->
{{include file="public/module/form_table" /}}
<!-- form table end -->
<!-- bottom operate start -->
<div class="am-margin-top-sm form-table-operate-bottom">
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}
</div>
<!-- bottom operate end -->
</form>
{{else /}}
<div class="table-no"><i class="am-icon-warning"></i> {{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}</div>
{{/if}}
<!-- page start -->
{{block name="form_page"}}
{{if !empty($data_list) and isset($page_html)}}
{{$page_html|raw}}
{{/if}}
{{/block}}
<!-- page end -->
<!-- extend start -->
{{block name="form_extend"}}{{/block}}
<!-- extend end -->
</div>

6
application/index/view/default/public/module/form.html
View File

@ -60,13 +60,13 @@
{{if !empty($form_table) and !empty($form_table['base']) and !empty($form_table['form']) and is_array($form_table['base']) and is_array($form_table['form'])}}
<form class="form-validation-search" method="post" action="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" request-type="jump" request-value="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}">
<!-- nav start -->
<div class="am-g form-table-navigation">
<div class="form-table-navigation">
{{block name="form_navigation"}}{{/block}}
</div>
<!-- nav end -->
<!-- top operate start -->
<div class="am-g form-table-operate-top">
<div class="form-table-operate-top">
{{block name="form_operate_top"}}
{{include file="public/module/form_operate_top" /}}
{{/block}}
@ -78,7 +78,7 @@
<!-- form table end -->
<!-- bottom operate start -->
<div class="am-g am-margin-top-sm form-table-operate-bottom">
<div class="am-margin-top-sm form-table-operate-bottom">
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}

6
application/index/view/default/public/module/user_form.html
View File

@ -68,13 +68,13 @@
{{if !empty($form_table) and !empty($form_table['base']) and !empty($form_table['form']) and is_array($form_table['base']) and is_array($form_table['form'])}}
<form class="form-validation-search" method="post" action="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}" request-type="jump" request-value="{{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1 and !empty($form_table['base']['search_url'])}}{{$form_table.base.search_url}}{{/if}}">
<!-- nav start -->
<div class="am-g form-table-navigation">
<div class="form-table-navigation">
{{block name="form_navigation"}}{{/block}}
</div>
<!-- nav end -->
<!-- top operate start -->
<div class="am-g form-table-operate-top">
<div class="form-table-operate-top">
{{block name="form_operate_top"}}
{{include file="public/module/form_operate_top" /}}
{{/block}}
@ -86,7 +86,7 @@
<!-- form table end -->
<!-- bottom operate start -->
<div class="am-g am-margin-top-sm form-table-operate-bottom">
<div class="am-margin-top-sm form-table-operate-bottom">
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}

34
application/tags.php
View File

@ -41,6 +41,17 @@ return array (
'plugins_service_order_pay_launch_handle' =>
array (
0 => 'app\\plugins\\neworderemail\\Hook',
1 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_admin_js' =>
array (
0 => 'app\\plugins\\orderremind\\Hook',
1 => 'app\\plugins\\orderpricerevision\\Hook',
),
'plugins_admin_view_common_bottom' =>
array (
0 => 'app\\plugins\\orderremind\\Hook',
1 => 'app\\plugins\\orderpricerevision\\Hook',
),
'plugins_css' =>
array (
@ -120,20 +131,23 @@ return array (
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\coupon\\Hook',
2 => 'app\\plugins\\membershiplevelvip\\Hook',
3 => 'app\\plugins\\weixinliveplayer\\Hook',
4 => 'app\\plugins\\answers\\Hook',
1 => 'app\\plugins\\speedplaceorder\\Hook',
2 => 'app\\plugins\\coupon\\Hook',
3 => 'app\\plugins\\membershiplevelvip\\Hook',
4 => 'app\\plugins\\weixinliveplayer\\Hook',
5 => 'app\\plugins\\answers\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\membershiplevelvip\\Hook',
2 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_goods_spec_base' =>
array (
0 => 'app\\plugins\\limitedtimediscount\\Hook',
1 => 'app\\plugins\\membershiplevelvip\\Hook',
2 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_view_goods_detail_base_top' =>
array (
@ -191,14 +205,6 @@ return array (
array (
0 => 'app\\plugins\\orderpricerevision\\Hook',
),
'plugins_admin_js' =>
array (
0 => 'app\\plugins\\orderpricerevision\\Hook',
),
'plugins_admin_view_common_bottom' =>
array (
0 => 'app\\plugins\\orderpricerevision\\Hook',
),
'plugins_view_admin_order_list_operate' =>
array (
0 => 'app\\plugins\\orderpricerevision\\Hook',
@ -212,5 +218,9 @@ return array (
array (
0 => 'app\\plugins\\userloginrewardintegral\\Hook',
),
'plugins_service_buy_order_insert_begin' =>
array (
0 => 'app\\plugins\\ordersubmitlimit\\Hook',
),
);
?>

2
config/shopxo.php
View File

@ -15,7 +15,7 @@
return [
// 开发模式
'is_develop' => true,
'is_develop' => false,
// 默认编码
'default_charset' => 'utf-8',

1
public/static/admin/default/css/common.css
View File

@ -401,6 +401,7 @@ ul {margin-top:0;}
.admin-sidebar-list li:first-child {border-top:none;}
.admin-sidebar-sub {margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#646464;padding-left:10px;}
.admin-sidebar-sub li:first-child {border-top:1px solid #dedede;}
.admin-sidebar-sub li { background: #404246 !important; border-color: #393b3e !important ; }
.admin-sidebar {height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch;}
.admin-sidebar .am-icon-angle-down {margin-top: 2px;}
@media only screen and (min-width:641px) {

2
public/static/admin/default/js/warehousegoods.js
View File

@ -117,7 +117,7 @@ $(function()
{
$parent.find('.am-gallery').addClass('am-avg-lg-5').removeClass('am-avg-lg-8');
} else {
$parent.find('.am-gallery').addClass('am-avg-lg-8').removeClass('am-avg-lg-6');
$parent.find('.am-gallery').addClass('am-avg-lg-8').removeClass('am-avg-lg-5');
}
}
});