Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhongyh 2019-12-17 17:56:35 +08:00
commit b21bd89ad0
32 changed files with 2498 additions and 10615 deletions

View File

@ -204,11 +204,9 @@ public class CategoryAction extends BaseAction{
@LogAnn(title = "删除分类", businessType = BusinessTypeEnum.DELETE)
@RequiresPermissions("cms:category:del")
public ResultData delete(@RequestBody List<CategoryEntity> categorys,HttpServletResponse response, HttpServletRequest request) {
int[] ids = new int[categorys.size()];
for(int i = 0;i<categorys.size();i++){
ids[i] =Integer.parseInt(categorys.get(i).getId()) ;
categoryBiz.delete(Integer.parseInt(categorys.get(i).getId()));
}
categoryBiz.delete(ids);
return ResultData.build().success();
}
/**
@ -265,6 +263,16 @@ public class CategoryAction extends BaseAction{
if(!StringUtil.checkLength(category.getCategoryParentId()+"", 0, 100)){
return ResultData.build().error(getResString("err.length", this.getResString("category.parent.id"), "1", "100"));
}
//判断是否选择子级为所属栏目
CategoryEntity _category = new CategoryEntity();
_category.setCategoryParentId(category.getId());
_category.setAppId(BasicUtil.getAppId());
List<CategoryEntity> categoryList = categoryBiz.queryChilds(_category);
for(CategoryEntity item:categoryList){
if(item.getId().equals(category.getCategoryId())){
return ResultData.build().error(getResString("cannot.select.child"));
}
}
category.setAppId(BasicUtil.getAppId());
categoryBiz.updateEntity(category);
return ResultData.build().success(category);

View File

@ -21,7 +21,9 @@ public interface ICategoryBiz extends IBaseBiz {
*/
List<CategoryEntity> queryChilds(CategoryEntity category);
int saveEntity(CategoryEntity entity);
void saveEntity(CategoryEntity entity);
void updateEntity(CategoryEntity entity);
void delete(int categoryId);
}

View File

@ -62,10 +62,19 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
return categoryDao.queryChildren(category);
}
@Override
public int saveEntity(CategoryEntity categoryEntity) {
public void saveEntity(CategoryEntity categoryEntity) {
// TODO Auto-generated method stub
setParentId(categoryEntity);
return super.saveEntity(categoryEntity);
super.saveEntity(categoryEntity);
//保存链接地址
String path=ObjectUtil.isNotNull(categoryEntity.getCategoryParentId())?categoryEntity.getCategoryParentId():"";
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
categoryEntity.setCategoryPath("/" + path.replaceAll(",", "/") + "/" + categoryEntity.getId());
} else {
categoryEntity.setCategoryPath("/" + categoryEntity.getId());
}
super.updateEntity(categoryEntity);
}
private void setParentId(CategoryEntity categoryEntity) {
@ -79,8 +88,16 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
}else {
categoryEntity.setCategoryParentId(null);
}
String path=ObjectUtil.isNotNull(categoryEntity.getCategoryParentId())?categoryEntity.getCategoryParentId():"";
categoryEntity.setCategoryPath("/"+path.replaceAll(",","/")+"/"+categoryEntity.getId());
//保存时先保存再修改链接地址修改时直接修改
if(StringUtils.isNotBlank(categoryEntity.getId())) {
String path = ObjectUtil.isNotNull(categoryEntity.getCategoryParentId()) ? categoryEntity.getCategoryParentId() : "";
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
categoryEntity.setCategoryPath("/" + path.replaceAll(",", "/") + "/" + categoryEntity.getId());
} else {
categoryEntity.setCategoryPath("/" + categoryEntity.getId());
}
}
}
private void setChildParentId(CategoryEntity categoryEntity) {
@ -94,7 +111,12 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
x.setCategoryParentId(categoryEntity.getCategoryParentId()+","+categoryEntity.getId());
}
String path=ObjectUtil.isNotNull(x.getCategoryParentId())?x.getCategoryParentId():"";
x.setCategoryPath("/"+path.replaceAll(",","/")+"/"+x.getId());
//判断是否有parentIds
if(StringUtils.isNotBlank(path)){
x.setCategoryPath("/"+path.replaceAll(",","/")+"/"+x.getId());
} else {
x.setCategoryPath("/"+x.getId());
}
super.updateEntity(x);
setChildParentId(x);
});
@ -106,4 +128,22 @@ public class CategoryBizImpl extends BaseBizImpl implements ICategoryBiz {
super.updateEntity(entity);
setChildParentId(entity);
}
@Override
public void delete(int categoryId) {
// TODO Auto-generated method stub
CategoryEntity category = (CategoryEntity) categoryDao.getEntity(categoryId);
//删除父类
if(category != null){
category.setCategoryParentId(null);
List<CategoryEntity> childrenList = categoryDao.queryChildren(category);
int[] ids = new int[childrenList.size()];
for(int i = 0; i < childrenList.size(); i++){
//删除子类
ids[i] = Integer.parseInt(childrenList.get(i).getId());
}
categoryDao.delete(ids);
deleteEntity(categoryId);
}
}
}

View File

@ -38,7 +38,13 @@
gutter="0"
justify="start" align="top">
<el-col span="12">
<el-form-item label="栏目管理属性" prop="categoryType">
<el-form-item prop="categoryType">
<template slot='label'>栏目类型
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
列表:常用于带列表、详情的业务,例如:新闻列表、图片列表<br>封面:常用单篇文章显示,例如:关于我们、公司介绍
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-radio-group v-model="form.categoryType"
:style="{width: ''}"
:disabled="false">
@ -63,7 +69,7 @@
gutter="0"
justify="start" align="top">
<el-col span="12">
<el-form-item :label="form.categoryType =='1'? '内容模板' : '封面模板'" prop="categoryUrl">
<el-form-item prop="categoryUrl" :label="form.categoryType =='1'? '内容模板' : '封面模板'">
<el-select v-model="form.categoryUrl"
:style="{width: '100%'}"
:filterable="false"
@ -76,7 +82,12 @@
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="列表模板" prop="categoryListUrl" v-if="form.categoryType == '1'">
<el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
<template slot='label'>列表模板
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" content="当栏目类型为列表时有效">
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-select v-model="form.categoryListUrl"
:style="{width: '100%'}"
:filterable="false"
@ -93,7 +104,12 @@
gutter="0"
justify="start" align="top">
<el-col span="12">
<el-form-item label="自定义模型" prop="mdiyModelId">
<el-form-item prop="mdiyModelId">
<template slot='label'>自定义模型
<el-popover slot="label" placement="top-start" title="提示" width="400" trigger="hover" content="如果发布时候文章字段信息不够,可以采用铭飞代码生成器生成自定义模型,再通过“自定义管理->自定义模型->导入”功能导入模型注意类型是cms">
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-select v-model="form.mdiyModelId"
:style="{width: '100%'}"
:filterable="false"
@ -169,7 +185,11 @@
el: '#form',
data() {
return {
treeList:[],
treeList:[{
id:'0',
categoryTitle:'顶级栏目',
children:[],
}],
saveDisabled: false,
//表单数据
form: {
@ -217,7 +237,7 @@
ms.http.get(ms.manager+"/cms/category/list.do",{pageSize:9999}).then(function(res){
if(res.result){
//res.data.rows.push({id:0,categoryId: null,categoryTitle:'顶级栏目管理'});
that.treeList = ms.util.treeData(res.data.rows,'id','categoryId','children');
that.treeList[0].children = ms.util.treeData(res.data.rows,'id','categoryId','children');
}
}).catch(function(err){
console.log(err);
@ -238,10 +258,17 @@
that.saveDisabled = true;
var data = JSON.parse(JSON.stringify(that.form));
if(data.id&&data.id==data.categoryId){
that.$message.error('所属栏目不能为自身')
that.$notify({
title: '提示',
message: '所属栏目不能为自身',
type: 'error'
});
that.saveDisabled = false;
return
}
if(data.categoryId == '0'){
data.categoryId = '';
}
data.categoryImg = JSON.stringify(data.categoryImg);
ms.http.post(url, data).then(function (data) {
if (data.result) {
@ -287,6 +314,9 @@
})
}else{
res.data.categoryImg=[]
}
if(!res.data.categoryId){
res.data.categoryId = '0';
}
that.form = res.data;
}

View File

@ -17,7 +17,7 @@
</el-col>
</el-header>
<el-main class="ms-container">
<el-table ref="multipleTable"
<el-table ref="multipleTable" :indent="6"
height="calc(100vh - 20px)"
border :data="dataList"
row-key="id"
@ -30,13 +30,16 @@
{{emptyText}}
</template>
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column label="编号" width="60" prop="id"></el-table-column>
<el-table-column label="编号" width="80" prop="id"></el-table-column>
<el-table-column label="标题" align="left" prop="categoryTitle">
</el-table-column>
<el-table-column label="属性" align="center" prop="categoryType" :formatter="categoryTypeFormat" width="65">
</el-table-column>
<el-table-column label="链接地址" align="left" prop="categoryPath" show-overflow-tooltip>
</el-table-column>
<template slot-scope="scope">
{{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}
</template>
</el-table-column>
<el-table-column label="列表地址" align="left" prop="categoryListUrl" show-overflow-tooltip>
</el-table-column>
<el-table-column label="内容地址" align="left" prop="categoryUrl" show-overflow-tooltip>

View File

@ -9,8 +9,7 @@
<el-header class="ms-header ms-tr" height="50px">
<el-button type="primary" icon="iconfont icon-baocun" size="mini" @click="save()" :loading="saveDisabled">保存
</el-button>
<el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)"
v-if="returnIsShow">返回
<el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回
</el-button>
</el-header>
<el-main class="ms-container">
@ -24,7 +23,7 @@
<el-row
gutter="0"
justify="start" align="top">
<el-col span="12">
<el-col :span="returnIsShow?'12':'24'">
<el-form-item label="文章标题" prop="contentTitle">
<el-input v-model="form.contentTitle"
:disabled="false"
@ -34,7 +33,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col span="12">
<el-col span="12" v-if="returnIsShow">
<el-form-item label="所属栏目" prop="contentCategoryId">
<tree-select :props="{value: 'id',label: 'categoryTitle',children: 'children'}"
:options="contentCategoryIdOptions" :style="{width:'100%'}"
@ -275,8 +274,19 @@
this.$refs.form[0].validate((valid) => {
if (valid) {
that.saveDisabled = true;
if(that.categoryIdOptions.filter(f => f['id'] == that.form.contentCategoryId)[0].categoryType == '2'){
that.$notify({
title: '提示',
message: '所属栏目不能为封面',
type: 'error'
});
that.saveDisabled = false;
return
}
var data = JSON.parse(JSON.stringify(that.form));
data.contentType = data.contentType.join(',');
if(data.contentType !=null){
data.contentType = data.contentType.join(',');
}
data.contentImg = JSON.stringify(data.contentImg);
ms.http.post(url, data).then(function (data) {
if (data.result) {
@ -387,6 +397,12 @@
res.data.contentImg = []
}
that.form = res.data;
var category = that.categoryIdOptions.filter(f => f['id'] == that.form.contentCategoryId);
if(category.length == 1){
if(category[0].categoryType == '2'){
that.returnIsShow = false;
}
}
that.changeModel();
}
}).catch(function (err) {
@ -399,7 +415,7 @@
ms.http.get(ms.manager + "/cms/category/list.do", {pageSize: 9999}).then(function (res) {
if (res.result) {
that.contentCategoryIdOptions = ms.util.treeData(res.data.rows, 'id', 'categoryId', 'children');
that.categoryIdOptions = res.data.rows
that.categoryIdOptions = res.data.rows;
that.changeModel();
}
}).catch(function (err) {

View File

@ -27,9 +27,6 @@
<div class="class-4" >
<el-form-item label="主题模板">
<el-select v-model="template"
:style="{width: '100%'}"
:filterable="false"
:disabled="false"
:clearable="true"
placeholder="请选择主题模板">
<el-option v-for='item in templateOptions' :key="item" :value="item"
@ -130,7 +127,7 @@
loading:false,
template:'',//主题模板
templateOptions:[],
position:'', //位置
position:'index.html', //位置
contentSection:'', //文章栏目
section:'', //栏目
time:ms.util.date.fmt(new Date(),"yyyy-MM-dd"),

View File

@ -7,9 +7,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<style>
body,html{height: -webkit-fill-available;}
</style>
</head>
<body>
<div style="

View File

@ -1,539 +0,0 @@
/* Logo 字体 */
@font-face {
font-family: "iconfont logo";
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
}
.logo {
font-family: "iconfont logo";
font-size: 160px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* tabs */
.nav-tabs {
position: relative;
}
.nav-tabs .nav-more {
position: absolute;
right: 0;
bottom: 0;
height: 42px;
line-height: 42px;
color: #666;
}
#tabs {
border-bottom: 1px solid #eee;
}
#tabs li {
cursor: pointer;
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
border-bottom: 2px solid transparent;
position: relative;
z-index: 1;
margin-bottom: -1px;
color: #666;
}
#tabs .active {
border-bottom-color: #f00;
color: #222;
}
.tab-container .content {
display: none;
}
/* 页面布局 */
.main {
padding: 30px 100px;
width: 960px;
margin: 0 auto;
}
.main .logo {
color: #333;
text-align: left;
margin-bottom: 30px;
line-height: 1;
height: 110px;
margin-top: -50px;
overflow: hidden;
*zoom: 1;
}
.main .logo a {
font-size: 160px;
color: #333;
}
.helps {
margin-top: 40px;
}
.helps pre {
padding: 20px;
margin: 10px 0;
border: solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists {
width: 100% !important;
overflow: hidden;
*zoom: 1;
}
.icon_lists li {
width: 100px;
margin-bottom: 10px;
margin-right: 20px;
text-align: center;
list-style: none !important;
cursor: default;
}
.icon_lists li .code-name {
line-height: 1.2;
}
.icon_lists .icon {
display: block;
height: 100px;
line-height: 100px;
font-size: 42px;
margin: 10px auto;
color: #333;
-webkit-transition: font-size 0.25s linear, width 0.25s linear;
-moz-transition: font-size 0.25s linear, width 0.25s linear;
transition: font-size 0.25s linear, width 0.25s linear;
}
.icon_lists .icon:hover {
font-size: 100px;
}
.icon_lists .svg-icon {
/* 通过设置 font-size 来改变图标大小 */
width: 1em;
/* 图标和文字相邻时,垂直对齐 */
vertical-align: -0.15em;
/* 通过设置 color 来改变 SVG 的颜色/fill */
fill: currentColor;
/* path stroke 溢出 viewBox 部分在 IE 下会显示
normalize.css 中也包含这行 */
overflow: hidden;
}
.icon_lists li .name,
.icon_lists li .code-name {
color: #666;
}
/* markdown 样式 */
.markdown {
color: #666;
font-size: 14px;
line-height: 1.8;
}
.highlight {
line-height: 1.5;
}
.markdown img {
vertical-align: middle;
max-width: 100%;
}
.markdown h1 {
color: #404040;
font-weight: 500;
line-height: 40px;
margin-bottom: 24px;
}
.markdown h2,
.markdown h3,
.markdown h4,
.markdown h5,
.markdown h6 {
color: #404040;
margin: 1.6em 0 0.6em 0;
font-weight: 500;
clear: both;
}
.markdown h1 {
font-size: 28px;
}
.markdown h2 {
font-size: 22px;
}
.markdown h3 {
font-size: 16px;
}
.markdown h4 {
font-size: 14px;
}
.markdown h5 {
font-size: 12px;
}
.markdown h6 {
font-size: 12px;
}
.markdown hr {
height: 1px;
border: 0;
background: #e9e9e9;
margin: 16px 0;
clear: both;
}
.markdown p {
margin: 1em 0;
}
.markdown>p,
.markdown>blockquote,
.markdown>.highlight,
.markdown>ol,
.markdown>ul {
width: 80%;
}
.markdown ul>li {
list-style: circle;
}
.markdown>ul li,
.markdown blockquote ul>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown>ul li p,
.markdown>ol li p {
margin: 0.6em 0;
}
.markdown ol>li {
list-style: decimal;
}
.markdown>ol li,
.markdown blockquote ol>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown code {
margin: 0 3px;
padding: 0 5px;
background: #eee;
border-radius: 3px;
}
.markdown strong,
.markdown b {
font-weight: 600;
}
.markdown>table {
border-collapse: collapse;
border-spacing: 0px;
empty-cells: show;
border: 1px solid #e9e9e9;
width: 95%;
margin-bottom: 24px;
}
.markdown>table th {
white-space: nowrap;
color: #333;
font-weight: 600;
}
.markdown>table th,
.markdown>table td {
border: 1px solid #e9e9e9;
padding: 8px 16px;
text-align: left;
}
.markdown>table th {
background: #F7F7F7;
}
.markdown blockquote {
font-size: 90%;
color: #999;
border-left: 4px solid #e9e9e9;
padding-left: 0.8em;
margin: 1em 0;
}
.markdown blockquote p {
margin: 0;
}
.markdown .anchor {
opacity: 0;
transition: opacity 0.3s ease;
margin-left: 8px;
}
.markdown .waiting {
color: #ccc;
}
.markdown h1:hover .anchor,
.markdown h2:hover .anchor,
.markdown h3:hover .anchor,
.markdown h4:hover .anchor,
.markdown h5:hover .anchor,
.markdown h6:hover .anchor {
opacity: 1;
display: inline-block;
}
.markdown>br,
.markdown>p>br {
clear: both;
}
.hljs {
display: block;
background: white;
padding: 0.5em;
color: #333333;
overflow-x: auto;
}
.hljs-comment,
.hljs-meta {
color: #969896;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-strong,
.hljs-emphasis,
.hljs-quote {
color: #df5000;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-type {
color: #a71d5d;
}
.hljs-literal,
.hljs-symbol,
.hljs-bullet,
.hljs-attribute {
color: #0086b3;
}
.hljs-section,
.hljs-name {
color: #63a35c;
}
.hljs-tag {
color: #333333;
}
.hljs-title,
.hljs-attr,
.hljs-selector-id,
.hljs-selector-class,
.hljs-selector-attr,
.hljs-selector-pseudo {
color: #795da3;
}
.hljs-addition {
color: #55a532;
background-color: #eaffea;
}
.hljs-deletion {
color: #bd2c00;
background-color: #ffecec;
}
.hljs-link {
text-decoration: underline;
}
/* 代码高亮 */
/* PrismJS 1.15.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/
code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection,
pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection,
code[class*="language-"] ::-moz-selection {
text-shadow: none;
background: #b3d4fc;
}
pre[class*="language-"]::selection,
pre[class*="language-"] ::selection,
code[class*="language-"]::selection,
code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}
@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre)>code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #999;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;
background: hsla(0, 0%, 100%, .5);
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}
.token.function,
.token.class-name {
color: #DD4A68;
}
.token.regex,
.token.important,
.token.variable {
color: #e90;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -8,6 +8,7 @@ body {
font-weight: initial !important;
font-size: 14px !important;
color: #333 !important;
overflow: hidden;
}
html *,
body * {
@ -119,6 +120,7 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
border-radius: 10px;
background-color: rgba(144,147,153,.5);
}
/*饿了么滚动样式*/
.ms-scrollbar .el-scrollbar__wrap{
overflow-x: hidden;
}

View File

@ -27,7 +27,6 @@ body {
height: 100vh;
background-color: #eee;
margin: 0;
display: flex;
font-weight: initial !important;
font-size: 14px !important;
color: #333 !important;
@ -131,9 +130,6 @@ textarea::-webkit-input-placeholder {
.ms-header-select > .el-select:nth-of-type(2) {
margin: 0 10px;
}
.el-submenu .el-menu-item.is-active {
border-radius: 4px;
}
.el-card,
.el-message {
border-radius: 0 !important;
@ -152,15 +148,17 @@ textarea::-webkit-input-placeholder {
.index {
width: 100%;
display: flex;
height: 100vh;
}
.ms-admin-header {
display: flex;
padding: 0;
background-color: #0099ff;
background-color: rgba(255,255,255,1);
height: 50px !important;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
z-index: 1;
}
.ms-admin-header .ms-admin-header-menu {
background-color: #0099ff;
border-bottom: none;
position: relative;
}
@ -168,19 +166,17 @@ textarea::-webkit-input-placeholder {
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item {
height: 50px !important;
line-height: 50px !important;
background-color: #0099ff !important;
color: rgba(255, 255, 255, 0.65) !important;
border-bottom: none !important;
font-size: 1em;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *:hover,
/*.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *:hover,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item:hover {
color: #fff !important;
}
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > *.is-active,
.ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item.is-active {
color: #fff !important;
}
}*/
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu {
padding: 0;
user-select: none;
@ -196,8 +192,7 @@ textarea::-webkit-input-placeholder {
top: 0;
z-index: 9;
background: #ffffff;
border: 1px solid #e6e6e6;
box-shadow: 2px 3px 5px 0.1px rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li {
margin: 0;
@ -215,7 +210,7 @@ textarea::-webkit-input-placeholder {
cursor: pointer;
color: #0099ff;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i {
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu .ms-admin-shortcut-menu-shrink {
position: absolute;
top: 18px;
right: 19px;
@ -223,19 +218,17 @@ textarea::-webkit-input-placeholder {
font-size: 14px;
color: #333;
}
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu i:hover {
.ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu .ms-admin-shortcut-menu-shrink:hover {
cursor: pointer;
}
.ms-admin-logo {
min-width: 200px;
width: 200px;
display: flex;
align-items: center;
overflow: hidden;
}
.ms-admin-logo > img {
padding: 20px 0 20px 20px;
width: 80px;
padding: 14px 0;
width: 50px;
}
.ms-admin-logo > div {
display: flex;
@ -250,6 +243,7 @@ textarea::-webkit-input-placeholder {
position: absolute;
margin-left: 10px;
font-size: 12px;
}
.ms-admin-logo .iconfont {
color: #fff;
@ -257,6 +251,9 @@ textarea::-webkit-input-placeholder {
margin-right: 20px;
cursor: pointer;
}
.ms-admin-logo-pack{
width: 64px!important;
}
.ms-admin-mstore {
margin-left: auto;
min-width: 200px;
@ -274,8 +271,8 @@ textarea::-webkit-input-placeholder {
display: flex;
align-items: center;
justify-content: center;
background: #fff;
color: #0099ff;
background: #0099ff;
color: #fff;
}
.ms-admin-mstore .ms-admin-mstore-icon {
min-width: 50px;
@ -328,7 +325,7 @@ textarea::-webkit-input-placeholder {
margin-right: 8px;
}
.ms-admin-login > span span {
color: #fff;
color: #333333;
}
.ms-admin-login .active {
background: #fff;
@ -338,7 +335,7 @@ textarea::-webkit-input-placeholder {
color: #fff;
}
.ms-admin-login .active span {
color: #333;
color: #409EFF;
}
.ms-admin-login-down {
width: 130px;
@ -353,7 +350,7 @@ textarea::-webkit-input-placeholder {
display: none;
}
.ms-admin-menu-aside {
width: 200px !important;
width: auto !important;
height: 100%;
position: relative;
overflow: visible;
@ -414,11 +411,12 @@ textarea::-webkit-input-placeholder {
width: 60px !important;
}
.ms-admin-container {
height: calc(100vh - 60px);
height:auto;
}
.ms-admin-container > .ms-admin-main {
padding: 0;
background-color: #fff;
z-index: 0;
}
.ms-admin-container > .ms-admin-main .ms-admin-tabs {
height: 100%;
@ -475,40 +473,40 @@ textarea::-webkit-input-placeholder {
border: none !important;
}
@keyframes rubberBand {
0 {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
10% {
-webkit-transform: scale3d(1.25, 0.75, 1);
transform: scale3d(1.25, 0.75, 1);
}
20% {
-webkit-transform: scale3d(0.75, 1.25, 1);
transform: scale3d(0.75, 1.25, 1);
}
30% {
-webkit-transform: scale3d(1.15, 0.85, 1);
transform: scale3d(1.15, 0.85, 1);
}
40% {
-webkit-transform: scale3d(0.95, 1.05, 1);
transform: scale3d(0.95, 1.05, 1);
}
50% {
-webkit-transform: scale3d(1.05, 0.95, 1);
transform: scale3d(1.05, 0.95, 1);
}
51% {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
0 {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
10% {
-webkit-transform: scale3d(1.25, 0.75, 1);
transform: scale3d(1.25, 0.75, 1);
}
20% {
-webkit-transform: scale3d(0.75, 1.25, 1);
transform: scale3d(0.75, 1.25, 1);
}
30% {
-webkit-transform: scale3d(1.15, 0.85, 1);
transform: scale3d(1.15, 0.85, 1);
}
40% {
-webkit-transform: scale3d(0.95, 1.05, 1);
transform: scale3d(0.95, 1.05, 1);
}
50% {
-webkit-transform: scale3d(1.05, 0.95, 1);
transform: scale3d(1.05, 0.95, 1);
}
51% {
-webkit-transform: scale3d(1, 1, 1);
transform: scale3d(1, 1, 1);
}
}
.el-scrollbar__wrap{overflow-x:hidden;}
.el-scrollbar {
position: static;
position: static;
}
[v-cloak] {
display: none;
display: none;
}

View File

@ -0,0 +1,36 @@
/*浅色系*/
.ms-theme-light .ms-admin-logo > div span{
color: #0080FF;
}
.ms-theme-light .el-menu-vertical-demo,
.ms-theme-light .el-menu-vertical-demo .el-menu,
.ms-theme-light.ms-admin-menu-aside-submenu *{
background: #0080FF;
}
.ms-theme-light .el-submenu .el-menu-item.is-active,
.ms-theme-light.ms-admin-menu-aside-submenu .el-menu-item.is-active{
background-color:rgba(255,255,255,0.3) !important;
}
.ms-theme-light .ms-admin-menu-aside .el-submenu__title:hover,
.ms-theme-light .ms-admin-menu-aside .el-menu-item:hover,
.ms-theme-light.ms-admin-menu-aside-submenu .el-menu-item:hover{
background-color:rgba(255,255,255,0.3) !important;
}
/*深色系*/
.ms-theme-dark .ms-admin-logo > div span{
color: rgba(56,58,63,1);
}
.ms-theme-dark .el-menu-vertical-demo,
.ms-theme-dark .el-menu-vertical-demo .el-menu,
.ms-theme-dark.ms-admin-menu-aside-submenu *{
background:rgba(56,58,63,1);
}
.ms-theme-dark .el-submenu .el-menu-item.is-active,
.ms-theme-dark.ms-admin-menu-aside-submenu .el-menu-item.is-active{
background-color:#0080FF !important;
}
.ms-theme-dark .ms-admin-menu-aside .el-submenu__title:hover,
.ms-theme-dark .ms-admin-menu-aside .el-menu-item:hover,
.ms-theme-dark.ms-admin-menu-aside-submenu .el-menu-item:hover{
background-color:#0080FF !important;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -12,6 +12,13 @@
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "100737",
"name": "等待",
"font_class": "dengdai",
"unicode": "e774",
"unicode_decimal": 59252
},
{
"icon_id": "155392",
"name": "电话",
@ -47,6 +54,13 @@
"unicode": "e622",
"unicode_decimal": 58914
},
{
"icon_id": "257539",
"name": "百货",
"font_class": "baihuo",
"unicode": "e74a",
"unicode_decimal": 59210
},
{
"icon_id": "273185",
"name": "菜单",
@ -166,6 +180,13 @@
"unicode": "e6b3",
"unicode_decimal": 59059
},
{
"icon_id": "675133",
"name": "母婴",
"font_class": "muying",
"unicode": "e74d",
"unicode_decimal": 59213
},
{
"icon_id": "689304",
"name": "下拉",
@ -229,6 +250,27 @@
"unicode": "e6c7",
"unicode_decimal": 59079
},
{
"icon_id": "875544",
"name": "FaceBook",
"font_class": "tian7_facebook",
"unicode": "e781",
"unicode_decimal": 59265
},
{
"icon_id": "895411",
"name": "美妆",
"font_class": "meizhuang",
"unicode": "e74f",
"unicode_decimal": 59215
},
{
"icon_id": "898039",
"name": "已领取",
"font_class": "yilingqu",
"unicode": "e770",
"unicode_decimal": 59248
},
{
"icon_id": "960725",
"name": "定位",
@ -264,6 +306,20 @@
"unicode": "e740",
"unicode_decimal": 59200
},
{
"icon_id": "1048877",
"name": "分类",
"font_class": "icon_category",
"unicode": "e76c",
"unicode_decimal": 59244
},
{
"icon_id": "1103477",
"name": "百货",
"font_class": "baihuo1",
"unicode": "e750",
"unicode_decimal": 59216
},
{
"icon_id": "1105003",
"name": "警告",
@ -292,6 +348,13 @@
"unicode": "e6e3",
"unicode_decimal": 59107
},
{
"icon_id": "1137796",
"name": "待收货",
"font_class": "daishouhuo1",
"unicode": "e778",
"unicode_decimal": 59256
},
{
"icon_id": "1155318",
"name": "+喜欢",
@ -404,6 +467,13 @@
"unicode": "e618",
"unicode_decimal": 58904
},
{
"icon_id": "1440885",
"name": "电话",
"font_class": "dianhua1",
"unicode": "e77f",
"unicode_decimal": 59263
},
{
"icon_id": "1463161",
"name": "徽章",
@ -460,6 +530,13 @@
"unicode": "e620",
"unicode_decimal": 58912
},
{
"icon_id": "1576800",
"name": "食品",
"font_class": "shipin2",
"unicode": "e751",
"unicode_decimal": 59217
},
{
"icon_id": "1605988",
"name": "自定义",
@ -677,6 +754,13 @@
"unicode": "e749",
"unicode_decimal": 59209
},
{
"icon_id": "2476889",
"name": "已取消",
"font_class": "yiquxiao",
"unicode": "e775",
"unicode_decimal": 59253
},
{
"icon_id": "2480244",
"name": "关注作者 已关注",
@ -719,6 +803,13 @@
"unicode": "e6a0",
"unicode_decimal": 59040
},
{
"icon_id": "2604742",
"name": "定时",
"font_class": "dingshi",
"unicode": "e989",
"unicode_decimal": 59785
},
{
"icon_id": "2649048",
"name": "气泡",
@ -747,6 +838,13 @@
"unicode": "e63c",
"unicode_decimal": 58940
},
{
"icon_id": "2769555",
"name": "已抢光-完整",
"font_class": "yiqiangguang",
"unicode": "e772",
"unicode_decimal": 59250
},
{
"icon_id": "2777844",
"name": "字号+",
@ -789,6 +887,13 @@
"unicode": "e636",
"unicode_decimal": 58934
},
{
"icon_id": "2885549",
"name": "日期",
"font_class": "riqi",
"unicode": "e760",
"unicode_decimal": 59232
},
{
"icon_id": "2894639",
"name": "签到",
@ -950,6 +1055,13 @@
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "3629441",
"name": "男装",
"font_class": "nanzhuang",
"unicode": "e752",
"unicode_decimal": 59218
},
{
"icon_id": "3639956",
"name": "复制代码",
@ -964,6 +1076,13 @@
"unicode": "e6bb",
"unicode_decimal": 59067
},
{
"icon_id": "3680685",
"name": "筛选",
"font_class": "shaixuan1",
"unicode": "e76f",
"unicode_decimal": 59247
},
{
"icon_id": "3719202",
"name": "气泡",
@ -985,6 +1104,13 @@
"unicode": "e87b",
"unicode_decimal": 59515
},
{
"icon_id": "3889504",
"name": "扫一扫",
"font_class": "saoyisao",
"unicode": "e765",
"unicode_decimal": 59237
},
{
"icon_id": "3991493",
"name": "数据",
@ -1006,6 +1132,20 @@
"unicode": "e60a",
"unicode_decimal": 58890
},
{
"icon_id": "4021369",
"name": "食品",
"font_class": "tianpin",
"unicode": "e7ab",
"unicode_decimal": 59307
},
{
"icon_id": "4071614",
"name": "男装",
"font_class": "nanzhuang1",
"unicode": "e753",
"unicode_decimal": 59219
},
{
"icon_id": "4103248",
"name": "鼠标",
@ -1041,6 +1181,13 @@
"unicode": "e6a5",
"unicode_decimal": 59045
},
{
"icon_id": "4247306",
"name": "积分",
"font_class": "jifen1",
"unicode": "e77b",
"unicode_decimal": 59259
},
{
"icon_id": "4271705",
"name": "Github",
@ -1118,6 +1265,13 @@
"unicode": "e711",
"unicode_decimal": 59153
},
{
"icon_id": "4451049",
"name": "无商品",
"font_class": "wushangpin",
"unicode": "e773",
"unicode_decimal": 59251
},
{
"icon_id": "4457626",
"name": "演讲稿 演讲 分析 PPT 线性",
@ -1139,6 +1293,20 @@
"unicode": "e65d",
"unicode_decimal": 58973
},
{
"icon_id": "4463438",
"name": "Excel",
"font_class": "ziliao-Excel",
"unicode": "e763",
"unicode_decimal": 59235
},
{
"icon_id": "4463441",
"name": "ppt",
"font_class": "ziliao-ppt",
"unicode": "e769",
"unicode_decimal": 59241
},
{
"icon_id": "4467122",
"name": "眼睛",
@ -1167,6 +1335,13 @@
"unicode": "e6d1",
"unicode_decimal": 59089
},
{
"icon_id": "4621838",
"name": "待付款",
"font_class": "daifukuan",
"unicode": "e776",
"unicode_decimal": 59254
},
{
"icon_id": "4657673",
"name": "奖杯",
@ -1195,6 +1370,13 @@
"unicode": "e6ac",
"unicode_decimal": 59052
},
{
"icon_id": "4695417",
"name": "文件",
"font_class": "wenjian2",
"unicode": "e76e",
"unicode_decimal": 59246
},
{
"icon_id": "4701864",
"name": "微信",
@ -1209,6 +1391,13 @@
"unicode": "e67c",
"unicode_decimal": 59004
},
{
"icon_id": "4860460",
"name": "促销活动",
"font_class": "cuxiaohuodong",
"unicode": "e782",
"unicode_decimal": 59266
},
{
"icon_id": "4890377",
"name": "分割线",
@ -1216,6 +1405,13 @@
"unicode": "e71a",
"unicode_decimal": 59162
},
{
"icon_id": "4924336",
"name": "支付设置",
"font_class": "zhifushezhi",
"unicode": "e98c",
"unicode_decimal": 59788
},
{
"icon_id": "4939715",
"name": "音乐",
@ -1223,6 +1419,13 @@
"unicode": "e644",
"unicode_decimal": 58948
},
{
"icon_id": "4962315",
"name": "缺省页暂无数据_复制",
"font_class": "queshengyezanwushuju",
"unicode": "e768",
"unicode_decimal": 59240
},
{
"icon_id": "5072805",
"name": "返回",
@ -1237,6 +1440,13 @@
"unicode": "e6dd",
"unicode_decimal": 59101
},
{
"icon_id": "5158688",
"name": "积分",
"font_class": "jifen",
"unicode": "e76a",
"unicode_decimal": 59242
},
{
"icon_id": "5180858",
"name": "旗帜",
@ -1328,6 +1538,13 @@
"unicode": "e634",
"unicode_decimal": 58932
},
{
"icon_id": "5373234",
"name": "通知",
"font_class": "tongzhi",
"unicode": "e77e",
"unicode_decimal": 59262
},
{
"icon_id": "5380615",
"name": "设置",
@ -1335,6 +1552,13 @@
"unicode": "e66b",
"unicode_decimal": 58987
},
{
"icon_id": "5425171",
"name": "上",
"font_class": "shang",
"unicode": "e786",
"unicode_decimal": 59270
},
{
"icon_id": "5467921",
"name": "放大",
@ -1475,6 +1699,13 @@
"unicode": "e670",
"unicode_decimal": 58992
},
{
"icon_id": "6277193",
"name": "兑换",
"font_class": "duihuan",
"unicode": "e77c",
"unicode_decimal": 59260
},
{
"icon_id": "6405627",
"name": "系统管理",
@ -1482,6 +1713,13 @@
"unicode": "e730",
"unicode_decimal": 59184
},
{
"icon_id": "6413312",
"name": "word",
"font_class": "ziliao-word",
"unicode": "e76d",
"unicode_decimal": 59245
},
{
"icon_id": "6616510",
"name": "步进器",
@ -1692,6 +1930,13 @@
"unicode": "e6fd",
"unicode_decimal": 59133
},
{
"icon_id": "7357015",
"name": "秒杀",
"font_class": "miaosha",
"unicode": "e77a",
"unicode_decimal": 59258
},
{
"icon_id": "7446847",
"name": "全屏",
@ -1741,6 +1986,13 @@
"unicode": "e9bb",
"unicode_decimal": 59835
},
{
"icon_id": "7588107",
"name": "上传",
"font_class": "shangchuan1",
"unicode": "e75a",
"unicode_decimal": 59226
},
{
"icon_id": "7602740",
"name": "闭眼",
@ -1811,6 +2063,13 @@
"unicode": "e70f",
"unicode_decimal": 59151
},
{
"icon_id": "7960183",
"name": "QQ",
"font_class": "QQ4",
"unicode": "e780",
"unicode_decimal": 59264
},
{
"icon_id": "7962612",
"name": "淘宝",
@ -1818,6 +2077,13 @@
"unicode": "e691",
"unicode_decimal": 59025
},
{
"icon_id": "7996008",
"name": "任务",
"font_class": "renwu",
"unicode": "e783",
"unicode_decimal": 59267
},
{
"icon_id": "8012431",
"name": "VIP @3x",
@ -1874,6 +2140,34 @@
"unicode": "e6dc",
"unicode_decimal": 59100
},
{
"icon_id": "8111913",
"name": "短信验证码",
"font_class": "duanxinyanzhengma",
"unicode": "e766",
"unicode_decimal": 59238
},
{
"icon_id": "8144768",
"name": "女装",
"font_class": "nvzhuang",
"unicode": "e754",
"unicode_decimal": 59220
},
{
"icon_id": "8144778",
"name": "母婴",
"font_class": "muyingchanpin",
"unicode": "e755",
"unicode_decimal": 59221
},
{
"icon_id": "8145350",
"name": "鞋子",
"font_class": "xiezi",
"unicode": "e756",
"unicode_decimal": 59222
},
{
"icon_id": "8152143",
"name": "新增",
@ -1909,6 +2203,13 @@
"unicode": "e603",
"unicode_decimal": 58883
},
{
"icon_id": "8232308",
"name": "倒计时",
"font_class": "daojishi",
"unicode": "e759",
"unicode_decimal": 59225
},
{
"icon_id": "8349788",
"name": "表",
@ -2007,6 +2308,13 @@
"unicode": "e6e0",
"unicode_decimal": 59104
},
{
"icon_id": "8841423",
"name": "条形进度条",
"font_class": "tiaoxingjindutiao",
"unicode": "e762",
"unicode_decimal": 59234
},
{
"icon_id": "8877978",
"name": "搞怪",
@ -2119,6 +2427,13 @@
"unicode": "e75c",
"unicode_decimal": 59228
},
{
"icon_id": "9299374",
"name": "已取消",
"font_class": "yiquxiao1",
"unicode": "e777",
"unicode_decimal": 59255
},
{
"icon_id": "9318721",
"name": "联通",
@ -2133,6 +2448,13 @@
"unicode": "e737",
"unicode_decimal": 59191
},
{
"icon_id": "9392420",
"name": "支付倒计时",
"font_class": "zhifudaojishi",
"unicode": "e779",
"unicode_decimal": 59257
},
{
"icon_id": "9400554",
"name": "暂无项目信息",
@ -2140,6 +2462,20 @@
"unicode": "e708",
"unicode_decimal": 59144
},
{
"icon_id": "9524670",
"name": "食品",
"font_class": "shipin4",
"unicode": "e757",
"unicode_decimal": 59223
},
{
"icon_id": "9524672",
"name": "鞋包-女包",
"font_class": "xiebao-nvbao",
"unicode": "e758",
"unicode_decimal": 59224
},
{
"icon_id": "9535007",
"name": "权限管理",
@ -2231,6 +2567,13 @@
"unicode": "e646",
"unicode_decimal": 58950
},
{
"icon_id": "9823509",
"name": "签到",
"font_class": "qiandao",
"unicode": "e771",
"unicode_decimal": 59249
},
{
"icon_id": "9857467",
"name": "拖动",
@ -2308,6 +2651,13 @@
"unicode": "e632",
"unicode_decimal": 58930
},
{
"icon_id": "10047001",
"name": "VIP",
"font_class": "VIP1",
"unicode": "e77d",
"unicode_decimal": 59261
},
{
"icon_id": "10100018",
"name": "收 藏-产品详情",
@ -2322,6 +2672,13 @@
"unicode": "e6cf",
"unicode_decimal": 59087
},
{
"icon_id": "10109461",
"name": "图片",
"font_class": "tupian1",
"unicode": "e7c3",
"unicode_decimal": 59331
},
{
"icon_id": "10120099",
"name": "文件夹",
@ -2378,6 +2735,13 @@
"unicode": "e6f1",
"unicode_decimal": 59121
},
{
"icon_id": "10222728",
"name": "文本框",
"font_class": "wenbenkuang",
"unicode": "e764",
"unicode_decimal": 59236
},
{
"icon_id": "10388177",
"name": "表单",
@ -2399,6 +2763,13 @@
"unicode": "e701",
"unicode_decimal": 59137
},
{
"icon_id": "10553738",
"name": "广告",
"font_class": "guanggao",
"unicode": "e76b",
"unicode_decimal": 59243
},
{
"icon_id": "10599660",
"name": "轮播图",
@ -2413,6 +2784,13 @@
"unicode": "e726",
"unicode_decimal": 59174
},
{
"icon_id": "10783651",
"name": "配置_底部工具栏",
"font_class": "biaoqianlan",
"unicode": "e75b",
"unicode_decimal": 59227
},
{
"icon_id": "10795206",
"name": "站群",
@ -2420,6 +2798,13 @@
"unicode": "e738",
"unicode_decimal": 59192
},
{
"icon_id": "11043027",
"name": "多行文本",
"font_class": "duohangwenben1",
"unicode": "e767",
"unicode_decimal": 59239
},
{
"icon_id": "11053422",
"name": "搜索框A",
@ -2539,6 +2924,27 @@
"unicode": "e6fc",
"unicode_decimal": 59132
},
{
"icon_id": "11448884",
"name": "文件夹",
"font_class": "wenjianjia2",
"unicode": "e80c",
"unicode_decimal": 59404
},
{
"icon_id": "11460414",
"name": "合并单元格-01",
"font_class": "hebingdanyuange-",
"unicode": "e75f",
"unicode_decimal": 59231
},
{
"icon_id": "11502246",
"name": "模块",
"font_class": "mokuai",
"unicode": "e784",
"unicode_decimal": 59268
},
{
"icon_id": "11715388",
"name": "优惠卷",

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 849 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 251 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB