5 gadi atpakaļ · 523814b249
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 
				 /.settings
			
 
				 /.*
			
 
				 .project
			
 
				-head-file.ftl
			
 
				+head-file.ftl
			
 
				+/bin/
			
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
 
				 spring:
			
 
				   datasource:
			
 
				-    url: jdbc:mysql://192.168.0.8:3316/mcms-dev-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
			
 
				-    username: mcms
			
 
				-    password: mcms
			
 
				+    url: jdbc:mysql://localhost:3306/mcms-dev-5.1?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
			
 
				+    username: root
			
 
				+    password: root
			
 
				     filters: wall,mergeStat
			
 
				     type: com.alibaba.druid.pool.DruidDataSource
			
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 
				 server:
			
 
				-  port: 8080
			
 
				+  port: 8081
			
 
				   servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
			
 
				 
			
 
				 logging:
			
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -6,7 +6,6 @@
 
				     <#include '/include/head-file.ftl'/>
			
 
				     <script src="${base}/static/plugins/sockjs/1.4.0/sockjs.min.js"></script>
			
 
				     <script src="${base}/static/plugins/stomp/2.3.3/stomp.min.js"></script>
			
 
				-    <script src="${base}/static/plugins/ms/compoents/store.umd.min.js"></script>
			
 
				     <style>
			
 
				         .to-ele {
			
 
				             font-size: 18px;
			
@@ -129,7 +128,10 @@
 
				                         </el-dropdown-menu>
			
 
				                     </el-dropdown>
			
 
				                     <!--mstore按钮-->
			
 
				-                    <ms-store client="${client}"></ms-store>
			
 
				+                    <div class="ms-admin-mstore-icon" @click="open(mstore)">
			
 
				+                        <span v-if="mstore.syncNum>0" v-text="mstore.syncNum"></span>
			
 
				+                        <i style="line-height: 42px !important;font-size: 30px;" class="iconfont icon-fenxiang2"></i>
			
 
				+                    </div>
			
 
				                 </div>
			
 
				 
			
 
				             </el-header>
			
@@ -526,6 +528,13 @@
 
				             this.list();
			
 
				             //获取登录用户信息
			
 
				             this.managerGet();
			
 
				+            var that = this;
			
 
				+            ms.http.get(ms.manager + "/store/sync.do").then(function (res) {
			
 
				+                if (res.result) {
			
 
				+                    res.data.syncStoreUrl += "/#/?client=${client}";
			
 
				+                    that.mstore = res.data;
			
 
				+                }
			
 
				+            })
			
 
				         },
			
 
				     })
			
 
				 </script>
			
--- a/src/main/webapp/templets/1/default/about.htm
+++ b/src/main/webapp/templets/1/default/about.htm
@@ -1,31 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <#include "head-file.htm"/>
			
 
				-    </head>
			
 
				-
			
 
				-    <body>
			
 
				-        <#include "head.htm"/>
			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/about_us.jpg) no-repeat center;">
			
 
				-            <p class="banner_tit_about animated fadeInLeft">关于我们</p>
			
 
				-            <p class="banner_tit_about_des animated fadeInRight">About us</p>
			
 
				-        </div>
			
 
				-        <div class="ms-content-about">
			
 
				-            <div class="ms-content-main">
			
 
				-                <#include "menu-left.htm"/>
			
 
				-                <div class="ms-content-right">
			
 
				-                    <div class="ms-content-right-position">
			
 
				-                        <a href="{ms:global.host/}">首页</a>
			
 
				-                        <span>></span>
			
 
				-                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-right-main">
			
 
				-                        <div class="ms-content-right-main-title">{ms:field.title/}</div>
			
 
				-                        <div class="ms-content-right-main-content">{ms:field.content/}</div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <#include "footer.htm"/>
			
 
				-    </body>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/advice.htm
+++ b/src/main/webapp/templets/1/default/advice.htm
@@ -1,67 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				-    <head>

			
 
				-        <#include "head-file.htm"/>

			
 
				-    </head>

			
 
				-    <body>

			
 
				-        <#include "head.htm"/>

			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/talk_online.jpeg) no-repeat center;">

			
 
				-            <p class="banner_tit_other animated fadeInLeft">在线留言</p>

			
 
				-            <p class="banner_tit_other_des animated fadeInRight">Talk online</p>

			
 
				-        </div>

			
 
				-        <div class="ms-content-advice">

			
 
				-            <div class="ms-content-form-background">

			
 
				-                <form class="ms-content-form" method="post" id="postForm">

			
 
				-                    <input class="ms-content-form-name" type="text" name="name" placeholder="姓名">

			
 
				-                    <input class="ms-content-form-phone" type="text" name="phone" placeholder="手机">

			
 
				-                    <textarea class="ms-content-form-message" name="words" placeholder="留言"></textarea>

			
 
				-                    <div class="ms-login-button">提交</div>

			
 
				-                </form>

			
 
				-            </div>

			
 
				-        </div>

			
 
				-        <#include "footer.htm"/>

			
 
				-    </body>

			
 
				-</html>

			
 
				-<script>

			
 
				-    /* 表单提交 */

			
 
				-    var flag = false;

			
 
				-    $(".ms-login-button").click(function() {

			
 
				-        if(!flag) {

			
 
				-            $.ajax({

			
 
				-                type: "POST",

			
 
				-                url: "{ms:global.host/}/mdiy/post/7df6529f9eaa26da7ae4e01c7f73aa06.do",

			
 
				-                data: $("#postForm").serialize(),

			
 
				-                success: function(msg) {

			
 
				-                    flag = true;

			
 
				-                    alert("提交成功");

			
 
				-                    location.reload();

			
 
				-                }

			
 
				-            });

			
 
				-        } else {

			
 
				-            alert("您已经提交过了！");

			
 
				-        }

			
 
				-    })

			
 
				-

			
 
				-    /* 表单验证 */

			
 
				-    function verification() {

			
 
				-        if($('input[name="name"]').val().length > 0 && $('input[name="phone"]').val().length > 0 && $('.ms-content-form-message').val().length > 0) {

			
 
				-            $('.ms-login-button').css("background-color", "#009aff");

			
 
				-            $('.ms-login-button').css("pointer-events", 'visible');

			
 
				-            $('.ms-login-button').css("color", "#fff");

			
 
				-        } else {

			
 
				-            $('.ms-login-button').css("background-color", "#fafafa");

			
 
				-            $('.ms-login-button').css('pointer-events', "none");

			
 
				-            $('.ms-login-button').css("color", "#ddd");

			
 
				-        }

			
 
				-    }

			
 
				-

			
 
				-    $('input[name="name"]').keyup(function() {

			
 
				-        verification();

			
 
				-    })

			
 
				-    $('input[name="phone"]').keyup(function() {

			
 
				-        verification();

			
 
				-    })

			
 
				-    $('.ms-content-form-message').keyup(function() {

			
 
				-        verification();

			
 
				-    })

			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/case-list.htm
+++ b/src/main/webapp/templets/1/default/case-list.htm
@@ -1,47 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				-    <head>

			
 
				-        <#include "head-file.htm"/>

			
 
				-    </head>

			
 
				-

			
 
				-    <body>

			
 
				-        <#include "head.htm"/>

			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/00.png) no-repeat center;">

			
 
				-            <p class="banner_tit_other animated fadeInLeft">案&nbsp;&nbsp;&nbsp;例</p>

			
 
				-            <p class="banner_tit_other_des animated fadeInRight">Case list</p>

			
 
				-        </div>

			
 
				-        <div class="ms-content-case">

			
 
				-            <div class="ms-content-main">

			
 
				-                {ms:arclist size=6 ispaging=true}

			
 
				-                <div class="ms-content-main-case">

			
 
				-                    <div class="ms-content-main-case-img">

			
 
				-                        <img src="{ms:global.host/}[field.litpic/]">

			
 
				-                    </div>

			
 
				-                    <div class="ms-content-main-case-explain">

			
 
				-                        <div class="ms-content-main-case-title">[field.title/]</div>

			
 
				-                        <div class="ms-content-main-case-content">

			
 
				-                            <p class="ms-content-main-case-written">

			
 
				-                                [field.content/]

			
 
				-                            </p>

			
 
				-                            <!-- <p class="ms-content-main-case-QRcode">

			
 
				-                                <img src="./images/1471918025445.png">

			
 
				-                            </p> -->

			
 
				-                        </div>

			
 
				-                        <div class="ms-content-main-case-click">

			
 
				-                            <a target="_blank" href="[field.source/]">点击查看</a>

			
 
				-                        </div>

			
 
				-                    </div>

			
 
				-                </div>

			
 
				-                {/ms:arclist}

			
 
				-            </div>

			
 
				-        </div>

			
 
				-        <#include "footer.htm"/>

			
 
				-    </body>

			
 
				-</html>

			
 
				-<script type="text/javascript">

			
 
				-    $(function() {

			
 
				-        $('.ms-content-main-case').hover(function() {

			
 
				-            $(this).find('.ms-content-main-case-explain').toggle();

			
 
				-        });

			
 
				-    });

			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/contact.htm
+++ b/src/main/webapp/templets/1/default/contact.htm
@@ -1,143 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <#include "head-file.htm"/>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <#include "head.htm"/>
			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/contact_us.jpeg) no-repeat center;">
			
 
				-            <p class="banner_tit_other animated fadeInLeft" >联系我们</p>
			
 
				-            <p class="banner_tit_other_des animated fadeInRight">Contact us</p>
			
 
				-        </div>
			
 
				-        <div class="ms-content-about">
			
 
				-            <div class="ms-content-main">
			
 
				-                <#include "menu-left.htm"/>
			
 
				-                <div class="ms-content-right">
			
 
				-                    <div class="ms-content-right-position">
			
 
				-                        <a href="{ms:global.host/}">首页</a>
			
 
				-                        <span>></span>
			
 
				-                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-right-main">
			
 
				-                        <div class="ms-content-right-main-title">联系我们</div>
			
 
				-                        <div class="ms-content-right-main-content"><!-- {ms:field.content/} -->
			
 
				-							<style type="text/css">
			
 
				-								.BMap_Marker img{
			
 
				-								    width: 100%;
			
 
				-								    height: 100%;
			
 
				-								}
			
 
				-							    html,body{margin:0;padding:0;}
			
 
				-							    .iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
			
 
				-							    .iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
			
 
				-							</style>
			
 
				-							<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
			
 
				-							<body>
			
 
				-							  <!--百度地图容器-->
			
 
				-							  <div style="width:100%;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
			
 
				-							</body>
			
 
				-							<script type="text/javascript">
			
 
				-							    //创建和初始化地图函数：
			
 
				-							    function initMap(){
			
 
				-							        createMap();//创建地图
			
 
				-							        setMapEvent();//设置地图事件
			
 
				-							        addMapControl();//向地图添加控件
			
 
				-							        addMarker();//向地图中添加marker
			
 
				-							    }
			
 
				-							    
			
 
				-							    //创建地图函数：
			
 
				-							    function createMap(){
			
 
				-							        var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
			
 
				-							        var point = new BMap.Point(116.737158,29.153633);//定义一个中心点坐标
			
 
				-							        map.centerAndZoom(point,9);//设定地图的中心点和坐标并将地图显示在地图容器中
			
 
				-							        window.map = map;//将map变量存储在全局
			
 
				-							    }
			
 
				-							    
			
 
				-							    //地图事件设置函数：
			
 
				-							    function setMapEvent(){
			
 
				-							        map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
			
 
				-							        map.enableScrollWheelZoom();//启用地图滚轮放大缩小
			
 
				-							        map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
			
 
				-							        map.enableKeyboard();//启用键盘上下左右键移动地图
			
 
				-							    }
			
 
				-							    
			
 
				-							    //地图控件添加函数：
			
 
				-							    function addMapControl(){
			
 
				-							        //向地图中添加缩放控件
			
 
				-							  var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
			
 
				-							  map.addControl(ctrl_nav);
			
 
				-							        //向地图中添加缩略图控件
			
 
				-							  var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
			
 
				-							  map.addControl(ctrl_ove);
			
 
				-							        //向地图中添加比例尺控件
			
 
				-							  var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
			
 
				-							  map.addControl(ctrl_sca);
			
 
				-							    }
			
 
				-							    
			
 
				-							    //标注点数组
			
 
				-							    var markerArr = [{title:"铭飞科技(景德镇)有限公司",content:"江西省景德镇市昌江区&nbsp;枫林佳苑&nbsp;15栋A区&nbsp;三单元&nbsp;302室",point:"117.187869|29.282949",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
			
 
				-							     ,{title:"铭飞科技(南昌)办事处",content:"江西省南昌市青山湖区创新一路&nbsp;绿地新都会(西门)&nbsp;12栋2单元901室",point:"116.003117|28.683521",isOpen:0,icon:{w:21,h:21,l:0,t:0,x:6,lb:5}}
			
 
				-							     ];
			
 
				-							    //创建marker
			
 
				-							    function addMarker(){
			
 
				-							        for(var i=0;i<markerArr.length;i++){
			
 
				-							            var json = markerArr[i];
			
 
				-							            var p0 = json.point.split("|")[0];
			
 
				-							            var p1 = json.point.split("|")[1];
			
 
				-							            var point = new BMap.Point(p0,p1);
			
 
				-							      var iconImg = createIcon(json.icon);
			
 
				-							            var marker = new BMap.Marker(point,{icon:iconImg});
			
 
				-							      var iw = createInfoWindow(i);
			
 
				-							      var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
			
 
				-							      marker.setLabel(label);
			
 
				-							            map.addOverlay(marker);
			
 
				-							            label.setStyle({
			
 
				-							                        borderColor:"#808080",
			
 
				-							                        color:"#333",
			
 
				-							                        cursor:"pointer"
			
 
				-							            });
			
 
				-							      
			
 
				-							      (function(){
			
 
				-							        var index = i;
			
 
				-							        var _iw = createInfoWindow(i);
			
 
				-							        var _marker = marker;
			
 
				-							        _marker.addEventListener("click",function(){
			
 
				-							            this.openInfoWindow(_iw);
			
 
				-							          });
			
 
				-							          _iw.addEventListener("open",function(){
			
 
				-							            _marker.getLabel().hide();
			
 
				-							          })
			
 
				-							          _iw.addEventListener("close",function(){
			
 
				-							            _marker.getLabel().show();
			
 
				-							          })
			
 
				-							        label.addEventListener("click",function(){
			
 
				-							            _marker.openInfoWindow(_iw);
			
 
				-							          })
			
 
				-							        if(!!json.isOpen){
			
 
				-							          label.hide();
			
 
				-							          _marker.openInfoWindow(_iw);
			
 
				-							        }
			
 
				-							      })()
			
 
				-							        }
			
 
				-							    }
			
 
				-							    //创建InfoWindow
			
 
				-							    function createInfoWindow(i){
			
 
				-							        var json = markerArr[i];
			
 
				-							        var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
			
 
				-							        return iw;
			
 
				-							    }
			
 
				-							    //创建一个Icon
			
 
				-							    function createIcon(json){
			
 
				-							        var icon = new BMap.Icon("{ms:global.host/}/{ms:global.style/}/images/img-2.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
			
 
				-							        return icon;
			
 
				-							    }
			
 
				-							    
			
 
				-							    initMap();//创建和初始化地图
			
 
				-							</script>                        
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <#include "footer.htm"/>
			
 
				-    </body>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/footer.htm
+++ b/src/main/webapp/templets/1/default/footer.htm
@@ -1,39 +0,0 @@
 
				-<div class="ms-footer">
			
 
				-    <div class="ms-footer-content">
			
 
				-        <div class="ms-footer-left">
			
 
				-            <div class="ms-footer-left-column">
			
 
				-                <span class="ms-footer-left-column-about">
			
 
				-                	<a href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				-                </span>|
			
 
				-                <span class="ms-footer-left-column-course">
			
 
				-                	<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
			
 
				-                </span>|
			
 
				-                <span class="ms-footer-left-column-contact">
			
 
				-                	<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>联系我们</a>
			
 
				-                </span>
			
 
				-            </div>
			
 
				-            <span class="ms-footer-left-copyright">版权所有&copy;铭飞科技有限公司2012-2018保留一切权利</span>
			
 
				-        </div>
			
 
				-        <div class="ms-footer-right">
			
 
				-            <img class='ms-footer-right-img-weixin' src="{ms:global.host/}/{ms:global.style/}/images/we-chat.png">
			
 
				-            <a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="{ms:global.host/}/{ms:global.style/}/images/baidu.png"></a>
			
 
				-            <a target="_blank" href='http://weibo.com/killfen'><img src="{ms:global.host/}/{ms:global.style/}/images/micro-blog.png"></a>
			
 
				-        	<div class="ms-footer-right-weixin">
			
 
				-        		<p></p>
			
 
				-        		<img alt="" src="{ms:global.host/}/{ms:global.style/}/images/weixin.jpg">
			
 
				-        	</div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-<script>
			
 
				-/*导航下拉*/
			
 
				-$(function(){
			
 
				-    $(".head-menu-list-li").hover(function(){
			
 
				-        $(this).find(".head-menu-son-list").fadeToggle();
			
 
				-    });
			
 
				-    $('.ms-footer-right-img-weixin').hover(function(){
			
 
				-    	$('.ms-footer-right-weixin').toggle();
			
 
				-    });
			
 
				-});
			
 
				-
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/head-file.htm
+++ b/src/main/webapp/templets/1/default/head-file.htm
@@ -1,36 +0,0 @@
 
				-<title>{ms:global.name/}</title>
			
 
				-<meta charset="utf-8">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/base.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/index.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/advice.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/case-list.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/about.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-list.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-show.css">
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/center.css">
			
 
				-
			
 
				-<script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-<script src="{ms:global.host/}/{ms:global.style/}/js/slider.js"></script>
			
 
				-<script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
			
 
				-<!--vue-懒加载-表单验证-->
			
 
				-<script src="{ms:global.host/}/plugins/vue/2.6.9/vue.min.js"></script>
			
 
				-<script src="{ms:global.host/}/plugins/validator/10.8.0/validator.min.js"></script>
			
 
				-<!-- Element -->
			
 
				-<link rel="stylesheet" href="{ms:global.host/}/plugins/element-ui/2.8.2/index.css">
			
 
				-<script src="{ms:global.host/}/plugins/element-ui/2.8.2/index.js"></script>
			
 
				-
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/animate.css">
			
 
				-<script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script>
			
 
				-<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.js"></script>
			
 
				-<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.http.js"></script>
			
 
				-<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.util.js"></script>
			
 
				-<script src="{ms:global.host/}/api/ms.people.min.js"></script>
			
 
				-<script src="{ms:global.host/}/static/plugins/plupload/plupload.full.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/ms/1.0.0/ms.upload.js"></script>
			
 
				-<script>
			
 
				-	window.http = ms.http;
			
 
				-	ms.base = "{ms:global.host/}";
			
 
				-	ms.login = '{ms:global.host/}';
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/head.htm
+++ b/src/main/webapp/templets/1/default/head.htm
@@ -1,146 +0,0 @@
 
				-<div class="ms-head">
			
 
				-    <div class="head-menu">
			
 
				-        <div class="head-men-left head-menu-flex-center">
			
 
				-            <a href="{ms:global.host/}/html/1/index.html">
			
 
				-                <img src="http://cdn.mingsoft.net/images/logo.png" />
			
 
				-            </a>
			
 
				-            <ul class="head-menu-list">
			
 
				-                <li class="head-menu-list-li">走进铭飞
			
 
				-                    <ul class="head-menu-son-list">
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='{ms:global.url/}/xinwenzhongxin/index.html'>公司动态</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>加入我们</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
			
 
				-                        </li>
			
 
				-                    </ul>
			
 
				-                </li>
			
 
				-                <li class="head-menu-list-li">
			
 
				-                    <a href='{ms:global.url/}/wangzhananli/index.html'>案例</a>
			
 
				-                </li>
			
 
				-                <li class="head-menu-list-li">
			
 
				-                    <a target="_blank" href='http://store.mingsoft.net/mstore/index.do'>插件&模板</a>
			
 
				-                    <!-- <ul class="head-menu-son-list">
			
 
				-                        <li><a href='http://mstore.mingsoft.net/mstoreShow.do'>模板</a></li>
			
 
				-                        <li><a href='http://mstore.mingsoft.net/mstoreShow.do'>插件</a></li>
			
 
				-                    </ul> -->
			
 
				-                </li>
			
 
				-                <li class="head-menu-list-li">
			
 
				-                    <a target="_blank" href='{ms:global.url/}/lianxiwomen19/zaixianliuyan/index.html'>在线留言</a>
			
 
				-                </li>
			
 
				-                <li class="head-menu-list-li">技术支持
			
 
				-                    <ul class="head-menu-son-list">
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='http://bbs.mingsoft.net/mbbs/main.do'>开源社区</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='https://gitee.com/mingSoft/MCMS'>源码下载</a>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <a target="_blank" href='http://doc.ms.mingsoft.net/plugs-cms/'>使用手册</a>
			
 
				-                        </li>
			
 
				-                    </ul>
			
 
				-                </li>
			
 
				-            </ul>
			
 
				-        </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/}/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>
			
 
				-            </div>
			
 
				-            <div class="head-menu-right-content" id="ms-login-vue">
			
 
				-                <span v-show="!isLogin" style="display: none;">
			
 
				-                    <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">
			
 
				-                        <img :src="'{ms:global.host/}/'+peopleInfo.puIcon" class="loginImg user_icon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
			
 
				-                        <b class="userName ms-userName" v-text="peopleInfo.puNickname"></b>
			
 
				-                    </a>
			
 
				-                    <a href="javascript:;" class="quitLogin" @click="quitLogin">退出</a>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-<script>
			
 
				-    var headVue = new Vue({
			
 
				-        el: "#ms-login-vue",
			
 
				-        data: {
			
 
				-            isLogin: "", //登录状态
			
 
				-            peopleInfo: "", //个人信息
			
 
				-            imgUrl:"",
			
 
				-        },
			
 
				-        
			
 
				-        mounted: function() {
			
 
				-            //获取个人信息
			
 
				-            var target = this;
			
 
				-            $.ajax({
			
 
				-                type: "POST",
			
 
				-                url: "{ms:global.host/}/checkLoginStatus.do",
			
 
				-                success: function(msg) {
			
 
				-                    target.isLogin = msg.result;  //判断用户是否登录，如登录，则target.isLogin===true
			
 
				-                    if(msg.result) {
			
 
				-                        $.ajax({
			
 
				-                            type: "GET",
			
 
				-                            url: "{ms:global.host/}/people/user/info.do",
			
 
				-                            success: function(msg) {
			
 
				-                                target.peopleInfo = msg;  //target.peopleInfo为当前登录用户的基本信息
			
 
				-                            }
			
 
				-                        })
			
 
				-                    }
			
 
				-                }
			
 
				-            })
			
 
				-        },
			
 
				-        methods: {
			
 
				-            //退出登录
			
 
				-            quitLogin: function() {
			
 
				-                var target = this;
			
 
				-                $.ajax({
			
 
				-                    type: "GET",
			
 
				-                    url: "{ms:global.host/}/people/quit.do",
			
 
				-                    success: function(msg) {
			
 
				-                        if(msg.result) {
			
 
				-                            $("body").append("<form id='msHeadForm' action=''></form>");
			
 
				-                            $("#msHeadForm").attr("action", "{ms:global.host/}").submit();
			
 
				-                        }
			
 
				-                    }
			
 
				-                })
			
 
				-            },
			
 
				-        },
			
 
				-    })
			
 
				-    
			
 
				-    /* $(function(){
			
 
				-        var r=location.href;
			
 
				-          if(r.match("53")){
			
 
				-          $(".head-menu-list-li").removeClass("head-active");
			
 
				-          $(".head-menu-list-li").eq(0).addClass("head-active");
			
 
				-        }else if(r.match("141")){
			
 
				-          $(".head-menu-list-li").removeClass("head-active");
			
 
				-          $(".head-menu-list-li").eq(0).addClass("head-active");
			
 
				-        }else if(r.match("59")){
			
 
				-          $(".head-menu-list-li").removeClass("head-active");
			
 
				-          $(".head-menu-list-li").eq(0).addClass("head-active");
			
 
				-        }else if(r.match("155")){
			
 
				-          $(".head-menu-list-li").removeClass("head-active");
			
 
				-          $(".head-menu-list-li").eq(1).addClass("head-active");
			
 
				-        }else if(r.match("142")){
			
 
				-            $(".head-menu-list-li").removeClass("head-active");
			
 
				-            $(".head-menu-list-li").eq(3).addClass("head-active");
			
 
				-          }
			
 
				-      }) */
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/images/00.png
+++ b/src/main/webapp/templets/1/default/images/00.png
--- a/src/main/webapp/templets/1/default/images/01.jpg
+++ b/src/main/webapp/templets/1/default/images/01.jpg
--- a/src/main/webapp/templets/1/default/images/02.jpg
+++ b/src/main/webapp/templets/1/default/images/02.jpg
--- a/src/main/webapp/templets/1/default/images/03.jpg
+++ b/src/main/webapp/templets/1/default/images/03.jpg
--- a/src/main/webapp/templets/1/default/images/1471918025445.png
+++ b/src/main/webapp/templets/1/default/images/1471918025445.png
--- a/src/main/webapp/templets/1/default/images/about_us.jpg
+++ b/src/main/webapp/templets/1/default/images/about_us.jpg
--- a/src/main/webapp/templets/1/default/images/ad_ctr.png
+++ b/src/main/webapp/templets/1/default/images/ad_ctr.png
--- a/src/main/webapp/templets/1/default/images/alpha.png
+++ b/src/main/webapp/templets/1/default/images/alpha.png
--- a/src/main/webapp/templets/1/default/images/baidu.png
+++ b/src/main/webapp/templets/1/default/images/baidu.png
--- a/src/main/webapp/templets/1/default/images/banner.jpg
+++ b/src/main/webapp/templets/1/default/images/banner.jpg
--- a/src/main/webapp/templets/1/default/images/case.png
+++ b/src/main/webapp/templets/1/default/images/case.png
--- a/src/main/webapp/templets/1/default/images/code.jpg
+++ b/src/main/webapp/templets/1/default/images/code.jpg
--- a/src/main/webapp/templets/1/default/images/company.png
+++ b/src/main/webapp/templets/1/default/images/company.png
--- a/src/main/webapp/templets/1/default/images/contact_us.jpeg
+++ b/src/main/webapp/templets/1/default/images/contact_us.jpeg
--- a/src/main/webapp/templets/1/default/images/error.png
+++ b/src/main/webapp/templets/1/default/images/error.png
--- a/src/main/webapp/templets/1/default/images/hu1.png
+++ b/src/main/webapp/templets/1/default/images/hu1.png
--- a/src/main/webapp/templets/1/default/images/img-2.png
+++ b/src/main/webapp/templets/1/default/images/img-2.png
--- a/src/main/webapp/templets/1/default/images/level-0.png
+++ b/src/main/webapp/templets/1/default/images/level-0.png
--- a/src/main/webapp/templets/1/default/images/level-1.png
+++ b/src/main/webapp/templets/1/default/images/level-1.png
--- a/src/main/webapp/templets/1/default/images/level-2.png
+++ b/src/main/webapp/templets/1/default/images/level-2.png
--- a/src/main/webapp/templets/1/default/images/level-3.png
+++ b/src/main/webapp/templets/1/default/images/level-3.png
--- a/src/main/webapp/templets/1/default/images/level-4.png
+++ b/src/main/webapp/templets/1/default/images/level-4.png
--- a/src/main/webapp/templets/1/default/images/level-5.png
+++ b/src/main/webapp/templets/1/default/images/level-5.png
--- a/src/main/webapp/templets/1/default/images/loading.gif
+++ b/src/main/webapp/templets/1/default/images/loading.gif
--- a/src/main/webapp/templets/1/default/images/logo.png
+++ b/src/main/webapp/templets/1/default/images/logo.png
--- a/src/main/webapp/templets/1/default/images/micro-blog.png
+++ b/src/main/webapp/templets/1/default/images/micro-blog.png
--- a/src/main/webapp/templets/1/default/images/mobile.png
+++ b/src/main/webapp/templets/1/default/images/mobile.png
--- a/src/main/webapp/templets/1/default/images/more.png
+++ b/src/main/webapp/templets/1/default/images/more.png
--- a/src/main/webapp/templets/1/default/images/ms.ico
+++ b/src/main/webapp/templets/1/default/images/ms.ico
--- a/src/main/webapp/templets/1/default/images/new-loading.gif
+++ b/src/main/webapp/templets/1/default/images/new-loading.gif
--- a/src/main/webapp/templets/1/default/images/news.png
+++ b/src/main/webapp/templets/1/default/images/news.png
--- a/src/main/webapp/templets/1/default/images/news2.png
+++ b/src/main/webapp/templets/1/default/images/news2.png
--- a/src/main/webapp/templets/1/default/images/no-comment.png
+++ b/src/main/webapp/templets/1/default/images/no-comment.png
--- a/src/main/webapp/templets/1/default/images/no-data.png
+++ b/src/main/webapp/templets/1/default/images/no-data.png
--- a/src/main/webapp/templets/1/default/images/our_company.jpeg
+++ b/src/main/webapp/templets/1/default/images/our_company.jpeg
--- a/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
+++ b/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
--- a/src/main/webapp/templets/1/default/images/pic.png
+++ b/src/main/webapp/templets/1/default/images/pic.png
--- a/src/main/webapp/templets/1/default/images/pics.png
+++ b/src/main/webapp/templets/1/default/images/pics.png
--- a/src/main/webapp/templets/1/default/images/search.jpg
+++ b/src/main/webapp/templets/1/default/images/search.jpg
--- a/src/main/webapp/templets/1/default/images/search.png
+++ b/src/main/webapp/templets/1/default/images/search.png
--- a/src/main/webapp/templets/1/default/images/talk_online.jpeg
+++ b/src/main/webapp/templets/1/default/images/talk_online.jpeg
--- a/src/main/webapp/templets/1/default/images/timg.jpg
+++ b/src/main/webapp/templets/1/default/images/timg.jpg
--- a/src/main/webapp/templets/1/default/images/we-chat.png
+++ b/src/main/webapp/templets/1/default/images/we-chat.png
--- a/src/main/webapp/templets/1/default/images/weixin.jpg
+++ b/src/main/webapp/templets/1/default/images/weixin.jpg
--- a/src/main/webapp/templets/1/default/index.htm
+++ b/src/main/webapp/templets/1/default/index.htm
@@ -1,286 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <#include "head-file.htm">
			
 
				-    <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
			
 
				-    <script type="text/javascript" src="{ms:global.host/}/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
			
 
				-    <script>
			
 
				-        var ms = {
			
 
				-            base:"http://store.mingsoft.net"
			
 
				-        }
			
 
				-    </script>
			
 
				-    <script src="http://store.mingsoft.net/api/ms.web.mstore.js"></script>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-<#include "head.htm">
			
 
				-<!-- <div class="ms-banner">
			
 
				-    <img src="./images/banner.jpg">
			
 
				-</div> -->
			
 
				-<div id="indexVue">
			
 
				-    <div id="banner_tabs" class="flexslider">
			
 
				-        <ul class="slides">
			
 
				-            <template v-for="banner in bannerList">
			
 
				-                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
			
 
				-                    <p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
			
 
				-                    <p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
			
 
				-                </li>
			
 
				-                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
			
 
				-                    <p class="banner_tit animated fadeInLeft">MStore</p>
			
 
				-                    <p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
			
 
				-                </li>
			
 
				-                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
			
 
				-                    <p class="banner_tit animated fadeInLeft">优质的服务体验</p>
			
 
				-                    <p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
			
 
				-                </li>
			
 
				-            </template>
			
 
				-        </ul>
			
 
				-        <ul class="flex-direction-nav">
			
 
				-            <li>
			
 
				-                <a class="flex-prev" href="javascript:;">Previous</a>
			
 
				-            </li>
			
 
				-            <li>
			
 
				-                <a class="flex-next" href="javascript:;">Next</a>
			
 
				-            </li>
			
 
				-        </ul>
			
 
				-    </div>
			
 
				-    <div class="ms-content-index">
			
 
				-        <div class="ms-content-template">
			
 
				-            <div>
			
 
				-                <ul class="nav nav-tabs ms-index-tabs" role="tablist">
			
 
				-                    <li role="presentation" class="active">
			
 
				-                        <a href="#model" aria-controls="model" role="tab" data-toggle="tab">模板</a>
			
 
				-                    </li>
			
 
				-                    <li role="presentation">
			
 
				-                        <a href="#plug" aria-controls="plug" role="tab" data-toggle="tab">插件</a>
			
 
				-                    </li>
			
 
				-                </ul>
			
 
				-                <div class="ms-content-all">
			
 
				-                    <div class="tab-content">
			
 
				-                        <div role="tabpanel" class="tab-pane active" id="model">
			
 
				-                            <div style="display: none;" class="ms-loading" v-show="!loading">
			
 
				-                                <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif" />
			
 
				-                            </div>
			
 
				-                            <div class="ms-model-content" style="display: none;" v-show="loading">
			
 
				-                                <template v-for="model in modelList">
			
 
				-                                    <div class="ms-model-list">
			
 
				-                                        <a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
			
 
				-                                            <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.img" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
			
 
				-                                        </a>
			
 
				-                                        <div class="ms-model-mobile-img" v-if="model.mobileImg != '' && model.mobileImg != undefined" style="background: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
			
 
				-                                            <div>
			
 
				-                                                <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.mobileImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
			
 
				-                                            </div>
			
 
				-                                        </div>
			
 
				-                                        <div class="ms-model-info">
			
 
				-                                            <span v-text="model.upgraderVersionName"></span>
			
 
				-                                            <img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
			
 
				-                                            <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+model.upgraderVersionStart+'.png'" />
			
 
				-                                            <div class="ms-model-type">模板</div>
			
 
				-                                        </div>
			
 
				-                                    </div>
			
 
				-                                </template>
			
 
				-                                <div class="ms-model-list" style="display: none;" v-show="loading">
			
 
				-                                    <div class="ms-model-more">
			
 
				-                                        <div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                        <div role="tabpanel" class="tab-pane" id="plug">
			
 
				-                            <div class="ms-model-content" style="display: none;" v-show="loading">
			
 
				-                                <template v-for="pulg in pulgList">
			
 
				-                                    <div class="ms-model-list">
			
 
				-                                        <a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
			
 
				-                                            <img :src="'http://store.mingsoft.net/'+pulg.img" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
			
 
				-                                        </a>
			
 
				-                                        <div class="ms-model-info">
			
 
				-                                            <span v-text="pulg.upgraderVersionName"></span>
			
 
				-                                            <img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
			
 
				-                                            <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+pulg.upgraderVersionStart+'.png'" />
			
 
				-                                            <div class="ms-model-type">插件</div>
			
 
				-                                        </div>
			
 
				-                                    </div>
			
 
				-                                </template>
			
 
				-                                <div class="ms-model-list" style="display: none;" v-show="loading">
			
 
				-                                    <div class="ms-model-more">
			
 
				-                                        <div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div class="ms-content-case">
			
 
				-            <div class="ms-content-case-mian">
			
 
				-                <div class="ms-content-case-title">
			
 
				-                    <div class="ms-content-case-title-words">网站案例</div>
			
 
				-                    <div class="ms-content-case-more">
			
 
				-                        <a href='{ms:global.url/}/149/index.html'>MORE>></a>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="ms-content-case-list">
			
 
				-                    {ms:arclist typeid=149 size=6}
			
 
				-                    <div class="ms-content-main-case">
			
 
				-                        <div class="ms-content-main-case-img">
			
 
				-                            <img src="{ms:global.host/}[field.litpic/]">
			
 
				-                        </div>
			
 
				-                        <div class="ms-content-main-case-explain">
			
 
				-                            <div class="ms-content-main-case-title">[field.title/]</div>
			
 
				-                            <div class="ms-content-main-case-content">
			
 
				-
			
 
				-                                <p class="ms-content-main-case-written">
			
 
				-                                    [field.content/]
			
 
				-                                </p>
			
 
				-                            </div>
			
 
				-                            <div class="ms-content-main-case-click">
			
 
				-                                <a target="_blank" href="[field.source/]">点击查看</a>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                    {/ms:arclist}
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div class="ms-content-product">
			
 
				-            <div class="ms-content-product-main">
			
 
				-                <div class="ms-content-product-title">
			
 
				-                    <div class="ms-content-product-title-words">产品方向</div>
			
 
				-                </div>
			
 
				-                <div class="ms-content-product-list">
			
 
				-                    <ul class="ms-content-product-list-ul">
			
 
				-                        <li>
			
 
				-                            <div class="ms-content-product-list-img">
			
 
				-                                <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">
			
 
				-                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu1.png"></a>
			
 
				-                            </div>
			
 
				-                            <div class="ms-content-product-list-content">
			
 
				-                                <div class="ms-content-product-list-content-title">
			
 
				-                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">铭飞建站系统MCMS</a></div>
			
 
				-                                <div class="ms-content-product-list-content-describe">纯Java开发，MCMS支持PC与MOBILE皮肤定制,同时使用MS团队移动JS插件，支持站群。</div></div>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <div class="ms-content-product-list-img">
			
 
				-                                <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">
			
 
				-                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu2.jpg"></a>
			
 
				-                            </div>
			
 
				-                            <div class="ms-content-product-list-content">
			
 
				-                                <div class="ms-content-product-list-content-title">
			
 
				-                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">移动互联网</a></div>
			
 
				-                                <div class="ms-content-product-list-content-describe">重新定义移动开发，快速、开放、高性能，数据无缝对接，超过500个模块api 接口，方便实现各种应用。</div></div>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            <div class="ms-content-product-list-img">
			
 
				-                                <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">
			
 
				-                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu3.jpg"></a>
			
 
				-                            </div>
			
 
				-                            <div class="ms-content-product-list-content">
			
 
				-                                <div class="ms-content-product-list-content-title">
			
 
				-                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">铭飞物联网</a></div>
			
 
				-                                <div class="ms-content-product-list-content-describe">MS+物联网，让生产企业真正掌握企业命脉，实现互联网+生产，给企业插上信息化翅膀，共享、共荣大数据时代</div></div>
			
 
				-                        </li>
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div class="ms-content-news">
			
 
				-            <div class="ms-content-news-main">
			
 
				-                <div class="ms-content-news-main-title">
			
 
				-                    <div class="ms-content-news-main-title-words">公司动态</div>
			
 
				-                    <div class="ms-content-news-main-title-more">
			
 
				-                        <a href='{ms:global.url/}/xinwenzhongxin/index.html'>MORE>></a>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="ms-content-news-main-img-text">
			
 
				-                    {ms:arclist typeid=59 size=1}
			
 
				-                    <img src="{ms:global.host/}[field.litpic/]">
			
 
				-                    {/ms:arclist}
			
 
				-                    <ul class="ms-content-news-main-ul">
			
 
				-                        {ms:arclist typeid=59 size=6}
			
 
				-                        <li>
			
 
				-                            <a href="{ms:global.url/}[field.link/]">
			
 
				-                                <div class="ms-content-news-main-li-title">
			
 
				-                                    <!-- <span class="ms-content-news-main-li-span">·</span> -->
			
 
				-                                    <span class="">[field.title/]</span>
			
 
				-                                </div>
			
 
				-                                <div class="ms-content-news-main-li-time">[field.date?string("yyyy-mm-dd")/]</div>
			
 
				-                            </a>
			
 
				-                        </li>
			
 
				-                        {/ms:arclist}
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</div>
			
 
				-<#include "footer.htm">
			
 
				-</body>
			
 
				-</html>
			
 
				-<script type="text/javascript">
			
 
				-    var index = new Vue({
			
 
				-        el: "#indexVue",
			
 
				-        data: {
			
 
				-            bannerList: ['01', '02', '03', '04', '05'], //幻灯片列表
			
 
				-            modelList: [], //模板列表
			
 
				-            pulgList: [], //插件列表
			
 
				-            loading: false, //加载状态
			
 
				-        },
			
 
				-        methods: {
			
 
				-            query: function(data, type) {
			
 
				-                var target = this;
			
 
				-                ms.web.mstore.list(data, function(json) {
			
 
				-                    if(type == 'model') {
			
 
				-                        target.modelList = json.list;
			
 
				-                    } else {
			
 
				-                        target.pulgList = json.list;
			
 
				-                        target.loading = true;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            imgMover: function() {
			
 
				-                var _this = event.target;
			
 
				-                var ms_top = ($(_this).height()) - 275;
			
 
				-                if(ms_top < 0) {
			
 
				-                    ms_top = 0;
			
 
				-                }
			
 
				-                $(_this).stop(true);
			
 
				-                $(_this).animate({
			
 
				-                    "top": -(ms_top)
			
 
				-                }, 2500);
			
 
				-            },
			
 
				-            imgMout: function() {
			
 
				-                var _this = event.target;
			
 
				-                $(_this).stop(true);
			
 
				-                $(_this).animate({
			
 
				-                    "top": 0
			
 
				-                }, 2500);
			
 
				-            },
			
 
				-        },
			
 
				-        mounted: function() {
			
 
				-            var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
			
 
				-            this.query(data, 'model');
			
 
				-            var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
			
 
				-            this.query(data, 'pulg');
			
 
				-            /*幻灯*/
			
 
				-            setTimeout(function() {
			
 
				-                var bannerSlider = new Slider($('#banner_tabs'), {
			
 
				-                    time: 5000,
			
 
				-                    delay: 400,
			
 
				-                    event: 'hover',
			
 
				-                    auto: true,
			
 
				-                    mode: 'fade',
			
 
				-                    controller: $('#bannerCtrl'),
			
 
				-                    activeControllerCls: 'active'
			
 
				-                });
			
 
				-                $('#banner_tabs .flex-prev').click(function() {
			
 
				-                    bannerSlider.prev()
			
 
				-                });
			
 
				-                $('#banner_tabs .flex-next').click(function() {
			
 
				-                    bannerSlider.next()
			
 
				-                });
			
 
				-            }, 300)
			
 
				-        },
			
 
				-    })
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/js/demo.js
+++ b/src/main/webapp/templets/1/default/js/demo.js
@@ -1,21 +0,0 @@
 
				-define(function(require, exports, module) {
			
 
				-	var ms = require("ms");
			
 
				-	var ajaxCfg = {
			
 
				-		"type": "post",
			
 
				-		"dataType": "json",
			
 
				-	};
			
 
				-	var mstore = "http://mstore.mingsoft.net/";//
			
 
				-	return {
			
 
				-		"version": "1.0.0",
			
 
				-		mstore: {
			
 
				-			list: function(data, func) {
			
 
				-				if(validator.isNull(data)) {
			
 
				-					return;
			
 
				-				}
			
 
				-				ajaxCfg.url = mstore + "/mstore/list.do";
			
 
				-				ajaxCfg.params = data;
			
 
				-				ms.ajax(ajaxCfg, func);
			
 
				-			}
			
 
				-		},
			
 
				-	}
			
 
				-})
			
--- a/src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js
+++ b/src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js
@@ -1,152 +0,0 @@
 
				-/**
			
 
				- * @author 夏の寒风
			
 
				- * @time 2012-12-14
			
 
				- */
			
 
				-
			
 
				-//自定义hashtable
			
 
				-function Hashtable() {
			
 
				-    this._hash = new Object();
			
 
				-    this.put = function(key, value) {
			
 
				-        if (typeof (key) != "undefined") {
			
 
				-            if (this.containsKey(key) == false) {
			
 
				-                this._hash[key] = typeof (value) == "undefined" ? null : value;
			
 
				-                return true;
			
 
				-            } else {
			
 
				-                return false;
			
 
				-            }
			
 
				-        } else {
			
 
				-            return false;
			
 
				-        }
			
 
				-    }
			
 
				-    this.remove = function(key) { delete this._hash[key]; }
			
 
				-    this.size = function() { var i = 0; for (var k in this._hash) { i++; } return i; }
			
 
				-    this.get = function(key) { return this._hash[key]; }
			
 
				-    this.containsKey = function(key) { return typeof (this._hash[key]) != "undefined"; }
			
 
				-    this.clear = function() { for (var k in this._hash) { delete this._hash[k]; } }
			
 
				-}
			
 
				-
			
 
				-var emotions = new Array();
			
 
				-var categorys = new Array();// 分组
			
 
				-var uSinaEmotionsHt = new Hashtable();
			
 
				-
			
 
				-// 初始化缓存，页面仅仅加载一次就可以了
			
 
				-
			
 
				-//替换
			
 
				-function AnalyticEmotion(s) {
			
 
				-	if(typeof (s) != "undefined" && s != null) {
			
 
				-		var sArr = s.match(/\[.*?\]/g);
			
 
				-		if(!sArr){return s}
			
 
				-		for(var i = 0; i < sArr.length; i++){
			
 
				-			if(uSinaEmotionsHt.containsKey(sArr[i])) {
			
 
				-				var reStr = "<img src=\"" + uSinaEmotionsHt.get(sArr[i]) + "\" height=\"20\" width=\"20\" />";
			
 
				-				s = s.replace(sArr[i], reStr);
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-	return s;
			
 
				-}
			
 
				-
			
 
				-(function($){
			
 
				-	$.fn.SinaEmotion = function(target){
			
 
				-		var cat_current;
			
 
				-		var cat_page;
			
 
				-		$(this).click(function(event){
			
 
				-			event.stopPropagation();
			
 
				-			
			
 
				-			var eTop = target.offset().top + target.height() + 15;
			
 
				-			var eLeft = target.offset().left - 1;
			
 
				-			
			
 
				-			if($('#emotions .categorys')[0]){
			
 
				-				$('#emotions').css({top: eTop, left: eLeft});
			
 
				-				$('#emotions').toggle();
			
 
				-				return;
			
 
				-			}
			
 
				-			$('body').append('<div id="emotions"></div>');
			
 
				-			$('#emotions').css({top: eTop, left: eLeft});
			
 
				-			$('#emotions').html('<div>正在加载，请稍候...</div>');
			
 
				-			$('#emotions').click(function(event){
			
 
				-				event.stopPropagation();
			
 
				-			});
			
 
				-			
			
 
				-			$('#emotions').html('<div style="float:right"><a href="javascript:void(0);" id="prev">&laquo;</a><a href="javascript:void(0);" id="next">&raquo;</a></div><div class="categorys"></div><div class="container"></div><div class="page"></div>');
			
 
				-			$('#emotions #prev').click(function(){
			
 
				-				showCategorys(cat_page - 1);
			
 
				-			});
			
 
				-			$('#emotions #next').click(function(){
			
 
				-				showCategorys(cat_page + 1);
			
 
				-			});
			
 
				-			showCategorys();
			
 
				-			showEmotions();
			
 
				-			
			
 
				-		});
			
 
				-		$('body').click(function(){
			
 
				-			$('#emotions').remove();
			
 
				-		});
			
 
				-		$.fn.insertText = function(text){
			
 
				-			this.each(function() {
			
 
				-				if(this.tagName !== 'INPUT' && this.tagName !== 'TEXTAREA') {return;}
			
 
				-				if (document.selection) {
			
 
				-					this.focus();
			
 
				-					var cr = document.selection.createRange();
			
 
				-					cr.text = text;
			
 
				-					cr.collapse();
			
 
				-					cr.select();
			
 
				-				}else if (this.selectionStart || this.selectionStart == '0') {
			
 
				-					var 
			
 
				-					start = this.selectionStart,
			
 
				-					end = this.selectionEnd;
			
 
				-					this.value = this.value.substring(0, start)+ text+ this.value.substring(end, this.value.length);
			
 
				-					this.selectionStart = this.selectionEnd = start+text.length;
			
 
				-				}else {
			
 
				-					this.value += text;
			
 
				-				}
			
 
				-			});        
			
 
				-			return this;
			
 
				-		}
			
 
				-		function showCategorys(){
			
 
				-			var page = arguments[0]?arguments[0]:0;
			
 
				-			if(page < 0 || page >= categorys.length / 5){
			
 
				-				return;
			
 
				-			}
			
 
				-			$('#emotions .categorys').html('');
			
 
				-			cat_page = page;
			
 
				-			for(var i = page * 5; i < (page + 1) * 5 && i < categorys.length; ++i){
			
 
				-				$('#emotions .categorys').append($('<a href="javascript:void(0);">' + categorys[i] + '</a>'));
			
 
				-			}
			
 
				-			$('#emotions .categorys a').click(function(){
			
 
				-				showEmotions($(this).text());
			
 
				-			});
			
 
				-			$('#emotions .categorys a').each(function(){
			
 
				-				if($(this).text() == cat_current){
			
 
				-					$(this).addClass('current');
			
 
				-				}
			
 
				-			});
			
 
				-		}
			
 
				-		function showEmotions(){
			
 
				-			var category = arguments[0]?arguments[0]:'默认';
			
 
				-			var page = arguments[1]?arguments[1] - 1:0;
			
 
				-			$('#emotions .container').html('');
			
 
				-			$('#emotions .page').html('');
			
 
				-			cat_current = category;
			
 
				-			for(var i = page * 72; i < (page + 1) * 72 && i < emotions[category].length; ++i){
			
 
				-				$('#emotions .container').append($('<a href="javascript:void(0);" title="' + emotions[category][i].name + '"><img src="' + emotions[category][i].icon + '" alt="' + emotions[category][i].name + '" width="22" height="22" /></a>'));
			
 
				-			}
			
 
				-			$('#emotions .container a').click(function(){
			
 
				-				target.insertText($(this).attr('title'));
			
 
				-				$('#emotions').remove();
			
 
				-			});
			
 
				-			for(var i = 1; i < emotions[category].length / 72 + 1; ++i){
			
 
				-				$('#emotions .page').append($('<a href="javascript:void(0);"' + (i == page + 1?' class="current"':'') + '>' + i + '</a>'));
			
 
				-			}
			
 
				-			$('#emotions .page a').click(function(){
			
 
				-				showEmotions(category, $(this).text());
			
 
				-			});
			
 
				-			$('#emotions .categorys a.current').removeClass('current');
			
 
				-			$('#emotions .categorys a').each(function(){
			
 
				-				if($(this).text() == category){
			
 
				-					$(this).addClass('current');
			
 
				-				}
			
 
				-			});
			
 
				-		}
			
 
				-	}
			
 
				-})(jQuery);
			
--- a/src/main/webapp/templets/1/default/js/slider.js
+++ b/src/main/webapp/templets/1/default/js/slider.js
@@ -1,156 +0,0 @@
 
				-/**
			
 
				- * slider插件可悬停控制
			
 
				- */
			
 
				-; $(function ($, window, document, undefined) {
			
 
				-    
			
 
				-    Slider = function (container, options) {
			
 
				-        /*
			
 
				-        options = {
			
 
				-            auto: true,
			
 
				-            time: 3000,
			
 
				-            event: 'hover' | 'click',
			
 
				-            mode: 'slide | fade',
			
 
				-            controller: $(),
			
 
				-            activeControllerCls: 'className',
			
 
				-            exchangeEnd: $.noop
			
 
				-        }
			
 
				-        */
			
 
				-
			
 
				-        "use strict"; //stirct mode not support by IE9-
			
 
				-
			
 
				-        if (!container) return;
			
 
				-
			
 
				-        var options = options || {},
			
 
				-            currentIndex = 0,
			
 
				-            cls = options.activeControllerCls,
			
 
				-            delay = options.delay,
			
 
				-            isAuto = options.auto,
			
 
				-            controller = options.controller,
			
 
				-            event = options.event,
			
 
				-            interval,
			
 
				-            slidesWrapper = container.children().first(),
			
 
				-            slides = slidesWrapper.children(),
			
 
				-            length = slides.length,
			
 
				-            childWidth = container.width(),
			
 
				-            totalWidth = childWidth * slides.length;
			
 
				-
			
 
				-        function init() {
			
 
				-            var controlItem = controller.children();
			
 
				-
			
 
				-            mode();
			
 
				-
			
 
				-            event == 'hover' ? controlItem.mouseover(function () {
			
 
				-                stop();
			
 
				-                var index = $(this).index();
			
 
				-
			
 
				-                play(index, options.mode);
			
 
				-            }).mouseout(function () {
			
 
				-                isAuto && autoPlay();
			
 
				-            }) : controlItem.click(function () {
			
 
				-                stop();
			
 
				-                var index = $(this).index();
			
 
				-
			
 
				-                play(index, options.mode);
			
 
				-                isAuto && autoPlay();
			
 
				-            });
			
 
				-
			
 
				-            isAuto && autoPlay();
			
 
				-        }
			
 
				-
			
 
				-        //animate mode
			
 
				-        function mode() {
			
 
				-            var wrapper = container.children().first();
			
 
				-
			
 
				-            options.mode == 'slide' ? wrapper.width(totalWidth) : wrapper.children().css({
			
 
				-                'position': 'absolute',
			
 
				-                'left': 0,
			
 
				-                'top': 0
			
 
				-            })
			
 
				-                .first().siblings().hide();
			
 
				-        }
			
 
				-
			
 
				-        //auto play
			
 
				-        function autoPlay() {
			
 
				-            interval = setInterval(function () {
			
 
				-                triggerPlay(currentIndex);
			
 
				-            }, options.time);
			
 
				-        }
			
 
				-
			
 
				-        //trigger play
			
 
				-        function triggerPlay(cIndex) {
			
 
				-            var index;
			
 
				-
			
 
				-            (cIndex == length - 1) ? index = 0 : index = cIndex + 1;
			
 
				-            play(index, options.mode);
			
 
				-        }
			
 
				-
			
 
				-        //play
			
 
				-        function play(index, mode) {
			
 
				-            slidesWrapper.stop(true, true);
			
 
				-            slides.stop(true, true);
			
 
				-
			
 
				-            mode == 'slide' ? (function () {
			
 
				-                if (index > currentIndex) {
			
 
				-                    slidesWrapper.animate({
			
 
				-                        left: '-=' + Math.abs(index - currentIndex) * childWidth + 'px'
			
 
				-                    }, delay);
			
 
				-                } else if (index < currentIndex) {
			
 
				-                    slidesWrapper.animate({
			
 
				-                        left: '+=' + Math.abs(index - currentIndex) * childWidth + 'px'
			
 
				-                    }, delay);
			
 
				-                } else {
			
 
				-                    return;
			
 
				-                }
			
 
				-            })() : (function () {
			
 
				-                if (slidesWrapper.children(':visible').index() == index) return;
			
 
				-                slidesWrapper.children().fadeOut(delay).eq(index).fadeIn(delay);
			
 
				-            })();
			
 
				-
			
 
				-            try {
			
 
				-                controller.children('.' + cls).removeClass(cls);
			
 
				-                controller.children().eq(index).addClass(cls);
			
 
				-            } catch (e) { }
			
 
				-
			
 
				-            currentIndex = index;
			
 
				-
			
 
				-            options.exchangeEnd && typeof options.exchangeEnd == 'function' && options.exchangeEnd.call(this, currentIndex);
			
 
				-        }
			
 
				-
			
 
				-        //stop
			
 
				-        function stop() {
			
 
				-            clearInterval(interval);
			
 
				-        }
			
 
				-
			
 
				-        //prev frame
			
 
				-        function prev() {
			
 
				-            stop();
			
 
				-
			
 
				-            currentIndex == 0 ? triggerPlay(length - 2) : triggerPlay(currentIndex - 2);
			
 
				-
			
 
				-            isAuto && autoPlay();
			
 
				-        }
			
 
				-
			
 
				-        //next frame
			
 
				-        function next() {
			
 
				-            stop();
			
 
				-
			
 
				-            currentIndex == length - 1 ? triggerPlay(-1) : triggerPlay(currentIndex);
			
 
				-
			
 
				-            isAuto && autoPlay();
			
 
				-        }
			
 
				-
			
 
				-        //init
			
 
				-        init();
			
 
				-
			
 
				-        //expose the Slider API
			
 
				-        return {
			
 
				-            prev: function () {
			
 
				-                prev();
			
 
				-            },
			
 
				-            next: function () {
			
 
				-                next();
			
 
				-            }
			
 
				-        }
			
 
				-    };
			
 
				-
			
 
				-}(jQuery, window, document));
			
--- a/src/main/webapp/templets/1/default/less/about.less
+++ b/src/main/webapp/templets/1/default/less/about.less
@@ -1,90 +0,0 @@
 
				-.ms-content-about{
			
 
				-	a:link{color:#000;text-decoration:none}
			
 
				-	a:visited{color:#000;text-decoration:none}
			
 
				-	a:active{color:#000;text-decoration:none}
			
 
				-	a:hover{color:#000;text-decoration:none}
			
 
				-	/*margin: 20px 0;*/
			
 
				-	margin-top: 20px;
			
 
				-    margin-bottom: 40px;
			
 
				-	.ms-content-main{
			
 
				-		width: 1200px;
			
 
				-		overflow: hidden;
			
 
				-		margin: auto;
			
 
				-		.ms-content-left{
			
 
				-			width: 230px;
			
 
				-			float: left;
			
 
				-			margin-right: 20px;
			
 
				-			.ms-content-left-title{
			
 
				-				font-weight: bold;
			
 
				-				background-color: #009aff;
			
 
				-				color: #fff;
			
 
				-				height: 40px;
			
 
				-				line-height: 40px;
			
 
				-				width: 190px;
			
 
				-				padding: 0 20px;
			
 
				-			}
			
 
				-			.ms-content-left-ul{
			
 
				-				a:hover{
			
 
				-					li{
			
 
				-						background-color: #54bcfe;
			
 
				-					}
			
 
				-					color: #fff;
			
 
				-				}
			
 
				-				background-color: #fff;
			
 
				-				margin-top: 1px;
			
 
				-				width: 230px;
			
 
				-				a{
			
 
				-					color: #999999;
			
 
				-				}
			
 
				-				li{
			
 
				-					height: 40px;
			
 
				-					line-height: 40px;
			
 
				-					font-size: 14px;
			
 
				-					cursor: pointer;
			
 
				-					/*width: 190px;*/
			
 
				-					padding: 0 20px;
			
 
				-					.ms-content-left-li-more{
			
 
				-						float: right;
			
 
				-					}
			
 
				-				}
			
 
				-				.ms-content-left-li-first{
			
 
				-					li{
			
 
				-						background-color: #54bcfe;
			
 
				-					}
			
 
				-					color: #fff;
			
 
				-				}
			
 
				-			}
			
 
				-		}
			
 
				-		.ms-content-right{
			
 
				-			overflow: hidden;
			
 
				-			a:visited{color:#000000;}
			
 
				-			.ms-content-right-position{
			
 
				-				a:hover{
			
 
				-					color:#0099ff;
			
 
				-				}
			
 
				-				font-size: 14px;
			
 
				-				span{
			
 
				-					padding: 0 5px;
			
 
				-				}
			
 
				-			}
			
 
				-			.ms-content-right-main{
			
 
				-				width: 952px;
			
 
				-				background-color: #ffffff;
			
 
				-				min-height: 450px;
			
 
				-				padding-bottom: 20px;
			
 
				-				.ms-content-right-main-content{
			
 
				-					margin: 0 20px;
			
 
				-				}
			
 
				-				.ms-content-right-main-title{
			
 
				-					text-align: center;
			
 
				-    				font-size: 20px;
			
 
				-    				padding-top: 40px;
			
 
				-				    padding-bottom: 20px;
			
 
				-				    border-bottom: 1px solid #d0cfcf99;
			
 
				-				    margin: 20px;
			
 
				-				}
			
 
				-			}
			
 
				-			
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/advice.less
+++ b/src/main/webapp/templets/1/default/less/advice.less
@@ -1,48 +0,0 @@
 
				-/*内容*/
			
 
				-.ms-content-advice{
			
 
				-	/*margin: 20px 0;*/
			
 
				-	margin-top: 20px;
			
 
				-    margin-bottom: 40px;
			
 
				-	.ms-content-form-background{
			
 
				-		width: 1200px;
			
 
				-		height: 480px;
			
 
				-		background-color: #ffffff;
			
 
				-		margin: auto;
			
 
				-		display: flex;
			
 
				-		.ms-content-form{
			
 
				-			::-webkit-input-placeholder { 
			
 
				-			    color:#999;
			
 
				-			}
			
 
				-			input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{
			
 
				-				font-family:Arial,Verdana,Sans-serif
			
 
				-			}	
			
 
				-			width: 330px;
			
 
				-			margin: auto;
			
 
				-			.ms-content-form-name,.ms-content-form-phone,.ms-content-form-message{
			
 
				-				width: 308px;
			
 
				-			    height: 12px;
			
 
				-			    padding: 10px;
			
 
				-			    display: block;
			
 
				-			    border: 1px solid #eeeeee;
			
 
				-			    border-radius: 3px;
			
 
				-			    color: #555555;
			
 
				-			    margin-bottom: 20px;
			
 
				-			}
			
 
				-			.ms-content-form-message{
			
 
				-				height: 142px;
			
 
				-			}
			
 
				-			.ms-login-button{
			
 
				-				pointer-events: none;
			
 
				-				width: 330px;
			
 
				-			    height: 34px;
			
 
				-			    line-height: 34px;
			
 
				-			    font-size: 14px;
			
 
				-			    color: #ddd;
			
 
				-			    text-align: center;
			
 
				-			    background-color: #fafafa;
			
 
				-			    cursor: pointer;
			
 
				-			    border-radius: 4px;
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/base.less
+++ b/src/main/webapp/templets/1/default/less/base.less
@@ -1,433 +0,0 @@
 
				-/*其他*/
			
 
				-
			
 
				-body,
			
 
				-ul,
			
 
				-ol,
			
 
				-li,
			
 
				-p,
			
 
				-h1,
			
 
				-h2,
			
 
				-h3,
			
 
				-h4,
			
 
				-h5,
			
 
				-h6,
			
 
				-form,
			
 
				-fieldset,
			
 
				-table,
			
 
				-td,
			
 
				-img,
			
 
				-div,
			
 
				-a {
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-    border: 0;
			
 
				-    text-decoration: none !important;
			
 
				-}
			
 
				-
			
 
				-* {
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-}
			
 
				-
			
 
				-body {
			
 
				-    min-width: 1200px;
			
 
				-    background-color: #fafafa;
			
 
				-}
			
 
				-
			
 
				-html,
			
 
				-body,
			
 
				-ul,
			
 
				-li {
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-}
			
 
				-
			
 
				-a {
			
 
				-    text-decoration: none;
			
 
				-    color: #555;
			
 
				-}
			
 
				-
			
 
				-ul,
			
 
				-li,
			
 
				-ol {
			
 
				-    list-style: none;
			
 
				-}
			
 
				-
			
 
				-input:focus,
			
 
				-textarea:focus {
			
 
				-    outline: none;
			
 
				-}
			
 
				-
			
 
				-
			
 
				-/*banner图*/
			
 
				-
			
 
				-.ms-banner {
			
 
				-    height: 337px;
			
 
				-    img {
			
 
				-        width: 100%;
			
 
				-        height: 100%;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.flexslider {
			
 
				-    margin: 0px auto 20px;
			
 
				-    position: relative;
			
 
				-    width: 100%;
			
 
				-    height: 440px;
			
 
				-    overflow: hidden;
			
 
				-    zoom: 1;
			
 
				-    .slides {
			
 
				-        li {
			
 
				-            width: 100%;
			
 
				-            height: 100%;
			
 
				-        }
			
 
				-        a {
			
 
				-            img {
			
 
				-                width: 100%;
			
 
				-                height: 337px;
			
 
				-                display: block;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .flex-direction-nav {
			
 
				-        width: 100%;
			
 
				-        /*position: absolute;*/
			
 
				-        bottom: 10px;
			
 
				-        text-align: center;
			
 
				-        a {
			
 
				-            width: 70px;
			
 
				-            height: 70px;
			
 
				-            line-height: 99em;
			
 
				-            overflow: hidden;
			
 
				-            margin: -35px 0 0;
			
 
				-            display: block;
			
 
				-            background: url(../images/ad_ctr.png) no-repeat;
			
 
				-            position: absolute;
			
 
				-            top: 50%;
			
 
				-            z-index: 10;
			
 
				-            cursor: pointer;
			
 
				-            opacity: 0;
			
 
				-            filter: alpha(opacity=0);
			
 
				-            -webkit-transition: all .3s ease;
			
 
				-            border-radius: 35px;
			
 
				-        }
			
 
				-        .flex-next {
			
 
				-            background-position: 0 -70px;
			
 
				-            right: 10px;
			
 
				-        }
			
 
				-        .flex-prev {
			
 
				-            left: 10px;
			
 
				-        }
			
 
				-        li {
			
 
				-            margin: 0 2px;
			
 
				-            display: inline-block;
			
 
				-            zoom: 1;
			
 
				-            *display: inline;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.flexslider:hover {
			
 
				-    .flex-next {
			
 
				-        opacity: 0.8;
			
 
				-        filter: alpha(opacity=25);
			
 
				-    }
			
 
				-    .flex-prev {
			
 
				-        opacity: 0.8;
			
 
				-        filter: alpha(opacity=25);
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.flexslider:hover .flex-next:hover,
			
 
				-.flexslider:hover .flex-prev:hover {
			
 
				-    opacity: 1;
			
 
				-    filter: alpha(opacity=50);
			
 
				-}
			
 
				-
			
 
				-
			
 
				-/*头部*/
			
 
				-
			
 
				-.ms-head {
			
 
				-    a {
			
 
				-        color: #fff;
			
 
				-    }
			
 
				-    background-color: #2b3442;
			
 
				-    .head-menu-flex-center {
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-    }
			
 
				-    .head-menu {
			
 
				-        width: 1200px;
			
 
				-        height: 60px;
			
 
				-        margin: auto;
			
 
				-        color: #ffffff;
			
 
				-        /*overflow: hidden;*/
			
 
				-        display: flex;
			
 
				-        justify-content: space-between;
			
 
				-        .head-menu-flex-center {
			
 
				-            .head-menu-list {
			
 
				-            	.head-active{
			
 
				-            		color: #ffb800;
			
 
				-                    background-color: #2b3442;
			
 
				-            	}
			
 
				-                .head-menu-list-li:hover {
			
 
				-                    background-color: #202833;
			
 
				-                    color: #ffb800;
			
 
				-                }
			
 
				-                .head-menu-list-li a:hover {
			
 
				-                    background-color: #202833;
			
 
				-                    color: #ffb800;
			
 
				-                }
			
 
				-                padding-left: 30px;
			
 
				-                height: 60px;
			
 
				-                line-height: 60px;
			
 
				-                margin: 0 !important;
			
 
				-                .head-menu-list-li {
			
 
				-                    cursor: pointer;
			
 
				-                    position: relative;
			
 
				-                    .head-menu-son-list {
			
 
				-                        background-color: #2b3442;
			
 
				-                        position: absolute;
			
 
				-                        width: 100%;
			
 
				-                        left: 0;
			
 
				-                        color: #fff;
			
 
				-                        display: none;
			
 
				-                        top: 60px;
			
 
				-                        z-index: 9999999;
			
 
				-                        li {
			
 
				-                            height: 40px;
			
 
				-                            line-height: 40px;
			
 
				-                            text-align: center;
			
 
				-                            a:hover {
			
 
				-                                color: #ffb800;
			
 
				-                                background-color: #2b3442;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        img,
			
 
				-        .head-menu-list,
			
 
				-        div,
			
 
				-        .head-menu-list-li {
			
 
				-            float: left;
			
 
				-        }
			
 
				-        img {
			
 
				-            width: 60px;
			
 
				-            height: 30px;
			
 
				-            padding-right: 10px;
			
 
				-        }
			
 
				-        li {
			
 
				-            padding: 0 15px;
			
 
				-            ul {
			
 
				-                /*display: none;*/
			
 
				-            }
			
 
				-        }
			
 
				-        .head-men-right {
			
 
				-            .head-menu-right-content {
			
 
				-                min-width: 100px;
			
 
				-                span {
			
 
				-                    span {
			
 
				-                        padding: 0 5px;
			
 
				-                        cursor: pointer;
			
 
				-                        a {
			
 
				-                            &:hover {
			
 
				-                                color: #ffb800;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            .head-menu-right-search {
			
 
				-                padding-right: 12px;
			
 
				-                position: relative;
			
 
				-                input:-webkit-autofill {
			
 
				-			        -webkit-box-shadow: 0 0 0px 1000px #2b3442 inset !important;//关于解决输入框背景颜色
			
 
				-			        -webkit-text-fill-color: rgba(255,255,255,1)!important;//关于接输入框文字颜色
			
 
				-			    }
			
 
				-                .ms-search-click {
			
 
				-                    background-image: url(../images/search.png);
			
 
				-                    width: 14px;
			
 
				-                    height: 14px;
			
 
				-                    border: 0;
			
 
				-                    background-color: #2b3442;
			
 
				-                    position: absolute;
			
 
				-                    right: 30px;
			
 
				-                    top: 8px;
			
 
				-                    cursor: pointer;
			
 
				-                }
			
 
				-                .ms-search-input {
			
 
				-                    height: 28px;
			
 
				-                    background-color: #2b3442;
			
 
				-                    border: 1px solid #fff;
			
 
				-                    border-radius: 15px;
			
 
				-                    padding-left: 30px;
			
 
				-                    color: #fff;
			
 
				-                    width: 318px;
			
 
				-                    font-size: 14px;
			
 
				-                }
			
 
				-                input::-webkit-input-placeholder {
			
 
				-                    color: #fff;
			
 
				-                }
			
 
				-                .iconfont {
			
 
				-                    font-size: 18px;
			
 
				-                    cursor: pointer;
			
 
				-                    position: absolute;
			
 
				-                    right: 28px;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-
			
 
				-/*底部*/
			
 
				-
			
 
				-.ms-footer {
			
 
				-    height: 140px;
			
 
				-    background-color: #2a3542;
			
 
				-    /*line-height: 140px;*/
			
 
				-    .ms-footer-content {
			
 
				-        padding: 46px 0;
			
 
				-        width: 1200px;
			
 
				-        margin: auto;
			
 
				-        .ms-footer-left {
			
 
				-            color: #999999;
			
 
				-            font-size: 14px;
			
 
				-            float: left;
			
 
				-            .ms-footer-left-copyright {
			
 
				-                display: block;
			
 
				-                padding-top: 20px;
			
 
				-                height: 14px;
			
 
				-            }
			
 
				-            .ms-footer-left-column {
			
 
				-                a:link {
			
 
				-                    color: #999;
			
 
				-                    text-decoration: none
			
 
				-                }
			
 
				-                a:visited {
			
 
				-                    color: #999;
			
 
				-                    text-decoration: none
			
 
				-                }
			
 
				-                a:hover{
			
 
				-                	color: #fff;
			
 
				-                }
			
 
				-                height: 14px;
			
 
				-                cursor:pointer;
			
 
				-                .ms-footer-left-column-course,
			
 
				-                .ms-footer-left-column-contact {
			
 
				-                    padding: 0 10px;
			
 
				-                }
			
 
				-                .ms-footer-left-column-about {
			
 
				-                    padding-right: 10px;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-footer-right {
			
 
				-            float: right;
			
 
				-            img {
			
 
				-                cursor: pointer;
			
 
				-            }
			
 
				-            .ms-footer-right-baidu {
			
 
				-                padding: 0 12px;
			
 
				-            }
			
 
				-            .ms-footer-right-weixin {
			
 
				-                position: relative;
			
 
				-                display: none;
			
 
				-                img {
			
 
				-                    top: -161px;
			
 
				-                    left: -38px;
			
 
				-                    width: 103px;
			
 
				-                    /* display: none; */
			
 
				-                    border: 2px solid #ccc;
			
 
				-                    position: absolute;
			
 
				-                }
			
 
				-                p {
			
 
				-                    font-size: 0;
			
 
				-                    line-height: 0;
			
 
				-                    display: block;
			
 
				-                    width: 0;
			
 
				-                    height: 0;
			
 
				-                    left: 8px;
			
 
				-                    border-left: 10px solid transparent;
			
 
				-                    border-right: 8px solid transparent;
			
 
				-                    border-top: 10px solid #fff;
			
 
				-                    position: absolute;
			
 
				-                    top: -58px;
			
 
				-                    z-index: 85;
			
 
				-                    /* display: none; */
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.ms-but-disabled2,
			
 
				-.ms-but-disabled {
			
 
				-    opacity: .6 !important;
			
 
				-    cursor: no-drop !important;
			
 
				-}
			
 
				-
			
 
				-.ms-but-disabled:hover {
			
 
				-    background-color: #009aff !important;
			
 
				-}
			
 
				-
			
 
				-.ms-loading {
			
 
				-    text-align: center;
			
 
				-    height: 700px;
			
 
				-    line-height: 700px;
			
 
				-    img {
			
 
				-        width: 60px;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.topbar-info {
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-    float: right;
			
 
				-    color: white;
			
 
				-    text-align: right;
			
 
				-    a {
			
 
				-        height: 30px;
			
 
				-        line-height: 30px;
			
 
				-        .loginImg {
			
 
				-            width: 30px !important;
			
 
				-            height: 30px !important;
			
 
				-            vertical-align: super;
			
 
				-            border-radius: 50%;
			
 
				-            padding: 0;
			
 
				-            margin-right: 12px;
			
 
				-            opacity: .9;
			
 
				-            cursor: pointer;
			
 
				-            &:hover {
			
 
				-                opacity: 1;
			
 
				-            }
			
 
				-        }
			
 
				-        .userName {
			
 
				-            line-height: 30px !important;
			
 
				-            margin-right: 12px;
			
 
				-            color: #fff;
			
 
				-            cursor: pointer;
			
 
				-            font-weight: 500;
			
 
				-            &:hover {
			
 
				-                color: #ffb800;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .quitLogin {
			
 
				-        color: #fff;
			
 
				-        height: 30px;
			
 
				-        line-height: 30px;
			
 
				-        &:hover {
			
 
				-            color: #ffb800;
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-userName {
			
 
				-        max-width: 110px;
			
 
				-        white-space: nowrap;
			
 
				-        display: inline-block;
			
 
				-        overflow: hidden;
			
 
				-        text-overflow: ellipsis;
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/case-list.less
+++ b/src/main/webapp/templets/1/default/less/case-list.less
@@ -1,128 +0,0 @@
 
				-
			
 
				-.ms-content-case{
			
 
				-/*	margin: 20px 0 ;*/
			
 
				-	background-color: #fff;
			
 
				-    overflow: hidden;
			
 
				-    padding-top: 20px;
			
 
				-	a:visited{color:#000000;}
			
 
				-	.ms-content-main{
			
 
				-		width: 1200px;
			
 
				-		min-height: 400px;
			
 
				-		margin: auto;
			
 
				-		overflow: hidden;
			
 
				-		.ms-content-main-case:nth-child(3n){
			
 
				-			margin-right: 0;
			
 
				-		}
			
 
				-		.ms-content-main-case{
			
 
				-			border: 1px solid #f0f0f0;
			
 
				-			width: 384px;
			
 
				-			height: 332px;
			
 
				-    		margin-right: 20px;
			
 
				-    		float: left;
			
 
				-    		position: relative;
			
 
				-    		overflow: hidden;
			
 
				-    		color: #ffffff;
			
 
				-    		margin-top: 20px;
			
 
				-			.ms-content-main-case-img{
			
 
				-				width: 387px;
			
 
				-				height: 334px;
			
 
				-				img{
			
 
				-					width: 100%;
			
 
				-					height: 100%;
			
 
				-				}
			
 
				-			}
			
 
				-			.ms-content-main-case-explain{
			
 
				-				display: none;
			
 
				-				width: 100%;
			
 
				-				height: 100%;
			
 
				-				background-color: #0099ff;
			
 
				-				opacity: 0.9;
			
 
				-				position: absolute;
			
 
				-			    top: 0px;
			
 
				-			    left: 0px;
			
 
				-			    .ms-content-main-case-title{
			
 
				-			    	font-size: 22px;
			
 
				-				    text-align: center;
			
 
				-				    margin: 20px 0;
			
 
				-				    padding: 0 20px;
			
 
				-				    height: 22px;
			
 
				-    				line-height: 22px;
			
 
				-    				overflow:hidden;
			
 
				-					text-overflow:ellipsis;
			
 
				-					-webkit-line-clamp:1;    
			
 
				-					-webkit-box-orient:vertical;
			
 
				-					display:-webkit-box;
			
 
				-			    }
			
 
				-			    .ms-content-main-case-content{
			
 
				-			   	 	min-height: 215px;
			
 
				-			    	p{
			
 
				-			    		font-size: 14px;
			
 
				-			    		padding: 0 30px;
			
 
				-			    		overflow: hidden;
			
 
				-					    text-overflow: ellipsis;
			
 
				-					    -webkit-line-clamp: 4;
			
 
				-					    -webkit-box-orient: vertical;
			
 
				-					    display: -webkit-box;
			
 
				-					    img{
			
 
				-						    	width: 100px;
			
 
				-							    text-align: center;
			
 
				-							    margin: 20px 0;
			
 
				-							    height: 100px;
			
 
				-						    }
			
 
				-			    	}
			
 
				-			    }
			
 
				-			    .ms-content-main-case-click{
			
 
				-			    	text-align: center;
			
 
				-			    	a{
			
 
				-			    		border: 1px solid #ffffff;
			
 
				-					    border-radius: 17px;
			
 
				-					    padding: 5px 39px;
			
 
				-					    color: #ffffff;
			
 
				-			    	}
			
 
				-			    }
			
 
				-			}
			
 
				-		}
			
 
				-		.ms-content-main-case-left{
			
 
				-			margin-right: 0px;
			
 
				-		}
			
 
				-		
			
 
				-	}
			
 
				-	#ms-case-page{
			
 
				-		 margin-top: 50px;
			
 
				-		 a:hover{
			
 
				-		 	 background-color: #eee;
			
 
				-		 }
			
 
				-	}
			
 
				-	.ms-content-main-page{
			
 
				-		a{
			
 
				-			color:#999;
			
 
				-			font-size:14px;
			
 
				-		}
			
 
				-		text-align: center;
			
 
				-	    margin-top: 30px;
			
 
				-	    margin-bottom: 50px;
			
 
				-		.ms-content-main-page-first,.ms-content-main-page-last{
			
 
				-			border: 1px solid #ddd;
			
 
				-			padding: 10px 15px;
			
 
				-			margin-right:-5px;
			
 
				-		}
			
 
				-		.ms-content-main-page-upper,.ms-content-main-page-next{
			
 
				-			border-top:1px solid #ddd;
			
 
				-			border-bottom:1px solid #ddd;
			
 
				-			/*border: 1px solid #ddd;*/
			
 
				-			padding: 10px 15px;
			
 
				-			margin-right:-5px;
			
 
				-		}
			
 
				-		.ms-content-main-page-upper{
			
 
				-			border-right: 1px solid #ddd;
			
 
				-		}
			
 
				-		.ms-content-main-page-first{
			
 
				-			border-top-left-radius: 4px;
			
 
				-			border-bottom-left-radius: 4px;
			
 
				-		}
			
 
				-		.ms-content-main-page-last{
			
 
				-			border-top-right-radius: 4px;
			
 
				-			border-bottom-right-radius: 4px;
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/center.less
+++ b/src/main/webapp/templets/1/default/less/center.less
@@ -1,223 +0,0 @@
 
				-.ms-content {
			
 
				-    font-family: arial, "Microsoft Yahei", "Hiragino Sans GB", sans-serif;
			
 
				-    width: 1200px;
			
 
				-    margin: auto;
			
 
				-    .ms-content-main {
			
 
				-        margin: 20px 0;
			
 
				-        .ms-content-left {
			
 
				-            width: 230px;
			
 
				-            height: 270px;
			
 
				-            background-color: #fff;
			
 
				-            text-align: center;
			
 
				-            margin-right: 20px;
			
 
				-            float: left;
			
 
				-            .ms-content-left-info {
			
 
				-                img {
			
 
				-                    width: 100px;
			
 
				-                    height: 100px;
			
 
				-                    border-radius: 50%;
			
 
				-                    margin: 20px 0 10px 0;
			
 
				-                }
			
 
				-                div {
			
 
				-                    border-bottom: 1px solid #f1f1f1;
			
 
				-                    padding-bottom: 10px;
			
 
				-                    font-weight: bold;
			
 
				-                    overflow: hidden;
			
 
				-                    white-space: nowrap;
			
 
				-                    text-overflow: ellipsis;
			
 
				-                    color: #555555;
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-content-left-list {
			
 
				-                .active {
			
 
				-                    color: #0099ff;
			
 
				-                }
			
 
				-                a:link {
			
 
				-                    color: #999;
			
 
				-                    text-decoration: none
			
 
				-                }
			
 
				-                a:hover{
			
 
				-                  color: #0099ff;
			
 
				-                }
			
 
				-                .ms-content-left-list-info {
			
 
				-                    margin-top: 20px;
			
 
				-                    cursor: pointer;
			
 
				-                    color: #999999;
			
 
				-                }
			
 
				-                .ms-content-left-list-pass {
			
 
				-                    margin: 20px 0;
			
 
				-                    color: #999999;
			
 
				-                    cursor: pointer;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-content-right {
			
 
				-            background-color: #fff;
			
 
				-            width: 950px;
			
 
				-            min-height: 653px;
			
 
				-            overflow: hidden;
			
 
				-            .ms-content-right-title {
			
 
				-                color: #555555;
			
 
				-                border-bottom: 1px solid #eeeeee;
			
 
				-                padding: 20px 0;
			
 
				-                margin: 0 20px;
			
 
				-            }
			
 
				-            /*修改密码*/
			
 
				-            .ms-content-right-form {
			
 
				-            	input::-webkit-input-placeholder {
			
 
				-                    color: #999;
			
 
				-                }
			
 
				-                .ms-content-old-password,
			
 
				-                .ms-content-data {
			
 
				-                	.span{
			
 
				-                		display: inline-block; 
			
 
				-                	}
			
 
				-                    font-size: 14px;
			
 
				-                    color: #999999;
			
 
				-                    .ms-error-hide {
			
 
				-                        opacity: 0;
			
 
				-                        color: #FF0000;
			
 
				-                        transition: all .2s;
			
 
				-                    }
			
 
				-                    .ms-error-show {
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    span {
			
 
				-                        min-width: 70px;
			
 
				-                        max-width: 300px;
			
 
				-                        /*display: inline-block;*/
			
 
				-                    }
			
 
				-                    
			
 
				-                    img {
			
 
				-                        vertical-align: middle;
			
 
				-                    }
			
 
				-                    input {
			
 
				-                        width: 220px;
			
 
				-                        height: 20px;
			
 
				-                        padding: 5px 10px;
			
 
				-                        border: 1px solid #eeeeee;
			
 
				-                        border-radius: 4px;
			
 
				-                        margin-top: 20px;
			
 
				-                        background-color: #fafafa;
			
 
				-                    }
			
 
				-                }
			
 
				-                form {
			
 
				-                    margin-left: 67px;
			
 
				-                }
			
 
				-                .ms-content-click {
			
 
				-                	pointer-events:none;
			
 
				- 	                background-color:#fafafa;
			
 
				- 	                color:#ddd;
			
 
				-                    /*color: white;*/
			
 
				-                    width: 120px;
			
 
				-                    /*background-color: #0099ff;*/
			
 
				-                    padding: 6px 0;
			
 
				-                    border-radius: 4px;
			
 
				-                    text-align: center;
			
 
				-                    margin-left: 141px;
			
 
				-                    margin-top: 20px;
			
 
				-                    cursor: pointer;
			
 
				-                    opacity: .9;
			
 
				-                    &:hover {
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                }
			
 
				-                .ms-content-click-password {
			
 
				-                    margin-left: 141px;
			
 
				-                }
			
 
				-            }
			
 
				-            /*基本资料*/
			
 
				-            .ms-content-right-form {
			
 
				-                .ms-content-data {
			
 
				-                    .ms-error-hide {
			
 
				-                        opacity: 0;
			
 
				-                        color: #FF0000;
			
 
				-                        transition: all .2s;
			
 
				-                    }
			
 
				-                    .ms-error-show {
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    input {
			
 
				-                        background-color: #ffffff;
			
 
				-                        height: 20px;
			
 
				-                        padding: 5px 10px;
			
 
				-                        margin-right: 18px;
			
 
				-                        transition: all .6s;
			
 
				-                        color: #999;
			
 
				-                        &:focus {
			
 
				-                            color: #000;
			
 
				-                            border-color: #0099ff;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-content-head-img {
			
 
				-                        width: 64px;
			
 
				-                        height: 64px;
			
 
				-                        position: relative;
			
 
				-                        &:hover {
			
 
				-                            #browse {
			
 
				-                                display: block;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        img {
			
 
				-                            width: 100%;
			
 
				-                            height: 100%;
			
 
				-                            border-radius: 50%;
			
 
				-                            background: white;
			
 
				-                        }
			
 
				-                        .ms-content-head-upload {
			
 
				-                            width: 100%;
			
 
				-                            height: 100%;
			
 
				-                            line-height: 64px;
			
 
				-                            position: absolute;
			
 
				-                            top: 0px;
			
 
				-                            left: 0px;
			
 
				-                            font-size: 12px;
			
 
				-                            color: #fff;
			
 
				-                            border-radius: 50%;
			
 
				-                            text-align: center;
			
 
				-                            span {
			
 
				-                                margin: auto;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                .ms-content-data-head {
			
 
				-                    text-align: left;
			
 
				-                    display: flex;
			
 
				-                    align-items: center;
			
 
				-                    margin-top: 20px;
			
 
				-                    cursor: pointer;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.ms-content-head-upload {
			
 
				-    .display-img {
			
 
				-        width: 64px;
			
 
				-        height: 64px;
			
 
				-        display: block !important;
			
 
				-    }
			
 
				-    span {
			
 
				-        display: none ;
			
 
				-    }
			
 
				-    &:hover {
			
 
				-        #browse {
			
 
				-            opacity: 1;
			
 
				-        }
			
 
				-    }
			
 
				-    #browse {
			
 
				-        background: rgba(89, 89, 89, 0.5);
			
 
				-        min-width: 64px;
			
 
				-        width: 64px;
			
 
				-        height: 64px;
			
 
				-        transition: .3s;
			
 
				-        position: absolute;
			
 
				-        z-index: 1;
			
 
				-        top: 0;
			
 
				-        left: 0;
			
 
				-        border-radius: 50%;
			
 
				-        opacity: 0;
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/index.less
+++ b/src/main/webapp/templets/1/default/less/index.less
@@ -1,399 +0,0 @@
 
				-body{
			
 
				-    font-size: 16px !important;
			
 
				-    font-family: inherit !important;
			
 
				-}
			
 
				-.ms-head{
			
 
				-    *{
			
 
				-        box-sizing: initial !important;
			
 
				-    }
			
 
				-    box-sizing: initial !important;
			
 
				-}
			
 
				-.ms-content-index {
			
 
				-    #ms-content-main-case-left {
			
 
				-        margin-right: 0px;
			
 
				-    }
			
 
				-    min-height: 550px;
			
 
				-    /*网站案例*/
			
 
				-    .ms-content-template {
			
 
				-        .ms-index-tabs {
			
 
				-        	
			
 
				-            text-align: center;
			
 
				-            border: none;
			
 
				-            margin-bottom: 3px;
			
 
				-            li {
			
 
				-            	a:hover{
			
 
				-            		color: #333;
			
 
				-            	}
			
 
				-            	margin-right: 15px;
			
 
				-                float: none;
			
 
				-                display: inline-block;
			
 
				-                font-size: 2.4rem;
			
 
				-                a {
			
 
				-                    border: none !important;
			
 
				-                    color: #777;
			
 
				-                    background-color: white;
			
 
				-                    padding: 10px 0px;
			
 
				-                    font-size: 20px;
			
 
				-                }
			
 
				-            }
			
 
				-            .active {
			
 
				-                a {
			
 
				-                    border-bottom: 2px solid #00b0ff !important;
			
 
				-                    color:#333;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-content-all {
			
 
				-            min-height: 700px;
			
 
				-            padding: 20px 0;
			
 
				-            width: 100%;
			
 
				-            background: #fafafa;
			
 
				-            .tab-content {
			
 
				-                background: #fafafa;
			
 
				-                width: 1200px;
			
 
				-                margin: auto;
			
 
				-                overflow: hidden;
			
 
				-                padding-bottom: 20px;
			
 
				-                .ms-model-content {
			
 
				-                    display: flex;
			
 
				-                    flex-wrap: wrap;
			
 
				-                    justify-content: space-between;
			
 
				-                    .ms-model-list {
			
 
				-                        .ms-model-more {
			
 
				-                            width: 385px;
			
 
				-                            height: 347px;
			
 
				-                            background-color: white;
			
 
				-                            line-height: 364px;
			
 
				-                            text-align: center;
			
 
				-                            background-size:100% 100%;  
			
 
				-                            background-image: url(../images/more.png);
			
 
				-                            div {
			
 
				-                                border: 1px solid #aaa;
			
 
				-                                color: #666;
			
 
				-                                padding: 6px 18px;
			
 
				-                                display: inline-block;
			
 
				-                                line-height: 1;
			
 
				-                                border-radius: 30px;
			
 
				-                                font-size: 1.4rem;
			
 
				-                                cursor: pointer;
			
 
				-                                &:hover {
			
 
				-                                    background: #aaa;
			
 
				-                                    color: white;
			
 
				-                                }
			
 
				-                            }
			
 
				-                        }
			
 
				-                        display: inline-block;
			
 
				-                        position: relative;
			
 
				-                        margin: 20px 0 0 0;
			
 
				-                        .ms-model-info {
			
 
				-                            padding: 18px;
			
 
				-                            background: white;
			
 
				-                            span {
			
 
				-                                display: block;
			
 
				-                                margin-bottom: 18px;
			
 
				-                                color: #666;
			
 
				-                            }
			
 
				-                            .ms-model-info-img {
			
 
				-                                width: 35px;
			
 
				-                                height: 35px;
			
 
				-                                border-radius: 50%;
			
 
				-                                margin-right: 6px;
			
 
				-                            }
			
 
				-                            .ms-model-type {
			
 
				-                                color: #fb803c;
			
 
				-                                display: inline-block;
			
 
				-                                float: right;
			
 
				-                                font-size: 2.4rem;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        .ms-model-img {
			
 
				-                            overflow: hidden;
			
 
				-                            position: relative;
			
 
				-                            height: 235px;
			
 
				-                            z-index: 2;
			
 
				-                            display: block;
			
 
				-                            img {
			
 
				-                                width: 385px;
			
 
				-                                position: relative;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        .ms-model-mobile-img {
			
 
				-                            position: absolute;
			
 
				-                            overflow: hidden;
			
 
				-                            z-index: 3;
			
 
				-                            right: 0;
			
 
				-                            top: 0;
			
 
				-                            height: 285px;
			
 
				-                            div {
			
 
				-                                width: 150px;
			
 
				-                                height: 192px;
			
 
				-                                padding: 0px 15px 0px 26px;
			
 
				-                                margin-top: 47px;
			
 
				-                                overflow: hidden;
			
 
				-                                position: relative;
			
 
				-                                img {
			
 
				-                                    width: 100%;
			
 
				-                                    position: relative;
			
 
				-                                    min-height: 100%;
			
 
				-                                }
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-content-case {
			
 
				-        width: 100%;
			
 
				-        /*height: 300px;*/
			
 
				-        overflow: hidden;
			
 
				-        background-color: #fff;
			
 
				-        .ms-content-case-mian {
			
 
				-            width: 1200px;
			
 
				-            margin: auto;
			
 
				-            overflow: hidden;
			
 
				-            padding-bottom: 40px;
			
 
				-            .ms-content-case-title {
			
 
				-                overflow: hidden;
			
 
				-                border-bottom: 1px solid #eee;
			
 
				-                padding-bottom: 20px;
			
 
				-                padding-top: 20px;
			
 
				-                .ms-content-case-title-words {
			
 
				-                    float: left;
			
 
				-                    font-size: 20px;
			
 
				-                }
			
 
				-                .ms-content-case-more {
			
 
				-                    float: right;
			
 
				-                    font-size: 14px;
			
 
				-                    color: #999;
			
 
				-                    cursor: pointer;
			
 
				-                    a:link {
			
 
				-                        color: #999;
			
 
				-                        text-decoration: none
			
 
				-                    }
			
 
				-                    a:visited {
			
 
				-                        color: #999;
			
 
				-                        text-decoration: none
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-content-case-list {
			
 
				-                .ms-content-main-case:nth-child(3n) {
			
 
				-                    margin-right: 0;
			
 
				-                }
			
 
				-                .ms-content-main-case {
			
 
				-                    border: 1px solid #f0f0f0;
			
 
				-                    width: 384px;
			
 
				-                    height: 332px;
			
 
				-                    margin-right: 22px;
			
 
				-                    float: left;
			
 
				-                    position: relative;
			
 
				-                    overflow: hidden;
			
 
				-                    color: #ffffff;
			
 
				-                    margin-top: 20px;
			
 
				-                    &:hover {
			
 
				-                        .ms-content-main-case-explain {
			
 
				-                            display: block;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-content-main-case-img {
			
 
				-                        width: 384px;
			
 
				-                        height: 334px;
			
 
				-                        img {
			
 
				-                            width: 100%;
			
 
				-                            height: 100%;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-content-main-case-explain {
			
 
				-                        display: none;
			
 
				-                        width: 100%;
			
 
				-                        height: 100%;
			
 
				-                        background-color: #0099ff;
			
 
				-                        opacity: 0.9;
			
 
				-                        position: absolute;
			
 
				-                        top: 0px;
			
 
				-                        left: 0px;
			
 
				-                        .ms-content-main-case-title {
			
 
				-                            font-size: 22px;
			
 
				-                            text-align: center;
			
 
				-                            margin: 20px 0;
			
 
				-                            padding: 0 20px;
			
 
				-                            height: 22px;
			
 
				-                            line-height: 22px;
			
 
				-                            overflow: hidden;
			
 
				-                            text-overflow: ellipsis;
			
 
				-                            -webkit-line-clamp: 1;
			
 
				-                            -webkit-box-orient: vertical;
			
 
				-                            display: -webkit-box;
			
 
				-                        }
			
 
				-                        .ms-content-main-case-content {
			
 
				-                            min-height: 215px;
			
 
				-                            p {
			
 
				-                                font-size: 14px;
			
 
				-                                padding: 0 30px;
			
 
				-                                overflow: hidden;
			
 
				-                                text-overflow: ellipsis;
			
 
				-                                -webkit-line-clamp: 4;
			
 
				-                                -webkit-box-orient: vertical;
			
 
				-                                display: -webkit-box;
			
 
				-                                img {
			
 
				-                                    width: 90px;
			
 
				-                                    text-align: center;
			
 
				-                                    margin: 10px 0 0 0;
			
 
				-                                    height: 90px;
			
 
				-                                }
			
 
				-                            }
			
 
				-                        }
			
 
				-                        .ms-content-main-case-click {
			
 
				-                            text-align: center;
			
 
				-                            a {
			
 
				-                                border: 1px solid #ffffff;
			
 
				-                                border-radius: 17px;
			
 
				-                                padding: 5px 39px;
			
 
				-                                color: #ffffff;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    /*产品方向*/
			
 
				-    .ms-content-product {
			
 
				-        background: #fafafa;
			
 
				-        .ms-content-product-main {
			
 
				-            width: 1200px;
			
 
				-            padding: 20px 0;
			
 
				-            margin: auto;
			
 
				-            .ms-content-product-title {
			
 
				-                .ms-content-product-title-words {
			
 
				-                    font-size: 20px;
			
 
				-                }
			
 
				-                padding: 15px 0;
			
 
				-                font-size: 18px;
			
 
				-                text-align: center;
			
 
				-                border-bottom: 1px solid #eee;
			
 
				-            }
			
 
				-            .ms-content-product-list {
			
 
				-                margin: 20px 0;
			
 
				-                .ms-content-product-list-ul {
			
 
				-                    li:last-child {
			
 
				-                        margin-right: 0;
			
 
				-                    }
			
 
				-                    overflow: hidden;
			
 
				-                    li {
			
 
				-                        width: 384px;
			
 
				-                        margin-right: 22px;
			
 
				-                        background-color: #fff;
			
 
				-                        float: left;
			
 
				-                        img {
			
 
				-                            width: 100%;
			
 
				-                        }
			
 
				-                        .ms-content-product-list-content {
			
 
				-                            a:hover {
			
 
				-                                color: #0099ff;
			
 
				-                            }
			
 
				-                            margin: 0 20px;
			
 
				-                            .ms-content-product-list-content-title {
			
 
				-                                margin: 18px 0;
			
 
				-                                a {
			
 
				-                                    color: #555;
			
 
				-                                    font-size: 16px;
			
 
				-                                    &:hover {
			
 
				-                                        color: #0099ff;
			
 
				-                                    }
			
 
				-                                }
			
 
				-                            }
			
 
				-                            .ms-content-product-list-content-describe {
			
 
				-                                font-size: 12px;
			
 
				-                                color: #999;
			
 
				-                                padding-bottom: 20px;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-content-news-main-title-more,.ms-content-case-more{
			
 
				-    	padding-top: 9px;
			
 
				-    	font-size:14px;
			
 
				-    	a:hover{
			
 
				-    		color: #0099ff !important;
			
 
				-    	}
			
 
				-    }
			
 
				-    /*公司动态*/
			
 
				-    .ms-content-news {
			
 
				-        margin-bottom: 40px;
			
 
				-        background-color: #fff;
			
 
				-        .ms-content-news-main {
			
 
				-            width: 1200px;
			
 
				-            margin: auto;
			
 
				-            .ms-content-news-main-title {
			
 
				-                overflow: hidden;
			
 
				-                border-bottom: 1px solid #eee;
			
 
				-                padding-bottom: 20px;
			
 
				-                padding-top: 40px;
			
 
				-                line-height: 1;
			
 
				-                .ms-content-news-main-title-words {
			
 
				-                    float: left;
			
 
				-                    font-size: 20px;
			
 
				-                }
			
 
				-                .ms-content-news-main-title-more {
			
 
				-                    float: right;
			
 
				-                    font-size: 14px;
			
 
				-                    color: #999;
			
 
				-                    cursor: pointer;
			
 
				-                    a:link {
			
 
				-                        color: #999;
			
 
				-                        text-decoration: none
			
 
				-                    }
			
 
				-                    a:visited {
			
 
				-                        color: #999;
			
 
				-                        text-decoration: none
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-content-news-main-img-text {
			
 
				-                margin-top: 21px;
			
 
				-                height: 250px;
			
 
				-                padding-bottom: 40px;
			
 
				-                overflow: hidden;
			
 
				-                img {
			
 
				-                    float: left;
			
 
				-                    margin-right: 20px;
			
 
				-                    width: 420px;
			
 
				-					height: 251px;
			
 
				-                }
			
 
				-                .ms-content-news-main-ul {
			
 
				-                    span:hover {
			
 
				-                        color: #0099ff;
			
 
				-                    }
			
 
				-                    overflow: hidden;
			
 
				-                    li {
			
 
				-                        overflow: hidden;
			
 
				-                        margin-bottom: 14px;
			
 
				-                        border-bottom: 1px dotted #eee;
			
 
				-                        padding-bottom: 10px;
			
 
				-                        line-height: 1;
			
 
				-                        .ms-content-news-main-li-title {
			
 
				-                            float: left;
			
 
				-                            font-size: 14px;
			
 
				-                            color: #555;
			
 
				-                            height: 19px;
			
 
				-                            .ms-content-news-main-li-span {
			
 
				-                                margin-right: 12px;
			
 
				-                            }
			
 
				-                            .ms-content-news-main-li-title {}
			
 
				-                        }
			
 
				-                        .ms-content-news-main-li-time {
			
 
				-                            float: right;
			
 
				-                            font-size: 14px;
			
 
				-                            color: #999;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/login.less
+++ b/src/main/webapp/templets/1/default/less/login.less
@@ -1,224 +0,0 @@
 
				-html,body,#login{
			
 
				-    height: 100%;
			
 
				-}
			
 
				-body{
			
 
				-    background-color: #ffffff;
			
 
				-}
			
 
				-body,p{
			
 
				-    margin: 0;
			
 
				-}
			
 
				-input:focus,textarea:focus {
			
 
				-    outline: none;
			
 
				-}
			
 
				-#login{
			
 
				-    display: flex;
			
 
				-    flex-direction:column;
			
 
				-    height: 893px;
			
 
				-    min-width: 1200px;
			
 
				-    background:url("../images/pic.png") no-repeat;
			
 
				-    background-position: 50%;
			
 
				-    .ms-none{
			
 
				-        display: none !important;
			
 
				-    }
			
 
				-    .ms-login-float{
			
 
				-        float: left;
			
 
				-    }
			
 
				-    .ms-head,.ms-footer,.ms-content-form,.ms-content-code{
			
 
				-        background-color: #ffffff;
			
 
				-    }
			
 
				-    .ms-head-line,.ms-head-welcome-login,.ms-footer{
			
 
				-        color: #999999;
			
 
				-    }
			
 
				-    .ms-head-welcome-login,.ms-login-english-title,.ms-login-remmember-password,.ms-footer{
			
 
				-        font-size: 12px;
			
 
				-    }
			
 
				-    .ms-head{
			
 
				-    	a{
			
 
				-    		width: 147px;	
			
 
				-    	}
			
 
				-        vertical-align: middle;
			
 
				-        height: 22px;
			
 
				-        padding: 34px 46px;
			
 
				-        display: flex;
			
 
				-        align-content: center;
			
 
				-        img{
			
 
				-            height: 100%;
			
 
				-        }
			
 
				-        .ms-head-welcome-login{
			
 
				-            margin-top: 4px;
			
 
				-            font-size: 1rem !important;
			
 
				-        }
			
 
				-        .ms-head-line{
			
 
				-            margin: 0 12px;
			
 
				-            border-left: 1px solid #999;
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-content{
			
 
				-        flex:1;
			
 
				-        position: relative;
			
 
				-        .ms-content-form,.ms-content-code{
			
 
				-            width: 280px;
			
 
				-            height: 215px;
			
 
				-            padding: 24px 20px;
			
 
				-            position: absolute;
			
 
				-            right: 160px;
			
 
				-            top: 25%;
			
 
				-            box-shadow: 2px 2px 8px 6px rgb(59, 177, 255);
			
 
				-        }
			
 
				-        #ms-content-form-register{
			
 
				-            height: 260px;
			
 
				-        }
			
 
				-        .ms-login-chinese-title{
			
 
				-            color: #0099ff;
			
 
				-            font-size: 16px;
			
 
				-            line-height: 15px;
			
 
				-        }
			
 
				-        .ms-login-code{
			
 
				-            position: absolute;
			
 
				-            top: 4px;
			
 
				-            right: 4px;
			
 
				-        }
			
 
				-        .ms-login-code-title{
			
 
				-            color: #0099ff;
			
 
				-            font-size: 12px;
			
 
				-        }
			
 
				-        .ms-content-form{
			
 
				-            .ms-login-title{
			
 
				-                line-height: 13px;
			
 
				-            }
			
 
				-            .ms-login-english-title,.ms-login-remmember-password,.ms-login-code-text{
			
 
				-                color: #999999;
			
 
				-            }
			
 
				-            .ms-login-people-name,.ms-login-remmember-password{
			
 
				-                margin-bottom: 12px;
			
 
				-            }
			
 
				-            .ms-login-error-text{
			
 
				-                height: 15px;
			
 
				-                font-size: 12px;
			
 
				-                color: #e4393c;
			
 
				-                display: flex;
			
 
				-                align-items: center;
			
 
				-                padding: 5px 0;
			
 
				-                img{
			
 
				-                    padding-right: 5px;
			
 
				-                }
			
 
				-            }
			
 
				-            input{
			
 
				-                border: 1px solid #eeeeee;
			
 
				-                border-radius: 3px;
			
 
				-                color: #555555;
			
 
				-                outline-color: #0099ff;
			
 
				-                &::-webkit-input-placeholder {
			
 
				-                	color: #999999;
			
 
				-                }
			
 
				-                &::-moz-placeholder {
			
 
				-                	color: #999999;
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-login-people-name{
			
 
				-                width: 260px;
			
 
				-                height: 20px;
			
 
				-                padding: 5px 10px;
			
 
				-            }
			
 
				-            .ms-error{
			
 
				-                border:1px solid #e4393c;
			
 
				-            }
			
 
				-            .ms-login-remmember-password{
			
 
				-                display: flex;
			
 
				-                line-height: 13px;
			
 
				-                align-items: center;
			
 
				-                height: 13px;
			
 
				-            }
			
 
				-            .ms-login-remmember-password input[type="checkbox"]{
			
 
				-                margin:0 6px 0 0;
			
 
				-            }
			
 
				-            .ms-login-button{
			
 
				-            	pointer-events:none;
			
 
				-                background-color:#fafafa;
			
 
				-                color:#ddd;
			
 
				-                width: 100%;
			
 
				-                height: 34px;
			
 
				-                line-height: 34px;
			
 
				-                font-size: 14px;
			
 
				-                /*color: #ffffff;*/
			
 
				-                text-align: center;
			
 
				-                /*background-color: #009aff;*/
			
 
				-                cursor: pointer;
			
 
				-                border-radius: 4px;
			
 
				-            }
			
 
				-            .login-code{
			
 
				-                overflow: hidden;
			
 
				-                margin-bottom: 12px;
			
 
				-                .login-code-input{
			
 
				-                    width: 115px;
			
 
				-                    height: 12px;
			
 
				-                    padding:10px;
			
 
				-                }
			
 
				-                .login-code-input,.login-code-img{
			
 
				-                    margin-right: 11px;
			
 
				-                }
			
 
				-                .login-code-img{
			
 
				-                    height: 34px;
			
 
				-                }
			
 
				-                .login-code-text{
			
 
				-                    font-size: 10px;
			
 
				-                }
			
 
				-                .login-code-change{
			
 
				-                    cursor: pointer;
			
 
				-                     color: #0099ff;
			
 
				-                }
			
 
				-                .login-code-rompt{
			
 
				-                    color: #999;
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-login-rand-code{
			
 
				-                width: 110px;
			
 
				-                height: 12px;
			
 
				-                padding:10px;
			
 
				-            }
			
 
				-            .ms-login-rand-code-img{
			
 
				-                height: 34px;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-content-code{
			
 
				-            .ms-computer-title{
			
 
				-                background: url(../images/frame.png) no-repeat;
			
 
				-                position: absolute;
			
 
				-                top: 10px;
			
 
				-                background-size: 100% 100%;
			
 
				-                color: #ffffff;
			
 
				-                font-size: 10px;
			
 
				-                width: 90px;
			
 
				-                right: 45px;
			
 
				-            }
			
 
				-            .ms-login-weixin{
			
 
				-                text-align: center;
			
 
				-                img{
			
 
				-                    margin: auto;
			
 
				-                    display: block;
			
 
				-                    margin-top: 18px;
			
 
				-                    margin-bottom: 16px;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-login-button:hover,.ms-login-button:active{
			
 
				-            background-color: #0086ff;
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-footer{
			
 
				-    	a:link{color:#999999;text-decoration:none}
			
 
				-		a:visited{color:#999999;text-decoration:none}
			
 
				-		a:active{color:#999999;text-decoration:none}
			
 
				-		a:hover{color:#0099ff;text-decoration:none}
			
 
				-        height: 40px;
			
 
				-        padding: 40px 0;
			
 
				-        text-align: center;
			
 
				-        p{
			
 
				-            margin: 0 0 18px 0;
			
 
				-            line-height: 11px;
			
 
				-            &:last-child{
			
 
				-                margin:0;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/news-list.less
+++ b/src/main/webapp/templets/1/default/less/news-list.less
@@ -1,186 +0,0 @@
 
				-.ms-content{
			
 
				-	.ms-content-left{
			
 
				-			width: 230px;
			
 
				-			float: left;
			
 
				-			margin-right: 20px;
			
 
				-			.ms-content-left-title{
			
 
				-				font-weight: bold;
			
 
				-				background-color: #009aff;
			
 
				-				color: #fff;
			
 
				-				height: 40px;
			
 
				-				line-height: 40px;
			
 
				-				width: 190px;
			
 
				-				padding: 0 20px;
			
 
				-			}
			
 
				-			.ms-content-left-ul{
			
 
				-				a:hover{
			
 
				-					li{
			
 
				-						background-color: #54bcfe;
			
 
				-					}
			
 
				-					color: #fff;
			
 
				-				}
			
 
				-				background-color: #fff;
			
 
				-				margin-top: 1px;
			
 
				-				width: 230px;
			
 
				-				a{
			
 
				-					color: #999999;
			
 
				-				}
			
 
				-				li{
			
 
				-					height: 40px;
			
 
				-					line-height: 40px;
			
 
				-					font-size: 14px;
			
 
				-					cursor: pointer;
			
 
				-					/*width: 190px;*/
			
 
				-					padding: 0 20px;
			
 
				-					.ms-content-left-li-more{
			
 
				-						float: right;
			
 
				-					}
			
 
				-				}
			
 
				-				.ms-content-left-li-first{
			
 
				-					li{
			
 
				-						background-color: #54bcfe;
			
 
				-					}
			
 
				-					color: #fff;
			
 
				-				}
			
 
				-			}
			
 
				-		}
			
 
				-	/*新闻列表*/
			
 
				-	margin: 20px 0 ;
			
 
				-	a:visited{color:#000000;}
			
 
				-	.ms-content-new-list{
			
 
				-		overflow: hidden;
			
 
				-		margin-top: 20px;
			
 
				-	}
			
 
				-	.ms-content-right-position{
			
 
				-		a:hover{
			
 
				-			color:#0099ff;
			
 
				-		}
			
 
				-		font-size: 14px;
			
 
				-		overflow: hidden;
			
 
				-    	margin-bottom: 20px;
			
 
				-		span{
			
 
				-			padding: 0 5px;
			
 
				-		}
			
 
				-	}
			
 
				-	#ms-content-search{
			
 
				-		float: none;
			
 
				-	    width: 100%;
			
 
				-	    margin-top: 20px;
			
 
				-	}
			
 
				-	.ms-content-main-list{
			
 
				-		
			
 
				-		float: right;
			
 
				-    	/*margin-bottom: 40px;*/
			
 
				-		width: 950px;
			
 
				-		
			
 
				-		min-height: 400px;
			
 
				-		/*margin: auto;*/
			
 
				-		.ms-content-main-div{
			
 
				-			background-color: #fff;
			
 
				-			padding-bottom: 30px;
			
 
				-			.ms-content-main-ul{
			
 
				-				a:link{color:#333;text-decoration:none}
			
 
				-				a:visited{color:#333;text-decoration:none}
			
 
				-				a:active{color:#333;text-decoration:none}
			
 
				-				a:hover{color:#0099ff;text-decoration:none}
			
 
				-				margin: 0 20px;
			
 
				-				li{
			
 
				-					border-bottom: 1px dotted #eee;
			
 
				-					padding: 12px 0;
			
 
				-					overflow: hidden;
			
 
				-				}
			
 
				-				.ms-content-main-li-span{
			
 
				-					padding-right: 10px;
			
 
				-					float: left;
			
 
				-				}
			
 
				-				.ms-content-main-li-title{
			
 
				-					float: left;
			
 
				-					color:#333;
			
 
				-				    overflow: hidden;
			
 
				-				    text-overflow: ellipsis;
			
 
				-				    -webkit-line-clamp: 1;
			
 
				-				    -webkit-box-orient: vertical;
			
 
				-				    display: -webkit-box;
			
 
				-				    font-size: 14px;
			
 
				-				    width: 500px;
			
 
				-				}
			
 
				-				.ms-content-main-li-time{
			
 
				-					float: right;
			
 
				-					color: #999999;
			
 
				-					font-size: 14px;
			
 
				-				}
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-	.ms-content-main-page{
			
 
				-		a{
			
 
				-			color:#999;
			
 
				-			font-size:14px;
			
 
				-		}
			
 
				-		a:hover{
			
 
				-		 	 background-color: #eee;
			
 
				-		 }
			
 
				-		text-align: center;
			
 
				-	    margin-top: 30px;
			
 
				-	    margin-bottom: 50px;
			
 
				-		.ms-content-main-page-first,.ms-content-main-page-last{
			
 
				-			border: 1px solid #ddd;
			
 
				-			padding: 10px 15px;
			
 
				-			margin-right:-5px;
			
 
				-		}
			
 
				-		.ms-content-main-page-upper,.ms-content-main-page-next{
			
 
				-			border-top:1px solid #ddd;
			
 
				-			border-bottom:1px solid #ddd;
			
 
				-			/*border: 1px solid #ddd;*/
			
 
				-			padding: 10px 15px;
			
 
				-			margin-right:-5px;
			
 
				-		}
			
 
				-		.ms-content-main-page-upper{
			
 
				-			border-right: 1px solid #ddd;
			
 
				-		}
			
 
				-		.ms-content-main-page-first{
			
 
				-			border-top-left-radius: 4px;
			
 
				-			border-bottom-left-radius: 4px;
			
 
				-		}
			
 
				-		.ms-content-main-page-last{
			
 
				-			border-top-right-radius: 4px;
			
 
				-			border-bottom-right-radius: 4px;
			
 
				-		}
			
 
				-	}
			
 
				-	/*搜索列表*/
			
 
				-	.ms-content-main-div{
			
 
				-		.ms-content-main-div-prompt{
			
 
				-			border-bottom: 1px solid #d0cfcf99;
			
 
				-			padding-top: 20px;
			
 
				-		    padding-left: 20px;
			
 
				-		    padding-bottom: 10px;
			
 
				-		    font-size: 14px;
			
 
				-		    color: #999999;
			
 
				-			span{
			
 
				-				color: #0198ff;
			
 
				-			}
			
 
				-		}
			
 
				-		.ms-content-main-ul{
			
 
				-			li{
			
 
				-				height: 22px;
			
 
				-    			line-height: 22px;
			
 
				-			}
			
 
				-			a{
			
 
				-				font-size:14px;
			
 
				-			}
			
 
				-			.ms-content-main-li-title:hover{
			
 
				-			 	 color: #0099ff;
			
 
				-			 }
			
 
				-			.ms-content-main-ul-result{
			
 
				-				color: #0198ff;
			
 
				-			}
			
 
				-		}
			
 
				-		.ms-content-main-div-nothing{
			
 
				-			font-size: 14px;
			
 
				-		    color: #999999;
			
 
				-		    padding-top: 20px;
			
 
				-		    padding-left: 20px;
			
 
				-		    text-align: center;
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/less/news-show.less
+++ b/src/main/webapp/templets/1/default/less/news-show.less
@@ -1,224 +0,0 @@
 
				-.ms-content-about {
			
 
				-    .ms-content-main {
			
 
				-        .ms-content-right {
			
 
				-            .ms-content-right-main-title {
			
 
				-            	.ms-content-right-main-title-div{
			
 
				-            		color:#333;
			
 
				-            	}
			
 
				-                overflow: hidden;
			
 
				-            }
			
 
				-            #ms-content-right-main-title {
			
 
				-                padding-bottom: 0px;
			
 
				-                text-align: left;
			
 
				-                border-bottom: 1px solid #fafafa;
			
 
				-            }
			
 
				-            .ms-content-right-main-icon {
			
 
				-            	.ms-content-right-vertical{
			
 
				-            		color: #ccc;
			
 
				-            	}
			
 
				-                font-size: 12px;
			
 
				-                color: #999999;
			
 
				-                /*float: right;*/
			
 
				-                overflow: hidden;
			
 
				-                padding: 20px 0;
			
 
				-                .ms-content-icon-left,
			
 
				-                .ms-content-icon-right {
			
 
				-                    div {
			
 
				-                        float: left;
			
 
				-                        overflow: hidden;
			
 
				-                        span {
			
 
				-                            margin: 0 12px;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                .ms-content-icon-right {
			
 
				-                    float: right;
			
 
				-                }
			
 
				-                .ms-content-right-main-icon-clicks,
			
 
				-                .ms-content-right-main-icon-comment,
			
 
				-                .ms-content-right-main-icon-Fabulous {
			
 
				-                    background-image: url(../images/pics.png);
			
 
				-                    width: 16px;
			
 
				-                    height: 15px;
			
 
				-                    margin-top: 2px;
			
 
				-                }
			
 
				-                .ms-content-right-main-icon-clicks {
			
 
				-                    background-position: -11px 84px;
			
 
				-                }
			
 
				-                .ms-content-right-main-icon-comment {
			
 
				-                    background-position: -67px 84px;
			
 
				-                }
			
 
				-                .ms-content-right-main-icon-Fabulous {
			
 
				-                    background-position: -120px 85px;
			
 
				-                }
			
 
				-                .ms-content-right-main-icon-num {
			
 
				-                    margin-left: 5px;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-content-right-main-content-Fabulous {
			
 
				-            width: 952px;
			
 
				-            height: 96px;
			
 
				-            border-top: 1px solid #fafafa;
			
 
				-            background-color: #fff;
			
 
				-            display: flex;
			
 
				-            align-items: center;
			
 
				-            .ms-content-right-main-content-icon {
			
 
				-                transition: all .6s;
			
 
				-                background-image: url(../images/pics.png);
			
 
				-                width: 56px;
			
 
				-                height: 56px;
			
 
				-                background-position: -45px 53px;
			
 
				-                background-color: #bababa;
			
 
				-                border-radius: 50%;
			
 
				-                margin: 0 auto;
			
 
				-                cursor: pointer;
			
 
				-            }
			
 
				-            .ms-is-attention {
			
 
				-                background-color: #009bff;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-content-right-comment {
			
 
				-            width: 952px;
			
 
				-            /*height: 300px;*/
			
 
				-            background-color: #fff;
			
 
				-            margin-top: 10px;
			
 
				-            .ms-content-right-comment-input {
			
 
				-                border-bottom: 1px solid #fafafa;
			
 
				-                padding-bottom: 40px;
			
 
				-                textarea::-webkit-input-placeholder {
			
 
				-                    color: #ddd;
			
 
				-                }
			
 
				-                textarea {
			
 
				-                    width: 888px;
			
 
				-                    height: 15px;
			
 
				-                    padding: 10px;
			
 
				-                    background-color: #fafafa;
			
 
				-                    border: 1px solid #eee;
			
 
				-                    border-radius: 3px;
			
 
				-                    /*margin: 20px;*/
			
 
				-                    margin: 0 20px;
			
 
				-                    margin-top: 20px;
			
 
				-                    margin-bottom: 10px;
			
 
				-                }
			
 
				-                .ms-content-right-comment-button {
			
 
				-                    width: 910px;
			
 
				-                    overflow: hidden;
			
 
				-                    margin: 0 20px;
			
 
				-                    .ms-content-right-comment-expression {
			
 
				-                        background-image: url(../images/pics.png);
			
 
				-                        background-position: -2px 37px;
			
 
				-                        width: 30px;
			
 
				-                        height: 30px;
			
 
				-                        float: left;
			
 
				-                        cursor: pointer;
			
 
				-                    }
			
 
				-                    .ms-content-right-comment-submit {
			
 
				-                        width: 50px;
			
 
				-                        background-color: #fafafa;
			
 
				-                        font-size: 14px;
			
 
				-                        height: 25px;
			
 
				-                        border-radius: 4px;
			
 
				-                        color: #ddd;
			
 
				-                        line-height: 25px;
			
 
				-                        text-align: center;
			
 
				-                        float: right;
			
 
				-                        cursor: no-drop;
			
 
				-                    }
			
 
				-                    .ms-submit-comments-css {
			
 
				-                        opacity: .9 !important;
			
 
				-                        cursor: pointer;
			
 
				-                        background-color: #009aff !important;
			
 
				-                        color: #ffffff;
			
 
				-                        &:hover {
			
 
				-                            opacity: 1 !important;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            .ms-content-right-comment-list {
			
 
				-                .ms-content-right-comment-list-div {
			
 
				-                    overflow: hidden;
			
 
				-                    padding: 20px 0;
			
 
				-                    margin: 0 20px;
			
 
				-                    border-bottom: 1px solid #fafafa;
			
 
				-                    .ms-content-right-comment-list-left {
			
 
				-                        font-size: 14px;
			
 
				-                        margin-left: 40px;
			
 
				-                        .ms-content-right-comment-list-portrait {
			
 
				-                            float: left;
			
 
				-                            margin-right: 20px;
			
 
				-                            img {
			
 
				-                                width: 64px;
			
 
				-                                height: 64px;
			
 
				-                                border-radius: 50%;
			
 
				-                                /* float: left;*/
			
 
				-                            }
			
 
				-                        }
			
 
				-                        .ms-content-right-comment-list-content {
			
 
				-                            overflow: hidden;
			
 
				-                            .ms-content-right-comment-list-name {
			
 
				-                                margin-bottom: 20px;
			
 
				-                            }
			
 
				-                            .ms-content-right-comment-list-comment {
			
 
				-                                color: #999;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-content-right-comment-list-right {
			
 
				-                        /*display: none;*/
			
 
				-                        float: right;
			
 
				-                        margin-right: 20px;
			
 
				-                        overflow: hidden;
			
 
				-                        height: 15px;
			
 
				-                        .ms-content-right-main-icon-comment,
			
 
				-                        .ms-content-right-main-icon-Fabulous {
			
 
				-                            background-image: url(../images/pics.png);
			
 
				-                            width: 16px;
			
 
				-                            height: 15px;
			
 
				-                            /*margin-top: 2px;*/
			
 
				-                            float: left;
			
 
				-                        }
			
 
				-                        .ms-content-right-main-icon-comment {
			
 
				-                            background-position: -67px 85px;
			
 
				-                            margin-right: 20px;
			
 
				-                        }
			
 
				-                        .ms-content-right-main-icon-Fabulous {
			
 
				-                            background-position: -120px 85px;
			
 
				-                        }
			
 
				-                        .ms-content-right-main-icon-num {
			
 
				-                            margin-left: 5px;
			
 
				-                            float: left;
			
 
				-                            font-size: 12px;
			
 
				-                            color: #999;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-content-right-comment-list-div-more{
			
 
				-                        cursor: pointer;
			
 
				-                    }
			
 
				-                    .ms-content-right-comment-list-div-more,
			
 
				-                    .ms-content-right-comment-list-div-no {
			
 
				-                        text-align: center;
			
 
				-                        font-size: 14px;
			
 
				-                        color: #999;
			
 
				-                    }
			
 
				-                    .ms-content-right-comment-list-div-no {}
			
 
				-                    .ms-content-right-comment-list-div-load {
			
 
				-                        text-align: center;
			
 
				-                        img {
			
 
				-                            width: 30px;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                .ms-content-right-active {
			
 
				-                    border: none;
			
 
				-                }
			
 
				-                .ms-content-right-comment-list-no-comment {
			
 
				-                    text-align: center;
			
 
				-                    height: 200px;
			
 
				-                    line-height: 200px;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/menu-left.htm
+++ b/src/main/webapp/templets/1/default/menu-left.htm
@@ -1,35 +0,0 @@
 
				-<div class="ms-content-left">
			
 
				-    <div class="ms-content-left-title">走进铭飞</div>
			
 
				-    <ul class="ms-content-left-ul">
			
 
				-        <a target="_blank" href='{ms:global.url/}/guanyuwomen53/index.html'>
			
 
				-            <li>关于我们<span class="ms-content-left-li-more">></span></li>
			
 
				-        </a>
			
 
				-        <a target="_blank" href='{ms:global.url/}/xinwenzhongxin/index.html'>
			
 
				-            <li>公司动态<span class="ms-content-left-li-more">></span></li>
			
 
				-        </a>
			
 
				-        <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>
			
 
				-            <li>发展历程<span class="ms-content-left-li-more">></span></li>
			
 
				-        </a>
			
 
				-        <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#lianx'>
			
 
				-            <li>加入我们<span class="ms-content-left-li-more">></span></li>
			
 
				-        </a>
			
 
				-        <a target="_blank" href='{ms:global.url/}/lianxiwomen19/lianxiwomen/index.html'>
			
 
				-            <li>联系我们<span class="ms-content-left-li-more">></span></li>
			
 
				-        </a>
			
 
				-    </ul>
			
 
				-</div>
			
 
				-<script>
			
 
				-    $(function(){
			
 
				-        var r=location.href;
			
 
				-        if(r.match("53")){
			
 
				-            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
			
 
				-            $(".ms-content-left-ul a").eq(0).addClass("ms-content-left-li-first");
			
 
				-        }else if(r.match("19")){
			
 
				-            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
			
 
				-            $(".ms-content-left-ul a").eq(4).addClass("ms-content-left-li-first");
			
 
				-        }else if(r.match("59")){
			
 
				-            $(".ms-content-left-ul a").removeClass("ms-content-left-li-first");
			
 
				-            $(".ms-content-left-ul a").eq(1).addClass("ms-content-left-li-first");
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/news-list.htm
+++ b/src/main/webapp/templets/1/default/news-list.htm
@@ -1,48 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <#include "head-file.htm"/>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <#include "head.htm"/>
			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/our_company.jpeg) no-repeat center;">
			
 
				-            <p class="banner_tit_other animated fadeInLeft">公司动态</p>
			
 
				-            <p class="banner_tit_other_des animated fadeInRight">Our company</p>
			
 
				-        </div>
			
 
				-        <div class="ms-content">
			
 
				-            <div class="ms-content-new-list">
			
 
				-                <#include "menu-left.htm"/>
			
 
				-                <div class="ms-content-right-position">
			
 
				-                    <a href="{ms:global.host/}">首页</a>
			
 
				-                    <span>></span>
			
 
				-                    {ms:channel type='self'}
			
 
				-                    <a href="{ms:global.url/}[field.typelink/]">[field.typetitle/]</a>
			
 
				-                    {/ms:channel}
			
 
				-                </div>
			
 
				-                <div class="ms-content-main-list">
			
 
				-
			
 
				-                    <div class="ms-content-main-div">
			
 
				-                        <ul class="ms-content-main-ul">
			
 
				-                            {ms:arclist size=10 ispaging=true}
			
 
				-                            <li>
			
 
				-                                <a href="{ms:global.url/}[field.link/]">
			
 
				-                                    <!-- <span class="ms-content-main-li-span">·</span> -->
			
 
				-                                    <span class="ms-content-main-li-title">[field.title/]</span>
			
 
				-                                    <span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
			
 
				-                                </a>
			
 
				-                            </li>
			
 
				-                            {/ms:arclist}
			
 
				-                        </ul>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-content-main-page">
			
 
				-               <a class="ms-content-main-page-first" href="{ms:global.url/}{ms:page.index/}">首页</a>
			
 
				-               <a class="ms-content-main-page-upper" href="{ms:global.url/}{ms:page.pre/}">上一页</a>
			
 
				-               <a class="ms-content-main-page-next" href="{ms:global.url/}{ms:page.next/}">下一页</a>
			
 
				-               <a class="ms-content-main-page-last" href="{ms:global.url/}{ms:page.last/}">末页</a>
			
 
				-           </div>
			
 
				-        </div>
			
 
				-        <#include "footer.htm"/>
			
 
				-    </body>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/news-show.htm
+++ b/src/main/webapp/templets/1/default/news-show.htm
@@ -1,265 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <#include "head-file.htm">
			
 
				-        <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/jquery.sinaemotion.css" />
			
 
				-        <script type="text/javascript" src="{ms:global.host/}/{ms:global.style/}/js/jquery.sinaEmotion.js"></script>
			
 
				-    </head>
			
 
				-
			
 
				-    <body>
			
 
				-        <#include "head.htm">
			
 
				-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/news2.png) no-repeat center;">
			
 
				-            <p class="banner_tit_other animated fadeInLeft">公司动态</p>
			
 
				-            
			
 
				-            <p class="banner_tit_other_des animated fadeInRight">Our company</p>
			
 
				-        </div>
			
 
				-        <div class="ms-content-about" id="news-show-vue">
			
 
				-            <div class="ms-content-main">
			
 
				-                <#include "menu-left.htm">
			
 
				-                <div class="ms-content-right">
			
 
				-                    <div class="ms-content-right-position">
			
 
				-                        <a href="{ms:global.host/}">首页</a>
			
 
				-                        <span>></span>
			
 
				-                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-right-main">
			
 
				-                        <div class="ms-content-right-main-title" id="ms-content-right-main-title">
			
 
				-                            <div class="ms-content-right-main-title-div">{ms:field.title/}</div>
			
 
				-                            <div class="ms-content-right-main-icon">
			
 
				-                                <div class="ms-content-icon-left">
			
 
				-                                    <div class="ms-content-right-main-icon-source">来源：{ms:field.source/}
			
 
				-                                        <span class="ms-content-right-vertical">|</span>
			
 
				-                                    </div>
			
 
				-                                    <div class="ms-content-right-main-icon-time">时间：{ms:field.date?string("yyyy-MM-dd")/}</div>
			
 
				-                                </div>
			
 
				-                                <div class="ms-content-icon-right">
			
 
				-                                    <div class="ms-content-right-main-icon-clicks"></div>
			
 
				-                                    <div class="ms-content-right-main-icon-num">{ms:field.hit/}
			
 
				-                                        <span class="ms-content-right-vertical">|</span>
			
 
				-                                    </div>
			
 
				-                                    <div class="ms-content-right-main-icon-comment"></div>
			
 
				-                                    <div class="ms-content-right-main-icon-num">
			
 
				-                                        <span style="margin: 0;" v-text="commentsList.length"></span>
			
 
				-                                        <span class="ms-content-right-vertical">|</span>
			
 
				-                                    </div>
			
 
				-                                    <div class="ms-content-right-main-icon-Fabulous"></div>
			
 
				-                                    <div class="ms-content-right-main-icon-num" v-text="attentionNum"></div>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                        <div class="ms-content-right-main-content">
			
 
				-                            <p>{ms:field.content/}</p><br/>
			
 
				-                        </div>
			
 
				-                        <div class="metfield">
			
 
				-					        <p>上一篇：<a href="{ms:global.url/}{ms:pre.link/}">{ms:pre.title/}</a></p>
			
 
				-					        <p>下一篇：<a href="{ms:global.url/}{ms:next.link/}">{ms:next.title/}</a></p>
			
 
				-					    </div>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-right-main-content-Fabulous">
			
 
				-                        <div class="ms-content-right-main-content-icon" @click="attentionNews" :class="{'ms-is-attention':isAttention}"></div>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-right-comment">
			
 
				-                        <div class="ms-content-right-comment-input">
			
 
				-                            <textarea v-model='isButAttention' class="emotion" type="text" name="comments" placeholder="我有话说..."></textarea>
			
 
				-                            <div class="ms-content-right-comment-button">
			
 
				-                                <div class="ms-content-right-comment-expression" id="ms-face"></div>
			
 
				-                                <div class="ms-content-right-comment-submit" :class="{'ms-submit-comments-css':isButAttention.length>0}" @click="submitComments">提交</div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                        <div class="ms-content-right-comment-list">
			
 
				-                            <div class="ms-content-right-comment-list-no-comment" style="display: none;" v-show="commentsList.length == 0">
			
 
				-                                <img src="{ms:global.host/}/{ms:global.style/}/images/no-comment.png">
			
 
				-                            </div>
			
 
				-                            <template v-for="(comments,index) in commentsList">
			
 
				-                                <div class="ms-content-right-comment-list-div" v-if="index <= listNum">
			
 
				-                                    <div class="ms-content-right-comment-list-left">
			
 
				-                                        <div class="ms-content-right-comment-list-portrait">
			
 
				-                                            <img :src="'{ms:global.host/}'+ comments.puIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
			
 
				-                                        </div>
			
 
				-                                        <div class="ms-content-right-comment-list-content">
			
 
				-                                            <div class="ms-content-right-comment-list-name" v-text="comments.puNickname"></div>
			
 
				-                                            <div class="ms-content-right-comment-list-comment" v-html="vueAnalyticEmotion(comments.commentContent)"></div>
			
 
				-                                        </div>
			
 
				-                                    </div>
			
 
				-                                    <!--<div class="ms-content-right-comment-list-right">
			
 
				-                                        <div class="ms-content-right-main-icon-comment"></div>
			
 
				-                                        <div class="ms-content-right-main-icon-Fabulous"></div>
			
 
				-                                        <div class="ms-content-right-main-icon-num">28</div>
			
 
				-                                    </div>-->
			
 
				-                                </div>
			
 
				-                            </template>
			
 
				-                            <div class="ms-content-right-comment-list-div ms-content-right-active">
			
 
				-                                <div class="ms-content-right-comment-list-div-more" @click="listNum = listNum +4" v-show="listNum < commentsList.length">
			
 
				-                                    查看更多评论
			
 
				-                                </div>
			
 
				-                                <div class="ms-content-right-comment-list-div-no" v-show="listNum >= commentsList.length && commentsList.length != 0">
			
 
				-                                    没有更多评论
			
 
				-                                </div>
			
 
				-                                <div class="ms-content-right-comment-list-div-load" style="display: none;">
			
 
				-                                    <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif">
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <#include "footer.htm">
			
 
				-    </body>
			
 
				-    <script>
			
 
				-        var newsShowVue = new Vue({
			
 
				-            el: "#news-show-vue",
			
 
				-            data: {
			
 
				-                commentsList: [], //评论列表
			
 
				-                attentionNum: 0, //点赞数
			
 
				-                isAttention: false, //点赞状态
			
 
				-                isButAttention: '', //按钮状态
			
 
				-                listNum: 4, //列表数
			
 
				-                loginStatus: '', //登录状态
			
 
				-                vueAnalyticEmotion: function(val) {
			
 
				-                    return AnalyticEmotion(val);
			
 
				-                },
			
 
				-            },
			
 
				-            methods: {
			
 
				-                //关注或者取消
			
 
				-                attentionNews: function() {
			
 
				-                    var obj = this;
			
 
				-                    if(this.loginStatus != true) {
			
 
				-                        alert("请先登录后重试");
			
 
				-                        return;
			
 
				-                    }
			
 
				-                    if(obj.isAttention == false) {
			
 
				-                        $.ajax({
			
 
				-                            type: "POST",
			
 
				-                            data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
			
 
				-                            url: "{ms:global.host/}/people/attention/save.do",
			
 
				-                            success: function(msg) {
			
 
				-                                if(msg.result) {
			
 
				-                                    obj.attentionNum++;
			
 
				-                                    obj.isAttention = true;
			
 
				-                                }
			
 
				-                            },
			
 
				-                            error: function() {
			
 
				-                                alert("操作失败，请检查是否已经安装关注插件");
			
 
				-                            }
			
 
				-                        })
			
 
				-                    } else {
			
 
				-                        $.ajax({
			
 
				-                            type: "POST",
			
 
				-                            data: "basicId={ms:field.id/}&basicAttentionType=2",
			
 
				-                            url: "{ms:global.host/}/people/attention/delete.do",
			
 
				-                            success: function(msg) {
			
 
				-                                if(msg.result) {
			
 
				-                                    obj.attentionNum--;
			
 
				-                                    obj.isAttention = false;
			
 
				-                                }
			
 
				-                            },
			
 
				-                            error: function() {
			
 
				-                                alert("操作失败，请检查是否已经安装关注插件");
			
 
				-                            }
			
 
				-                        })
			
 
				-                    }
			
 
				-                },
			
 
				-                //关注
			
 
				-                list: function() {
			
 
				-                    var obj = this;
			
 
				-                    $.ajax({
			
 
				-                        type: "POST",
			
 
				-                        data: "commentBasicId={ms:field.id/}",
			
 
				-                        url: "{ms:global.host/}/comment/list.do",
			
 
				-                        success: function(msg) {
			
 
				-                            obj.commentsList = msg.list;
			
 
				-                        }
			
 
				-                    })
			
 
				-                },
			
 
				-                //提交
			
 
				-                submitComments: function() {
			
 
				-                    if(this.isButAttention == '') {
			
 
				-                        return;
			
 
				-                    }
			
 
				-                    if(this.loginStatus != true) {
			
 
				-                        alert("请先登录后重试");
			
 
				-                        return;
			
 
				-                    }
			
 
				-                    var obj = this;
			
 
				-                    $.ajax({
			
 
				-                        type: "POST",
			
 
				-                        data: "commentContent=" + $("textarea[name=comments]").val() + "&isCode=false&commentBasicId={ms:field.id/}",
			
 
				-                        url: "{ms:global.host/}/people/comment/save.do",
			
 
				-                        success: function(msg) {
			
 
				-                            if(msg.result) {
			
 
				-                                alert("评论成功");
			
 
				-                                obj.list();
			
 
				-                            } else {
			
 
				-                                alert(msg.resultMsg);
			
 
				-                            }
			
 
				-                            obj.isButAttention = '';
			
 
				-                        },
			
 
				-                        error: function() {
			
 
				-                            alert("评论失败，请检查是否已经安装评论插件");
			
 
				-                        },
			
 
				-                    })
			
 
				-                }
			
 
				-            },
			
 
				-            mounted: function() {
			
 
				-                $('#ms-face').SinaEmotion($('.emotion'));
			
 
				-                var obj = this;
			
 
				-                //登录状态
			
 
				-                $.ajax({
			
 
				-                    type: "POST",
			
 
				-                    url: "{ms:global.host/}/checkLoginStatus.do",
			
 
				-                    success: function(msg) {
			
 
				-                        obj.loginStatus = msg.result;
			
 
				-                    }
			
 
				-                })
			
 
				-
			
 
				-                //关注数
			
 
				-                $.ajax({
			
 
				-                    type: "POST",
			
 
				-                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
			
 
				-                    url: "{ms:global.host/}/attention/count.do",
			
 
				-                    success: function(msg) {
			
 
				-                        obj.attentionNum = msg;
			
 
				-                    }
			
 
				-                })
			
 
				-                //是否关注了
			
 
				-                $.ajax({
			
 
				-                    type: "POST",
			
 
				-                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
			
 
				-                    url: "{ms:global.host/}/people/attention/isExists.do",
			
 
				-                    success: function(msg) {
			
 
				-                        obj.isAttention = msg.result;
			
 
				-                    }
			
 
				-                })
			
 
				-            },
			
 
				-            beforeCreate: function() {
			
 
				-                var obj = this;
			
 
				-                var app_id = '1362404091';
			
 
				-                $.ajax({
			
 
				-                    async: true,
			
 
				-                    dataType: 'jsonp',
			
 
				-                    url: 'https://api.weibo.com/2/emotions.json?source=' + app_id,
			
 
				-                    success: function(response) {
			
 
				-                        var data = response.data;
			
 
				-                        for(var i in data) {
			
 
				-                            if(data[i].category == '') {
			
 
				-                                data[i].category = '默认';
			
 
				-                            }
			
 
				-                            if(emotions[data[i].category] == undefined) {
			
 
				-                                emotions[data[i].category] = new Array();
			
 
				-                                categorys.push(data[i].category);
			
 
				-                            }
			
 
				-                            emotions[data[i].category].push({
			
 
				-                                name: data[i].phrase,
			
 
				-                                icon: data[i].icon
			
 
				-                            });
			
 
				-                            uSinaEmotionsHt.put(data[i].phrase, data[i].icon);
			
 
				-                        }
			
 
				-                        obj.list();
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-        })
			
 
				-    </script>
			
 
				-
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/people/center.htm
+++ b/src/main/webapp/templets/1/default/people/center.htm
@@ -1,206 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-<head>
			
 
				-    <#include "/head-file.htm" />
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <#include "/head.htm" />
			
 
				-    <div class="ms-content" id="center-vue">
			
 
				-        <div class="ms-content-main">
			
 
				-            <div class="ms-content-left">
			
 
				-                <div class="ms-content-left-info">
			
 
				-                    <el-upload class="avatar-uploader" action="{ms:global.host/}/file/upload.do" :show-file-list="false"
			
 
				-                        :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
			
 
				-                    </el-upload>
			
 
				-                    <img :src="'{ms:global.host/}/'+peopleInfo.puIcon"
			
 
				-                        onerror='this.src="http://cdn.mingsoft.net/global/images/msheader.png"'>
			
 
				-
			
 
				-                    <div style="display: none;" v-show="peopleInfo.puNickname!='' && peopleInfo.puNickname != undefined"
			
 
				-                        v-if="peopleInfo.puNickname!='' && peopleInfo.puNickname != undefined"
			
 
				-                        v-text="peopleInfo.puNickname"></div>
			
 
				-                    <div v-else v-text="'暂无昵称'"></div>
			
 
				-                </div>
			
 
				-                <div class="ms-content-left-list">
			
 
				-                    <div class="ms-content-left-list-info">
			
 
				-                        <a class='active' href="{ms:global.host/}/people/center.do">基本资料</a>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-left-list-pass">
			
 
				-                        <a href="{ms:global.host/}/people/password-change.do">修改密码</a>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-content-right">
			
 
				-                <div class="ms-content-right-title">基本资料</div>
			
 
				-                <div id="form" style="padding-top: 30px;width: 60%;">
			
 
				-                    <el-form :model="peopleInfo" :rules="rules" ref="peopleInfo" label-width="100px"
			
 
				-                        class="demo-peopleInfo" status-icon>
			
 
				-                        <el-form-item label="手机号" prop="peoplePhone">
			
 
				-                            <el-input v-model="peopleInfo.peoplePhone" placeholder="请输入 11 位手机号码" @blur="validate"></el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-form-item label="昵称" prop="puNickname">
			
 
				-                            <el-input v-model="peopleInfo.puNickname" placeholder="输入昵称，3~5位字符" @blur="validate"></el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-form-item label="邮箱" prop="peopleMail">
			
 
				-                            <el-input v-model="peopleInfo.peopleMail" placeholder="输入昵称，3~请输入您的邮箱" @blur="validate"></el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-button style="margin-left: 100px;" type="primary" @click="updateInfo('peopleInfo')" :disabled="flag" v-text="submit">
			
 
				-                        </el-button>
			
 
				-                    </el-form>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-    </div>
			
 
				-    <#include "/footer.htm" />
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
 
				-<script type="text/javascript">
			
 
				-    new Vue({
			
 
				-        el: '#center-vue',
			
 
				-        data: {
			
 
				-            peopleInfo: "",
			
 
				-            submit:"确认",
			
 
				-            flag:true,
			
 
				-            rules: {
			
 
				-                peoplePhone: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入手机号码',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        pattern: /^1[34578]\d{9}$/,
			
 
				-                        message: '请输入正确的手机号码',
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ],
			
 
				-                puNickname: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入昵称',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        min: 3,
			
 
				-                        max: 5,
			
 
				-                        message: '长度在 3 到 5 个字符',
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ],
			
 
				-                peopleMail: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入邮箱',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        pattern: /^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/,
			
 
				-                        message: '请输入正确的邮箱',
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ],
			
 
				-            },
			
 
				-        },
			
 
				-
			
 
				-        methods: {
			
 
				-            updateInfo: function (formName) {
			
 
				-                this.submit="提交中...";
			
 
				-                var params = {
			
 
				-                    peoplePhone: this.peopleInfo.peoplePhone,
			
 
				-                    puNickname: this.peopleInfo.puNickname,
			
 
				-                    peopleMail: this.peopleInfo.peopleMail,
			
 
				-                    puIcon: this.peopleInfo.puIcon
			
 
				-                }
			
 
				-                ms.people.user.update(params, function (returnJson) {
			
 
				-                    //更新用户信息
			
 
				-                    if (returnJson.result) {
			
 
				-                        alert("修改成功");
			
 
				-                        location.reload();
			
 
				-                    } else {
			
 
				-                        alert(returnJson.resultMsg);
			
 
				-                        this.flag=true;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            validate() {
			
 
				-                this.$refs.peopleInfo.validate((valid) => {
			
 
				-                    if (valid) {
			
 
				-                        this.flag=false;
			
 
				-                    }
			
 
				-                    else{
			
 
				-                        this.flag=true;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            submitForm(formName) {
			
 
				-                this.$refs[formName].validate((valid) => {
			
 
				-                    if (!valid) {
			
 
				-                        console.log('error submit!!');
			
 
				-                        die;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            resetForm(formName) {
			
 
				-                this.$refs[formName].resetFields();
			
 
				-            },
			
 
				-            //获取个人信息
			
 
				-            getPeopleInfo: function () {
			
 
				-                var target = this;
			
 
				-                ms.people.user.info(function (returnJson) {
			
 
				-                    target.peopleInfo = returnJson;
			
 
				-                })
			
 
				-            },
			
 
				-            //上传头像成功后，更新用户信息
			
 
				-            handleAvatarSuccess(res, file) {
			
 
				-                this.peopleInfo.puIcon = file.response;
			
 
				-                var params = {
			
 
				-                    peopleMail: this.peopleInfo.peopleMail,
			
 
				-                    puIcon: this.peopleInfo.puIcon
			
 
				-                }
			
 
				-                ms.people.user.update(params, function (returnJson) {
			
 
				-                    //更新用户信息
			
 
				-                    if (returnJson.result) {
			
 
				-                        alert("头像修改成功");
			
 
				-                        location.reload();
			
 
				-                    } else {
			
 
				-                        alert(returnJson.resultMsg);
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            beforeAvatarUpload(file) {
			
 
				-                const isJPG = file.type === 'image/jpeg';
			
 
				-                const isLt2M = file.size / 1024 / 1024 < 2;
			
 
				-
			
 
				-                if (!isJPG) {
			
 
				-                    this.$message.error('上传头像图片只能是 JPG 格式!');
			
 
				-                }
			
 
				-                if (!isLt2M) {
			
 
				-                    this.$message.error('上传头像图片大小不能超过 2MB!');
			
 
				-                }
			
 
				-                return isJPG && isLt2M;
			
 
				-            }
			
 
				-        },
			
 
				-        mounted: function () {
			
 
				-            this.getPeopleInfo();
			
 
				-            var target = this;
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-<style type="text/css">
			
 
				-    .avatar-uploader .el-upload {
			
 
				-        border: none !important;
			
 
				-        cursor: pointer;
			
 
				-        position: absolute;
			
 
				-        z-index: 100;
			
 
				-        width: 100px;
			
 
				-        height: 100px;
			
 
				-        padding: 0 !important;
			
 
				-        left: 29%;
			
 
				-        top: calc(50% - 10px);
			
 
				-        transform: translateY(-50%);
			
 
				-    }
			
 
				-
			
 
				-    .ms-content-left-info {
			
 
				-        position: relative;
			
 
				-    }
			
 
				-</style>
			
--- a/src/main/webapp/templets/1/default/people/login.htm
+++ b/src/main/webapp/templets/1/default/people/login.htm
@@ -1,228 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <title>登录</title>
			
 
				-    <meta charset="utf-8">
			
 
				-    <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less">
			
 
				-    <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
			
 
				-    <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-    <script src="{ms:global.host/}/static/plugins/vue/2.3.3/vue.min.js"></script>
			
 
				-    <script src="{ms:global.host/}/static/plugins/validator/5.5.0/validator.min.js"></script>
			
 
				-    <script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <div id="login">
			
 
				-        <div class="ms-head">
			
 
				-            <a href="{ms:global.host/}"><img src="{ms:global.host/}/{ms:global.style/}/images/logo.png" /></a>
			
 
				-            <span class="ms-head-line"></span>
			
 
				-            <span class="ms-head-welcome-login">欢迎登录</span>
			
 
				-        </div>
			
 
				-        <div class="ms-content">
			
 
				-            <div class="ms-content-form" :class="{'ms-none':show == 'weixin'}">
			
 
				-                <div class="ms-login-title">
			
 
				-                    <span class="ms-login-chinese-title">账号登录 /</span>
			
 
				-                    <span class="ms-login-english-title">User login</span>
			
 
				-                </div>
			
 
				-                <div class="ms-login-error-text">
			
 
				-                    <img src="{ms:global.host/}/{ms:global.style/}/images/error.png" style="display: none;"
			
 
				-                        v-show="errorText != ''" />
			
 
				-                    <span v-text="errorText" v-show="errorText != ''"></span>
			
 
				-                </div>
			
 
				-                <form id="ms-login-form">
			
 
				-                    <input @keyup="chanageBackgroundColor" maxlength="20" @keyup.enter="login" type="text"
			
 
				-                        class="ms-login-people-name" :class="{'ms-error':error == 'peopleName'}" name="peopleName"
			
 
				-                        v-model="peopleName" placeholder="必填，6-20个字符" @blur="checkPeopleName" />
			
 
				-                    <input @keyup="chanageBackgroundColor" maxlength="20" @keyup.enter="login" type="password"
			
 
				-                        class="ms-login-people-name" :class="{'ms-error':error == 'peoplePassword'}"
			
 
				-                        name="peoplePassword" v-model="peoplePassword" placeholder="必填，6-20个字符"
			
 
				-                        @blur="checkPeoplePassword" />
			
 
				-                    <div class="login-code">
			
 
				-                        <input @keyup="chanageBackgroundColor" maxlength="4" @keyup.enter="login" type="text"
			
 
				-                            class="login-code-input ms-login-float" name="rand_code" placeholder="必填，4个字符"
			
 
				-                            v-model="peopleCode" :class="{'ms-error':error == 'peopleCode'}" @blur="checkPeopleCode" />
			
 
				-                        <img src="{ms:global.host/}/{ms:global.style/}/images/code.jpg"
			
 
				-                            class="login-code-img ms-login-float" @click="code">
			
 
				-                        <p class="ms-login-float login-code-text">
			
 
				-                            <span class="login-code-rompt">看不清?</span>
			
 
				-                            <br />
			
 
				-                            <spna class="login-code-change" @click="code">换一张</span>
			
 
				-                        </p>
			
 
				-                    </div>
			
 
				-                    <div class="ms-login-button" @click="login" :disabled="butState != '登录'"
			
 
				-                        :class="{'ms-but-disabled':butState != '登录'}" v-text="butState"></div>
			
 
				-                </form>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div class="ms-footer">
			
 
				-            <p>
			
 
				-                <span>
			
 
				-                    <a href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				-                </span>
			
 
				-                <span>|</span>
			
 
				-                <span>
			
 
				-                    <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
			
 
				-                </span>
			
 
				-                <span>|</span>
			
 
				-                <span>
			
 
				-                    <a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
			
 
				-                </span>
			
 
				-            </p>
			
 
				-            <p>版权所有 @铭飞科技有限公司2012-2018保留一切权利</p>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</body>
			
 
				-<script>
			
 
				-    var loginVue = new Vue({
			
 
				-        el: '#login',
			
 
				-        data: {
			
 
				-            show: "form", //切换显示的内容
			
 
				-            errorText: "", //错误提示
			
 
				-            error: "", //输入框错误的显示
			
 
				-            peopleName: "", //用户名输入框
			
 
				-            peoplePassword: "", //密码输入框
			
 
				-            peopleCode: "", //验证码输入框
			
 
				-            butState: "登录", //按钮文字
			
 
				-        },
			
 
				-        watch: {
			
 
				-            peopleName: function () {
			
 
				-                var pattern = /[^\w\u4E00-\u9FA5]/ig;
			
 
				-                if (!validator.isNull(this.peopleName) && this.peopleName.indexOf(" ") < 0 && validator
			
 
				-                    .isLength(this.peopleName, {
			
 
				-                        min: 6,
			
 
				-                        max: 20
			
 
				-                    }) && pattern.test(this.peopleName) == false && this.error == 'peopleName') {
			
 
				-                    this.errorText = "";
			
 
				-                    this.error = "";
			
 
				-                }
			
 
				-            },
			
 
				-            peoplePassword: function () {
			
 
				-                if (!validator.isNull(this.peoplePassword) && this.peoplePassword.indexOf(" ") < 0 &&
			
 
				-                    validator.isLength(this.peoplePassword, {
			
 
				-                        min: 6,
			
 
				-                        max: 20
			
 
				-                    }) && this.error == 'peoplePassword') {
			
 
				-                    this.errorText = "";
			
 
				-                    this.error = "";
			
 
				-                }
			
 
				-            },
			
 
				-            peopleCode: function () {
			
 
				-                if (!validator.isNull(this.peopleCode) && this.peopleCode.indexOf(" ") < 0 && this
			
 
				-                    .peopleCode != 4 && this.error == 'peopleCode') {
			
 
				-                    this.errorText = "";
			
 
				-                    this.error = "";
			
 
				-                }
			
 
				-            },
			
 
				-        },
			
 
				-        methods: {
			
 
				-            errorShow: function (msg, type) {
			
 
				-                this.errorText = msg;
			
 
				-                this.error = type;
			
 
				-            },
			
 
				-            //判断用户名
			
 
				-            checkPeopleName: function () {
			
 
				-                var pattern = /[^\w\u4E00-\u9FA5]/ig;
			
 
				-                if (validator.isNull(this.peopleName)) {
			
 
				-                    this.errorShow("用户名不能为空", 'peopleName');
			
 
				-                    return false;
			
 
				-                } else if (this.peopleName.indexOf(" ") >= 0) {
			
 
				-                    this.errorShow("用户名不能包含空格", 'peopleName');
			
 
				-                    return false;
			
 
				-                } else if (!validator.isLength(this.peopleName, {
			
 
				-                        min: 6,
			
 
				-                        max: 20
			
 
				-                    })) {
			
 
				-                    this.errorShow("用户名为6~20个字符", 'peopleName');
			
 
				-                    return false;
			
 
				-                } else if (pattern.test(this.peopleName)) {
			
 
				-                    this.errorShow("用户名不能包含特殊字符", 'peopleName');
			
 
				-                    return false;
			
 
				-                }
			
 
				-                return true;
			
 
				-            },
			
 
				-            //判断密码
			
 
				-            checkPeoplePassword: function () {
			
 
				-                if (validator.isNull(this.peoplePassword)) {
			
 
				-                    this.errorShow("密码不能为空", 'peoplePassword');
			
 
				-                    return false;
			
 
				-                } else if (!validator.isLength(this.peoplePassword, {
			
 
				-                        min: 6,
			
 
				-                        max: 20
			
 
				-                    })) {
			
 
				-                    this.errorShow("密码长度在6~20位之间!", 'peoplePassword');
			
 
				-                    return;
			
 
				-                } else if (this.peoplePassword.indexOf(" ") >= 0) {
			
 
				-                    this.errorShow("密码是不能包含空格", 'peoplePassword');
			
 
				-                    return false;
			
 
				-                }
			
 
				-                return true;
			
 
				-            },
			
 
				-            //判断验证码
			
 
				-            checkPeopleCode: function () {
			
 
				-                if (validator.isNull(this.peopleCode)) {
			
 
				-                    this.errorShow("验证码不能为空", 'peopleCode');
			
 
				-                    return false;
			
 
				-                } else if (this.peopleCode.length != 4) {
			
 
				-                    this.errorShow("验证码为4位字符", 'peopleCode');
			
 
				-                    return false;
			
 
				-                } else if (this.peopleCode.indexOf(" ") >= 0) {
			
 
				-                    this.errorShow("验证码不能包括空格", 'peopleCode');
			
 
				-                    return false;
			
 
				-                }
			
 
				-                return true;
			
 
				-            },
			
 
				-            //登录
			
 
				-            login: function () {
			
 
				-                var target = this;
			
 
				-                if (this.checkPeoplePassword() && this.checkPeopleName() && this.checkPeopleCode) {
			
 
				-                    target.butState = '登录中...';
			
 
				-                    $.ajax({
			
 
				-                        type: "post",
			
 
				-                        data: $("#ms-login-form").serialize(),
			
 
				-                        url: "{ms:global.host/}/checkLogin.do",
			
 
				-                        success: function (msg) {
			
 
				-                            if (msg.result != true) {
			
 
				-                                alert(msg.resultMsg);
			
 
				-                                target.code();
			
 
				-                            } else {
			
 
				-                                $("body").append(
			
 
				-                                    "<form action='{ms:global.host/}/people/center.do' id='goForm'></form>"
			
 
				-                                );
			
 
				-                                $("#goForm").submit();
			
 
				-                            }
			
 
				-                            target.butState = '登录';
			
 
				-                        }
			
 
				-                    })
			
 
				-                }
			
 
				-            },
			
 
				-            code: function () {
			
 
				-                $(".login-code-img").attr("src", "{ms:global.host/}/code?t=" + (new Date).getTime())
			
 
				-            },
			
 
				-            chanageBackgroundColor: function () {
			
 
				-                if ($('input[name="peopleName"]').val().length >= 6 && $('input[name="peoplePassword"]')
			
 
				-                    .val().length >= 6 && $('input[name="rand_code"]').val().length == 4) {
			
 
				-                    $('.ms-login-button').css("background-color", "#009aff");
			
 
				-                    $('.ms-login-button').css("pointer-events", 'visible');
			
 
				-                    $('.ms-login-button').css("color", "#fff");
			
 
				-                } else {
			
 
				-                    $('.ms-login-button').css("background-color", "#fafafa");
			
 
				-                    $('.ms-login-button').css('pointer-events', "none");
			
 
				-                    $('.ms-login-button').css("color", "#ddd");
			
 
				-                }
			
 
				-            },
			
 
				-        },
			
 
				-        mounted: function () {
			
 
				-            $(".login-code-img").attr("src", "{ms:global.host/}/code?t=" + (new Date).getTime())
			
 
				-            if (document.referrer == "http://localhost:8282/people/password-change.do") {
			
 
				-                history.pushState(null, null, document.URL);
			
 
				-                window.addEventListener('popstate', function () {
			
 
				-                    history.pushState(null, null, document.URL);
			
 
				-                });
			
 
				-
			
 
				-            }
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/people/password-change.htm
+++ b/src/main/webapp/templets/1/default/people/password-change.htm
@@ -1,285 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <#include "/head-file.htm" />
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <#include "/head.htm" />
			
 
				-    <div class="ms-content" id="pa-change-vue">
			
 
				-        <div class="ms-content-main">
			
 
				-            <div class="ms-content-left">
			
 
				-                <div class="ms-content-left-info">
			
 
				-                        <el-upload class="avatar-uploader" action="{ms:global.host/}/file/upload.do" :show-file-list="false"
			
 
				-                        :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
			
 
				-                    </el-upload>
			
 
				-                    <img :src="'{ms:global.host/}/'+peopleInfo.puIcon"
			
 
				-                        onerror='this.src="http://cdn.mingsoft.net/global/images/msheader.png"'>
			
 
				-                    <div style="display: none;" v-show="peopleInfo.puNickname!='' && peopleInfo.puNickname != undefined"
			
 
				-                        v-if="peopleInfo.puNickname!='' && peopleInfo.puNickname != undefined"
			
 
				-                        v-text="peopleInfo.puNickname"></div>
			
 
				-                    <div v-else v-text="'暂无昵称'"></div>
			
 
				-                </div>
			
 
				-                <div class="ms-content-left-list">
			
 
				-                    <div class="ms-content-left-list-info">
			
 
				-                        <a href="{ms:global.host/}/people/center.do">基本资料</a>
			
 
				-                    </div>
			
 
				-                    <div class="ms-content-left-list-pass">
			
 
				-                        <a class='active' href="{ms:global.host/}/people/password-change.do">修改密码</a>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-content-right">
			
 
				-                <div class="ms-content-right-title">修改密码</div>
			
 
				-                <div class="ms-content-right-form" style="width: 60%;padding-top: 30px;">
			
 
				-                    <el-form :model="form" :rules="rules" ref="form" label-width="100px"
			
 
				-                        class="demo-form" status-icon style="margin-left: 15px;">
			
 
				-                        <el-form-item label="当前密码" prop="peopleOldPassword">
			
 
				-                            <el-input v-model="form.peopleOldPassword" placeholder="必填，6~20位字符" @blur="validate">
			
 
				-                            </el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-form-item label="新密码" prop="peoplePassword">
			
 
				-                            <el-input v-model="form.peoplePassword" placeholder="必填，6~20位字符" @blur="validate">
			
 
				-                            </el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-form-item label="确认密码" prop="rePeoplePassword">
			
 
				-                            <el-input v-model="form.rePeoplePassword" placeholder="请再次输入新密码" @blur="validate">
			
 
				-                            </el-input>
			
 
				-                        </el-form-item>
			
 
				-                        <el-form-item label="验证码" prop="rand_code" style="position: relative;">
			
 
				-                            <el-input v-model="form.rand_code" placeholder="必填，4位字符" @blur="validate"></el-input>
			
 
				-                            <div id="code">
			
 
				-                                <img :src="codeSrc" class="login-code-img" @click="code" />
			
 
				-                                <div>
			
 
				-                                    <span>看不清?</span>
			
 
				-                                    <span class="img-code" @click="code" ref="imgCode">换一张</span>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </el-form-item>
			
 
				-                        <el-button style="margin-left: 100px;" type="primary" @click="changePassword('form')"
			
 
				-                            :disabled="flag" v-text="submit">
			
 
				-                        </el-button>
			
 
				-                    </el-form>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-    <#include "/footer.htm" />
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
 
				-<script type="text/javascript">
			
 
				-    var validatePass2 = (rule, value, callback) => {
			
 
				-        if (value === '') {
			
 
				-            callback(new Error('请再次输入密码'));
			
 
				-        } else if (value !== V.form.peoplePassword) {
			
 
				-            callback(new Error('两次输入密码不一致!'));
			
 
				-        } else {
			
 
				-            callback();
			
 
				-        }
			
 
				-    };
			
 
				-    var V = new Vue({
			
 
				-        el: "#pa-change-vue",
			
 
				-        data: {
			
 
				-            // 用户信息
			
 
				-            peopleInfo:"",
			
 
				-            //提交信息
			
 
				-            form: {
			
 
				-                peopleOldPassword: "", //用户旧密码
			
 
				-                peoplePassword: "", //用户密码
			
 
				-                rePeoplePassword: "", //确认密码
			
 
				-                rand_code: ""
			
 
				-            },
			
 
				-            flag: true,
			
 
				-            submit: "确认",
			
 
				-            codeSrc:"{ms:global.host/}/code",
			
 
				-            rules: {
			
 
				-                peopleOldPassword: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入旧密码',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        min: 6,
			
 
				-                        max: 20,
			
 
				-                        message: '密码长度在 6 到 20 个字符',
			
 
				-                        trigger: 'blur'
			
 
				-
			
 
				-                    }
			
 
				-                ],
			
 
				-                peoplePassword: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入新密码',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        min: 6,
			
 
				-                        max: 20,
			
 
				-                        message: '密码长度在 6 到 20 个字符',
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ],
			
 
				-                rePeoplePassword: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入新密码',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        validator: validatePass2,
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ],
			
 
				-                rand_code: [{
			
 
				-                        required: true,
			
 
				-                        message: '请输入验证码',
			
 
				-                        trigger: 'blur'
			
 
				-                    },
			
 
				-                    {
			
 
				-                        min: 4,
			
 
				-                        max: 4,
			
 
				-                        message: '输入验证码位数错误',
			
 
				-                        trigger: 'blur'
			
 
				-                    }
			
 
				-                ]
			
 
				-            },
			
 
				-        },
			
 
				-        methods: {
			
 
				-            test: function () {
			
 
				-                alert(1);
			
 
				-            },
			
 
				-            //更改验证码
			
 
				-            code: function () {
			
 
				-                this.codeSrc="{ms:global.host/}/code?t=" + (new Date).getTime();
			
 
				-            },
			
 
				-            //修改密码
			
 
				-            changePassword: function (formName) {
			
 
				-                this.submitForm(formName);
			
 
				-                var target = this;
			
 
				-                var params = {
			
 
				-                    peopleOldPassword: this.form.peopleOldPassword,
			
 
				-                    peoplePassword: this.form.peoplePassword,
			
 
				-                    rePeoplePassword: this.form.rePeoplePassword,
			
 
				-                    rand_code: this.form.rand_code
			
 
				-                }
			
 
				-                ms.people.changePassword(params, function (returnJson) {
			
 
				-                    if (returnJson.result) {
			
 
				-                        target.submit = "提交中..."
			
 
				-                        setTimeout(function () {                            
			
 
				-                            alert("密码修改成功，请重新登录")
			
 
				-                            http.post("{ms:global.host/}/people/quit.do")
			
 
				-                            location.href = "{ms:global.host/}/mcms/login.do";
			
 
				-                        }, 500)
			
 
				-
			
 
				-                    } else if (returnJson.resultMsg == "密码错误!") {
			
 
				-                        alert('原密码错误！');
			
 
				-                        this.flag = true;
			
 
				-                    } else if (returnJson.resultMsg == "验证码错误!") {
			
 
				-                        alert("验证码错误！");
			
 
				-                        target.$refs.imgCode.click();
			
 
				-                        target.form.rand_code="",
			
 
				-                        this.flag = true;
			
 
				-                    }
			
 
				-                })
			
 
				-            },
			
 
				-            submitForm(formName) {
			
 
				-                this.$refs[formName].validate((valid) => {
			
 
				-                    if (!valid) {
			
 
				-                        console.log('error submit!!');
			
 
				-                        die;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            validate() {
			
 
				-                this.$refs.form.validate((valid) => {
			
 
				-                    if (valid) {
			
 
				-                        this.flag = false;
			
 
				-                    } else {
			
 
				-                        this.flag = true;
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            handleAvatarSuccess(res, file) {
			
 
				-                this.peopleInfo.puIcon = file.response;
			
 
				-                var params = {
			
 
				-                    peopleMail: this.peopleInfo.peopleMail,
			
 
				-                    puIcon: this.peopleInfo.puIcon,
			
 
				-                }
			
 
				-                ms.people.user.update(params, function (returnJson) {
			
 
				-                    //更新用户信息
			
 
				-                    if (returnJson.result) {
			
 
				-                        alert("头像修改成功");
			
 
				-                        location.reload();
			
 
				-                    } else {
			
 
				-                        alert(returnJson.resultMsg);
			
 
				-                    }
			
 
				-                });
			
 
				-            },
			
 
				-            beforeAvatarUpload(file) {
			
 
				-                const isJPG = file.type === 'image/jpeg';
			
 
				-                const isLt2M = file.size / 1024 / 1024 < 2;
			
 
				-
			
 
				-                if (!isJPG) {
			
 
				-                    this.$message.error('上传头像图片只能是 JPG 格式!');
			
 
				-                }
			
 
				-                if (!isLt2M) {
			
 
				-                    this.$message.error('上传头像图片大小不能超过 2MB!');
			
 
				-                }
			
 
				-                return isJPG && isLt2M;
			
 
				-            }
			
 
				-        },
			
 
				-
			
 
				-
			
 
				-        mounted: function () {
			
 
				-            //获取个人信息
			
 
				-            var target = this;
			
 
				-            ms.people.user.info(function (returnJson) {
			
 
				-                target.peopleInfo = returnJson;
			
 
				-            })
			
 
				-        }
			
 
				-    })
			
 
				-</script>
			
 
				-<style type="text/css">
			
 
				-    #code {
			
 
				-        position: absolute;
			
 
				-        right: -150px;
			
 
				-        top: 0;
			
 
				-        height: 40px;
			
 
				-    }
			
 
				-
			
 
				-    #code>.login-code-img {
			
 
				-        height: 40px;
			
 
				-    }
			
 
				-
			
 
				-    #code>div {
			
 
				-        font-size: 15px;
			
 
				-        display: inline-block;
			
 
				-        vertical-align: top;
			
 
				-    }
			
 
				-
			
 
				-    #code>div>span {
			
 
				-        display: block;
			
 
				-        line-height: 1.4;
			
 
				-    }
			
 
				-
			
 
				-    #code>div>.img-code {
			
 
				-        cursor: pointer;
			
 
				-        color: #00A5FF;
			
 
				-    }
			
 
				-    .avatar-uploader .el-upload {
			
 
				-        border: none !important;
			
 
				-        cursor: pointer;
			
 
				-        position: absolute;
			
 
				-        z-index: 100;
			
 
				-        width: 100px;
			
 
				-        height: 100px;
			
 
				-        padding: 0 !important;
			
 
				-        left: 29%;
			
 
				-        top: calc(50% - 10px);
			
 
				-        transform: translateY(-50%);
			
 
				-    }
			
 
				-
			
 
				-    .ms-content-left-info {
			
 
				-        position: relative;
			
 
				-    }
			
 
				-</style>
			
--- a/src/main/webapp/templets/1/default/people/register.htm
+++ b/src/main/webapp/templets/1/default/people/register.htm
@@ -1,236 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <title>注册</title>
			
 
				-        <meta charset="utf-8">
			
 
				-        <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less">
			
 
				-        <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
			
 
				-        <script src="{ms:global.host/}/static/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-        <script src="{ms:global.host/}/static/plugins/vue/2.3.3/vue.min.js"></script>
			
 
				-        <script src="{ms:global.host/}/static/plugins/validator/5.5.0/validator.min.js"></script>
			
 
				-        <script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <div id="login">
			
 
				-            <div class="ms-head">
			
 
				-                <a href="{ms:global.host/}"><img src="{ms:global.host/}/{ms:global.style/}/images/logo.png" /></a>
			
 
				-                <span class="ms-head-line"></span>
			
 
				-                <span class="ms-head-welcome-login">欢迎登录</span>
			
 
				-            </div>
			
 
				-            <div class="ms-content">
			
 
				-                <div class="ms-content-form" id="ms-content-form-register" :class="{'ms-none':show == 'weixin'}">
			
 
				-                    <div class="ms-login-title">
			
 
				-                        <span class="ms-login-chinese-title">账号登录 /</span>
			
 
				-                        <span class="ms-login-english-title">User Register</span>
			
 
				-                    </div>
			
 
				-                    <div class="ms-login-error-text">
			
 
				-                        <img src="{ms:global.host/}/{ms:global.style/}/images/error.png" style="display: none;" v-show="errorText != ''" />
			
 
				-                        <span v-text="errorText" v-show="errorText != ''"></span>
			
 
				-                    </div>
			
 
				-                    <form id="ms-login-form">
			
 
				-                        <input @keyup="chanageBackgroundColor" maxlength="20" @keyup.enter="login" type="text" class="ms-login-people-name" :class="{'ms-error':error == 'peopleName'}" name="peopleName" v-model="peopleName" placeholder="必填，6-20个字符" @blur="checkPeopleName" />
			
 
				-                        <input @keyup="chanageBackgroundColor" maxlength="20" @keyup.enter="login" type="password" class="ms-login-people-name" :class="{'ms-error':error == 'peoplePassword'}" name="peoplePassword" v-model="peoplePassword" placeholder="必填，6-20个字符" @blur="checkPeoplePassword" />
			
 
				-                        <input @keyup="chanageBackgroundColor" maxlength="20" @keyup.enter="login" type="password" name="rePassword" class="ms-login-people-name" :class="{'ms-error':error == 'rePeoplePassword'}" v-model="rePeoplePassword" placeholder="必填，6-20个字符，与密码一致" @blur="checkPeopleRePassword">
			
 
				-                        <div class="login-code">
			
 
				-                            <input @keyup="chanageBackgroundColor" maxlength="4" @keyup.enter="login" type="text" class="login-code-input ms-login-float" name="rand_code" placeholder="必填，4个字符" v-model="peopleCode" :class="{'ms-error':error == 'peopleCode'}" @blur="checkPeopleCode" />
			
 
				-                            <img src="{ms:global.host/}/{ms:global.style/}/images/code.jpg" class="login-code-img ms-login-float" @click="code">
			
 
				-                            <p class="ms-login-float login-code-text">
			
 
				-                                <span class="login-code-rompt">看不清?</span>
			
 
				-                                <br/>
			
 
				-                                <span class="login-code-change" @click="code">换一张</span>
			
 
				-                            </p>
			
 
				-                        </div>
			
 
				-                        <div class="ms-login-button" @click="login" :disabled="butState != '注册'" :class="{'ms-but-disabled':butState != '注册'}" v-text="butState">注册</div>
			
 
				-                    </form>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-footer">
			
 
				-                <p>
			
 
				-                    <span>
			
 
				-                        <a href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				-                    </span>
			
 
				-                    <span>|</span>
			
 
				-                    <span>
			
 
				-                        <a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
			
 
				-                    </span>
			
 
				-                    <span>|</span>
			
 
				-                    <span>
			
 
				-                        <a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
			
 
				-                    </span>
			
 
				-                </p>
			
 
				-                <p>版权所有 @铭飞科技有限公司2012-2018保留一切权利</p>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-    </body>
			
 
				-    <script>
			
 
				-        new Vue({
			
 
				-            el: '#login',
			
 
				-            data: {
			
 
				-                show: "form", //切换显示的内容
			
 
				-                errorText: "", //错误提示
			
 
				-                error: "", //输入框错误的显示
			
 
				-                peopleName: "", //用户名输入框
			
 
				-                peoplePassword: "", //密码输入框
			
 
				-                rePeoplePassword:"",//确定密码输入框
			
 
				-                peopleCode:"",//验证码输入框
			
 
				-                butState:"注册",//注册按钮
			
 
				-            },
			
 
				-            watch: {
			
 
				-                peopleName: function() {
			
 
				-                    var pattern = /[^\w\u4E00-\u9FA5]/ig;
			
 
				-                    if(!validator.isNull(this.peopleName) && this.peopleName.indexOf(" ") < 0 && validator.isLength(this.peopleName, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        }) && pattern.test(this.peopleName) == false && this.error == 'peopleName') {
			
 
				-                        this.errorText = "";
			
 
				-                        this.error = "";
			
 
				-                    }
			
 
				-                },
			
 
				-                peoplePassword: function() {
			
 
				-                    if(!validator.isNull(this.peoplePassword) && this.peoplePassword.indexOf(" ") < 0 && validator.isLength(this.peoplePassword, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        }) && this.error == 'peoplePassword') {
			
 
				-                        this.errorText = "";
			
 
				-                        this.error = "";
			
 
				-                    }
			
 
				-                },
			
 
				-                rePeoplePassword: function() {
			
 
				-                    if(!validator.isNull(this.rePeoplePassword) && this.rePeoplePassword.indexOf(" ") < 0 && validator.isLength(this.rePeoplePassword, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        }) && this.error == 'rePeoplePassword' && this.rePeoplePassword == this.peoplePassword) {
			
 
				-                        this.errorText = "";
			
 
				-                        this.error = "";
			
 
				-                    }
			
 
				-                },
			
 
				-                peopleCode: function() {
			
 
				-                    if(!validator.isNull(this.peopleCode) && this.peopleCode.indexOf(" ") < 0 && this.peopleCode != 4 && this.error == 'peopleCode') {
			
 
				-                        this.errorText = "";
			
 
				-                        this.error = "";
			
 
				-                    }
			
 
				-                },
			
 
				-            },
			
 
				-            methods: {
			
 
				-                errorShow: function(msg, type) {
			
 
				-                    this.errorText = msg;
			
 
				-                    this.error = type;
			
 
				-                },
			
 
				-                //判断用户名
			
 
				-                checkPeopleName: function() {
			
 
				-                    var pattern = /[^\w\u4E00-\u9FA5]/ig;
			
 
				-                    if(validator.isNull(this.peopleName)) {
			
 
				-                        this.errorShow("用户名不能为空", 'peopleName');
			
 
				-                        return false;
			
 
				-                    } else if(this.peopleName.indexOf(" ") >= 0) {
			
 
				-                        this.errorShow("用户名不能包含空格", 'peopleName');
			
 
				-                        return false;
			
 
				-                    } else if(!validator.isLength(this.peopleName, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        })) {
			
 
				-                        this.errorShow("用户名为6~20个字符", 'peopleName');
			
 
				-                        return false;
			
 
				-                    } else if(pattern.test(this.peopleName)) {
			
 
				-                        this.errorShow("用户名不能包含特殊字符", 'peopleName');
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    return true;
			
 
				-                },
			
 
				-                //判断密码
			
 
				-                checkPeoplePassword: function() {
			
 
				-                    if(validator.isNull(this.peoplePassword)) {
			
 
				-                        this.errorShow("密码不能为空", 'peoplePassword');
			
 
				-                        return false;
			
 
				-                    } else if(!validator.isLength(this.peoplePassword, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        })) {
			
 
				-                        this.errorShow("密码长度在6~20位之间!", 'peoplePassword');
			
 
				-                        return false;
			
 
				-                    } else if(this.peoplePassword.indexOf(" ") >= 0) {
			
 
				-                        this.errorShow("密码是不能包含空格", 'peoplePassword');
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    return true;
			
 
				-
			
 
				-                },
			
 
				-                //判断确定密码
			
 
				-                checkPeopleRePassword: function() {
			
 
				-                    if(validator.isNull(this.rePeoplePassword)) {
			
 
				-                        this.errorShow("确定密码不能为空", 'rePeoplePassword');
			
 
				-                        return false;
			
 
				-                    } else if(!validator.isLength(this.rePeoplePassword, {
			
 
				-                            min: 6,
			
 
				-                            max: 20
			
 
				-                        })) {
			
 
				-                        this.errorShow("确定密码长度在6~20位之间!", 'rePeoplePassword');
			
 
				-                        return false;
			
 
				-                    } else if(this.rePeoplePassword.indexOf(" ") >= 0) {
			
 
				-                        this.errorShow("确定密码是不能包含空格", 'rePeoplePassword');
			
 
				-                        return false;
			
 
				-                    } else if(this.rePeoplePassword != this.peoplePassword){
			
 
				-                        this.errorShow("确定密码和密码不一致", 'rePeoplePassword');
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    return true;
			
 
				-
			
 
				-                },
			
 
				-                 //判断验证码
			
 
				-                checkPeopleCode: function() {
			
 
				-                    if(validator.isNull(this.peopleCode)) {
			
 
				-                        this.errorShow("验证码不能为空", 'peopleCode');
			
 
				-                        return false;
			
 
				-                    } else if(this.peopleCode.length != 4) {
			
 
				-                        this.errorShow("验证码为4位字符", 'peopleCode');
			
 
				-                        return false;
			
 
				-                    } else if(this.peopleCode.indexOf(" ") >= 0) {
			
 
				-                        this.errorShow("验证码不能包括空格", 'peopleCode');
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    return true;
			
 
				-                },
			
 
				-                //登录
			
 
				-                login: function() {
			
 
				-                	var target = this;
			
 
				-                    if(this.checkPeoplePassword() && this.checkPeopleName() && this.checkPeopleRePassword() && this.checkPeopleCode()) {
			
 
				-                   		target.butState = '注册中...';
			
 
				-                    	 $.ajax({
			
 
				-                            type: "post",
			
 
				-                            data: $("#ms-login-form").serialize(),
			
 
				-                            url: "{ms:global.host/}/register.do",
			
 
				-                            success: function(msg) {
			
 
				-                                if(msg.result != true) {
			
 
				-                                    alert(msg.resultMsg);
			
 
				-                                    target.code();
			
 
				-                                } else {
			
 
				-                                	alert("注册成功！");
			
 
				-                                    $("body").append("<form action='{ms:global.host/}/mdiyPage/login.do' id='goForm'></form>");
			
 
				-                                    $("#goForm").submit();
			
 
				-                                }
			
 
				-                                target.butState = '注册';
			
 
				-                            }
			
 
				-                        })
			
 
				-                    }
			
 
				-                },
			
 
				-                code: function() {
			
 
				-                    $(".login-code-img").attr("src", "{ms:global.host/}/code?t=" + (new Date).getTime())
			
 
				-                },
			
 
				-                chanageBackgroundColor: function(){
			
 
				-                    if($('input[name="peopleName"]').val().length >= 6 &&　$('input[name="peoplePassword"]').val().length >= 6 &&　$('input[name="rePassword"]').val().length >= 6 && $('input[name="rand_code"]').val().length == 4){
			
 
				-                        $('.ms-login-button').css("background-color", "#009aff");
			
 
				-                        $('.ms-login-button').css("pointer-events", 'visible');
			
 
				-                        $('.ms-login-button').css("color", "#fff");
			
 
				-                    }else{
			
 
				-                        $('.ms-login-button').css("background-color", "#fafafa");
			
 
				-                        $('.ms-login-button').css('pointer-events', "none");
			
 
				-                        $('.ms-login-button').css("color", "#ddd");
			
 
				-                    }
			
 
				-                 },
			
 
				-            },
			
 
				-            mounted: function() {
			
 
				-                $(".login-code-img").attr("src", "{ms:global.host/}/code?t=" + (new Date).getTime())
			
 
				-            }
			
 
				-        })
			
 
				-    </script>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/search.htm
+++ b/src/main/webapp/templets/1/default/search.htm
@@ -1,71 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <head>
			
 
				-        <#include "head-file.htm"/>
			
 
				-    </head>
			
 
				-    <body>
			
 
				-        <#include "head.htm"/>
			
 
				-        <div class="ms-banner">
			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/search.jpg">
			
 
				-        </div>
			
 
				-        <div class="ms-content" id="body">
			
 
				-            <div class="ms-content-main-list" id="ms-content-search">
			
 
				-                <div class="ms-content-main-div">
			
 
				-                    <div class="ms-content-main-div-prompt">您搜索的关键字
			
 
				-                        <span>{ms:search.content_title/}</span>
			
 
				-                        <!-- 共7个结果 -->
			
 
				-                    </div>
			
 
				-                    <ul class="ms-content-main-ul">
			
 
				-                        {ms:arclist size=10 ispaging=true}
			
 
				-                        <li>
			
 
				-                            <a href="{ms:global.url/}/[field.link/]">
			
 
				-                                [field.title/]
			
 
				-                                <span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
			
 
				-                            </a>
			
 
				-                        </li>
			
 
				-                        {/ms:arclist}
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				-                <div class="ms-content-main-page">
			
 
				-	              	 <a class="ms-content-main-page-first" href="{ms:page.index/}">首页</a>
			
 
				-		             <a class="ms-content-main-page-upper" href="{ms:page.pre/}">上一页</a>
			
 
				-		             <a class="ms-content-main-page-next" href="{ms:page.next/}">下一页</a>
			
 
				-		             <a class="ms-content-main-page-last" href="{ms:page.last/}">末页</a>
			
 
				-	            </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <#include "footer.htm"/>
			
 
				-    </body>
			
 
				-</html>
			
 
				-<script>
			
 
				-new Vue({
			
 
				-    el: "#body",
			
 
				-    data: {
			
 
				-       title: '',
			
 
				-       list: [],
			
 
				-    },
			
 
				-    methods: {
			
 
				-   	//上下页
			
 
				-  	search:function(flag){
			
 
				-  		var pageNo = {ms:search.pageNo/};
			
 
				-  		var total = {ms:page.total/};
			
 
				-  		if(flag){
			
 
				-  			pageNo = pageNo==total ? total : pageNo +1;//下一页
			
 
				-  		}else{
			
 
				-  			pageNo = pageNo -1==0 ? 1 : pageNo-1;//上一页
			
 
				-  		}
			
 
				-  		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
			
 
				-  		window.event.returnValue=false;
			
 
				-  	},
			
 
				-  	//首页和尾页
			
 
				-  	indexAndLast:function(pageNo){
			
 
				-  		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
			
 
				-  		window.event.returnValue=false;
			
 
				-  	},
			
 
				-    },
			
 
				- })
			
 
				-    if($('.ms-content-main-ul li').length <= 0) {
			
 
				-        $('.ms-content-main-page').remove();
			
 
				-        $('.ms-content-main-ul').before("<div class='ms-content-main-div-nothing'>没找到相关记录</div>")
			
 
				-    }
			
 
				-</script>