Skip to content
GitLab
Commit f7e5e034 authored by xierz's avatar xierz
Browse files

Merge remote-tracking branch 'origin/master'

parents 021aff2f 761d5654
Expand all Show whitespace changes
Inline Side-by-side
src/main/webapp/template/1/default/message.htm
View file @ f7e5e034
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8">
<title>{ms:global.name/}</title> <title>{ms:global.name/}</title>
<meta http-equiv="content-type" content="text/html" /> <meta http-equiv="content-type" content="text/html">
<META HTTP-EQUIV="Pragma" CONTENT="no-cache" /> <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
<meta name="viewport" content="initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no,width=device-width"/> <meta name="viewport" content="initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no,width=device-width">
<meta name="format-detection" content="telephone=no"/> <meta name="format-detection" content="telephone=no">
<meta name="app-mobile-web-app-capable" content="yes"/> <meta name="app-mobile-web-app-capable" content="yes">
<meta name="app-mobile-web-app-status-bar-style" content="black-translucent"/> <meta name="app-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="keywords" content="{ms:global.keyword/}" /> <meta name="keywords" content="{ms:global.keyword/}">
<meta name="description" content="{ms:global.descrip/}" /> <meta name="description" content="{ms:global.descrip/}">
<script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script> <script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script>
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/minireset/0.0.2/minireset.min.css" /> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/minireset/0.0.2/minireset.min.css">
<link rel="stylesheet" href="https://cdn.mingsoft.net/iconfont/iconfont.css" /> <link rel="stylesheet" href="https://cdn.mingsoft.net/iconfont/iconfont.css">
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/animate/4.1.0/animate.min.css"> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/animate/4.1.0/animate.min.css">
<script src="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.js"></script> <script src="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.js"></script>
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.css" /> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.css">
<link rel="stylesheet" href="{ms:global.host/}/{ms:global.style/}/css/app.css">
<link rel="stylesheet" href="{ms:global.host/}/{ms:global.style/}/css/app.css" />
<!--网络请求框架--> <!--网络请求框架-->
<script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script> <script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script>
<script src="{ms:global.host/}/static/plugins/qs/6.6.0/qs.min.js"></script> <script src="{ms:global.host/}/static/plugins/qs/6.6.0/qs.min.js"></script>
...@@ -38,57 +31,41 @@ ...@@ -38,57 +31,41 @@
display: none; display: none;
} }
</style> </style>
</head> </head>
<body> <body>
<div id="app" v-cloak> <div id="app" v-cloak>
<#include "nav.htm" />
<#include "nav.htm"/> <div class="news">
<div class="body">
<div class="news"> <div class="left">
<div class="body"> <span class="title"> 分类名称 </span>
<div class="left"> <span class="sub-title-sel"> 分类名称 </span>
<span class="title" > <span class="sub-title"> 分类名称 </span>
分类名称
</span>
<span class="sub-title-sel" >
分类名称
</span>
<span class="sub-title" >
分类名称
</span>
</div>
<div class="right">
<div class="ms-channel-path">
<span class="ms-channel-path-label">
当前位置：
</span>
<a href="/" class="ms-channel-path-index">
首页
</a>
{ms:channel type="path"}
<i class="iconfont icon-youjiantou"></i>
<a href="{ms:global.url/}${field.typelink}" class="ms-channel-path-link">
${field.typetitle}
</a>
{/ms:channel}
</div>
<div class="message-body">
<!--输入框-start-->
<input class="ms-input"/>
<!--输入框-end-->
<!--输入框-start-->
<input class="ms-input"/>
<!--输入框-end-->
<div >
提交
</div>
</div> </div> </div> </div>
<#include "footer.htm"/>
</div> </div>
</body> <div class="right">
</html> <div class="ms-channel-path">
<span class="ms-channel-path-label"> 当前位置： </span>
<script> <a href="/" class="ms-channel-path-index"> 首页 </a> {ms:channel type="path"}
<i class="iconfont icon-youjiantou"></i>
<a href="{ms:global.url/}${field.typelink}" class="ms-channel-path-link"> ${field.typetitle} </a> {/ms:channel}
</div>
<div class="message-body">
<!--输入框-start-->
<input class="ms-input">
<!--输入框-end-->
<!--输入框-start-->
<input class="ms-input">
<!--输入框-end-->
<div>
提交
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm" />
</div>
<script>
var app = new Vue({ var app = new Vue({
el: '#app', el: '#app',
watch:{ watch:{
...@@ -110,8 +87,7 @@ var app = new Vue({ ...@@ -110,8 +87,7 @@ var app = new Vue({
} }
}) })
</script> </script>
<style>
<style>
body { body {
background-color:#fff; background-color:#fff;
box-sizing:border-box; box-sizing:border-box;
...@@ -202,14 +178,14 @@ var app = new Vue({ ...@@ -202,14 +178,14 @@ var app = new Vue({
} }
.news .body .right .news .body .right
{ {
padding-bottom:0px;
flex-wrap:nowrap;
flex-direction:column; flex-direction:column;
display:flex; display:flex;
padding-right:20px; padding-right:20px;
box-sizing:border-box;
padding-bottom:0px;
flex-wrap:nowrap;
width:1000px; width:1000px;
margin-bottom:0px; margin-bottom:0px;
box-sizing:border-box;
padding-top:0px; padding-top:0px;
padding-left:20px; padding-left:20px;
margin-top:0px; margin-top:0px;
...@@ -217,26 +193,26 @@ var app = new Vue({ ...@@ -217,26 +193,26 @@ var app = new Vue({
} }
.news .body .right .ms-channel-path .news .body .right .ms-channel-path
{ {
margin-right:auto;
align-items:center; align-items:center;
flex-wrap:nowrap;
flex-direction:row; flex-direction:row;
display:flex; display:flex;
box-sizing:border-box;
margin-left:auto;
margin-right:auto;
flex-wrap:nowrap;
width:100%; width:100%;
margin-bottom:10px; margin-bottom:10px;
box-sizing:border-box;
padding-left:0px; padding-left:0px;
margin-top:10px; margin-top:10px;
height:30px; height:30px;
margin-left:auto;
} }
.news .body .right .ms-channel-path span .news .body .right .ms-channel-path span
{ {
font-size:16PX;
color:#909399; color:#909399;
flex-direction:row; flex-direction:row;
word-wrap:break-word; word-wrap:break-word;
display:inline-block; display:inline-block;
font-size:16PX;
} }
.news .body .right .ms-channel-path .ms-channel-path-index .news .body .right .ms-channel-path .ms-channel-path-index
{ {
...@@ -451,10 +427,10 @@ var app = new Vue({ ...@@ -451,10 +427,10 @@ var app = new Vue({
} }
.news .body .right .ms-channel-path span .news .body .right .ms-channel-path span
{ {
font-size:14PX;
flex-direction:row; flex-direction:row;
word-wrap:break-word; word-wrap:break-word;
display:inline-block; display:inline-block;
font-size:14PX;
} }
.news .body .right .ms-channel-path .ms-channel-path-index .news .body .right .ms-channel-path .ms-channel-path-index
{ {
...@@ -476,18 +452,20 @@ var app = new Vue({ ...@@ -476,18 +452,20 @@ var app = new Vue({
} }
.news .body .right .message-body .news .body .right .message-body
{ {
flex-direction:column;
display:flex;
box-sizing:border-box;
margin-left:0px;
margin-right:0px; margin-right:0px;
padding-bottom:0px; padding-bottom:0px;
flex-wrap:nowrap; flex-wrap:nowrap;
flex-direction:column;
display:flex;
width:100%; width:100%;
box-sizing:border-box;
margin-bottom:0px; margin-bottom:0px;
padding-top:0px; padding-top:0px;
margin-top:0px; margin-top:0px;
height:300px; height:300px;
margin-left:0px;
} }
}</style> }</style>
</body>
</html>
\ No newline at end of file
src/main/webapp/template/1/default/nav.htm
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1603868885841.png deleted 100644 → 0
View file @ 021aff2f
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1603868894525.jpg deleted 100644 → 0
View file @ 021aff2f
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1603873778103.jpg deleted 100644 → 0
View file @ 021aff2f
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609729706771.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739360761.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739587867.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739781890.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739792665.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739824520.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
src/main/webapp/upload/1/cms/content/1609739871146.png 0 → 100644
View file @ f7e5e034
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment