Skip to content

Y
yii2_fecshop

OpenDocCN / yii2_fecshop

通知 18
Star 0
Fork 0
Y
yii2_fecshop

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

提交 36131906 编写于 作者: T Terry
浏览文件
操作

update admin theme and other update

上级 4e7af984
隐藏空白更改
内联 并排
Showing with 725 addition and 91 deletion
app/appadmin/modules/AppadminbaseBlock.php
浏览文件 @ 36131906
......@@ -411,9 +411,9 @@ class AppadminbaseBlock extends BaseObject
<li><a class="icon csvdownload" href="'.$csvUrl.'" target="dwzExport" targetType="navTab" title="实要导出这些记录吗?"><span>导出EXCEL</span></a></li>
*/
return '<ul class="toolBar">
<li><a class="add" href="'.$this->_editUrl.'" target="dialog" height="580" width="1000" drawable="true" mask="true"><span>' . Yii::$service->page->translate->__('Add') . '</span></a></li>
<li><a class="add" href="'.$this->_editUrl.'" target="dialog" height="680" width="1200" drawable="true" mask="true"><span>' . Yii::$service->page->translate->__('Add') . '</span></a></li>
<li><a target="dialog" height="580" width="1000" drawable="true" mask="true" class="edit" href="'.$this->_editUrl.'?'.$this->_primaryKey.'={sid_user}" ><span>' . Yii::$service->page->translate->__('Update') . '</span></a></li>
<li><a target="dialog" height="680" width="1200" drawable="true" mask="true" class="edit" href="'.$this->_editUrl.'?'.$this->_primaryKey.'={sid_user}" ><span>' . Yii::$service->page->translate->__('Update') . '</span></a></li>
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to delete these records?') . '" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_deleteUrl.'" class="delete"><span>' . Yii::$service->page->translate->__('Batch Delete') . '</span></a></li>
</ul>';
}
......@@ -586,8 +586,8 @@ class AppadminbaseBlock extends BaseObject
$str .= '<td><span title="'.$display_title.'">'.$val.'</span></td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" >' . Yii::$service->page->translate->__('delete') . '</a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" ><i class="fa fa-trash-o"></i></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/modules/AppadminbaseBlockEdit.php
浏览文件 @ 36131906
......@@ -118,7 +118,7 @@ EOF;
</ul>
</div>
</div>
<div class="tabsContent" style="height:30px;">
<div class="tabsContent" style="">
{$tabLangInput}
</div>
<div class="tabsFooter">
......
app/appadmin/modules/Catalog/block/category/Product.php
浏览文件 @ 36131906
......@@ -81,6 +81,27 @@ class Product extends AppadminbaseBlock implements AppadminbaseBlockInterface
];
}
/**
* list pager, it contains numPerPage , pageNum , totalNum.
*/
public function getToolBar($numCount, $pageNum, $numPerPage)
{
return '<div class="pages">
<span>' . Yii::$service->page->translate->__('Show') . '</span>
<select class="combox" name="numPerPage" onchange="navTabPageBreak({numPerPage:this.value, rel:\"pagerForm2\"})">
<option '.($numPerPage == 2 ? 'selected' : '').' value="2">2</option>
<option '.($numPerPage == 6 ? 'selected' : '').' value="6">6</option>
<option '.($numPerPage == 20 ? 'selected' : '').' value="20">20</option>
<option '.($numPerPage == 50 ? 'selected' : '').' value="50">50</option>
<option '.($numPerPage == 100 ? 'selected' : '').' value="100">100</option>
<option '.($numPerPage == 200 ? 'selected' : '').' value="200">200</option>
</select>
<span>' . Yii::$service->page->translate->__('Line, Total {numCount} Line', ['numCount' => $numCount]) . '</span>
</div>
<div class="pagination" targetType="navTab" totalCount="'.$numCount.'" numPerPage="'.$numPerPage.'" pageNumShown="10" currentPage="'.$pageNum.'"></div>
';
}
/**
* get search bar Arr config.
*/
......
app/appadmin/modules/Catalog/block/productinfo/Imageupload.php
浏览文件 @ 36131906
......@@ -44,17 +44,17 @@ class Imageupload
<td style="width:30px;text-align:center;"><input type="radio" name="image" value="'.$imgSavedRelativePath.'" /></td>
<td style="width:220px;text-align:center;">
<select name="is_thumbnails" class="is_thumbnails">
<option value="1">Yes</option>
<option value="2">No</option>
<option value="1">'.Yii::$service->page->translate->__('Yes').'</option>
<option value="2">'.Yii::$service->page->translate->__('No').'</option>
</select>
</td>
<td style="width:220px;text-align:center;">
<select name="is_detail" class="is_detail">
<option value="1">Yes</option>
<option value="2">No</option>
<option value="1">'.Yii::$service->page->translate->__('Yes').'</option>
<option value="2">'.Yii::$service->page->translate->__('No').'</option>
</select>
</td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)">删除</a></td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)"><i class="fa fa-trash-o"></i></a></td>
</tr>';
}
$index++;
......
app/appadmin/modules/Catalog/block/productinfo/Index.php
浏览文件 @ 36131906
......@@ -347,10 +347,9 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td><span title="'.$display_title.'">'.$val.'</span></td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" >' . Yii::$service->page->translate->__('Delete') . '</a>
<br/>
<a title="' . Yii::$service->page->translate->__('Copy') . '" target="dialog" class="button" mask="true" drawable="true" width="1000" height="580" href="'.$this->_copyUrl.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><span>' . Yii::$service->page->translate->__('Copy') . '</span></a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" ><i class="fa fa-trash-o"></i></a>
<a style="margin:3px 0 0" title="' . Yii::$service->page->translate->__('Copy') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_copyUrl.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><span><i class="fa fa-copy"></i></span></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/modules/Catalog/block/productinfo/Manageredit.php
浏览文件 @ 36131906
......@@ -152,7 +152,7 @@ class Manageredit extends AppadminbaseBlockEdit implements AppadminbaseBlockEdit
$this->_custom_option_list_str .= '<td rel="qty" val="'.$one['qty'].'">'.$one['qty'].'</td>';
$this->_custom_option_list_str .= '<td rel="price" val="'.$one['price'].'">'.$one['price'].'</td>';
$this->_custom_option_list_str .= '<td rel="image" ><img style="width:30px;" rel="'.$one['image'].'" src="'.Yii::$service->product->image->getUrl($one['image']).'"/></td>';
$this->_custom_option_list_str .= '<td><a title="' . Yii::$service->page->translate->__('delete') . '" href="javascript:void(0)" class="btnDel deleteCustomList">' . Yii::$service->page->translate->__('delete') . '</a></td>';
$this->_custom_option_list_str .= '<td><a title="' . Yii::$service->page->translate->__('delete') . '" href="javascript:void(0)" class="btnDel deleteCustomList"><i class="fa fa-trash-o"></i></a></td>';
$this->_custom_option_list_str .= '</tr>';
}
}
......@@ -304,7 +304,7 @@ class Manageredit extends AppadminbaseBlockEdit implements AppadminbaseBlockEdit
</select>
</td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)">' . Yii::$service->page->translate->__('Delete') . '</a></td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)"><i class="fa fa-trash-o"></i></a></td>
</tr>';
}
if (!empty($gallery_image) && is_array($gallery_image)) {
......@@ -329,7 +329,7 @@ class Manageredit extends AppadminbaseBlockEdit implements AppadminbaseBlockEdit
'.$this->getYesNoOptions($is_detail).'
</select>
</td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)">' . Yii::$service->page->translate->__('Delete') . '</a></td>
<td style="padding:0 0 0 20px;"><a class="delete_img btnDel" href="javascript:void(0)"><i class="fa fa-trash-o"></i></a></td>
</tr>';
$i++;
}
......
app/appadmin/modules/Catalog/block/productreview/Index.php
浏览文件 @ 36131906
......@@ -303,9 +303,9 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
}
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '">' . Yii::$service->page->translate->__('Delete') . '</a>
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '"><i class="fa fa-trash-o"></i></a>
</td>';
$str .= '</tr>';
}
......@@ -315,12 +315,12 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
public function getEditBar()
{
return '<ul class="toolBar">
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to review these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_auditUrl.'" class="edit"><span>' . Yii::$service->page->translate->__('Bulk Approved') . '</span></a></li>
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to reject these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_auditRejectedUrl.'" class="edit"><span>' . Yii::$service->page->translate->__('Bulk Not Approved') . '</span></a></li>
<li><a target="dialog" height="580" width="1000" drawable="true" mask="true" class="edit" href="'.$this->_editUrl.'?'.$this->_primaryKey.'={sid_user}" ><span>' . Yii::$service->page->translate->__('Edit') . '</span></a></li>
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to delete these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_deleteUrl.'" class="delete" ><span>' . Yii::$service->page->translate->__('Bulk Delete') . '</span></a></li>
return '<ul class="toolBar">
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to review these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_auditUrl.'" class="edit"><span>' . Yii::$service->page->translate->__('Bulk Approved') . '</span></a></li>
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to reject these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_auditRejectedUrl.'" class="edit"><span>' . Yii::$service->page->translate->__('Bulk Not Approved') . '</span></a></li>
<li><a target="dialog" height="680" width="1200" drawable="true" mask="true" class="edit" href="'.$this->_editUrl.'?'.$this->_primaryKey.'={sid_user}" ><span>' . Yii::$service->page->translate->__('Edit') . '</span></a></li>
<li><a csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" title="' . Yii::$service->page->translate->__('Are you sure you want to delete these reviews in bulk') . '?" target="selectedTodo" rel="'.$this->_primaryKey.'s" postType="string" href="'.$this->_deleteUrl.'" class="delete" ><span>' . Yii::$service->page->translate->__('Bulk Delete') . '</span></a></li>
</ul>';
}
}
app/appadmin/modules/Cms/block/article/Index.php
浏览文件 @ 36131906
......@@ -225,8 +225,8 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" >' . Yii::$service->page->translate->__('Remove') . '</a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" ><i class="fa fa-trash-o"></i></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/modules/Cms/block/staticblock/Index.php
浏览文件 @ 36131906
......@@ -240,8 +240,8 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" >' . Yii::$service->page->translate->__('Remove') . '</a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" ><i class="fa fa-trash-o"></i></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/modules/Sales/block/coupon/Manager.php
浏览文件 @ 36131906
......@@ -266,8 +266,8 @@ class Manager extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" >' . Yii::$service->page->translate->__('Remove') . '</a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<a title="' . Yii::$service->page->translate->__('Remove') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel" csrfName="' .CRequest::getCsrfName(). '" csrfVal="' .CRequest::getCsrfValue(). '" ><i class="fa fa-trash-o"></i></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/modules/Sales/block/orderinfo/Manager.php
浏览文件 @ 36131906
......@@ -286,8 +286,8 @@ class Manager extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >' . Yii::$service->page->translate->__('Edit') . '</a>
<!-- <a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel">' . Yii::$service->page->translate->__('Delete') . '</a>
<a title="' . Yii::$service->page->translate->__('Edit') . '" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
<!-- <a title="' . Yii::$service->page->translate->__('Delete') . '" target="ajaxTodo" href="'.$this->_deleteUrl.'?'.$csrfString.'&'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" class="btnDel"><i class="fa fa-trash-o"></i></a>
-->
</td>';
$str .= '</tr>';
......
app/appadmin/modules/System/block/error/Index.php
浏览文件 @ 36131906
......@@ -229,7 +229,7 @@ class Index extends AppadminbaseBlock implements AppadminbaseBlockInterface
$str .= '<td>'.$val.'</td>';
}
$str .= '<td>
<a title="编辑" target="dialog" class="btnEdit" mask="true" drawable="true" width="1000" height="580" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" >编辑</a>
<a title="编辑" target="dialog" class="btnEdit" mask="true" drawable="true" width="1200" height="680" href="'.$this->_editUrl.'?'.$this->_primaryKey.'='.$one[$this->_primaryKey].'" ><i class="fa fa-pencil"></i></a>
</td>';
$str .= '</tr>';
}
......
app/appadmin/theme/base/default/assets/css/appadmin.css
浏览文件 @ 36131906
......@@ -20,7 +20,7 @@ table.list .hover{
}
.pageFormContent p.edit_p{
margin:3px 0
margin:5px 0 10px;
}
.pageFormContent p.edit_p label{
......@@ -41,3 +41,93 @@ table.list .hover{
font-size: 10px;
}
.pagination li.jumpto{
display:none;
}
.panelBar .pages span{
float: left;
line-height: 26px;
margin: 0px 5px;
}
.dialog .dialogHeader, .dialog .dialogHeader_r,.dialog .dialogHeader_c{
background: #fff
}
.dialog .dialogContent{
background: #fff;
border:none;
}
.tabs .tabsContent, .tabs .tabsFooterContent, .resizable_f_c, .tabs, .tabs .tabsHeader, .tabs .tabsHeaderContent, .tabs .tabsHeader ul, .tabs .tabsHeader li,.tabs .tabsHeader li a , .tabs .tabsHeader li span {
background: #fff;
}
.tabs .tabsHeader li.selected {
border-top: 1px solid #b8d0d6;
border-left: 1px solid #b8d0d6;
border-right: 1px solid #b8d0d6;
border-bottom: none;
}
.tabs .tabsHeader li{
border-top: none;
border-left: none;
border-right: none;
border-bottom: 1px solid #b8d0d6;
}
.tabs .tabsHeader{
border-bottom: 1px solid #b8d0d6;
}
.dialog .formBar{
border:none;
}
.dialog .pageContent{
border:none;
}
table.list thead tr{background:#fff}
.custom_option_list table thead tr th{
background: #fff;
}
.tier_price table tfoot tr td a{
margin:10px 0 0
}
.alert .alertContent, .alert .alertFooter_c, .alert .alertFooter_r, .alert .alertFooter{
background: #fff;
border:none;
}
#alertMsgBox{
border:1px solid #ccc;
}
.category-product-list .panelBar{
width:100%;
}
.fa-trash-o{
cursor:pointer;
}
.dialogBackground{
background:#ddd;
}
fieldset{
padding:3px 5px 10px 3px;
}
.grid .gridCol{
font-weight:100;
}
app/appadmin/theme/base/default/assets/css/bootstrap-appadmin.css 0 → 100644
浏览文件 @ 36131906
#header, #header .headerNav {
background: #fff;
border-color: #fff;
}
#header .logo {
color: #000000;
font-size: 18px;
padding-left: 35px;
z-index: 99;
position: relative;
padding-top: 13px;
}
#header .headerNav a:hover {
color:#575962;
text-decoration: underline;
}
#sidebar {
z-index: 4;
border-top: 1px solid #eee;
padding-top: 20px;
}
#leftside {
padding-top:50px;
border-right: 1px solid #eee;
box-shadow: 6px 1px 20px rgba(69, 65, 78, 0.1);
background: #fff;
}
.accordion .accordionHeader, .accordion .accordionHeader h2, .accordion .accordionHeader h2 span {
background:none;
}
.toggleCollapse {
border: none;
background: none;
height: 40px;
line-height: 40px;
}
.toggleCollapse div {display:none;width: 100px;background: none;text-align: right;margin-right: 15px;}
.accordion {
border: none;
padding-left: 15px;
}
.toggleCollapse h2 {
line-height: 40px;
font-size: 14px;
padding-left: 20px;
line-height: 40px;
}
body {
background: #fff;
}
#container {
background-color: #ffffff;
border: none;
/* border: 1px solid #b8d0d6; */
}
#sidebar_s .collapse {
height: 100%;
}
#sidebar_s .collapse {
border: none;
background: #fff;
}
#splitBar {
background: #dad8d8;
}
.toggleCollapse div .fa {
line-height: 40px;
font-size: 16px;
}
.accordion .accordionHeader h2 {
display: block;
overflow: hidden;
padding: 0 25px 0 5px;
height: 30px;
line-height: 30px;
color: #575962;
}
.accordion .accordionHeader h2 span {
text-indent: 0;
height: 30px;
line-height: 30px;
font-weight: normal;
}
#sidebar_s {
width: 30px;
}
#sidebar_s .toggleCollapse div {
margin-top: 5px;
}
.tree .file {
background: none;
width:5px;
}
.tabsPage .tabsPageHeader, .tabsPage .tabsPageHeader li, .tabsPage .tabsPageHeader li a, .tabsPage .tabsPageHeader li column-span {
background: none;
}
.grid .gridCol {
height: 40px;
line-height: 40px;
background: none;
font-size: 14px;
}
.grid .gridHeader, .grid .gridHeader th {
background: none;
}
.grid .gridHeader th {
border: none;
border-bottom: 2px solid #dee2e6;
border-top: 2px solid #dee2e6;
}
.tabsPage .tabsPageContent {
border: none;
}
td {}
.grid .gridTbody td {
border: none;
border-bottom: solid 1px #ededed;
}
.panelBar {
background: #fff;
border-bottom: none;
/* height: 40px; */
float: left;
padding: 15px 0;
font-size: 14px;
width:50%;
}
.url-rewrite .panelBar {
width:100%;
}
.panelBar .toolBar span, .panelBar .toolBar li.hover span {
background: none;
padding: 0 5px;
line-height: 23px;
border: none;
}
.panelBar .toolBar span .fa {
font-size: 13px;
padding-right: 4px;
}
.combox .select a,.textInput,input.readonly, .textInput, input.focus, input.required, input.error, input.readonly, input.disabled {
line-height: 1.5;
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
padding: .375rem .75rem;
}
.textArea, textarea.readonly, textarea.focus, textarea.required, textarea.error, textarea.readonly, textarea.disabled {
color: #495057;
background-color: #fff;
background-clip: padding-box;
border: 1px solid #ced4da;
border-radius: .25rem;
}
.searchContent input {
width: 100px;
margin-left: 5px;
}
.combox .select a {
padding: 0 22px 0 6px;
line-height: 28px;
height: 27px;
background-position: 99% -48px;
width: auto;
}
.comboxop a {
display: inline-block;
word-break: initial;
width: 100px;
margin: 3px 5px;
padding: 5px;
color: #808080;
}
.comboxop {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.06);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
box-shadow: 0 6px 12px rgba(0,0,0,.175);
}
.comboxop .selected,.comboxop a:hover {
background: #f5f5f5;
color: #2196F3;
border-radius: 3px;
}
.searchBar .subBar ul {
float: left;
}
.searchBar .subBar li {
margin-right: 10px;
margin-left: 0;
}
.button, .buttonActive, .buttonDisabled {
display: inline-block;
font-weight: 400;
text-align: center;
white-space: nowrap;
vertical-align: middle;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
border: 1px solid transparent;
padding: 2px 8px;
font-size: 12px;
line-height: 1.5;
border-radius: .25rem;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
background: #607D8B !important;
color: #ffffff !important;
}
.button, .button span, .buttonDisabled, .buttonDisabled span, .buttonActive, .buttonActive span, .button .buttonContent, .buttonHover, .buttonHover .buttonContent, .buttonActive .buttonContent, .buttonActiveHover, .buttonActiveHover .buttonContent, .buttonDisabled .buttonContent {
background: none;
color: #fff;
}
.buttonActive .buttonContent {
padding: 0;
}
.button span, .buttonDisabled span, .buttonActive span, .button .buttonContent, .buttonHover, .buttonHover .buttonContent, .buttonActive .buttonContent, .buttonDisabled .buttonContent, .button button, .buttonHover button, .buttonActive button, .buttonDisabled button {
color: #fff;
}
.button span {
padding: 0;
}
a.btnAdd, a.btnDel, a.btnView, a.btnEdit, a.btnSelect, a.btnInfo, a.btnAssign, a.btnLook, a.btnAttach {
background: none;
text-indent: 0;
width: 16px;
}
.grid .gridTbody td div a {line-height: 21px;font-size: 14px;}
.page .pageHeader, .formBar {
background: #fff;
border: none;
}
.panelBar .pages {
float: right;
margin-left: 15px;
height: 36px;
margin-top: 0;
}
.pagination {
background: none;
margin-top: 1px;
}
.pagination li.jumpto .goto {
margin-left: 5px;
}
.pagination li.selected a {
color: #2196F3;
}
.pagination a, .pagination li.hover a, .pagination li span {
font-size: 14px;
}
.accountInfo {
background: #f7f8fa;
color: #575962;
padding: 0.85rem 1.5rem;
border-radius: 4px;
margin: 10px 0;
height: auto;
}
.tabsPage .tabsPageHeader li, .tabsPage .tabsPageHeader li a,.tabsPage .tabsPageHeader li span {
height: 40px;
line-height: 40px;
font-size: 14px;
background: none;
}
.tabsPage .tabsPageHeader .home_icon {
background: none;
}
.tabsPage .tabsPageHeader li.main span {
padding: 0;
}
.tabsPage .tabsPageHeaderContent {
height: 40px;
border-bottom: 1px solid #b8d0d6;
}
.tabsPage .tabsPageHeader {
height: 40px;
border: none;
}
div#navTab {
border:none;
}
.tabsPage .tabsPageHeader ul {
height: 40px;
border-top: 1px solid #b8d0d6;
}
.tabsPage .tabsPageHeader li.selected {
border-left: 1px solid #b8d0d6;
border-right: 1px solid #b8d0d6;
position:relative;
}
.tabsPage .tabsPageHeader li.selected:after{content:'';position:absolute;left:0;height: 5px;background: #ffffff;bottom: -4px;z-index: 999;width:100%;}
.tabsPage .tabsPageHeader li:nth-child(1) {
border-left: none;
}
.tabsPage .tabsPageHeader li:nth-last-child(1) {
/* border-right: none; */
}
unitBox {}
.searchContent {
padding-top: 10px;
/* margin-left: -10px; */
}
.page.unitBox {
border-top: 1px solid #b8d0d6;
}
.pages .combox a {
height: 24px;
width: 18px;
}
.searchBar .searchContent td {
padding-right: 15px;
padding-bottom: 5px;
}
#contextmenu ul {
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.06);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
box-shadow: 0 6px 12px rgba(234, 226, 226, 0.175);
}
#contextmenu li {
border-radius: 3px;
height: 24px;
line-height: 24px;
}
#contextmenu li.hover {
border: 1px solid transparent;
background-color: #f5f5f5;
color: #2196F3;
}
.panelBar, .toolBar li.hover, .toolBar li.hover a, .toolBar li.hover span, .toolBar span, .pagination, .pagination li.hover, .pagination li.hover a, .pagination li span, .pagination li.disabled span span, .panelBar .line, .pagination li.jumpto, .pagination li.jumpto .goto{/* background: #fff; */}
.alert .error .alertInner {
border-width: 0;
}
.store_langs{
background: #fff;
height: 20px;
}
select{
background: #fff;
}
app/appadmin/theme/base/default/catalog/category/product.php
浏览文件 @ 36131906
......@@ -33,7 +33,7 @@ use fec\helpers\CRequest;
</div>
</div>
</div>
<div class="pageContent">
<div class="pageContent category-product-list">
<div class="panelBar">
<?= $toolBar; ?>
......
app/appadmin/theme/base/default/catalog/productinfo/manageredit.php
浏览文件 @ 36131906
......@@ -20,9 +20,9 @@ use fecadmin\models\AdminRole;
.dialog .pageContent {background:none;}
.dialog .pageContent .pageFormContent{background:none;}
.edit_p{display:block;height:35px;}
.edit_p label{float:left;line-height: 20px;min-width:110px;}
.edit_p label{float:left;line-height: 20px;min-width:200px;}
.edit_p input{width:700px;}
.tabsContent .tabsContent .edit_p label{min-width:104px;}
.tabsContent .tabsContent .edit_p label{min-width:194px;}
.edit_p .tier_price input{
width:100px;
}
......@@ -214,7 +214,7 @@ function thissubmit(thiss){
</ul>
</div>
</div>
<div class="tabsContent" style="height:450px;overflow:auto;">
<div class="tabsContent" style="height:550px;overflow:auto;">
<div>
<input type="hidden" value="<?= $product_id; ?>" size="30" name="product_id" class="textInput ">
......@@ -253,7 +253,7 @@ function thissubmit(thiss){
<input class="tier_price" type="text" value="<?= $one['price'] ?>">
</td>
<td>
<img src="<?= \Yii::$service->image->getImgUrl('/images/bkg_btn-close2.gif') ?>">
<i class="fa fa-trash-o"></i>
</td>
</tr>
<?php } ?>
......@@ -273,13 +273,13 @@ function thissubmit(thiss){
$(document).ready(function(){
$(".addProductTierPrice").click(function(){
str = "<tr>";
str +="<td><input class=\"tier_qty\" type=\"text\" /> <?= Yii::$service->page->translate->__('And Above') ?> </td>";
str +="<td><input class=\"tier_price\" type=\"text\" /></td>";
str +="<td><img src=\"<?= \Yii::$service->image->getImgUrl('/images/bkg_btn-close2.gif') ?>\" /></td>";
str +="<td><input class=\"tier_qty textInput \" type=\"text\" /> <?= Yii::$service->page->translate->__('And Above') ?> </td>";
str +="<td><input class=\"tier_price textInput\" type=\"text\" /></td>";
str +="<td><i class='fa fa-trash-o'></i></td>";
str +="</tr>";
$(".tier_price table tbody").append(str);
});
$(".dialog").off("click").on("click",".tier_price table tbody tr td img",function(){
$(".dialog").off("click").on("click",".tier_price table tbody tr td .fa-trash-o",function(){
$(this).parent().parent().remove();
});
......@@ -467,8 +467,8 @@ function thissubmit(thiss){
alert("<?= Yii::$service->page->translate->__('you must chose a image'); ?>");
}
$str += '<td rel="image"><img style="width:30px;" rel="'+chosened_img_rel+'" src="'+chosened_img_src+'"/></td>';
$str += '<td><a title="<?= Yii::$service->page->translate->__('Delete') ?>" href="javascript:void(0)" class="btnDel deleteCustomList"><?= Yii::$service->page->translate->__('Delete') ?></a></td>'
//检查这个sku是否已经存在
$str += '<td><a title="<?= Yii::$service->page->translate->__('Delete') ?>" href="javascript:void(0)" class="btnDel deleteCustomList"><i class="fa fa-trash-o"></i></a></td>'
// 检查这个sku是否已经存在
$(".custom_option_sku").each(function(){
sku = $(this).html();
if(sku == custom_option_sku){
......
app/appadmin/theme/base/default/catalog/urlrewrite/index.php
浏览文件 @ 36131906
......@@ -24,7 +24,7 @@ use fec\helpers\CRequest;
</div>
</form>
</div>
<div class="pageContent">
<div class="pageContent url-rewrite">
<div class="panelBar">
<?= $toolBar; ?>
......
app/appadmin/theme/base/default/layouts/dashboard.php
浏览文件 @ 36131906
......@@ -69,6 +69,7 @@ $cssOptions = [
[
'css' =>[
'css/appadmin.css',
'css/bootstrap-appadmin.css',
],
// 将css放到最后面
'options' => [
......@@ -79,6 +80,7 @@ $cssOptions = [
\Yii::$service->page->asset->jsOptions = \yii\helpers\ArrayHelper::merge($jsOptions, \Yii::$service->page->asset->jsOptions);
\Yii::$service->page->asset->cssOptions = \yii\helpers\ArrayHelper::merge($cssOptions, \Yii::$service->page->asset->cssOptions);
\Yii::$service->page->asset->register($this);
$logoPath = $this->assetManager->publish('@fecshop/app/appadmin/theme/base/default/assets/images/blue_logo.png');
?>
<?php $this->beginPage() ?>
......@@ -90,7 +92,8 @@ $cssOptions = [
<?= Html::csrfMetaTags() ?>
<title><?= $this->title ? Html::encode($this->title) : Yii::$service->page->translate->__('Fecshop Admin Manager System') ?></title>
<?php $this->head() ?>
<link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" >
<?php $this->head() ?>
<script>
　$(function(){
......@@ -115,8 +118,9 @@ $cssOptions = [
<div id="layout">
<div id="header">
<div class="headerNav">
<a target="_blank" class="logo" href="http://www.fecshop.com">FECSHOP</a>
<a target="_blank" class="logo" href="http://www.fecshop.com">
<img style="height:30px;" src="<?= Yii::getAlias($logoPath[1]); ?>" alt="Fecshop" />
</a>
<?php $currentLangCode = Yii::$service->admin->getCurrentLangCode() ?>
<?php $langArr = Yii::$service->admin->getLangArr() ?>
<select class="store_langs" style="font-size:10px;">
......@@ -126,7 +130,7 @@ $cssOptions = [
</option>
<?php endforeach; ?>
</select>
<a style="color:#fff; display: block; height: 21px;position: absolute; right: 10px;top: 18px;z-index: 31;"
<a style="color:#777; display: block; height: 21px;position: absolute; right: 10px;top: 18px;z-index: 31;"
doPost
href='javascript:doPost("<?= Yii::$service->url->getUrl("fecadmin/logout") ?>", {"<?= CRequest::getCsrfName() ?>": "<?= CRequest::getCsrfValue() ?>", "islogout": "1"}) '>
<?= Yii::$service->page->translate->__('Logout'); ?>
......@@ -140,7 +144,10 @@ $cssOptions = [
</div>
</div>
<div id="sidebar">
<div class="toggleCollapse"><h2><?= Yii::$service->page->translate->__('Main Menu'); ?></h2><div><?= Yii::$service->page->translate->__('Pull Back'); ?></div></div>
<div class="toggleCollapse">
<h2><?= Yii::$service->page->translate->__('Main Menu'); ?></h2>
<div><i class=”fa fa-list”></i></div>
</div>
<div class="accordion" fillSpace="sidebar">
<?= Yii::$service->admin->menu->getLeftMenuHtml(); ?>
......@@ -201,7 +208,7 @@ $cssOptions = [
<footer class="footer">
<div class="container">
<div style="position:absolute;z-index: 99999;" id="footer">
© 2015-2018
© 2015-2019
<a style="text-decoration:none" href="http://www.fecshop.com" target="_blank">
<?= Yii::$service->page->translate->__('Fecshop Team'); ?> - www.fecshop.com
</a>
......
app/appadmin/theme/base/default/layouts/login.php
浏览文件 @ 36131906
......@@ -20,7 +20,7 @@ LoginAsset::register($this);
?>
<?php
$login_logoPath = $this->assetManager->publish('@fecadmin/myassets/dwz_jui-master/themes/default/images/login_logo.gif');
$logoPath = $this->assetManager->publish('@fecshop/app/appadmin/theme/base/default/assets/images/blue_logo.png');
$login_titlePath = $this->assetManager->publish('@fecadmin/myassets/dwz_jui-master/themes/default/images/login_title.png');
$header_bgPath = $this->assetManager->publish('@fecadmin/myassets/dwz_jui-master/themes/default/images/header_bg.png');
$login_bannerPath = $this->assetManager->publish('@fecadmin/myassets/dwz_jui-master/themes/default/images/login_banner.jpg');
......@@ -50,9 +50,10 @@ $login_bannerPath = $this->assetManager->publish('@fecadmin/myassets/dwz_jui-mas
<div id="login">
<div id="login_header">
<h1 class="login_logo">
<!-- <img src="<?= $login_logoPath[1] ?>" /> -->
<a href="<?= Yii::$app->getHomeUrl() ?>" style="font-size:35px;text-decoration:none;
color:#6f8992;"><img src="<?= CUrl::getHomeUrl(); ?>/skin/default/images/blue_logo.png"></a>
color:#6f8992;">
<img alt="Fecshop" src="<?= Yii::getAlias($logoPath[1]); ?>">
</a>
</h1>
<div class="login_headerContent">
<div class="navList">
......
app/appfront/config/modules/Customer.php
浏览文件 @ 36131906
......@@ -17,6 +17,8 @@ return [
* 模块内部的params配置。
*/
'params'=> [
'login_breadcrumbs' => true,
'register_breadcrumbs' => true,
'register' => [
// 账号注册成功后，是否自动登录
'successAutoLogin' => true,
......
app/appfront/modules/Customer/block/account/Login.php
浏览文件 @ 36131906
......@@ -23,7 +23,7 @@ class Login
$loginParam = \Yii::$app->getModule('customer')->params['login'];
$loginPageCaptcha = isset($loginParam['loginPageCaptcha']) ? $loginParam['loginPageCaptcha'] : false;
$email = isset($param['email']) ? $param['email'] : '';
$this->breadcrumbs(Yii::$service->page->translate->__('Login'));
return [
'loginPageCaptcha' => $loginPageCaptcha,
'email' => $email,
......@@ -32,6 +32,16 @@ class Login
];
}
// 面包屑导航
protected function breadcrumbs($name)
{
if (Yii::$app->controller->module->params['login_breadcrumbs']) {
Yii::$service->page->breadcrumbs->addItems(['name' => $name]);
} else {
Yii::$service->page->breadcrumbs->active = false;
}
}
public function login($param)
{
$captcha = $param['captcha'];
......
app/appfront/modules/Customer/block/account/Register.php
浏览文件 @ 36131906
......@@ -25,7 +25,7 @@ class Register
$email = isset($param['email']) ? $param['email'] : '';
$registerParam = \Yii::$app->getModule('customer')->params['register'];
$registerPageCaptcha = isset($registerParam['registerPageCaptcha']) ? $registerParam['registerPageCaptcha'] : false;
$this->breadcrumbs(Yii::$service->page->translate->__('Register'));
return [
'firstname' => $firstname,
'lastname' => $lastname,
......@@ -37,6 +37,15 @@ class Register
'registerPageCaptcha' => $registerPageCaptcha,
];
}
// 面包屑导航
protected function breadcrumbs($name)
{
if (Yii::$app->controller->module->params['register_breadcrumbs']) {
Yii::$service->page->breadcrumbs->addItems(['name' => $name]);
} else {
Yii::$service->page->breadcrumbs->active = false;
}
}
public function register($param)
{
......
app/appfront/modules/Customer/block/address/Edit.php
浏览文件 @ 36131906
......@@ -117,7 +117,7 @@ class Edit
if (!$stateHtml) {
$stateHtml = '<input id="state" name="address[state]" value="'.$state.'" title="State" class="input-text" style="" type="text">';
} else {
$stateHtml = '<select id="address:state" class="address_state validate-select" title="State" name="address[state]">
$stateHtml = '<select id="address:state" class="address_state validate-select" title="State" name="address[state]">
<option value="">Please select region, state or province</option>'
.$stateHtml.'</select>';
}
......
app/appfront/modules/Customer/block/address/Index.php
浏览文件 @ 36131906
......@@ -17,6 +17,11 @@ use Yii;
*/
class Index
{
protected $numPerPage = 10;
protected $pageNum;
protected $orderBy;
protected $_page = 'p';
public function getLastData()
{
$method = Yii::$app->request->post('method');
......@@ -24,9 +29,13 @@ class Index
if ($method == 'remove' && $address_id) {
$this->removeAddressById($address_id);
}
$this->pageNum = (int) Yii::$app->request->get($this->_page);
$this->pageNum = ($this->pageNum >= 1) ? $this->pageNum : 1;
$this->orderBy = ['updated_at' => SORT_DESC];
$data = $this->coll();
return [
'coll' => $this->coll(),
'coll' => $data['coll'],
'pageToolBar' => $data['pageToolBar'],
];
}
......@@ -35,18 +44,39 @@ class Index
$identity = Yii::$app->user->identity;
$customer_id = $identity['id'];
$filter = [
'numPerPage' => 100,
'pageNum' => 1,
'orderBy' => ['updated_at' => SORT_DESC],
'where' => [
['customer_id' => $customer_id],
],
'numPerPage' => $this->numPerPage,
'pageNum' => $this->pageNum,
'orderBy' => $this->orderBy,
'where' => [
['customer_id' => $customer_id],
],
'asArray' => true,
];
];
$coll = Yii::$service->customer->address->coll($filter);
if (isset($coll['coll']) && !empty($coll['coll'])) {
return $coll['coll'];
$count = $coll['count'];
$pageToolBar = $this->getAddressPage($count);
$coll['pageToolBar'] = $pageToolBar;
return $coll;
}
}
protected function getAddressPage($countTotal)
{
if ($countTotal <= $this->numPerPage) {
return '';
}
$config = [
'class' => 'fecshop\app\appfront\widgets\Page',
'view' => 'widgets/page.php',
'pageNum' => $this->pageNum,
'numPerPage' => $this->numPerPage,
'countTotal' => $countTotal,
'page' => $this->_page,
];
return Yii::$service->page->widget->renderContent('category_product_page', $config);
}
public function removeAddressById($address_id)
......
app/appfront/modules/Customer/block/productfavorite/Index.php
浏览文件 @ 36131906
......@@ -18,7 +18,7 @@ use Yii;
class Index
{
public $pageNum;
public $numPerPage = 20;
public $numPerPage = 10;
public $_page = 'p';
public function initFavoriteParam()
......
app/appfront/modules/Customer/block/productreview/Index.php
浏览文件 @ 36131906
......@@ -18,7 +18,7 @@ use Yii;
class Index
{
public $pageNum;
public $numPerPage = 20;
public $numPerPage = 10;
public $_page = 'p';
public function getLastData()
......
app/appfront/theme/base/front/customer/account/forgotpasswordsubmit.php
浏览文件 @ 36131906
......@@ -27,7 +27,7 @@
<?php
$param = ['logUrlB' => '<a href="'. $forgotPasswordUrl.' ">','logUrlE' => '</a> '];
?>
<?= Yii::$service->page->translate->__('Email address do not exist, please {logUrlB} click here {logUrlE} to re-enter!',$param); ?>
<?= Yii::$service->page->translate->__('Email address do not exist, please {logUrlB} click here {logUrlE} to re-enter!',$param); ?>
</div>
<div>
<?php endif; ?>
......
config/services/Admin.php
浏览文件 @ 36131906
......@@ -74,12 +74,7 @@ return [
'label' => 'Product Reveiew',
'url_key' => '/catalog/productreview/index',
],
// 三级类
'product_search_manager' => [
'label' => 'Product Search',
'url_key' => '/catalog/productsearch/index',
],
'product_favorite_manager' => [
'label' => 'Product Favorite',
'url_key' => '/catalog/productfavorite/index',
......
config/services/FecshopLang.php
浏览文件 @ 36131906
......@@ -18,16 +18,16 @@ return [
],
'de_DE' => [
'code' => 'de',
],,
],
'es_ES' => [
'code' => 'es',
],,
],
'ru_RU' => [
'code' => 'ru',
],,
],
'pt_PT' => [
'code' => 'pt',
],,
],
'zh_CN' => [
'code' => 'zh',
],
......
services/Admin.php
浏览文件 @ 36131906
......@@ -130,8 +130,8 @@ class Admin extends Service
}
public function setCurrentLangCode($code){
$allLangCode = Yii::$service->fecshoplang->getAllLangCode();
if (in_array($code, $allLangCode)) {
$adminLangCode = Yii::$service->fecshoplang->getAdminLangCode();
if (in_array($code, $adminLangCode)) {
Yii::$service->session->set(self::ADMIN_CURRENT_LANG_CODE, $code);
$this->_currentLangCode = $code;
if ($this->setTranslateLang($code)) {
......@@ -156,10 +156,10 @@ class Admin extends Service
public function getLangArr(){
$arr = [];
$allLangCode = Yii::$service->fecshoplang->allLangCode;
$adminLangCode = Yii::$service->fecshoplang->adminLangCode;
if (is_array($allLangCode)) {
foreach ($allLangCode as $one) {
if (is_array($adminLangCode)) {
foreach ($adminLangCode as $one) {
$arr[$one['code']] = $one['name'];
}
}
......
services/FecshopLang.php
浏览文件 @ 36131906
......@@ -23,13 +23,14 @@ class Fecshoplang extends Service
* all languages.
*/
public $allLangCode;
public $adminLangCode;
/**
* default language.
*/
public $defaultLangCode;
protected $_allLangCode;
protected $_adminLangCode;
/**
* @param $attrName|string , attr name ,like : tilte , description ,name etc..
......@@ -50,6 +51,29 @@ class Fecshoplang extends Service
return $attrName.'_'.$this->defaultLangCode;
}
protected function actionGetAdminLangCode()
{
if (!$this->_adminLangCode) {
if (empty($this->adminLangCode) || !is_array($this->adminLangCode)) {
return [];
}
if ($this->defaultLangCode) {
$this->_adminLangCode[] = $this->defaultLangCode;
foreach ($this->adminLangCode as $codeInfo) {
$code = $codeInfo['code'];
if ($this->defaultLangCode != $code) {
$this->_adminLangCode[] = $code;
}
}
}
}
return $this->_adminLangCode;
}
/**
* 得到所有的语言简码，譬如：en,es,fr,zh,de等
*/
......
services/Store.php
浏览文件 @ 36131906
......@@ -311,3 +311,4 @@ class Store extends Service
return $topLang;
}
}
services/helper/Appserver.php
浏览文件 @ 36131906
......@@ -230,8 +230,8 @@ class Appserver extends Service
}
$corsFilterArr[] = 'Access-Control-Allow-Credentials: true';
}
return $corsFilterArr;
return $corsFilterArr;
}
/**
* @param int $code 状态码
......
services/page/Translate.php
浏览文件 @ 36131906
......@@ -60,7 +60,6 @@ class Translate extends Service
*/
protected function actionSetLanguage($language)
{
$language = str_replace('_', '-', $language);
Yii::$app->language = $language;
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或