!218 上传位置

Merge pull request !218 from 小伍/5.0.0
This commit is contained in:
铭飞 2020-01-10 21:16:45 +08:00 committed by Gitee
commit 4c51a7401d
6 changed files with 193 additions and 240 deletions

File diff suppressed because one or more lines are too long

View File

@ -96,40 +96,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
*/
@Autowired
private IModelBiz modelBiz;
// 如商城就为:/mall/{key}.do
/**
* 前段会员中心所有页面都可以使用该方法 请求地址例如 {diy}.do,例如登陆界面与注册界面都可以使用
*
* @param key
*/
@RequestMapping("/{diy}.do")
@ExceptionHandler(java.lang.NullPointerException.class)
public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) {
Map map = BasicUtil.assemblyRequestMap();
map.put(ParserUtil.URL, BasicUtil.getUrl());
//动态解析
map.put(ParserUtil.IS_DO,true);
//设置动态请求的模块路径
map.put(ParserUtil.MODEL_NAME, "mcms");
//解析后的内容
String content = "";
PageEntity page = new PageEntity();
page.setPageKey(diy);
//根据请求路径查询模版文件
PageEntity _page = (PageEntity) pageBiz.getEntity(page);
try {
content = CmsParserUtil.generate(_page.getPagePath(), map, isMobileDevice(req));
} catch (TemplateNotFoundException e) {
e.printStackTrace();
} catch (MalformedTemplateNameException e) {
e.printStackTrace();
} catch (ParseException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
this.outString(resp, content);
}
/**
* 动态列表页

View File

@ -111,12 +111,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row
gutter="0"
justify="start" align="top">
<el-row gutter="0" justify="start" align="top">
<el-col span="12">
<el-form-item prop="categoryListUrl" v-if="form.categoryType == '1'">
<template slot='label'>列表模板
@ -138,6 +133,11 @@
</el-col>
<el-col span="12">
<el-form-item label="栏目属性" prop="categoryFlag">
<template slot='label'>栏目属性
<el-popover placement="top-start" title="提示" trigger="hover" content="类型不满足可以在自定义字典菜单中新增,字段类型为“栏目属性”">
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-select v-model="form.categoryFlag"
:style="{width: '100%'}"
:filterable="false"
@ -149,9 +149,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="栏目管理关键字" prop="categoryKeyword">
<template slot='label'>栏目关键字
@ -203,7 +200,7 @@
:limit="1"
:on-exceed="categoryImghandleExceed"
:disabled="false"
:data="{uploadPath:'/cms/category','isRename':true}"
:data="{uploadPath:'/cms/category','isRename':true,'appId':true}"
:on-success="categoryImgSuccess"
accept="image/*"
list-type="picture-card">

View File

@ -184,7 +184,7 @@
:limit="1"
:on-exceed="contentImghandleExceed"
:disabled="false"
:data="{uploadPath:'/cms/content','isRename':true}"
:data="{uploadPath:'/cms/content','isRename':true,'appId':true}"
:on-success="contentImgSuccess"
accept="image/*"
list-type="picture-card">

View File

@ -54,8 +54,8 @@
</div>
<div class="head-men-right head-menu-flex-center">
<div class="head-menu-flex-center head-menu-right-search">
<form id="searchDataForm" action="{ms:global.host/}/cms/1/search.do" method="post">
<input type="text" class='ms-search-input' name="basic_title" placeholder="请输入关键字">
<form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post">
<input type="text" class='ms-search-input' name="content_title" placeholder="请输入关键字">
<!-- <i class="iconfont ms-search-click">&#xe85e;</i> -->
<input type="submit" value="" class="ms-search-click">
</form>
@ -63,8 +63,8 @@
<div class="head-menu-right-content" id="ms-login-vue">
<span v-show="!isLogin" style="display: none;">
<span>
<a href='{ms:global.host/}/mcms/login.do'>登录</a>
</span>|<span><a href='{ms:global.host/}/mcms/register.do'>注册</a></span>
<a href='{ms:global.host/}/mdiyPage/login.do'>登录</a>
</span>|<span><a href='{ms:global.host/}/mdiyPage/register.do'>注册</a></span>
</span>
<div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;">
<a class="user-name" href="{ms:global.host/}/people/center.do">

View File

@ -19,7 +19,7 @@
</ul>
</div>
<script>
$(function(){
$(function(){
var r=location.href;
if(r.match("53")){
$(".ms-content-left-ul a").removeClass("ms-content-left-li-first");