Commit f7e5e034 authored by xierz's avatar xierz

Merge remote-tracking branch 'origin/master'

parents 021aff2f 761d5654
<p align="center"> <p align="center">
<a href="https://www.mingsoft.net/"><img src="http://cdn.mingsoft.net/global/images/logo-blue.png" width="50" height=""50></a> <a href="https://www.mingsoft.net/"><img src="http://cdn.mingsoft.net/global/images/logo-blue.png" width="50" height=""50></a>
</p> </p>
...@@ -88,7 +87,7 @@ git clone https://gitee.com/mingSoft/MCMS.git<br/> ...@@ -88,7 +87,7 @@ git clone https://gitee.com/mingSoft/MCMS.git<br/>
* IDEA导入,点击 Import Project,选择 pom.xml 文件,点击 Next 按钮,选择 Import Maven projects automatically 复选框,然后一直点击 Next 按钮,直到点击 Finish 按钮,即可成功导入<br/> * IDEA导入,点击 Import Project,选择 pom.xml 文件,点击 Next 按钮,选择 Import Maven projects automatically 复选框,然后一直点击 Next 按钮,直到点击 Finish 按钮,即可成功导入<br/>
4、Eclipse(IDEA)会自动加载 Maven 依赖包,初次加载会比较慢(根据自身网络情况而定),若工程上有小叉号,请打开 Problems 窗口,查看具体错误内容,直到无错误为止<br/> 4、Eclipse(IDEA)会自动加载 Maven 依赖包,初次加载会比较慢(根据自身网络情况而定),若工程上有小叉号,请打开 Problems 窗口,查看具体错误内容,直到无错误为止<br/>
5、创建数据库db-mcms-open(数据库使用utf-8编码),导入doc/db-mcms-open-版本号.sql,如果升级现有系统请使用*-up-*.sql升级,如果导入了系统对应的完整版SQL,sql升级补丁不需要重复导入;<br/> 5、创建数据库db-mcms-open(数据库使用utf-8编码),导入doc/mcms-版本号.sql,如果升级现有系统请使用*-up-*.sql升级,如果导入了系统对应的完整版SQL,sql升级补丁不需要重复导入;<br/>
6、修改src\main\resources\application-dev.yml文件中的数据库设置参数;<br/> 6、修改src\main\resources\application-dev.yml文件中的数据库设置参数;<br/>
7、运行MSApplication.java main方法<br/> 7、运行MSApplication.java main方法<br/>
8、首先先访问后台地址:http://ip|域名/项目发布名/ms/login.do,管理员账号,用户名:msopen 密码:msopen,进入后台点击内容管理->静态化菜单,进行"生成主页","生成栏目","生成文章"操作一遍 (注意!!!是后台登录界面,不是会员中心登录界面) 8、首先先访问后台地址:http://ip|域名/项目发布名/ms/login.do,管理员账号,用户名:msopen 密码:msopen,进入后台点击内容管理->静态化菜单,进行"生成主页","生成栏目","生成文章"操作一遍 (注意!!!是后台登录界面,不是会员中心登录界面)
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.2.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId>
<version>5.2.0</version>
<name>ms-mcms</name>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.28</version>
</dependency>
<!-- 此部分是铭飞平台MStroe的客户端(MStore不在铭飞开源产品范围),如果不需要使用MStore可以删除掉 -->
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId>
<version>5.1</version>
</dependency>
</dependencies>
<build>
<finalName>ms-mcms</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<!--打包生产-->
<configuration>
<fork>true</fork>
<mainClass>net.mingsoft.MSApplication</mainClass>
</configuration>
</plugin>
<!--
打包生产
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>bin/assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/webapp</directory>
<excludes>
<!--打包生产-->
<exclude>static/**</exclude>
<exclude>html/**</exclude>
<exclude>upload/**</exclude>
<exclude>templets/**</exclude>
<exclude>WEB-INF/**</exclude>
</excludes>
</resource>
</resources>
<defaultGoal>compile</defaultGoal>
</build>
</project>
\ No newline at end of file
This diff is collapsed.
...@@ -3,44 +3,106 @@ ...@@ -3,44 +3,106 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>net.mingsoft</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>ms-pom</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version> <version>2.2.2.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId> <artifactId>ms-mcms</artifactId>
<version>5.2.0.RELEASE</version> <version>5.2.0.RELEASE</version>
<name>ms-mcms</name> <name>ms-mcms</name>
<!-- 打包jar包 -->
<packaging>jar</packaging>
<!-- 打包war包 --> <!-- 打包war包 -->
<!-- <packaging>war</packaging> --> <!-- <packaging>war</packaging>-->
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<repositories>
<repository>
<id>central-repos</id>
<name>Central Repository 2</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
<!--阿里云仓库-->
<!--
<repository>
<id>alimaven</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
-->
</repositories>
<dependencies> <dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-base</artifactId>
<version>1.0.25</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-basic</artifactId>
<version>1.0.37</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mdiy</artifactId>
<version>1.0.28</version>
</dependency>
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId> <artifactId>ms-mpeople</artifactId>
<version>1.0.33</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId> <artifactId>store-client</artifactId>
<version>5.2.0.RELEASE</version> <version>5.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>ms-mcms</finalName> <finalName>ms-mcms</finalName>
<resources>
<resource>
<directory>src/main/webapp</directory>
<excludes>
<!-- 打包生产并手动将static、html、upload、template复制到生产 -->
<exclude>static/</exclude>
<exclude>html/</exclude>
<exclude>upload/</exclude>
<exclude>template/</exclude>
<!-- 如果生产需要实时修改WEB-INF/下的页面可,启用这行并手动将项目中的WEB-INF目录复制到运行环境 -->
<!-- <exclude>WEB-INF/</exclude>-->
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
...@@ -64,22 +126,7 @@ ...@@ -64,22 +126,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
<resources>
<resource>
<directory>src/main/webapp</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/main/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<defaultGoal>compile</defaultGoal> <defaultGoal>compile</defaultGoal>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -86,8 +86,8 @@ public class WebConfig implements WebMvcConfigurer { ...@@ -86,8 +86,8 @@ public class WebConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler(uploadMapping).addResourceLocations(File.separator+uploadFloderPath+File.separator,"file:"+uploadFloderPath+File.separator); registry.addResourceHandler(uploadMapping).addResourceLocations(File.separator+uploadFloderPath+File.separator,"file:"+uploadFloderPath+File.separator,"classpath:/template/");
registry.addResourceHandler("/template/**").addResourceLocations(File.separator+template+File.separator,"file:"+template+File.separator); registry.addResourceHandler("/template/**").addResourceLocations(File.separator+template+File.separator,"file:"+template+File.separator,"classpath:/html/");
registry.addResourceHandler("/html/**").addResourceLocations("/html/","file:html/"); registry.addResourceHandler("/html/**").addResourceLocations("/html/","file:html/");
//三种映射方式 webapp下、当前目录下、jar内 //三种映射方式 webapp下、当前目录下、jar内
registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/"); registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/");
...@@ -137,7 +137,7 @@ public class WebConfig implements WebMvcConfigurer { ...@@ -137,7 +137,7 @@ public class WebConfig implements WebMvcConfigurer {
*/ */
@Override @Override
public void addViewControllers(ViewControllerRegistry registry) { public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/").setViewName("forward:/index"); registry.addViewController("/").setViewName("forward:/index.do");
registry.setOrder(Ordered.HIGHEST_PRECEDENCE); registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
WebMvcConfigurer.super.addViewControllers(registry); WebMvcConfigurer.super.addViewControllers(registry);
} }
......
spring: spring:
datasource: datasource:
url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.2-8?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true url: jdbc:mysql:/localhost:3306/mcms?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
username: mcms username: root
password: mcms password: root
filters: wall,mergeStat filters: wall,mergeStat
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file
#spring:
# datasource:
# driver-class-name: oracle.jdbc.driver.OracleDriver
# url: jdbc:oracle:thin:@192.168.0.7:1521:helowin
# username: mcms
# password: mcms
# filters: wall,mergeStat
# type: com.alibaba.druid.pool.DruidDataSource
...@@ -7,7 +7,7 @@ server: ...@@ -7,7 +7,7 @@ server:
logging: logging:
level: level:
net.mingsoft: trace net.mingsoft: debug
file: file:
name: mcms.log #会在项目的根目录下生成对应的mcms.log文件,也可以根据实际情况写绝对路径,例如:d:/mcms.log name: mcms.log #会在项目的根目录下生成对应的mcms.log文件,也可以根据实际情况写绝对路径,例如:d:/mcms.log
path: log #会在项目的根目录下生成log目录,里面会生成对应的日期目录,日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件,例如:log/2020-01/app-2020-01-03-18.1.log.gz(表示2020年1月3号下午六点的第一个备份),也可以根据实际情况写绝对路径,例如:d:/log path: log #会在项目的根目录下生成log目录,里面会生成对应的日期目录,日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件,例如:log/2020-01/app-2020-01-03-18.1.log.gz(表示2020年1月3号下午六点的第一个备份),也可以根据实际情况写绝对路径,例如:d:/log
...@@ -20,7 +20,7 @@ ms: ...@@ -20,7 +20,7 @@ ms:
manager: manager:
path: /ms #后台访问的路径,如:http://项目/ms/login.do,生产的时候建议修改 path: /ms #后台访问的路径,如:http://项目/ms/login.do,生产的时候建议修改
view-path: /WEB-INF/manager #后台视图层路径配置 view-path: /WEB-INF/manager #后台视图层路径配置
check-code: false #默认开启验证码验证,false验证码不验证 check-code: true #默认开启验证码验证,false验证码不验证
upload: upload:
enable-web: true #启用web层的上传 enable-web: true #启用web层的上传
...@@ -43,7 +43,7 @@ spring: ...@@ -43,7 +43,7 @@ spring:
datasource: datasource:
druid: druid:
stat-view-servlet: stat-view-servlet:
enabled: true #启用druid监控 enabled: false #启用druid监控
profiles: profiles:
active: dev active: dev
cache: cache:
......
<#macro ms_file jsonString>
<#if jsonString??&&jsonString!=''>
<@compress>
${jsonString?eval[0].path}
</@compress>
</#if>
</#macro>
\ No newline at end of file
...@@ -133,22 +133,7 @@ ...@@ -133,22 +133,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col span="12"> <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"
:disabled="false"
:multiple="true" :clearable="true"
placeholder="请选择栏目属性">
<el-option v-for='item in categoryFlagOptions' :key="item.dictValue" :value="item.dictValue"
:label="item.dictLabel"></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col span="12" v-if="form.categoryType == 3"> <el-col span="12" v-if="form.categoryType == 3">
...@@ -172,6 +157,24 @@ ...@@ -172,6 +157,24 @@
<el-row <el-row
:gutter="0" :gutter="0"
justify="start" align="top"> justify="start" align="top">
<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"
:disabled="false"
:multiple="true" :clearable="true"
placeholder="请选择栏目属性">
<el-option v-for='item in categoryFlagOptions' :key="item.dictValue" :value="item.dictValue"
:label="item.dictLabel"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="栏目拼音" prop="categoryPinyin"> <el-form-item label="栏目拼音" prop="categoryPinyin">
<el-input <el-input
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<!--底部导航-start-->
<div class="footer">
<!--友情链接-start-->
<div class="links">
<div class="body">
<span >
网站导航
</span>
<div class="link">
<!--下拉框-start-->
<select class="ms-select">
{ms:arclist typeid=163 size=10 }
<option value="">[field.title/]</option>
{/ms:arclist}
</select> <!--下拉框-end-->
</div>
<div class="link">
<!--下拉框-start-->
<select class="ms-select">
{ms:arclist typeid=163 size=10 }
<option value="">[field.title/]</option>
{/ms:arclist}
</select> <!--下拉框-end-->
</div>
<div class="link">
<!--下拉框-start-->
<select class="ms-select">
{ms:arclist typeid=163 size=10 }
<option value="">[field.title/]</option>
{/ms:arclist}
</select> <!--下拉框-end-->
</div>
<div class="link">
<!--下拉框-start-->
<select class="ms-select">
{ms:arclist typeid=163 size=5 }
<option value="">[field.title/]</option>
{/ms:arclist}
</select> <!--下拉框-end-->
</div>
<div class="link">
<!--下拉框-start-->
<select class="ms-select">
{ms:arclist typeid=163 size=5 }
<option value="">[field.title/]</option>
{/ms:arclist}
</select> <!--下拉框-end-->
</div> </div> </div> <!--友情链接-end-->
<!--版权信息-start-->
<div class="copyright">
<div class="body">
<img
title=""
alt=""
src="{ms:global.host/}/{ms:global.style/}/images/1602123532415.png"
/>
<div class="desc">
<div class="text">
<div >
<a href="#"
>
关于我们
</a>
<span >
</span>
<a href="#"
>
网站地图
</a>
</div> </div>
<div class="text">
<a href="#"
>
主办:江西省人民政府办公厅
</a>
<a href="#"
>
承办:江西省信息中心
</a>
</div>
<div class="text">
<a href="#"
>
赣ICP备05004294号
</a>
<a href="#"
>
政府网站标识码3600000012
</a>
<a href="#"
>
赣公网安备 36010802000128号
</a>
</div>
<div class="ms-designer">
<a href="www.mingsoft.net"
target="_blank"
>
@该网页由MDesigner制作完成
</a>
</div> </div>
<div class="right">
<div class="img">
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1234.png"
/>
<span >
国务院客户端
</span>
</div>
<div class="img">
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_724.png"
/>
<span >
国务院小程序
</span>
</div>
<div class="wx">
<div >
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1434.png"
/>
<img
title=""
alt=""
src="http://www.gov.cn/govweb/xhtml/2016gov/guowuyuan/20190301gwykhd/images/icon_1534.png"
/>
<span >
中国政府网微博、微信
</span>
</div> </div> </div> </div> </div> <!--版权信息-end-->
<!--左漂浮-start-->
<div class="left-fixed">
<div class="content">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
/>
</div> </div> <!--左漂浮-end-->
<!--右漂浮-start-->
<div class="right-fixed">
<div class="content">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
/>
</div> </div> <!--右漂浮-end-->
</div> <!--底部导航-end-->
<!--导航-start-->
<div class="header">
<!--中间区域-start-->
<div class="center">
<!--左侧-start-->
<div class="left">
<a href="${global.url}"
>
首页
</a>
{ms:channel active='nav-sel' type='nav' flag='d'}
<a href="${global.url}${field.typelink}"
class="${field.active}">
${field.typetitle}
</a>
{/ms:channel}
</div> <!--左侧-end-->
<!--手机端-start-->
<div @click='switchShow(["1601304203000_30278"]);' class="h5-menu">
<i class="iconfont icon-caidan icon" ></i>
<!--手机端菜单-start-->
<div id="key_1601304203000_30278"
class="h5-menu-nav">
{ms:channel type='nav' flag='n'}
<a href="${global.url}${field.typelink}"
>
${field.typetitle}
</a>
{/ms:channel}
</div> <!--手机端菜单-end-->
</div> <!--手机端-end-->
<!--副链接-start-->
<div class="right">
<a href="http://www.gov.cn/"
target="_blank"
>
中国政府网
</a>
<span >
|
</span>
<a href="http://www.jxrd.gov.cn/"
target="_blank"
>
省人大
</a>
<span >
|
</span>
<a href="http://jxzx.jxnews.com.cn/"
target="_blank"
>
省政协
</a>
</div> <!--副链接-end-->
</div> <!--中间区域-end-->
</div> <!--导航-end-->
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<div style="align-items:center;flex-direction:row;background-image:url({ms:global.host/}/{ms:global.style/}/images/1601264474008.png);display:flex;padding-right:0px;box-sizing:border-box;justify-content:center;border-top-left-radius:0px;border-bottom-left-radius:0px;width:100%;border-bottom-right-radius:0px;background-size:auto;border-top-right-radius:0px;background-position:top center;background-repeat:repeat;padding-left:0px;height:152px;">
<div style="align-items:center;flex-direction:row;display:flex;padding-right:0px;width:1170px;box-sizing:border-box;padding-top:0px;justify-content:center;height:100%;">
<img
title=""
alt=""
src="{@ms:file global.logo/}"
style="border-bottom-left-radius:0px;width:377px;border-bottom-right-radius:0px;border-top-right-radius:0px;height:74px;border-top-left-radius:0px;"/>
<div style="align-items:flex-end;flex-direction:column;display:flex;padding-right:120px;box-sizing:border-box;justify-content:center;border-top-left-radius:0px;border-bottom-left-radius:0px;width:100%;border-bottom-right-radius:0px;border-top-right-radius:0px;padding-left:0px;height:100%;">
<div style="align-items:center;flex-direction:row;display:flex;padding-right:0px;width:370px;box-sizing:border-box;justify-content:flex-end;height:30px;">
<a href="#" style="cursor:pointer;font-size:13px;text-decoration:none;color:#666666;"
>
政务邮箱
</a>
</div>
<div style="align-items:flex-end;flex-direction:row;display:flex;padding-right:0px;box-sizing:border-box;justify-content:center;border-top-left-radius:0px;border-bottom-left-radius:0px;width:270px;border-bottom-right-radius:0px;border-top-right-radius:0px;padding-left:0px;height:21%;">
<form id="searchDataForm" action="{ms:global.host/}/mcms/search.do" method="post" style="margin:0;padding:0;width:100%">
<div class="ms-search-input">
<div class="ms-search-input-div">
<!--输入框 - start -->
<input class="ms-input" placeholder="输入搜索关键字"/>
<!--输入框 -end -->
</div>
<div class="ms-search-button" onclick="document.getElementById('searchDataForm').submit();">
<i class="iconfont icon-fangdajing"></i>
<span>
搜索
</span>
</div>
</div>
</form> </div> </div> </div> </div>
\ No newline at end of file
This diff is collapsed.
\ No newline at end of file
<div class="ms-footer"> <div class="ms-footer">
<div class="body"> <div class="body">
<div class="top"> <div class="top">
<div class="top-left"> <div class="top-left">
{ms:channel flag='nav'} {ms:channel flag='nav' type='top'}
<div class="foot-nav"> <div class="foot-nav">
<a href="{ms:global.url/}${field.typelink}" <a href="{ms:global.url/}${field.typelink}" class="nav-item"> ${field.typetitle} </a> {ms:channel }
target="_blank" <div>
class="nav-item"> <a href="{ms:global.url/}${field.typelink}" class="item"> ${field.typetitle} </a>
父栏目名称 </div> {/ms:channel}
</a> </div> {/ms:channel}
{ms:channel } </div>
<a href="{ms:global.url/}${field.typelink}" <div class="top-right">
target="_blank" <div class="qr">
class="item"> <img title="" alt="" src="{ms:global.host/}/{ms:global.style/}/images/sw.png" class="pic">
子栏目名称 <span class="text"> 商务微信 </span>
</a> </div>
{/ms:channel} <div class="qr">
<img title="" alt="" src="{ms:global.host/}/{ms:global.style/}/images/gzh.png" class="pic">
<span class="text"> 公众号 </span>
</div>
</div>
</div>
<span class="copyright"> <el-link href="https://www.mingsoft.net/" type="primary">© 江西铭软科技有限公司</el-link> 2012-至今 All Rights Reserved. Powered by MCms </span>
<span class="power"> @该网页由 <el-link href="https://designer.mingsoft.net/" type="primary">MDesigner</el-link> 制作完成 </span>
</div>
</div> </div>
\ No newline at end of file
{/ms:channel} </div>
<div class="top-right">
<div class="qr">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
class="pic" />
<span class="text" >
公众号
</span>
</div>
<div class="qr">
<img
title=""
alt=""
src="https://iph.href.lu/100x100"
class="pic" />
<span class="text" >
公众号
</span>
</div> </div> </div>
<span class="copyright" >
© 江西铭软科技有限公司 2020 All Rights Reserved. Powered by MCms
</span>
<span class="power" >
@该网页由MDesigner制作完成
</span>
</div> </div>
\ No newline at end of file
<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
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
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