5 years ago · 1b080a160c
--- a/src/main/webapp/templets/1/default/index.htm
+++ b/src/main/webapp/templets/1/default/index.htm
@@ -190,7 +190,7 @@
 
				                 <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/}/59/index.html'>MORE>></a>
			
 
				+                        <a href='{ms:global.url/}/xinwenzhongxin/index.html'>MORE>></a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				                 <div class="ms-content-news-main-img-text">
			
--- a/src/main/webapp/templets/1/default/m/about.htm
+++ b/src/main/webapp/templets/1/default/m/about.htm
@@ -1,35 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

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

			
 
				-    <body>

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

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/about.png" class="am-img-responsive" alt=""/>

			
 
				-        </div>

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

			
 
				-            <div class="am-tabs am-tabs-default ms-about-content-div">

			
 
				-                <ul class="am-tabs-nav am-cf">

			
 
				-                    <li class="am-active ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/53/index.html">关于我们</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/59/index.html">公司动态</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="http://mingsoft.net/html/1//5527/index.html#faz">发展历程</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="http://mingsoft.net/html/1//5527/index.html#lianx">加入我们</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/19/index.html">联系我们</a>

			
 
				-                    </li>

			
 
				-                </ul>

			
 
				-                <div class="am-tabs-bd ms-about-content-main">

			
 
				-                    <div data-tab-panel-0 class="">{ms:field.content/}</div>

			
 
				-                </div>

			
 
				-            </div>

			
 
				-        </div>

			
 
				-       <#include "/m/footer.htm"/>

			
 
				-    </body>

			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/advice.htm
+++ b/src/main/webapp/templets/1/default/m/advice.htm
@@ -1,66 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

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

			
 
				-    <body>

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

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/message.png" alt="" width="100%" />

			
 
				-        </div>

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

			
 
				-            <form method="post" id="postForm">

			
 
				-                <p>

			
 
				-                    <input type="text" class="am-form-field am-radius" name='name' placeholder="姓名" />

			
 
				-                </p>

			
 
				-                <p>

			
 
				-                    <input type="text" class="am-form-field am-radius" name='phone' placeholder="手机" />

			
 
				-                </p>

			
 
				-                <div class="am-form-group">

			
 
				-                    <textarea class="am-form-field ms-content-form-message" id="doc-ta-1" name='content' placeholder="留言"></textarea>

			
 
				-                </div>

			
 
				-                <button type="button" class="am-btn am-btn-primary ms-content-button">提交</button>

			
 
				-            </form>

			
 
				-        </div>

			
 
				-        <#include "/m/footer.htm"/>

			
 
				-    </body>

			
 
				-</html>

			
 
				-<script>

			
 
				-    var flag = false;

			
 
				-    $(".am-btn-primary").click(function() {

			
 
				-        if(!flag) {

			
 
				-            $.ajax({

			
 
				-                type: "POST",

			
 
				-                url: "{ms:global.host/}/mdiy/diyForm/f2c131968438246e885e0feed7256dbc.do",

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

			
 
				-                success: function(msg) {

			
 
				-                    flag = true;

			
 
				-                    alert("提交成功");

			
 
				-                }

			
 
				-            });

			
 
				-        } else {

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

			
 
				-        }

			
 
				-    })

			
 
				-

			
 
				-    /* 表单验证 */

			
 
				-    function verification() {

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

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

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

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

			
 
				-        } else {

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

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

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

			
 
				-        }

			
 
				-    }

			
 
				-

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

			
 
				-        verification();

			
 
				-    })

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

			
 
				-        verification();

			
 
				-    })

			
 
				-    $('.ms-content-form-message').on("input", function() {

			
 
				-        verification();

			
 
				-    })

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

			
 
				-<html>

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

			
 
				-    <body>

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

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/mo.png" class="am-img-responsive" alt=""/>

			
 
				-        </div>

			
 
				-        <div class="ms-case-list" id="am-active-1">

			
 
				-            <ul data-am-widget="gallery" id='ms-ui' class="am-gallery am-avg-sm-2 am-gallery-imgbordered">

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

			
 
				-                <li>

			
 
				-                    <div class="am-gallery-item ms-case-div">

			
 
				-                        <a href='[field.source/]'><img class="ms-case-list-img" src="{ms:global.host/}[field.litpic/]" alt="[field.title/]"/></a>

			
 
				-                	</div>

			
 
				-                </li>

			
 
				-                {/ms:arclist}

			
 
				-            </ul>

			
 
				-        </div>

			
 
				-        <#include "/m/footer.htm"/>

			
 
				-    </body>

			
 
				-</html>

			
 
				-<script>

			
 
				-var time = 1;

			
 
				-$(window).scroll(function() {　　

			
 
				-	var scrollTop = $(this).scrollTop();　　

			
 
				-	var scrollHeight = $(document).height();　

			
 
				-	var windowHeight = $(this).height();　　

			
 
				-	if(scrollTop + windowHeight == scrollHeight) {

			
 
				-		var time2 = $(".ms-cur-" + time + "-1").text()

			
 
				-		$("#ul" + time).load(time2 + " #ms-ui");

			
 
				-		$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")

			
 
				-		time++;

			
 
				-	}else if(scrollTop + 56 + windowHeight == scrollHeight){

			
 
				-		var time2 = $(".ms-cur-" + time + "-1").text()

			
 
				-		$("#ul" + time).load(time2 + " #ms-ui");

			
 
				-		$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")

			
 
				-		time++;

			
 
				-	}

			
 
				-});

			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/m/contact.htm
+++ b/src/main/webapp/templets/1/default/m/contact.htm
@@ -1,35 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

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

			
 
				-    <body>

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

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/about.png" class="am-img-responsive" alt=""/>

			
 
				-        </div>

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

			
 
				-            <div class="am-tabs am-tabs-default ms-about-content-div">

			
 
				-                <ul class="am-tabs-nav am-cf">

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/53/index.html">关于我们</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/59/index.html">公司动态</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="http://mingsoft.net/html/1//5527/index.html#faz">发展历程</a>

			
 
				-                    </li>

			
 
				-                    <li class="ms-about-content-li">

			
 
				-                        <a href="http://mingsoft.net/html/1//5527/index.html#lianx">加入我们</a>

			
 
				-                    </li>

			
 
				-                    <li class="am-active ms-about-content-li">

			
 
				-                        <a href="{ms:global.url/}/19/index.html">联系我们</a>

			
 
				-                    </li>

			
 
				-                </ul>

			
 
				-                <div class="am-tabs-bd ms-about-content-main">

			
 
				-                    <div data-tab-panel-0 class="">{ms:field.content/}</div>

			
 
				-                </div>

			
 
				-            </div>

			
 
				-        </div>

			
 
				-       <#include "/m/footer.htm"/>

			
 
				-    </body>

			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/css/jquery.sinaemotion.css
+++ b/src/main/webapp/templets/1/default/m/css/jquery.sinaemotion.css
@@ -1,80 +0,0 @@
 
				-#emotions{
			
 
				-	left:0;
			
 
				-	width: 395px;
			
 
				-	max-width: 98%;
			
 
				-	font-size:12px;
			
 
				-	background:#fff;
			
 
				-	position:absolute;
			
 
				-	border: 1px solid #E8E8E8;
			
 
				-}
			
 
				-#emotions a{
			
 
				-	color: #9ABBC8;
			
 
				-	padding:2px 7px;
			
 
				-	text-decoration:none;
			
 
				-}
			
 
				-#emotions img{
			
 
				-	border:0;
			
 
				-}
			
 
				-#emotions div{
			
 
				-	margin:5px 10px;
			
 
				-	padding:1px;
			
 
				-	overflow: hidden;
			
 
				-}
			
 
				-#emotions #prev,
			
 
				-#emotions #next
			
 
				-{
			
 
				-	margin-left:3px;
			
 
				-	background:#eee;
			
 
				-}
			
 
				-#emotions .categorys{
			
 
				-	color:#ccc;
			
 
				-	height:23px;
			
 
				-	color: #9ABBC8;
			
 
				-	overflow:hidden;
			
 
				-}
			
 
				-#emotions .categorys a{
			
 
				-	display: inline-block;
			
 
				-}
			
 
				-#emotions .categorys a:hover{
			
 
				-	text-decoration:underline;
			
 
				-}
			
 
				-#emotions .categorys a.current{
			
 
				-	cursor: default;
			
 
				-	background: #F0F0F0;
			
 
				-	-moz-border-radius: 3px;
			
 
				-	-webkit-border-radius: 3px;
			
 
				-}
			
 
				-#emotions .container{
			
 
				-	padding:1px;
			
 
				-	overflow: hidden;
			
 
				-}
			
 
				-#emotions .container a{
			
 
				-	float:left;
			
 
				-	width:26px;
			
 
				-	height:22px;
			
 
				-	text-align:center;
			
 
				-	box-sizing: content-box;
			
 
				-	padding: 4px 2px;
			
 
				-	margin: -1px 0 0 -1px;
			
 
				-	border: 1px solid #e8e8e8;
			
 
				-}
			
 
				-#emotions .container a:hover{
			
 
				-	z-index:2;
			
 
				-	position:relative;
			
 
				-	border:1px solid #0095cd;
			
 
				-}
			
 
				-#emotions .page{
			
 
				-	text-align:right;
			
 
				-}
			
 
				-#emotions .page a.current{
			
 
				-	color: #666;
			
 
				-	background-color:#fff;
			
 
				-}
			
 
				-#emotions .page a{
			
 
				-	margin-left:3px;
			
 
				-	color: #0078B6;
			
 
				-	background-color:#f3f3f3;
			
 
				-}
			
 
				-#emotions .page a:hover{
			
 
				-	background-color:#e7e7e7;
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/css/style.css
+++ b/src/main/webapp/templets/1/default/m/css/style.css
@@ -1,83 +0,0 @@
 
				-	body{/*background-color: #262626*/}
			
 
				-	*{
			
 
				-		padding: 0;
			
 
				-		margin: 0;
			
 
				-	}
			
 
				-	.container{
			
 
				-		max-width: 800px;
			
 
				-		margin: 0 auto;
			
 
				-	}
			
 
				-	.slide{
			
 
				-		width: 100%;
			
 
				-		min-height: 180px;
			
 
				-		overflow: hidden;
			
 
				-		position: relative;
			
 
				-		height: 300px;
			
 
				-
			
 
				-	}
			
 
				-	.slide .img{
			
 
				-		overflow: hidden;
			
 
				-		position: absolute;
			
 
				-		transition: width 0.4s,height 0.4s,top 0.4s,left 0.4s,z-index 0.4s;
			
 
				-	}
			
 
				-	.slide .img img{
			
 
				-		width: calc(100% - 14px);
			
 
				-		height: calc(100% - 14px);
			
 
				-		margin: 7px;
			
 
				-	}
			
 
				-	.slide .img1{
			
 
				-		width: 40%;
			
 
				-		/*height: 40%;*/
			
 
				-		top: 35%;
			
 
				-		left: -50%;
			
 
				-		z-index: 1;
			
 
				-	}
			
 
				-	.slide .img2{
			
 
				-		width: 60%;
			
 
				-		/*height: 60%;*/
			
 
				-		top: 25%;
			
 
				-		left: -20%;
			
 
				-		z-index: 2;
			
 
				-	}
			
 
				-	.slide .img3{
			
 
				-		width: 80%;
			
 
				-		/*height: 80%;*/
			
 
				-		top: 15%;
			
 
				-		left: 10%;
			
 
				-		z-index: 3;
			
 
				-	}
			
 
				-	.slide .img4{
			
 
				-		width: 60%;
			
 
				-		/*height: 60%;*/
			
 
				-		top: 25%;
			
 
				-		left: 60%;
			
 
				-		z-index: 2;
			
 
				-	}
			
 
				-	.slide .img5{
			
 
				-		width: 40%;
			
 
				-		/*height: 40%;*/
			
 
				-		top: 35%;
			
 
				-		left: 110%;
			
 
				-		z-index: 1;
			
 
				-	}
			
 
				-	.slide-bt{
			
 
				-		position: absolute;
			
 
				-		left: 50%;
			
 
				-		bottom: 13%;
			
 
				-		z-index: 10;
			
 
				-	}
			
 
				-	.slide-bt span{
			
 
				-		width: 24px;
			
 
				-		height: 8px;
			
 
				-		background: #c9caca;
			
 
				-		float: left;
			
 
				-		margin: 5px;
			
 
				-		border-radius: 4px;
			
 
				-	}
			
 
				-	.slide .slide-bt .on{
			
 
				-		background: #ffd200;
			
 
				-	}
			
 
				-/* 	button{
			
 
				-		width: 50px;
			
 
				-		margin: 20px;
			
 
				-	} */
			
--- a/src/main/webapp/templets/1/default/m/footer.htm
+++ b/src/main/webapp/templets/1/default/m/footer.htm
@@ -1,14 +0,0 @@
 
				-<div class="ms-footer">
			
 
				-    <footer class="am-footer am-footer-default">
			
 
				-        <div class="am-footer-switch ms-footer-div">
			
 
				-            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="{ms:global.url/}/53/index.html">关于我们</a>
			
 
				-            <span class="am-footer-divider ms-footer-div-a">|</span>
			
 
				-            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="http://mingsoft.net/html/1//5527/index.html#faz">发展历程</a>
			
 
				-            <span class="am-footer-divider ms-footer-div-a">|</span>
			
 
				-            <a id="godesktop" class="am-footer-desktop ms-footer-div-a" href="{ms:global.url/}/19/index.html">联系我们</a>
			
 
				-        </div>
			
 
				-        <div class="am-footer-miscs ms-footer-copyright">
			
 
				-            <p>版权所有©铭飞科技有限公司2012-2018保留一切权利</p>
			
 
				-        </div>
			
 
				-    </footer>
			
 
				-</div>
			
--- a/src/main/webapp/templets/1/default/m/head-file.htm
+++ b/src/main/webapp/templets/1/default/m/head-file.htm
@@ -1,32 +0,0 @@
 
				-<head>
			
 
				-    <title>{ms:global.name/}</title>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
			
 
				-    <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/amazeui/2.7.2/css/amazeui.min.css" />
			
 
				-    <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/index.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/base.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/about.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/case-list.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/news-list.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/news-show.less" />
			
 
				-    <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/advice.less" />
			
 
				-    <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-    <script src="{ms:global.host/}/plugins/amazeui/2.7.2/js/amazeui.min.js"></script>
			
 
				-    <script src="{ms:global.host/}/{ms:global.style/}/js/jiaoben.js"></script>
			
 
				-    <script src="{ms:global.host/}/plugins/seajs/3.0.0/sea.js"></script>
			
 
				-    <!--vue-懒加载-表单验证-->
			
 
				-    <script src="{ms:global.host/}/plugins/vue/2.3.3/vue.min.js"></script>
			
 
				-    <script src="{ms:global.host/}/plugins/validator/5.5.0/validator.min.js"></script>
			
 
				-    <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/style.css">
			
 
				-    <script>
			
 
				-    ms.config({
			
 
				-        base: "{ms:global.host/}",
			
 
				-        filter: {
			
 
				-            people: {
			
 
				-                loginUrl: '{ms:global.host/}'
			
 
				-            }
			
 
				-        }
			
 
				-    });
			
 
				-</script>
			
 
				-</head>
			
--- a/src/main/webapp/templets/1/default/m/head.htm
+++ b/src/main/webapp/templets/1/default/m/head.htm
@@ -1,72 +0,0 @@
 
				-<div class="ms-head">
			
 
				-    <header data-am-widget="header" class="am-header am-header-default ms-head-background">
			
 
				-        <div class="am-header-left am-header-nav">
			
 
				-            <a href="{ms:global.host/}/" class="">
			
 
				-                <i class="iconfont">&#xe99b;</i>
			
 
				-            </a>
			
 
				-        </div>
			
 
				-        <h1 style="height: 100%;" class="am-header-title ms-header-title">
			
 
				-            <a href="{ms:global.host/}" class="">
			
 
				-                <img src="{ms:global.host/}/{ms:global.style/}/images/ms.ico">
			
 
				-            </a>
			
 
				-        </h1>
			
 
				-        <nav data-am-widget="menu" class="am-menu  am-menu-offcanvas1" data-am-menu-offcanvas>
			
 
				-            <a href="javascript: void(0)" class="am-menu-toggle ms-head-menu" style="/* height: 55px;line-height: 55px; */">
			
 
				-                <i class="am-menu-toggle-icon am-icon-bars" style="/* height: 55px;line-height: 55px; */"></i>
			
 
				-            </a>
			
 
				-            <div class="am-offcanvas">
			
 
				-                <div class="am-offcanvas-bar">
			
 
				-                    <ul class="am-menu-nav am-avg-sm-1">
			
 
				-                    	<li class="">
			
 
				-                            <a href="{ms:global.host/}" class="">首页</a>
			
 
				-                        </li>
			
 
				-                        <li class="am-parent">
			
 
				-                            <a href="##" class="">走进铭飞</a>
			
 
				-                            <ul class="am-menu-sub am-collapse  am-avg-sm-3 ">
			
 
				-                                <li class="">
			
 
				-                                    <a href="{ms:global.url/}/53/index.html" class="">关于我们</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="{ms:global.url/}/59/index.html" class="">公司动态</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="http://mingsoft.net/html/1//5527/index.html#faz" class="">发展历程</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="http://mingsoft.net/html/1//5527/index.html#lianx" class="">加入我们</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="{ms:global.url/}/19/index.html" class="">联系我们</a>
			
 
				-                                </li>
			
 
				-                                
			
 
				-                            </ul>
			
 
				-                        </li>
			
 
				-                        <li class="">
			
 
				-                            <a href="{ms:global.url/}/149/index.html" class="">案例</a>
			
 
				-                        </li>
			
 
				-                        <li class="">
			
 
				-                            <a href="http://mstore.mingsoft.net/mstoreShow.do" class="">模板&插件</a>
			
 
				-                        </li>
			
 
				-                        <li class="">
			
 
				-                            <a href="{ms:global.url/}/19/142/index.html" class="">在线留言</a>
			
 
				-                        </li>
			
 
				-                        <li class="am-parent">
			
 
				-                            <a>技术支持</a>
			
 
				-                            <ul class="am-menu-sub am-collapse  am-avg-sm-3 ">
			
 
				-                                <li class="">
			
 
				-                                    <a href="http://bbs.mingsoft.net/mbbs/main.do" class="">开源社区</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="https://gitee.com/mingSoft/MCMS" class="">源码下载</a>
			
 
				-                                </li>
			
 
				-                                <li class="">
			
 
				-                                    <a href="http://doc.ms.mingsoft.net/plugs-cms/" class="">使用手册</a>
			
 
				-                                </li>
			
 
				-                            </ul>
			
 
				-                        </li>
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </nav>
			
 
				-    </header>
			
 
				-</div>
			
--- a/src/main/webapp/templets/1/default/m/images/01.png
+++ b/src/main/webapp/templets/1/default/m/images/01.png
--- a/src/main/webapp/templets/1/default/m/images/02.png
+++ b/src/main/webapp/templets/1/default/m/images/02.png
--- a/src/main/webapp/templets/1/default/m/images/03.png
+++ b/src/main/webapp/templets/1/default/m/images/03.png
--- a/src/main/webapp/templets/1/default/m/images/04.png
+++ b/src/main/webapp/templets/1/default/m/images/04.png
--- a/src/main/webapp/templets/1/default/m/images/05.png
+++ b/src/main/webapp/templets/1/default/m/images/05.png
--- a/src/main/webapp/templets/1/default/m/images/about.png
+++ b/src/main/webapp/templets/1/default/m/images/about.png
--- a/src/main/webapp/templets/1/default/m/images/case.png
+++ b/src/main/webapp/templets/1/default/m/images/case.png
--- a/src/main/webapp/templets/1/default/m/images/hu1.png
+++ b/src/main/webapp/templets/1/default/m/images/hu1.png
--- a/src/main/webapp/templets/1/default/m/images/level-0.png
+++ b/src/main/webapp/templets/1/default/m/images/level-0.png
--- a/src/main/webapp/templets/1/default/m/images/level-1.png
+++ b/src/main/webapp/templets/1/default/m/images/level-1.png
--- a/src/main/webapp/templets/1/default/m/images/level-2.png
+++ b/src/main/webapp/templets/1/default/m/images/level-2.png
--- a/src/main/webapp/templets/1/default/m/images/level-3.png
+++ b/src/main/webapp/templets/1/default/m/images/level-3.png
--- a/src/main/webapp/templets/1/default/m/images/level-4.png
+++ b/src/main/webapp/templets/1/default/m/images/level-4.png
--- a/src/main/webapp/templets/1/default/m/images/level-5.png
+++ b/src/main/webapp/templets/1/default/m/images/level-5.png
--- a/src/main/webapp/templets/1/default/m/images/loading.gif
+++ b/src/main/webapp/templets/1/default/m/images/loading.gif
--- a/src/main/webapp/templets/1/default/m/images/message.png
+++ b/src/main/webapp/templets/1/default/m/images/message.png
--- a/src/main/webapp/templets/1/default/m/images/mo.png
+++ b/src/main/webapp/templets/1/default/m/images/mo.png
--- a/src/main/webapp/templets/1/default/m/images/mobile.png
+++ b/src/main/webapp/templets/1/default/m/images/mobile.png
--- a/src/main/webapp/templets/1/default/m/images/ms.ico
+++ b/src/main/webapp/templets/1/default/m/images/ms.ico
--- a/src/main/webapp/templets/1/default/m/images/no-data.png
+++ b/src/main/webapp/templets/1/default/m/images/no-data.png
--- a/src/main/webapp/templets/1/default/m/images/pics.png
+++ b/src/main/webapp/templets/1/default/m/images/pics.png
--- a/src/main/webapp/templets/1/default/m/images/timg.jpg
+++ b/src/main/webapp/templets/1/default/m/images/timg.jpg
--- a/src/main/webapp/templets/1/default/m/images/搜索.png
+++ b/src/main/webapp/templets/1/default/m/images/搜索.png
--- a/src/main/webapp/templets/1/default/m/index.htm
+++ b/src/main/webapp/templets/1/default/m/index.htm
@@ -1,205 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-    <#include "/m/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>
			
 
				-    <body>
			
 
				-        <#include "/m/head.htm">
			
 
				-        <div id="indexVue">
			
 
				-            <div class="ms-banner">
			
 
				-                <div data-am-widget="slider" class="am-slider am-slider-a1" data-am-slider='{&quot;directionNav&quot;:false}'>
			
 
				-                    <ul class="am-slides">
			
 
				-                        <template v-for="banner in bannerList">
			
 
				-                            <li>
			
 
				-                                <img :src="'{ms:global.host/}/{ms:global.style/}/images/'+banner+'.png'">
			
 
				-                            </li>
			
 
				-                        </template>
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-content-template">
			
 
				-                <div>
			
 
				-                    <ul class="nav nav-tabs ms-index-tabs" role="tablist">
			
 
				-                        <li role="presentation" id="ms-model" class="active ms-active">
			
 
				-                            <a @click="tabShow('model')" href="#model">模板</a>
			
 
				-                        </li>
			
 
				-                        <li role="presentation" id="ms-plug" class="ms-active">
			
 
				-                            <a @click="tabShow('plug')" href="#plug">插件</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 :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
			
 
				-                                            </a>
			
 
				-                                            <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background-image: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
			
 
				-                                                <div>
			
 
				-                                                    <img :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" 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'" width="60px" />
			
 
				-                                                <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://mstore.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://mstore.mingsoft.net/'+pulg.upgraderVersionImg" 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="'{ms:global.host/}/'+ 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'"  width="60px"/>
			
 
				-                                                <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://mstore.mingsoft.net/mstoreShow.do')">查看更多>></div>
			
 
				-                                        </div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="ms-index-content">
			
 
				-                <div class="ms-case">
			
 
				-                    <div data-am-widget="list_news" class="am-list-news am-list-news-default ms-case-div">
			
 
				-                        <!--列表标题-->
			
 
				-                        <div class="am-list-news-hd am-cf ms-case-title">
			
 
				-                            <!--带更多链接-->
			
 
				-                            <a href="{ms:global.url/}/149/index.html" class="">
			
 
				-                                <h2 class="ms-case-title-h2">网站案例</h2>
			
 
				-                                <span class="am-list-news-more am-fr ms-case-more">MORE &raquo;</span>
			
 
				-                            </a>
			
 
				-                        </div>
			
 
				-                        <div class="ms-case-list-div">
			
 
				-                            <ul data-am-widget="gallery" class="am-gallery am-avg-sm-2 am-gallery-imgbordered">
			
 
				-                                {ms:arclist typeid=149 size=4}
			
 
				-                                <li>
			
 
				-                                    <div class="am-gallery-item ms-case-div-li">
			
 
				-                                        <a href='[field.source/]'>
			
 
				-                                            <img class="ms-case-list-img" src="{ms:global.host/}[field.litpic/]" alt="[field.title/]" />
			
 
				-                                        </a>
			
 
				-                                    </div>
			
 
				-                                </li>
			
 
				-                                {/ms:arclist}
			
 
				-                            </ul>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="ms-product">
			
 
				-                    <div class="container ms-product-container">
			
 
				-                        <div id="slide" class="slide" class="index-slide" alt="star">
			
 
				-                            <h2>产品方向</h2>
			
 
				-                            <div class="img img2" data-slide-imgid="0" onclick="left()">
			
 
				-						        <a 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="img img3" data-slide-imgid="1">
			
 
				-						    	<a 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="img img4" data-slide-imgid="2" onclick="right()">
			
 
				-						        <a 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>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="ms-news">
			
 
				-                    <div data-am-widget="list_news" class="am-list-news am-list-news-default">
			
 
				-                        <div class="am-list-news-hd am-cf ms-news-title">
			
 
				-                            <!--带更多链接-->
			
 
				-                            <a href="{ms:global.url/}/59/index.html" class="">
			
 
				-                                <h2 class="ms-news-title-h2">公司动态</h2>
			
 
				-                                <span class="am-list-news-more am-fr ms-news-more">MORE &raquo;</span>
			
 
				-                            </a>
			
 
				-                        </div>
			
 
				-                        <div class="am-list-news-bd ms-product-news-list">
			
 
				-                            <ul class="am-list">
			
 
				-                                {ms:arclist typeid=59 size=6}
			
 
				-                                <li class="am-g am-list-item-dated ms-product-news-list-li">
			
 
				-                                    <a href="{ms:global.url/}[field.link/]" class="am-list-item-hd ">[field.title/]</a>
			
 
				-                                    <span class="am-list-date">[field.date?string("yyyy-mm-dd")/]</span>
			
 
				-                                </li>
			
 
				-                                {/ms:arclist}
			
 
				-                            </ul>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <#include "/m/footer.htm">
			
 
				-    </body>
			
 
				-    <script>
			
 
				-        var index = new Vue({
			
 
				-            el: "#indexVue",
			
 
				-            data: {
			
 
				-                bannerList: ['01', '02', '03', '04', '05'],
			
 
				-                modelList: [], //模板列表
			
 
				-                pulgList: [], //插件列表
			
 
				-                loading: false, //加载状态
			
 
				-            },
			
 
				-            methods: {
			
 
				-                //切换tab
			
 
				-                tabShow: function(type) {
			
 
				-                    event.preventDefault();
			
 
				-                    $(".tab-pane").removeClass("active");
			
 
				-                    $(".ms-active").removeClass("active");
			
 
				-                    $("#ms-" + type).addClass("active");
			
 
				-                    $("#" + type).addClass("active");
			
 
				-                },
			
 
				-                //加载列表
			
 
				-                query: function(data, type) {
			
 
				-                    var target = this;
			
 
				-                    $.ajax({
			
 
				-                        type: "POST",
			
 
				-                        data: data,
			
 
				-                        url: "http://mstore.mingsoft.net//mstore/list.do", //
			
 
				-                        success: function(msg) {
			
 
				-                            if(type == 'model') {
			
 
				-                                target.modelList = msg.list;
			
 
				-                            } else {
			
 
				-                                target.pulgList = msg.list;
			
 
				-                                target.loading = true;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    })
			
 
				-                },
			
 
				-            },
			
 
				-            mounted: function() {
			
 
				-                var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=4&pageNo=1";
			
 
				-                this.query(data, 'model');
			
 
				-                var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=4&pageNo=1";
			
 
				-                this.query(data, 'pulg');
			
 
				-            }
			
 
				-        })
			
 
				-    </script>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/js/jiaoben.js
+++ b/src/main/webapp/templets/1/default/m/js/jiaoben.js
@@ -1,169 +0,0 @@
 
				-var autoLb = false;          //autoLb=true为开启自动轮播
			
 
				-var autoLbtime = 1;         //autoLbtime为轮播间隔时间（单位秒）
			
 
				-var touch = true;           //touch=true为开启触摸滑动
			
 
				-var slideBt = true;         //slideBt=true为开启滚动按钮
			
 
				-var slideNub;               //轮播图片数量
			
 
				-
			
 
				-//窗口大小改变时改变轮播图宽高
			
 
				-/*$(window).resize(function(){
			
 
				-$(".slide").height($(".slide").width()*0.56);
			
 
				-});*/
			
 
				-
			
 
				-
			
 
				-$(function(){
			
 
				-/*$(".slide").height($(".slide").width()*0.56);*/
			
 
				-slideNub = $(".slide .img").size();             //获取轮播图片数量
			
 
				-for(i=0;i<slideNub;i++){
			
 
				-	$(".slide .img:eq("+i+")").attr("data-slide-imgId",i);
			
 
				-}
			
 
				-
			
 
				-//根据轮播图片数量设定图片位置对应的class
			
 
				-if(slideNub==1){
			
 
				-	for(i=0;i<slideNub;i++){
			
 
				-		$(".slide .img:eq("+i+")").addClass("img3");
			
 
				-	}
			
 
				-}
			
 
				-if(slideNub==2){
			
 
				-	for(i=0;i<slideNub;i++){
			
 
				-		$(".slide .img:eq("+i+")").addClass("img"+(i+3));
			
 
				-	}
			
 
				-}
			
 
				-if(slideNub==3){
			
 
				-	for(i=0;i<slideNub;i++){
			
 
				-		$(".slide .img:eq("+i+")").addClass("img"+(i+2));
			
 
				-	}
			
 
				-}
			
 
				-if(slideNub>3&&slideNub<6){
			
 
				-	for(i=0;i<slideNub;i++){
			
 
				-		$(".slide .img:eq("+i+")").addClass("img"+(i+1));
			
 
				-	}
			
 
				-}
			
 
				-if(slideNub>=6){
			
 
				-	for(i=0;i<slideNub;i++){
			
 
				-		if(i<5){
			
 
				-		   $(".slide .img:eq("+i+")").addClass("img"+(i+1)); 
			
 
				-		}else{
			
 
				-			$(".slide .img:eq("+i+")").addClass("img5"); 
			
 
				-		}
			
 
				-	}
			
 
				-}
			
 
				-
			
 
				-//根据轮播图片数量设定轮播图按钮数量
			
 
				-if(slideBt){
			
 
				-	for(i=1;i<=slideNub;i++){
			
 
				-		$(".slide-bt").append("<span data-slide-bt='"+i+"' onclick='tz("+i+")'></span>");
			
 
				-	}
			
 
				-	$(".slide-bt").width(slideNub*34);
			
 
				-	$(".slide-bt").css("margin-left","-"+slideNub*17+"px");
			
 
				-}
			
 
				-
			
 
				-//自动轮播
			
 
				-if(autoLb){
			
 
				-	setInterval(function(){
			
 
				-	right();
			
 
				-}, autoLbtime*500);
			
 
				-}
			
 
				-
			
 
				-
			
 
				-if(touch){
			
 
				-	k_touch();
			
 
				-}
			
 
				-slideLi();
			
 
				-imgClickFy();
			
 
				-})
			
 
				-
			
 
				-//右滑动
			
 
				-function right(){
			
 
				-var fy = new Array();
			
 
				-for(i=0;i<slideNub;i++){
			
 
				-	fy[i]=$(".slide .img[data-slide-imgId="+i+"]").attr("class");
			
 
				-}
			
 
				-for(i=0;i<slideNub;i++){
			
 
				-	if(i==0){
			
 
				-		$(".slide .img[data-slide-imgId="+i+"]").attr("class",fy[slideNub-1]);
			
 
				-	}else{
			
 
				-	   $(".slide .img[data-slide-imgId="+i+"]").attr("class",fy[i-1]); 
			
 
				-	}
			
 
				-}
			
 
				-imgClickFy();
			
 
				-slideLi();
			
 
				-}
			
 
				-
			
 
				-//左滑动
			
 
				-function left(){
			
 
				-var fy = new Array();
			
 
				-for(i=0;i<slideNub;i++){
			
 
				-	fy[i]=$(".slide .img[data-slide-imgId="+i+"]").attr("class");
			
 
				-}
			
 
				-for(i=0;i<slideNub;i++){
			
 
				-	if(i==(slideNub-1)){
			
 
				-		$(".slide .img[data-slide-imgId="+i+"]").attr("class",fy[0]);
			
 
				-	}else{
			
 
				-	   $(".slide .img[data-slide-imgId="+i+"]").attr("class",fy[i+1]); 
			
 
				-	}
			
 
				-}
			
 
				-imgClickFy();
			
 
				-slideLi();
			
 
				-}
			
 
				-
			
 
				-//轮播图片左右图片点击翻页
			
 
				-function imgClickFy(){
			
 
				-$(".slide .img").removeAttr("onclick");
			
 
				-$(".slide .img2").attr("onclick","left()");
			
 
				-$(".slide .img4").attr("onclick","right()");
			
 
				-}
			
 
				-
			
 
				-//修改当前最中间图片对应按钮选中状态
			
 
				-function slideLi(){
			
 
				-var slideList = parseInt($(".slide .img3").attr("data-slide-imgId")) + 1;
			
 
				-$(".slide-bt span").removeClass("on");
			
 
				-$(".slide-bt span[data-slide-bt="+slideList+"]").addClass("on");
			
 
				-}
			
 
				-
			
 
				-//轮播按钮点击翻页
			
 
				-function tz(id){
			
 
				-var tzcs = id - (parseInt($(".slide .img3").attr("data-slide-imgId")) + 1);
			
 
				-if(tzcs>0){
			
 
				-	for(i=0;i<tzcs;i++){
			
 
				-		setTimeout(function(){
			
 
				-		  right();  
			
 
				-		},1);
			
 
				-	}
			
 
				-}
			
 
				-if(tzcs<0){
			
 
				-	tzcs=(-tzcs);
			
 
				-	for(i=0;i<tzcs;i++){
			
 
				-		setTimeout(function(){
			
 
				-		  left();  
			
 
				-		},1);
			
 
				-	}
			
 
				-}
			
 
				-slideLi();
			
 
				-}
			
 
				-
			
 
				-
			
 
				-//触摸滑动模块
			
 
				-function k_touch() {
			
 
				-var _start = 0, _end = 0, _content = document.getElementById("slide");
			
 
				-_content.addEventListener("touchstart", touchStart, false);
			
 
				-_content.addEventListener("touchmove", touchMove, false);
			
 
				-_content.addEventListener("touchend", touchEnd, false);
			
 
				-function touchStart(event) {
			
 
				-	var touch = event.targetTouches[0];
			
 
				-	_start = touch.pageX;
			
 
				-}
			
 
				-function touchMove(event) {
			
 
				-	var touch = event.targetTouches[0];
			
 
				-	_end = (_start - touch.pageX);
			
 
				-}
			
 
				-
			
 
				-function touchEnd(event) {
			
 
				-	if (_end < -100) {
			
 
				-		left();
			
 
				-		_end=0;
			
 
				-	}else if(_end > 100){
			
 
				-		right();
			
 
				-		_end=0;
			
 
				-	}
			
 
				-}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/js/jquery.sinaEmotion.js
+++ b/src/main/webapp/templets/1/default/m/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/m/less/about.less
+++ b/src/main/webapp/templets/1/default/m/less/about.less
@@ -1,37 +0,0 @@
 
				-.ms-about-content{
			
 
				-	.ms-about-content-div{
			
 
				-		margin: 10px;
			
 
				-		ul{
			
 
				-			line-height: 40px;
			
 
				-		    background-color: #eee;
			
 
				-		    width: 100%;
			
 
				-		    padding: 0;
			
 
				-		    margin: 0;
			
 
				-		    list-style: none;
			
 
				-		    text-align: center;
			
 
				-		    display: flex;
			
 
				-		    li{
			
 
				-	    	    -webkit-box-flex: 1;
			
 
				-			    -webkit-flex: 1;
			
 
				-			    -ms-flex: 1;
			
 
				-			    flex: 1;
			
 
				-		    	a{
			
 
				-	    		    display: block;
			
 
				-				    word-wrap: normal;
			
 
				-				    text-overflow: ellipsis;
			
 
				-				    white-space: nowrap;
			
 
				-				    overflow: hidden;
			
 
				-				    line-height: 42px;
			
 
				-		    	}
			
 
				-		    }
			
 
				-		}
			
 
				-		.ms-about-content-main{
			
 
				-			color:#555;
			
 
				-			border: none;
			
 
				-	    	margin-top: 2rem;
			
 
				-		}
			
 
				-		.ms-about-content-li{
			
 
				-			font-size: 1rem;
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/less/advice.less
+++ b/src/main/webapp/templets/1/default/m/less/advice.less
@@ -1,41 +0,0 @@
 
				-.ms-message-content {
			
 
				-    form {
			
 
				-        width: 95%;
			
 
				-        margin: auto;
			
 
				-        padding-top: 2rem;
			
 
				-        padding-bottom: 5rem;
			
 
				-        button {
			
 
				-            width: 100%;
			
 
				-            border-radius: 5px;
			
 
				-            background-color: #fafafa;
			
 
				-            color: #ddd;
			
 
				-            border-color: #fafafa;
			
 
				-            pointer-events: none;
			
 
				-            transition: all .6s;
			
 
				-            outline: none;
			
 
				-        }
			
 
				-        input {
			
 
				-        	border: 1px solid #eeeeee;
			
 
				-            outline: none;
			
 
				-            transition: all .6s;
			
 
				-            &:focus {
			
 
				-                border-color: rgb(0, 154, 255);
			
 
				-            }
			
 
				-        }
			
 
				-        textarea {
			
 
				-        	border: 1px solid #eeeeee;
			
 
				-            outline: none;
			
 
				-            transition: all .6s;
			
 
				-            &:focus {
			
 
				-                border-color: rgb(0, 154, 255);
			
 
				-            }
			
 
				-            width: 100%;
			
 
				-            border-radius: 5px;
			
 
				-            height: 10rem;
			
 
				-        }
			
 
				-        textarea::-webkit-input-placeholder,
			
 
				-        input::-webkit-input-placeholder {
			
 
				-            color: #999;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/less/base.less
+++ b/src/main/webapp/templets/1/default/m/less/base.less
@@ -1,30 +0,0 @@
 
				-.ms-head {
			
 
				-    .ms-header-title {
			
 
				-        img {
			
 
				-            margin-top: 7px;
			
 
				-            height: 35px;
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-head-background {
			
 
				-        background-color: #ffffff;
			
 
				-        .ms-head-menu {
			
 
				-            color: #999;
			
 
				-        }
			
 
				-        .am-header-nav {
			
 
				-            .iconfont {
			
 
				-                color: #999;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.ms-footer {
			
 
				-    footer {
			
 
				-        background-color: #2a3542;
			
 
				-        .ms-footer-div-a,
			
 
				-        .ms-footer-copyright {
			
 
				-            color: #999;
			
 
				-            font-size: 1rem;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/less/case-list.less
+++ b/src/main/webapp/templets/1/default/m/less/case-list.less
@@ -1,22 +0,0 @@
 
				-.ms-case-list{
			
 
				-	margin-bottom: 2rem;
			
 
				-	margin-top: 1rem;
			
 
				-	ul{
			
 
				-		li{
			
 
				-			.ms-case-list-img{
			
 
				-				border:none;
			
 
				-				width: 100%;
			
 
				-				height: 100%;
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-}
			
 
				-.ms-case-div,.ms-case-div-li{
			
 
				-	/*width: 192px;*/
			
 
				-	height: 193px;
			
 
				-}
			
 
				-.ms-case-div-li{
			
 
				-	img{
			
 
				-		height:100%;
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/less/index.less
+++ b/src/main/webapp/templets/1/default/m/less/index.less
@@ -1,212 +0,0 @@
 
				- .ms-content-template {
			
 
				-     .ms-index-tabs {
			
 
				-     	#ms-plug{
			
 
				-     		margin-left: 2rem;
			
 
				-     	}
			
 
				-         text-align: center;
			
 
				-         border: none;
			
 
				-         margin: 20px 0 3px 0;
			
 
				-         padding: 0;
			
 
				-         li {
			
 
				-             float: none;
			
 
				-             display: inline-block;
			
 
				-             font-size: 2rem;
			
 
				-             a {
			
 
				-                 border: none !important;
			
 
				-                 color: #777 !important;
			
 
				-                 background-color: white;
			
 
				-                 padding: 6px 0px;
			
 
				-                 font-size: 1.6rem;
			
 
				-             }
			
 
				-         }
			
 
				-         .active {
			
 
				-             a {
			
 
				-                 color: #333 !important;
			
 
				-                 border-bottom: 2px solid #00b0ff !important;
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				-     .ms-content-all {
			
 
				-         width: 100%;
			
 
				-         background: #fafafa;
			
 
				-         .tab-content {
			
 
				-             background: #fafafa;
			
 
				-             width: 100%;
			
 
				-             margin: auto;
			
 
				-             overflow: hidden;
			
 
				-             padding-bottom: 12px;
			
 
				-             .ms-model-content {
			
 
				-                 padding: 0 12px;
			
 
				-                 display: flex;
			
 
				-                 flex-wrap: wrap;
			
 
				-                 justify-content: space-between;
			
 
				-                 .ms-model-list {
			
 
				-                     overflow: hidden;
			
 
				-                     .ms-model-more {
			
 
				-                         width: 385px;
			
 
				-                         height: 40px;
			
 
				-                         background-color: #fafafa;
			
 
				-                         line-height: 40px;
			
 
				-                         text-align: center;
			
 
				-                         div {
			
 
				-                             border: 1px solid #aaa;
			
 
				-                             color: #999;
			
 
				-                             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: 12px 0 0 0;
			
 
				-                     .ms-model-info {
			
 
				-                         padding: 6px;
			
 
				-                         background: white;
			
 
				-                         span {
			
 
				-                             font-size: 14px;
			
 
				-                             display: block;
			
 
				-                             margin-bottom: 12px;
			
 
				-                             color: #666;
			
 
				-                             width: calc(~"49vw - 36px");
			
 
				-                             overflow: hidden;
			
 
				-                             white-space: nowrap;
			
 
				-                             text-overflow: ellipsis;
			
 
				-                         }
			
 
				-                         .ms-model-info-img {
			
 
				-                             width: 30px;
			
 
				-                             height: 30px;
			
 
				-                             border-radius: 50%;
			
 
				-                             margin-right: 0px;
			
 
				-                         }
			
 
				-                         .ms-model-type {
			
 
				-                             color: #fb803c;
			
 
				-                             display: inline-block;
			
 
				-                             float: right;
			
 
				-                             font-size: 1.8rem;
			
 
				-                         }
			
 
				-                     }
			
 
				-                     .ms-model-img {
			
 
				-                         overflow: hidden;
			
 
				-                         position: relative;
			
 
				-                         height: 110px;
			
 
				-                         z-index: 2;
			
 
				-                         display: inline-block;
			
 
				-                         width: calc(~"49vw - 15px");
			
 
				-                         img {
			
 
				-                             width: 100%;
			
 
				-                             position: relative;
			
 
				-                         }
			
 
				-                     }
			
 
				-                     .ms-model-mobile-img {
			
 
				-                         position: absolute;
			
 
				-                         overflow: hidden;
			
 
				-                         z-index: 3;
			
 
				-                         right: 0;
			
 
				-                         top: 0;
			
 
				-                         height: 155px;
			
 
				-                         background-size: 100px 170px;
			
 
				-                         right: -22px;
			
 
				-                         div {
			
 
				-                             width: 120px;
			
 
				-                             height: 108px;
			
 
				-                             padding: 0px 34px 0px 16px;
			
 
				-                             margin-top: 27px;
			
 
				-                             overflow: hidden;
			
 
				-                             position: relative;
			
 
				-                             img {
			
 
				-                                 width: 100%;
			
 
				-                                 position: relative;
			
 
				-                                 min-height: 100%;
			
 
				-                             }
			
 
				-                         }
			
 
				-                     }
			
 
				-                 }
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				- }
			
 
				- 
			
 
				- .ms-case {
			
 
				- 	.ms-case-div{
			
 
				- 		margin-bottom: 2.2rem;
			
 
				-	    margin-left: 10px;
			
 
				-	    margin-right: 10px;
			
 
				-	    margin-top: 10px;
			
 
				- 	}
			
 
				-     .ms-case-title {
			
 
				-         border-bottom: 1px solid #ddd;
			
 
				-         .ms-case-title-h2 {
			
 
				-             color: #000;
			
 
				-         }
			
 
				-         .ms-case-more {
			
 
				-             color: #999;
			
 
				-         }
			
 
				-     }
			
 
				-     .ms-case-list-div {
			
 
				-         margin-top: 1rem;
			
 
				-         ul {
			
 
				-             padding: 0;
			
 
				-             li {
			
 
				-                 .ms-case-list-img {
			
 
				-                     border: none;
			
 
				-                     height:100%;
			
 
				-                 }
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				- }
			
 
				- 
			
 
				- .ms-product {
			
 
				- 	.ms-product-container{
			
 
				- 		padding-right: 0;
			
 
				-	    padding-left: 0;
			
 
				-	    margin-right: 0;
			
 
				-	    margin-left: 0;
			
 
				- 	}
			
 
				-     background-color: #fafafa;
			
 
				-     .container {
			
 
				-         .slide {
			
 
				-             /*height: 27rem;*/
			
 
				-             h2 {
			
 
				-                 font-size: 1.6rem;
			
 
				-                 margin-top: 1rem;
			
 
				-                 height: 2rem;
			
 
				-                 text-align: center;
			
 
				-                 line-height: 2rem;
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				- }
			
 
				- 
			
 
				- .ms-news {
			
 
				-     .ms-news-title {
			
 
				-         border-bottom: 1px solid #fafafa;
			
 
				-         .ms-news-title-h2 {
			
 
				-             color: #000;
			
 
				-         }
			
 
				-         .ms-news-more {
			
 
				-             color: #999;
			
 
				-         }
			
 
				-     }
			
 
				-     .ms-product-news-list {
			
 
				-     	.ms-product-news-list{
			
 
				-     		/*border: none;*/
			
 
				-     	}
			
 
				-         ul {
			
 
				-             li {
			
 
				-             	border: none;
			
 
				-                 a {
			
 
				-                     font-size: 1.5rem;
			
 
				-                     color: #555;
			
 
				-                 }
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				- }
			
--- a/src/main/webapp/templets/1/default/m/less/news-list.less
+++ b/src/main/webapp/templets/1/default/m/less/news-list.less
@@ -1,23 +0,0 @@
 
				-
			
 
				-.ms-news-list{
			
 
				-	ul{
			
 
				-		li{
			
 
				-			a{
			
 
				-				color: #000;
			
 
				-    			font-size: 1.5rem;
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-	.ms-news-list-page{
			
 
				-		margin-left: 0px; 
			
 
				-	    margin-right: 0px; 
			
 
				-	    text-align: center;
			
 
				-	    li{
			
 
				-	    	a{
			
 
				-	    		padding: 0.5em 0.5em;
			
 
				-	    		color: #999;
			
 
				-	    		font-size: 0.6rem;
			
 
				-	    	}
			
 
				-	    }
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/less/news-show.less
+++ b/src/main/webapp/templets/1/default/m/less/news-show.less
@@ -1,204 +0,0 @@
 
				-.ms-news-show{
			
 
				-	input::-webkit-input-placeholder { 
			
 
				-	    color:#999;
			
 
				-	}
			
 
				-	color:#555;
			
 
				-	.ms-news-show-title{
			
 
				-
			
 
				-	}
			
 
				-	.ms-news-show-content{
			
 
				-		padding: 0 1rem;
			
 
				-    	margin-top: 0.5rem;
			
 
				-	}
			
 
				-	.ms-news-show-main{
			
 
				-		margin: 0 1rem;
			
 
				-	    border-bottom: 1px solid #ddd;
			
 
				-	    padding-bottom: 0.5rem;
			
 
				-	    padding-top: 1rem;
			
 
				-	    .ms-news-show-title{
			
 
				-	    	font-size: 1.9rem;
			
 
				-			color: #444;
			
 
				-	    }
			
 
				-		p{
			
 
				-			display: none;
			
 
				-		}
			
 
				-		.ms-news-show-icon{
			
 
				-			.ms-news-show-icon-title{
			
 
				-				display: block;
			
 
				-    			float: left;
			
 
				-			}
			
 
				-			.ms-news-show-icon-con{
			
 
				-				display: block;
			
 
				-			    overflow: hidden;
			
 
				-			    text-overflow: ellipsis;
			
 
				-			    white-space: nowrap;
			
 
				-			    width: 6rem;
			
 
				-			    float: left;
			
 
				-			}
			
 
				-			overflow: hidden;
			
 
				-			font-size: 1.3rem;
			
 
				-			color: #999;
			
 
				-			div{
			
 
				-				float: left;
			
 
				-				span{
			
 
				-					margin: 0 0.5rem;
			
 
				-				}
			
 
				-			}
			
 
				-			.ms-news-show-icon-clicks,.ms-news-show-icon-Fabulous{
			
 
				-				background-image: url(../images/pics.png);
			
 
				-			    width: 22px;
			
 
				-			    height: 15px;
			
 
				-			    margin-top: 0.4rem;
			
 
				-			    
			
 
				-			}
			
 
				-			.ms-news-show-icon-clicks{
			
 
				-				background-position: -11px 84px;
			
 
				-			}
			
 
				-			.ms-news-show-icon-Fabulous{
			
 
				-				background-position: -120px 85px;
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-	.ms-news-show-comment{
			
 
				-	    padding-top: 2rem;
			
 
				-	    padding-bottom: 1rem;
			
 
				-	    border-bottom: 1px solid #ddd;
			
 
				-		.ms-news-show-comment-top{
			
 
				-			margin-bottom: 1rem;
			
 
				-			.ms-news-show-comment-top-icon{
			
 
				-			    transition: all .6s;
			
 
				-				background-image: url(../images/pics.png);
			
 
				-			    width: 4rem;
			
 
				-			    height: 4rem;
			
 
				-			    background-position: -49px 49px;
			
 
				-			    background-color: #bababa;
			
 
				-			    border-radius: 50%;
			
 
				-			    margin: 0 auto;
			
 
				-			    cursor: pointer;
			
 
				-			}
			
 
				-			.ms-is-attention {
			
 
				-                background-color: #009bff;
			
 
				-            }
			
 
				-		}
			
 
				-		.ms-news-show-comment-bottom{
			
 
				-		    border-top: 1px solid #ddd;
			
 
				-		    padding-top: 1rem;
			
 
				-		    margin: 0 0.5rem;
			
 
				-			.ms-news-show-comment-input{
			
 
				-				/*margin-bottom: 1rem;*/
			
 
				-				border-bottom: 1px solid #ddd;
			
 
				-    			padding-bottom: 2rem;
			
 
				-				textarea{
			
 
				-					height: 3.3rem;
			
 
				-				    padding: 0.7rem;
			
 
				-				    background-color: #fafafa;
			
 
				-				    border: 1px solid #eee;
			
 
				-				    border-radius: 3px;
			
 
				-				    width: 100%;
			
 
				-				    outline:none;
			
 
				-				}
			
 
				-				textarea::-webkit-input-placeholder{
			
 
				-					color:#ccc;
			
 
				-					font-size: 1.4rem;
			
 
				-				}
			
 
				-				.ms-news-show-comment-button{
			
 
				-					overflow: hidden;
			
 
				-    				margin-top: 0.5rem;
			
 
				-					.ms-news-show-comment-expression{
			
 
				-						background-image: url(../images/pics.png);
			
 
				-					    background-position: -2px 37px;
			
 
				-					    width: 3rem;
			
 
				-					    height: 2rem;
			
 
				-					    float: left;
			
 
				-					    cursor: pointer;
			
 
				-					}
			
 
				-					.ms-news-show-comment-submit{
			
 
				-						width: 5rem;
			
 
				-					    background-color: #fafafa;
			
 
				-					    font-size: 1.4rem;
			
 
				-					    height: 2.5rem;
			
 
				-					    border-radius: 4px;
			
 
				-					    color: #ccc;
			
 
				-					    line-height: 2.5rem;
			
 
				-					    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-news-show-comment-whole{
			
 
				-				text-align: center;
			
 
				-				margin: 1rem 0;
			
 
				-			}
			
 
				-			.ms-news-show-comment-list{
			
 
				-				.ms-news-show-comment-list-div{
			
 
				-					overflow: hidden;
			
 
				-					border-bottom: 1px solid #ddd;
			
 
				-   					padding: 1rem 0;
			
 
				-					.ms-news-show-comment-list-left{
			
 
				-						overflow: hidden;
			
 
				-						float: left;
			
 
				-						width: 100%;
			
 
				-						.ms-news-show-comment-list-portrait{
			
 
				-							float: left;
			
 
				-							overflow: hidden;
			
 
				-							margin-right: 0.5rem;
			
 
				-							img{
			
 
				-								width: 4rem;
			
 
				-							    height: 4rem;
			
 
				-							    border-radius: 50%;
			
 
				-							}
			
 
				-						}
			
 
				-						.ms-news-show-comment-list-content{
			
 
				-							.ms-news-show-comment-list-top{
			
 
				-								width: 100%;
			
 
				-    							overflow: hidden;
			
 
				-							}
			
 
				-							.ms-news-show-comment-list-right{
			
 
				-								overflow: hidden;
			
 
				-								float: right;
			
 
				-		    					width: 11%;
			
 
				-								.ms-news-show-main-icon-Fabulous{
			
 
				-									background-position: -120px 85px;
			
 
				-									background-image: url(../images/pics.png);
			
 
				-								    width: 1.5rem;
			
 
				-								    height: 1.5rem;
			
 
				-								    margin-top: 0.3rem;
			
 
				-								    float: left;
			
 
				-								}
			
 
				-								.ms-news-show-main-icon-num{
			
 
				-		
			
 
				-								}
			
 
				-							}
			
 
				-							font-size: 1.2rem; 	
			
 
				-							overflow: hidden;
			
 
				-							.ms-news-show-comment-list-name,.ms-news-show-comment-list-time{
			
 
				-								color: #999;
			
 
				-							}
			
 
				-							.ms-news-show-comment-list-name{
			
 
				-								float: left;
			
 
				-							}
			
 
				-						}
			
 
				-					}
			
 
				-					
			
 
				-				}
			
 
				-				.ms-news-show-comment-more{
			
 
				-					text-align: center;
			
 
				-				    color: #999;
			
 
				-				    margin: 1rem 0;
			
 
				-				    font-size: 14px;
			
 
				-				}
			
 
				-
			
 
				-			}
			
 
				-		}
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/news-list.htm
+++ b/src/main/webapp/templets/1/default/m/news-list.htm
@@ -1,25 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

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

			
 
				-    <body>

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

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/case.png" class="am-img-responsive" alt=""/>

			
 
				-        </div>

			
 
				-        <div class="ms-news-list">

			
 
				-            <div data-am-widget="list_news" class="am-list-news am-list-news-default">

			
 
				-                <div class="am-list-news-bd">

			
 
				-                    <ul class="am-list">

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

			
 
				-	                        <li class="am-g am-list-item-dated">

			
 
				-	                            <a href="{ms:global.url/}[field.link/]" class="am-list-item-hd ">[field.title/]</a>

			
 
				-	                            <span class="am-list-date">[field.date?string("yyyy-mm-dd")/]</span>

			
 
				-	                        </li>

			
 
				-                       {/ms:arclist}

			
 
				-                    </ul>

			
 
				-                </div>

			
 
				-            </div>

			
 
				-        </div>

			
 
				-        <#include "/m/footer.htm"/>

			
 
				-    </body>

			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/news-show.htm
+++ b/src/main/webapp/templets/1/default/m/news-show.htm
@@ -1,244 +0,0 @@
 
				-<!DOCTYPE html>

			
 
				-<html>

			
 
				-    <head>

			
 
				-        <#include "/m/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 "/m/head.htm"/>

			
 
				-        <div class="ms-banner">

			
 
				-            <img src="{ms:global.host/}/{ms:global.style/}/images/case.png" class="am-img-responsive" alt="" />

			
 
				-        </div>

			
 
				-        <div class="ms-news-show" id="news-show-vue">

			
 
				-            <article class="am-article">

			
 
				-                <div class="am-article-hd ms-news-show-main">

			
 
				-                    <div class="ms-news-show-title">{ms:field.title/}</div>

			
 
				-                    <p class="am-article-meta">

			
 
				-                        <div class="ms-news-show-icon">

			
 
				-                            <div class="ms-news-show-icon-source"><lable class="ms-news-show-icon-title">来源：</lable><lable class="ms-news-show-icon-con">{ms:field.source/}</lable>

			
 
				-                                <span>|</span>

			
 
				-                            </div>

			
 
				-                            <div class="ms-news-show-icon-time">

			
 
				-                                <span>|</span>

			
 
				-                            </div>

			
 
				-                            <div class="ms-news-show-icon-clicks"></div>

			
 
				-                            <div class="ms-news-show-icon-num">{ms:field.hit/}

			
 
				-                                <span>|</span>

			
 
				-                            </div>

			
 
				-                            <!-- <div class="ms-news-show-icon-comment"></div>

			
 
				-                            <div class="ms-news-show-icon-num">52<span>|</span></div> -->

			
 
				-                            <div class="ms-news-show-icon-Fabulous"></div>

			
 
				-                            <div class="ms-news-show-icon-num" v-text="attentionNum"></div>

			
 
				-                        </div>

			
 
				-                    </p>

			
 
				-                </div>

			
 
				-                <div class="am-article-bd ms-news-show-content">{ms:field.content/}</div>

			
 
				-                <div class="metfield">

			
 
				-			        <p>上一篇：<a href="{ms:pre.link/}">{ms:pre.title/}</a></p>

			
 
				-			        <p>下一篇：<a href="{ms:next.link/}">{ms:next.title/}</a></p>

			
 
				-			    </div>

			
 
				-            </article>

			
 
				-            <div class="ms-news-show-comment">

			
 
				-                <div class="ms-news-show-comment-top">

			
 
				-                    <div class="ms-news-show-comment-top-icon" @click="attentionNews" :class="{'ms-is-attention':isAttention}"></div>

			
 
				-                </div>

			
 
				-                <div class="ms-news-show-comment-bottom">

			
 
				-                    <div class="ms-news-show-comment-input">

			
 
				-                        <textarea v-model='isButAttention' class="emotion" type="text" name="comments" placeholder="我有话说..."></textarea>

			
 
				-                        <div class="ms-news-show-comment-button">

			
 
				-                            <div class="ms-news-show-comment-expression" id="ms-face"></div>

			
 
				-                            <div class="ms-news-show-comment-submit" :class="{'ms-submit-comments-css':isButAttention.length > 0}" @click="submitComments()">提交</div>

			
 
				-                        </div>

			
 
				-                    </div>

			
 
				-                    <div class="ms-news-show-comment-whole">全部评论</div>

			
 
				-                    <div class="ms-news-show-comment-list">

			
 
				-                        <template v-for="(comments,index) in commentsList">

			
 
				-                            <div class="ms-news-show-comment-list-div" v-if="index <= listNum">

			
 
				-                                <div class="ms-news-show-comment-list-left">

			
 
				-                                    <div class="ms-news-show-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-news-show-comment-list-content">

			
 
				-                                        <div class="ms-news-show-comment-list-top">

			
 
				-                                            <div class="ms-news-show-comment-list-name" v-text="comments.puNickname"></div>

			
 
				-                                            <!-- <div class="ms-news-show-comment-list-right">

			
 
				-                                                <div class="ms-news-show-main-icon-Fabulous"></div>

			
 
				-                                                <div class="ms-news-show-main-icon-num">28</div>

			
 
				-                                            </div> -->

			
 
				-                                        </div>

			
 
				-                                        <div class="ms-news-show-comment-list-bottom">

			
 
				-                                            <div class="ms-news-show-comment-list-comment" v-html="vueAnalyticEmotion(comments.commentContent)"></div>

			
 
				-                                            <div class="ms-news-show-comment-list-time" v-text="comments.commentTime"></div>

			
 
				-                                        </div>

			
 
				-                                    </div>

			
 
				-                                </div>

			
 
				-                            </div>

			
 
				-                        </template>

			
 
				-                        <div class="ms-news-show-comment-more" @click="listNum = listNum +4" v-show="listNum < commentsList.length">查看更多评论</div>

			
 
				-                        <div class="ms-news-show-comment-more" v-show="listNum >= commentsList.length && commentsList.length != 0">没有更多评论</div>

			
 
				-                    </div>

			
 
				-                </div>

			
 
				-            </div>

			
 
				-        </div>

			
 
				-        <#include "/m/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/m/people/center.htm
+++ b/src/main/webapp/templets/1/default/m/people/center.htm
@@ -1,280 +0,0 @@
 
				-<!doctype html>
			
 
				-<html class="no-js">
			
 
				-	<head>
			
 
				-		<meta charset="utf-8">
			
 
				-		<title>修改资料</title>
			
 
				-		<#include "/head-file.htm" />
			
 
				-		<script src='{ms:global.host/}/plugins/plupload/plupload.full.min.js'></script>
			
 
				-	</head>
			
 
				-
			
 
				-	<body>
			
 
				-		<div class="ms-center ms-people-info am-page am-padding" id="mobile-index">
			
 
				-			<header class="demo-header am-text-center"><h3>个人信息</h3></header>
			
 
				-			<div id="widget-list">
			
 
				-				<ul class="am-list m-widget-list">
			
 
				-					<li class="am-g am-list-item-dated">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">用户名</a>
			
 
				-			          	<span class="am-list-date" v-text="peopleName"></span>
			
 
				-			      	</li>
			
 
				-
			
 
				-					<li class="am-g am-list-item-dated"  data-am-modal="{target: '#nike-prompt'}">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">昵称</a>
			
 
				-			          	<span class="am-list-date">
			
 
				-			          		<span v-text="peopleNike"></span>
			
 
				-			          		<i class="iconfont am-fr ms-iconfont">&#xe823;</i>
			
 
				-			          	</span>
			
 
				-			      	</li>
			
 
				-
			
 
				-					<li class="am-g am-list-item-dated"  data-am-modal="{target: '#name-prompt'}">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">真实姓名</a>
			
 
				-			          	<span class="am-list-date">
			
 
				-			          		<span v-text="peopleRealName"></span>
			
 
				-			          		<i class="iconfont am-fr ms-iconfont">&#xe823;</i>
			
 
				-			          	</span>
			
 
				-			      	</li>
			
 
				-
			
 
				-					<li class="am-g am-list-item-dated" data-am-modal="{target: '#sex-prompt'}">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">性别</a>
			
 
				-			          	<span class="am-list-date">
			
 
				-			          		<span v-text="peopleSex">女</span>
			
 
				-			          		<i class="iconfont am-fr ms-iconfont">&#xe823;</i>
			
 
				-			          	</span>
			
 
				-			      	</li>
			
 
				-
			
 
				-					<!-- <li class="am-g am-list-item-dated">
			
 
				-			          	<a href="{ms:global.host/}/people/address.do" class="am-list-item-hd ms-info-title">收货地址</a>
			
 
				-			          	<span class="am-list-date"><a class="ms-info-title ms-info-operate" href="{ms:global.host/}/people/address.do"><i class="iconfont am-fr ms-iconfont">&#xe823;</i></a></span>
			
 
				-			      	</li>
			
 
				- -->
			
 
				-					<!-- <li class="am-g am-list-item-dated">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">绑定邮箱</a>
			
 
				-			          	<span class="am-list-date">
			
 
				-				          	<a class="ms-info-title ms-info-operate" href="{ms:global.host/}/people/bind-email.do">
			
 
				-				          		<span v-text="peopleEmail"></span>
			
 
				-				          		<i class="iconfont am-fr ms-iconfont">&#xe823;</i>
			
 
				-				          	</a>
			
 
				-			          	</span>
			
 
				-			      	</li> -->
			
 
				-					<li class="am-g am-list-item-dated">
			
 
				-			          	<a href="javascript:;" class="am-list-item-hd ms-info-title">登录密码</a>
			
 
				-			          	<span class="am-list-date"><a class="ms-info-title ms-info-operate" href="{ms:global.host/}/people/password-change.do">去修改<i class="iconfont am-fr ms-iconfont">&#xe823;</i></a></span>
			
 
				-			      	</li>
			
 
				-
			
 
				-				</ul>
			
 
				-
			
 
				-				<v-touch type="button" class="am-btn am-btn-block am-btn-danger am-radius ms-center-button" v-on:tap="quitLogin">退出</v-touch>
			
 
				-
			
 
				-				<!-- <a href="{ms:global.host/}/people/center.do">
			
 
				-					<button type="button" class="am-btn am-btn-block am-btn-default am-radius ms-center-button">返回个人中心</button>
			
 
				-				</a> -->
			
 
				-				
			
 
				-			</div>
			
 
				-
			
 
				-
			
 
				-			<!-- 修改昵称 -->
			
 
				-			<div class="am-modal am-modal-prompt" id="nike-prompt">		
			
 
				-			  <div class="am-modal-dialog">
			
 
				-			    <div class="am-modal-hd">修改昵称</div>
			
 
				-			    <div class="am-modal-bd">
			
 
				-			      <input type="text" class="am-modal-prompt-input" v-model="changeNike">
			
 
				-			    </div>
			
 
				-			    <div class="am-modal-footer">
			
 
				-			    	<v-touch class="am-modal-btn" v-on:tap="updateNike">提交</v-touch>
			
 
				-			      	<v-touch class="am-modal-btn" data-am-modal-cancel v-on:tap="cancelNike">取消</v-touch>
			
 
				-			    </div>
			
 
				-			  </div>
			
 
				-			</div>
			
 
				-
			
 
				-			<!-- 修改真实姓名 -->
			
 
				-			<div class="am-modal am-modal-prompt" id="name-prompt">		
			
 
				-			  <div class="am-modal-dialog">
			
 
				-			    <div class="am-modal-hd">真实姓名</div>
			
 
				-			    <div class="am-modal-bd">
			
 
				-			      <input type="text" class="am-modal-prompt-input" v-model="changeName">
			
 
				-			    </div>
			
 
				-			    <div class="am-modal-footer">
			
 
				-			    	<v-touch class="am-modal-btn" v-on:tap="updateName">提交</v-touch>
			
 
				-			      	<v-touch class="am-modal-btn" data-am-modal-cancel v-on:tap="cancelName">取消</v-touch>
			
 
				-			    </div>
			
 
				-			  </div>
			
 
				-			</div>
			
 
				-			<!-- 修改性别 -->
			
 
				-			<div class="am-modal am-modal-no-btn" id="sex-prompt">	
			
 
				-			  <div class="am-modal-dialog">
			
 
				-			    <div class="am-modal-hd">修改性别
			
 
				-			      <a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close>&times;</a>
			
 
				-			    </div>
			
 
				-			    <v-touch v-on:tap="updateSex(1)" v-bind:class="{'active':sex1}">男</v-touch>
			
 
				-			    <v-touch class="ms-sex-padding" v-on:tap="updateSex(2)" v-bind:class="{'active':sex2}">女</v-touch>
			
 
				-			  </div>
			
 
				-			</div>
			
 
				-		</div>
			
 
				-
			
 
				-			
			
 
				-
			
 
				-
			
 
				-		<script type="text/javascript">
			
 
				-
			
 
				-				var vm = new Vue({
			
 
				-					el: "#mobile-index",
			
 
				-					data:{
			
 
				-						title: '编辑资料',
			
 
				-          				backBtn:"javascript:history.back()",
			
 
				-						peopleName:'加载中',
			
 
				-						peopleNike:"",
			
 
				-						peopleSex:"",
			
 
				-						peopleEmail:"",
			
 
				-						headSrc:"{ms:global.host/}/{ms:global.style/}/people/images/center-head.png",
			
 
				-						changeNike:"",
			
 
				-						sex1:false,
			
 
				-						sex2:false,
			
 
				-						peopleRealName:"",
			
 
				-						changeName:"",
			
 
				-					},
			
 
				-					methods:{
			
 
				-						//获取用户信息
			
 
				-						getInfo : function(){
			
 
				-							var _obj = this;
			
 
				-							mpeople.people.user.info(function(returnJson){	
			
 
				-								//获取用户名
			
 
				-								_obj.peopleName = returnJson.peopleName;
			
 
				-								//追加昵称
			
 
				-								_obj.peopleNike = returnJson.puNickname;
			
 
				-								_obj.changeNike = returnJson.puNickname;
			
 
				-								_obj.peopleRealName = returnJson.puRealName;
			
 
				-								_obj.changeName =  returnJson.puRealName;
			
 
				-								//追加邮箱
			
 
				-								_obj.peopleEmail = returnJson.peopleMail;
			
 
				-								//追加性别
			
 
				-								if(returnJson.puSex == 1){
			
 
				-									_obj.peopleSex = "男";
			
 
				-									_obj.sex1 = true;
			
 
				-								}else if(returnJson.puSex == 2){
			
 
				-									_obj.peopleSex = "女";
			
 
				-									_obj.sex2 = true;
			
 
				-								}else{
			
 
				-									_obj.peopleSex = "未知"
			
 
				-								}
			
 
				-								//有头像获取追加头像
			
 
				-								if(returnJson.puIcon != undefined){
			
 
				-									_obj.headSrc = "{ms:global.host/}"+returnJson.puIcon
			
 
				-								}
			
 
				-						    });								
			
 
				-										
			
 
				-						},
			
 
				-						//取消修改昵称
			
 
				-						cancelNike:function(){
			
 
				-							this.changeNike = this.peopleNike;
			
 
				-						},
			
 
				-						//取消修改真实姓名
			
 
				-						cancelName:function(){
			
 
				-							this.changeName = this.peopleRealName;
			
 
				-						},
			
 
				-						//修改真实姓名
			
 
				-						updateName:function(){
			
 
				-							var _obj = this;
			
 
				-							var pattern=new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]","i");
			
 
				-							if(_obj.changeName.indexOf(" ") >=0){
			
 
				-								alert("真实姓名不能为空格");
			
 
				-								this.changeName = this.peopleRealName;
			
 
				-								return;
			
 
				-							}
			
 
				-							if(pattern.test(this.peopleName)){
			
 
				-								alert("真实姓名不能为特殊字符");
			
 
				-								this.changeName = this.peopleRealName;
			
 
				-								return;
			
 
				-							}
			
 
				-							if(validator.isLength(_obj.changeName,{min:0,max:20})){
			
 
				-								var updateParam = "puRealName=" + _obj.changeName;
			
 
				-								mpeople.people.user.update(updateParam,function(returnJson){	//更新用户信息
			
 
				-									if(returnJson.result){
			
 
				-								        alert("修改成功");
			
 
				-					                    _obj.peopleRealName = _obj.changeName;
			
 
				-					                }
			
 
				-							    });
			
 
				-							}else{
			
 
				-								alert("真实姓名最大长度为20个字符");
			
 
				-								this.changeName = this.peopleRealName;
			
 
				-							}
			
 
				-						},
			
 
				-						//修改昵称
			
 
				-						updateNike : function(){
			
 
				-							var _obj = this;
			
 
				-							var pattern=new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]","i");
			
 
				-							if(_obj.changeNike.indexOf(" ") >=0){
			
 
				-								alert("昵称不能为空格");
			
 
				-								this.changeNike = this.peopleNike;
			
 
				-								return;
			
 
				-							}
			
 
				-							if(pattern.test(this.changeNike)){
			
 
				-								alert("昵称不能为特殊字符");
			
 
				-								this.changeNike = this.peopleNike;
			
 
				-								return;
			
 
				-							}
			
 
				-							if(validator.isLength(_obj.changeNike,{min:0,max:20})){
			
 
				-								var updateParam = "puNickname=" + _obj.changeNike;
			
 
				-								mpeople.people.user.update(updateParam,function(returnJson){	//更新用户信息
			
 
				-									if(returnJson.result){
			
 
				-								        alert("修改成功");
			
 
				-					                    _obj.peopleNike = _obj.changeNike;
			
 
				-					                }
			
 
				-							    });
			
 
				-							}else{
			
 
				-								alert("昵称最大长度为20个字符");
			
 
				-								this.changeNike = this.peopleNike;
			
 
				-							}
			
 
				-								
			
 
				-						},
			
 
				-
			
 
				-						//修改性别
			
 
				-						updateSex : function(data){
			
 
				-							var _obj = this;
			
 
				-							var updateParam = "puSex=" + data;
			
 
				-							if(data == 1){
			
 
				-								_obj.sex1 = true;
			
 
				-						       	_obj.sex2 = false;
			
 
				-							}else{
			
 
				-								_obj.sex1 = false;
			
 
				-						       	_obj.sex2 = true;
			
 
				-							}
			
 
				-							mpeople.people.user.update(updateParam,function(returnJson){	//更新用户信息
			
 
				-						        if(returnJson.result){
			
 
				-						        	if(data == 1){
			
 
				-						        		_obj.peopleSex = "男";
			
 
				-						        		_obj.sex1 = true;
			
 
				-						        		_obj.sex2 = false;
			
 
				-						        	}else if(data == 2){
			
 
				-						        		_obj.peopleSex = "女";
			
 
				-						        		_obj.sex1 = false;
			
 
				-						        		_obj.sex2 = true;
			
 
				-						        	}
			
 
				-							        alert("修改成功");
			
 
				-				                	$('#sex-prompt').modal('close');
			
 
				-				                }
			
 
				-						    });
			
 
				-						},		
			
 
				-
			
 
				-						//退出
			
 
				-						quitLogin : function(){
			
 
				-							mpeople.people.quit(function(){});
			
 
				-							alert("退出成功");
			
 
				-		                    location.href = ms.base+"/login.do";
			
 
				-						},
			
 
				-						
			
 
				-
			
 
				-					}
			
 
				-				});
			
 
				-				vm.getInfo();
			
 
				-				    
			
 
				-		</script>
			
 
				-		<!--[if (gte IE 9)|!(IE)]><!-->
			
 
				-		
			
 
				-		<!--<![endif]-->
			
 
				-		<!--[if lte IE 8 ]>
			
 
				-		<script src="http://libs.baidu.com/jquery/1.11.3/jquery.min.js"></script>
			
 
				-		<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
			
 
				-		<script src="assets/js/amazeui.ie8polyfill.min.js"></script>
			
 
				-		<![endif]-->
			
 
				-		<script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
			
 
				-	</body>
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/people/css/ms.mall.m.people.css
+++ b/src/main/webapp/templets/1/default/m/people/css/ms.mall.m.people.css
@@ -1,1371 +0,0 @@
 
				-.am-form input[type=number]:focus,
			
 
				-.am-form input[type=search]:focus,
			
 
				-.am-form input[type=text]:focus,
			
 
				-.am-form input[type=password]:focus,
			
 
				-.am-form input[type=datetime]:focus,
			
 
				-.am-form input[type=datetime-local]:focus,
			
 
				-.am-form input[type=date]:focus,
			
 
				-.am-form input[type=month]:focus,
			
 
				-.am-form input[type=time]:focus,
			
 
				-.am-form input[type=week]:focus,
			
 
				-.am-form input[type=email]:focus,
			
 
				-.am-form input[type=url]:focus,
			
 
				-.am-form input[type=tel]:focus,
			
 
				-.am-form input[type=color]:focus,
			
 
				-.am-form select:focus,
			
 
				-.am-form textarea:focus,
			
 
				-.am-form-field:focus {
			
 
				-  box-shadow: none;
			
 
				-}
			
 
				-/*收获地址列表样式*/
			
 
				-.address {
			
 
				-  font-size: 1em;
			
 
				-  margin: 0em auto;
			
 
				-  color: #fff;
			
 
				-  width: 93.75%;
			
 
				-  height: 3em;
			
 
				-  margin-top: .6em;
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-.ms-address-add .ms-list-news-border {
			
 
				-  padding: 0em 0em!important;
			
 
				-  margin-bottom: 2em!important;
			
 
				-  margin: 0em;
			
 
				-  padding: 0em 1em;
			
 
				-}
			
 
				-.ms-address-add .ms-list-news-border .ms-list-border {
			
 
				-  border-top: none!important;
			
 
				-  margin-bottom: 0.1em!important;
			
 
				-  padding: 1rem 1em;
			
 
				-  line-height: 2.5em;
			
 
				-}
			
 
				-.ms-address-add .ms-list-news-border .ms-list-border .am-list-item-hd {
			
 
				-  font-weight: 100;
			
 
				-}
			
 
				-.ms-address-add .ms-list-news-border .ms-list-border .ms-input {
			
 
				-  border: 0em;
			
 
				-  margin-top: 0.2em;
			
 
				-  width: 70%;
			
 
				-}
			
 
				-.ms-address-add .ms-list-news-border .ms-list-border .ms-address-default {
			
 
				-  width: 92%;
			
 
				-}
			
 
				-.ms-address-add .ms-list-border {
			
 
				-  border-top: none!important;
			
 
				-  margin-bottom: 0.1em!important;
			
 
				-  padding: 1rem 1em;
			
 
				-  line-height: 2.5em;
			
 
				-}
			
 
				-.ms-address-add .ms-list-border .am-list-item-hd {
			
 
				-  font-weight: 100;
			
 
				-}
			
 
				-.ms-address-add .ms-list-border .ms-input {
			
 
				-  border: 0em;
			
 
				-  margin-top: 0.2em;
			
 
				-  width: 70%;
			
 
				-}
			
 
				-.ms-address-add .ms-list-border .ms-address-default {
			
 
				-  width: 92%;
			
 
				-}
			
 
				-.ms-address-add .ms-address-add-btn {
			
 
				-  background: #fff;
			
 
				-  text-align: center;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-address-add .ms-address-add-btn .ms-save-address {
			
 
				-  font-size: 1em;
			
 
				-  margin: 0em auto;
			
 
				-  width: 93.75%;
			
 
				-  height: 3em;
			
 
				-  margin-top: .6em;
			
 
				-  margin-bottom: 0.6em;
			
 
				-  background: #f23030;
			
 
				-  color: #fff;
			
 
				-  line-height: 2em;
			
 
				-}
			
 
				-.ms-address-add .ms-address-add-btn .ms-back-address {
			
 
				-  font-size: 1em;
			
 
				-  margin: 0em auto;
			
 
				-  color: #fff;
			
 
				-  width: 93.75%;
			
 
				-  height: 3em;
			
 
				-  margin-top: .6em;
			
 
				-  margin-bottom: 0.6em;
			
 
				-  background: #f3f5f7;
			
 
				-  color: #999;
			
 
				-  line-height: 2em;
			
 
				-}
			
 
				-.ms-address-add .am-btn-group-stacked > .am-btn + .am-btn {
			
 
				-  margin: 0em auto;
			
 
				-}
			
 
				-
			
 
				-.ms-address {
			
 
				-  background: #f5f5f5;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border {
			
 
				-  padding: 0em 0em!important;
			
 
				-  margin-bottom: 6em!important;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url(http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif) no-repeat center;
			
 
				-  background-size: 15%;
			
 
				-  position: fixed;
			
 
				-  z-index: 1000;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-nothing {
			
 
				-  margin: 15px;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border {
			
 
				-  border-top: none!important;
			
 
				-  margin-bottom: 0.5em!important;
			
 
				-  padding: 0.7rem 1rem 0 1rem;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border .ms-contact-font {
			
 
				-  font-size: 1em;
			
 
				-  color: #232326;
			
 
				-  font-weight: 400!important;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border .ms-contact-address-font {
			
 
				-  color: #686868!important;
			
 
				-  font-size: 0.8em;
			
 
				-  -webkit-line-clamp: 1!important;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border .ms-contact-address-font .ms-sitem-tip {
			
 
				-  margin-right: 0.5em;
			
 
				-  padding: .2em .6em;
			
 
				-  background: #f23030;
			
 
				-  color: #fff;
			
 
				-  font-size: .875em;
			
 
				-  font-style: normal;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border .ms-address-border {
			
 
				-  padding: 0em 0em 0em .7em;
			
 
				-  margin-top: 0.6em;
			
 
				-  height: 2em;
			
 
				-  width: 2.2em;
			
 
				-  border-left: 0.06em solid #dedede;
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border .ms-list-border .ms-address-border .ms-address-del {
			
 
				-  color: black;
			
 
				-  font-size: 1em;
			
 
				-}
			
 
				-.ms-address .ms-list-news-border {
			
 
				-  margin: 0em;
			
 
				-  padding: 0em 1em;
			
 
				-  font-weight: 100!important;
			
 
				-}
			
 
				-.ms-address .ms-address-btn {
			
 
				-  background: #fff;
			
 
				-  text-align: center;
			
 
				-  position: fixed;
			
 
				-  bottom: 0;
			
 
				-  width: 100%;
			
 
				-  z-index: 6;
			
 
				-}
			
 
				-.ms-address .ms-address-btn .ms-new-address {
			
 
				-  font-size: 1em;
			
 
				-  background: #f23030;
			
 
				-  color: #fff;
			
 
				-  width: 93.75%;
			
 
				-  height: 3em;
			
 
				-  margin-top: .6em;
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-
			
 
				-.email-bind {
			
 
				-  background-color: #f6f6f6;
			
 
				-  height: 100%;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.email-bind .ms-background {
			
 
				-  background-color: #ffffff;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding {
			
 
				-  padding: 0 1em 1em 1em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-padding-right {
			
 
				-  text-align: left;
			
 
				-  padding-right: 0.2em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-email-input {
			
 
				-  width: 34%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-email-input input {
			
 
				-  margin: 0.4em 1em;
			
 
				-  outline: none;
			
 
				-  border: none;
			
 
				-  outline: medium;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-email-input .ms-width {
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-padding-left {
			
 
				-  padding-left: 0.2em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-padding-left .ms-font {
			
 
				-  color: #c70034;
			
 
				-  font-size: .8em;
			
 
				-  line-height: 2em;
			
 
				-  padding-left: 0.7em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-border {
			
 
				-  margin: 0.4em 0;
			
 
				-  height: 2em;
			
 
				-  width: 6.5em;
			
 
				-  border-left: 1px solid #d5d5d5;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-border .ms-font {
			
 
				-  color: #c70034;
			
 
				-  font-size: .8em;
			
 
				-  line-height: 2em;
			
 
				-  padding-left: 0.7em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group {
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-padding-right {
			
 
				-  text-align: left;
			
 
				-  padding-right: 0.2em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-padding-left {
			
 
				-  padding-left: 0.2em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-border {
			
 
				-  margin: 0.4em 0;
			
 
				-  height: 2em;
			
 
				-  width: 6.5em;
			
 
				-  border-left: 1px solid #d5d5d5;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-email-phone-width {
			
 
				-  width: 19%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-email-input {
			
 
				-  width: 34%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-email-input input {
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-email-phone-input {
			
 
				-  width: 81%;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-form-group .ms-email-phone-input input {
			
 
				-  margin: 0.4em 1em;
			
 
				-  outline: none;
			
 
				-  border: none;
			
 
				-  outline: medium;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-font-size {
			
 
				-  font-size: 0.7em;
			
 
				-  color: #999;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-font-size .ms-font-margin {
			
 
				-  margin: 1em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-margin {
			
 
				-  padding: 0 1em 1em 1em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-margin .ms-padding-left {
			
 
				-  padding-left: 0;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-margin .ms-font-margin {
			
 
				-  margin: 1em;
			
 
				-}
			
 
				-.email-bind .ms-background .ms-padding .ms-top-bottom {
			
 
				-  margin: 0.1em 0;
			
 
				-}
			
 
				-.email-bind .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url(http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif) no-repeat center;
			
 
				-  background-size: 15%;
			
 
				-  z-index: 1000;
			
 
				-}
			
 
				-.email-bind .ms-btn-background {
			
 
				-  border: none;
			
 
				-  background: #888;
			
 
				-}
			
 
				-.email-bind .am-form input[type=email] {
			
 
				-  border: none;
			
 
				-}
			
 
				-
			
 
				-div.ms-center {
			
 
				-  overflow: hidden;
			
 
				-  background-color: #f3f5f7;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin {
			
 
				-  margin-bottom: 0.5em;
			
 
				-  font-family: Arial, sans-serif;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-auto {
			
 
				-  text-align: center;
			
 
				-  padding: 0.5em;
			
 
				-  width: 33.33333333%;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg {
			
 
				-  background: url(../images/center-bg.png) no-repeat bottom;
			
 
				-  background-size: 100% 100%;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd {
			
 
				-  padding: 0em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list {
			
 
				-  margin: .6em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-portrait {
			
 
				-  margin-right: 1em;
			
 
				-  height: 73px;
			
 
				-  width: 73px;
			
 
				-  background: #f7f7f7;
			
 
				-  border-radius: 100%;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-portrait .ms-head {
			
 
				-  width: 73px;
			
 
				-  height: 73px;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-name-img {
			
 
				-  margin-top: .6em;
			
 
				-  padding-left: 0em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-name-img h3 {
			
 
				-  margin-bottom: .4em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-name-img h3 a {
			
 
				-  color: #ffffff;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-name-img .am-list-item-text {
			
 
				-  width: 7.4em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list .ms-center-name-img .am-list-item-text img {
			
 
				-  width: 100%;
			
 
				-  height: 100%;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-content-bg .am-list-news-hd .am-list > li {
			
 
				-  background-color: rgba(255, 255, 255, 0.05);
			
 
				-  border: none;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-color {
			
 
				-  color: #666;
			
 
				-  font-size: 0.95em;
			
 
				-  font-weight: 100;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-background-color {
			
 
				-  background-color: rgba(255, 255, 255, 0);
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-background-color .ms-update-padding {
			
 
				-  padding-top: 0.2em;
			
 
				-  padding-bottom: 0.3em;
			
 
				-}
			
 
				-div.ms-center .ms-panel-margin .ms-background-color .ms-update-padding .ms-font-color {
			
 
				-  color: #666;
			
 
				-}
			
 
				-div.ms-center .ms-margin {
			
 
				-  margin: 0;
			
 
				-}
			
 
				-div.ms-center .ms-delete-padding {
			
 
				-  padding: 0;
			
 
				-}
			
 
				-div.ms-center .ms-delete-padding .ms-menu-4 {
			
 
				-  padding: 0.5em;
			
 
				-  text-align: center;
			
 
				-}
			
 
				-div.ms-center .ms-delete-padding .ms-menu-4 .ms-color {
			
 
				-  color: #666;
			
 
				-  font-size: 1.6em;
			
 
				-}
			
 
				-div.ms-center .ms-delete-padding .ms-menu-4 .ms-font {
			
 
				-  font-size: 0.8em;
			
 
				-  color: #666;
			
 
				-  font-weight: 100;
			
 
				-}
			
 
				-div.ms-center .ms-delete-padding .ms-menu-4 img {
			
 
				-  margin: 0.5em 0;
			
 
				-}
			
 
				-div.ms-center .ms-center-title {
			
 
				-  border-bottom: white;
			
 
				-}
			
 
				-div.ms-center .ms-center-list {
			
 
				-  padding: 0px;
			
 
				-}
			
 
				-div.ms-center .ms-center-list .ms-center-address {
			
 
				-  margin-bottom: -0.6em;
			
 
				-}
			
 
				-div.ms-center .ms-center-list li {
			
 
				-  padding: 0.8em 1.0em;
			
 
				-  font-size: 0.9em;
			
 
				-  line-height: 1.8em;
			
 
				-}
			
 
				-div.ms-center .ms-center-list li span {
			
 
				-  color: #888;
			
 
				-}
			
 
				-div.ms-center .ms-center-list li .ms-center-address-border {
			
 
				-  border: white;
			
 
				-}
			
 
				-div.ms-center .ms-center-list .ms-center-button {
			
 
				-  width: 90%;
			
 
				-  margin: 1em auto;
			
 
				-}
			
 
				-div.ms-center .ms-center-list .ms-center-list-a {
			
 
				-  padding: 0;
			
 
				-  color: #555;
			
 
				-  display: inline;
			
 
				-}
			
 
				-div.ms-center .ms-center-list .ms-center-border-top {
			
 
				-  border-top: white;
			
 
				-}
			
 
				-div.ms-center .ms-center-list .ms-center-border-bottom {
			
 
				-  border-bottom: white;
			
 
				-}
			
 
				-div.ms-center .ms-footer {
			
 
				-  font-size: 0.6em;
			
 
				-  padding: 0;
			
 
				-}
			
 
				-div.ms-center .ms-sex-padding {
			
 
				-  padding-bottom: 1em;
			
 
				-}
			
 
				-div.ms-center .active {
			
 
				-  color: #dd514c;
			
 
				-}
			
 
				-div.ms-people-info {
			
 
				-  background-color: #fff;
			
 
				-}
			
 
				-div.ms-people-info .ms-info-title {
			
 
				-  color: #666;
			
 
				-}
			
 
				-div.ms-people-info .ms-iconfont {
			
 
				-  font-size: 1.4rem;
			
 
				-}
			
 
				-div.ms-people-info .am-list .am-list-item-dated a.ms-info-operate {
			
 
				-  padding-right: 0px;
			
 
				-}
			
 
				-div.ms-people-info .ms-center-button {
			
 
				-  margin-bottom: 10px;
			
 
				-}
			
 
				-
			
 
				-.ms-password-change {
			
 
				-  background: #f3f5f7 !important;
			
 
				-}
			
 
				-.ms-password-change .ms-form {
			
 
				-  margin: 1em;
			
 
				-}
			
 
				-.ms-password-change .ms-btn {
			
 
				-  color: #fff;
			
 
				-  background-color: #ddd;
			
 
				-}
			
 
				-.ms-password-change .ms-text {
			
 
				-  font-size: .8em;
			
 
				-  font-weight: 200;
			
 
				-}
			
 
				-
			
 
				-.ms-order-confirm {
			
 
				-  display: none;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position {
			
 
				-  position: relative;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding {
			
 
				-  padding-left: .1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding .ms-padding {
			
 
				-  padding-left: 1.5em;
			
 
				-  padding-top: 0.6em;
			
 
				-  font-size: 1.3em;
			
 
				-  color: #252525;
			
 
				-  font-weight: bold;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding .ms-padding .ms-padding-margin {
			
 
				-  margin-left: 0.3em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding .ms-margin {
			
 
				-  margin-top: 0;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding .ms-margin-text {
			
 
				-  margin-top: .5em;
			
 
				-  margin-left: .5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-update-padding .ms-text-color {
			
 
				-  color: #6e6e6e;
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  display: -webkit-box;
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-icon-top {
			
 
				-  margin-top: 1.3em;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-position .ms-order-confirm-background {
			
 
				-  position: absolute;
			
 
				-  bottom: -0.2em;
			
 
				-  left: 0;
			
 
				-  height: 0.2em;
			
 
				-  width: 100%;
			
 
				-  background: url(../images/location-border.png) repeat-x;
			
 
				-  background-size: 6.2em 0.2em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g {
			
 
				-  font-size: small;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding {
			
 
				-  padding-left: .1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding .ms-padding {
			
 
				-  padding-left: 1.5em;
			
 
				-  padding-top: 0.6em;
			
 
				-  font-size: 1.3em;
			
 
				-  color: #252525;
			
 
				-  font-weight: bold;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding .ms-padding .ms-padding-margin {
			
 
				-  margin-left: 0.3em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding .ms-margin {
			
 
				-  margin-top: 0;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding .ms-margin-text {
			
 
				-  margin-top: .5em;
			
 
				-  margin-left: .5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-update-padding .ms-text-color {
			
 
				-  color: #6e6e6e;
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  display: -webkit-box;
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-icon-top {
			
 
				-  margin-top: 1.3em;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-order-confirm .ms-g .ms-order-confirm-background {
			
 
				-  position: absolute;
			
 
				-  bottom: -0.2em;
			
 
				-  left: 0;
			
 
				-  height: 0.2em;
			
 
				-  width: 100%;
			
 
				-  background: url(../images/location-border.png) repeat-x;
			
 
				-  background-size: 6.2em 0.2em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title {
			
 
				-  width: 70%;
			
 
				-  font-size: 0.8em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul {
			
 
				-  margin: 0;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-text-color {
			
 
				-  color: #6e6e6e;
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  display: -webkit-box;
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-list-style {
			
 
				-  margin-left: -1.5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-list-style .ms-color {
			
 
				-  color: #d73d3c;
			
 
				-  font-size: 1.2em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-list-style .ms-icon-margin {
			
 
				-  margin-left: 1.5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-price-margin {
			
 
				-  margin-top: 0.5em;
			
 
				-  margin-left: -1.5em;
			
 
				-  padding-top: 1.5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-price-margin .ms-color {
			
 
				-  color: #d73d3c;
			
 
				-  font-size: 1.2em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-order-confirm-title .ms-order-confirm-ul .ms-price-margin .ms-icon-margin {
			
 
				-  margin-left: 1.5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-delete-margin {
			
 
				-  margin-bottom: 0;
			
 
				-}
			
 
				-.ms-order-confirm .ms-delete-margin .ms-panel-margin {
			
 
				-  margin-bottom: 1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-delete-margin .ms-panel-margin .ms-font-size {
			
 
				-  font-size: 1.1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-delete-margin .ms-panel-margin ms-panel-size {
			
 
				-  font-size: 1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-delete-margin .ms-textarea {
			
 
				-  width: 100%;
			
 
				-  border: .1em solid #dedede;
			
 
				-}
			
 
				-.ms-order-confirm .ms-center {
			
 
				-  text-align: center;
			
 
				-  color: #d73d3c;
			
 
				-  background-color: #fff;
			
 
				-}
			
 
				-.ms-order-confirm .ms-center .ms-center-size {
			
 
				-  font-size: 1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-center .ms-stress-size {
			
 
				-  font-size: 1.5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-footer-padding {
			
 
				-  padding: 1em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-footer-padding .ms-btn-padding {
			
 
				-  font-size: 1em;
			
 
				-  color: #ffdcd9;
			
 
				-  background-color: #f23030;
			
 
				-  border-color: #f23030;
			
 
				-}
			
 
				-.ms-order-confirm .ms-img-margin {
			
 
				-  margin-top: .5em;
			
 
				-}
			
 
				-.ms-order-confirm .ms-update-padding li,
			
 
				-.ms-order-confirm .ms-list-style {
			
 
				-  list-style: none;
			
 
				-}
			
 
				-
			
 
				-.ms-favorite .ms-favorite-list {
			
 
				-  margin: 0 1em;
			
 
				-}
			
 
				-.ms-favorite .ms-favorite-list .ms-favorite-li {
			
 
				-  border-top-color: white;
			
 
				-  margin-bottom: 0;
			
 
				-}
			
 
				-.ms-favorite .ms-favorite-list .ms-favorite-li .ms-favorite-title {
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  -webkit-box-orient: vertical;
			
 
				-  display: -webkit-box;
			
 
				-  font-size: 0.8em;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-favorite .ms-favorite-list .ms-favorite-li .ms-favorite-cancel {
			
 
				-  float: right;
			
 
				-  margin-top: 1em;
			
 
				-  border: 1px solid #cecdcd;
			
 
				-  padding: 0.5em 1em;
			
 
				-  border-radius: 0.5em;
			
 
				-  font-size: 0.6em;
			
 
				-  line-height: 1.5em;
			
 
				-}
			
 
				-.ms-favorite .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url(http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif) no-repeat center;
			
 
				-  background-size: 15%;
			
 
				-}
			
 
				-.ms-favorite .ms-nothing {
			
 
				-  margin: 15px;
			
 
				-}
			
 
				-
			
 
				-.ms-password-forget-2 {
			
 
				-  background-color: #f3f5f7;
			
 
				-  min-height: 25em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin {
			
 
				-  margin-top: 2em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-text-warning {
			
 
				-  color: #d73d3c;
			
 
				-  font-size: 1em;
			
 
				-  font-weight: 500;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-margin-text {
			
 
				-  margin-bottom: 1em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-margin-text .ms-text {
			
 
				-  font-size: .9em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-margin-text .ms-num {
			
 
				-  font-size: .85em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-monospace {
			
 
				-  margin-top: 5em;
			
 
				-  font-size: .9em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-monospace .ms-link-text {
			
 
				-  margin-left: -0.5em;
			
 
				-  text-decoration: underline;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .am-input-group .ms-btn {
			
 
				-  border-color: #f3f5f7;
			
 
				-  background-color: #ddd;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .am-input-group .ms-text {
			
 
				-  font-size: .9em;
			
 
				-}
			
 
				-.ms-password-forget-2 .ms-margin .ms-submit {
			
 
				-  color: #fff;
			
 
				-  margin-top: 2em;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-
			
 
				-.ms-password-forget-3 {
			
 
				-  background: #f3f5f7!important;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-form {
			
 
				-  margin: 1em;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-span {
			
 
				-  font-size: 0.8em;
			
 
				-  margin-left: 1.5em;
			
 
				-  margin-right: 1.5em;
			
 
				-  color: #383030;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-span .ms-btn {
			
 
				-  text-align: center;
			
 
				-  color: #fff;
			
 
				-  margin-top: 2em;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-span .ms-btn .ms-submit {
			
 
				-  color: #fff;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-span .ms-monospace {
			
 
				-  margin-top: 5em;
			
 
				-  font-size: .9em;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-span .ms-monospace .ms-link-text {
			
 
				-  margin-left: -0.5em;
			
 
				-  text-decoration: underline;
			
 
				-}
			
 
				-.ms-password-forget-3 .ms-text {
			
 
				-  font-size: .8em;
			
 
				-  font-weight: 200;
			
 
				-}
			
 
				-
			
 
				-.ms-password-forget {
			
 
				-  background: #f4f5f7;
			
 
				-  min-height: 25em;
			
 
				-}
			
 
				-.ms-password-forget .ms-form-group {
			
 
				-  margin-left: 1em;
			
 
				-  margin-right: 1em;
			
 
				-  margin-top: 1.5em;
			
 
				-}
			
 
				-.ms-password-forget .ms-form-group .ms-input-label {
			
 
				-  background-color: #fff;
			
 
				-  border: 1px solid #eee;
			
 
				-}
			
 
				-.ms-password-forget .ms-form-group input .ms-input-label {
			
 
				-  background-color: #fff;
			
 
				-  border: 1px solid #eee;
			
 
				-}
			
 
				-.ms-password-forget .ms-input-group {
			
 
				-  margin-left: 1em;
			
 
				-  margin-right: 1em;
			
 
				-}
			
 
				-.ms-password-forget .ms-input-group .ms-input-label {
			
 
				-  background-color: #fff;
			
 
				-  border: 1px solid #eee;
			
 
				-}
			
 
				-.ms-password-forget .ms-input-group .ms-input-label .ms-valiDateCode {
			
 
				-  border: 0.1em;
			
 
				-  height: 2em;
			
 
				-  border-color: #000000;
			
 
				-}
			
 
				-.ms-password-forget .ms-btn {
			
 
				-  margin-top: 1.5em;
			
 
				-  margin-left: 1em;
			
 
				-  margin-right: 1em;
			
 
				-  background-color: #ddd;
			
 
				-}
			
 
				-.ms-password-forget .ms-submit {
			
 
				-  color: #fff;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-password-forget .ms-input {
			
 
				-  height: 2em;
			
 
				-}
			
 
				-
			
 
				-div.ms-cart-goods {
			
 
				-  background: #f0f2f5;
			
 
				-  overflow: hidden;
			
 
				-  display: none;
			
 
				-}
			
 
				-div.ms-cart-goods .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url('http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif') no-repeat center #ffffff;
			
 
				-  background-size: 15%;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-one-checkbox {
			
 
				-  background: url(../images/cart-input.png) no-repeat;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-all-checkbox {
			
 
				-  background: url(../images/cart-input.png) no-repeat;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-active-checkbox {
			
 
				-  background: url(../images/cart-active.png) no-repeat;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-checkbox {
			
 
				-  padding-left: 8px;
			
 
				-  background-size: 20px;
			
 
				-  background-position: 2px 0px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-one-checkbox {
			
 
				-  padding-left: 26px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-all-checkbox {
			
 
				-  padding-left: 25px;
			
 
				-  background-position: 11px 0px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-nothing {
			
 
				-  margin: 15px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div {
			
 
				-  margin: 0.2em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-checkbox-margin {
			
 
				-  margin: 0.5em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-checkbox-min {
			
 
				-  margin-top: 2.1em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-img {
			
 
				-  width: 6.3em;
			
 
				-  margin-right: 1em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title {
			
 
				-  margin-right: 0.4em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-title {
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  -webkit-box-orient: vertical;
			
 
				-  display: -webkit-box;
			
 
				-  color: #757575;
			
 
				-  font-size: 0.8em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title #ms-cart-goods-price {
			
 
				-  font-size: 1em;
			
 
				-  color: red;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-right {
			
 
				-  margin-right: 0.3em;
			
 
				-  margin-top: 0.5em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-right .ms-cart-goods-btn {
			
 
				-  background-color: #fff;
			
 
				-  padding: .3em .3em;
			
 
				-  border-color: #eeeeee;
			
 
				-  width: 2em;
			
 
				-  text-align: center;
			
 
				-  line-height: 15px;
			
 
				-  float: left;
			
 
				-  border: 1px solid #eee;
			
 
				-  height: 24px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-right .ms-cart-num {
			
 
				-  width: 2.5em;
			
 
				-  border-left: none;
			
 
				-  border-right: none;
			
 
				-  padding: 0.2em 0.3em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-cf {
			
 
				-  clear: both;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-goods-div .ms-cart-goods-list-title .ms-cart-goods-edit {
			
 
				-  text-align: right;
			
 
				-  margin-right: 0.5em;
			
 
				-  font-size: 0.7em;
			
 
				-  width: 50px;
			
 
				-  float: right;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn {
			
 
				-  background: #fff;
			
 
				-  padding-bottom: 1em;
			
 
				-  box-shadow: 0px 0px 10px #888888;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn .ms-u-sm-margin {
			
 
				-  margin-top: 1em;
			
 
				-  padding-bottom: 10px;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn .ms-u-sm-padding {
			
 
				-  padding: 0em;
			
 
				-  margin-top: 1em;
			
 
				-  margin-left: -1.5em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn .ms-u-sm-padding .ms-fl {
			
 
				-  margin-left: 1.1em;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn .ms-price-padding {
			
 
				-  padding: 0em;
			
 
				-  margin-top: 1em;
			
 
				-  margin-left: -2em;
			
 
				-  color: red;
			
 
				-}
			
 
				-div.ms-cart-goods .ms-cart-btn .ms-buttom-margin {
			
 
				-  margin-top: 0.3em;
			
 
				-}
			
 
				-
			
 
				-.ms-people-heard .ms-admin-sidebar-list {
			
 
				-  margin-bottom: 0em;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li {
			
 
				-  border: none;
			
 
				-  margin-bottom: 0px;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li .ms-header {
			
 
				-  background: #efefef url(../images/header-bg.png) repeat-x 0 0;
			
 
				-  margin: 0em!important;
			
 
				-  color: #9d9ea0;
			
 
				-  font-weight: 100;
			
 
				-  background-size: 100% 2.5em;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li .ms-header .ms-titlebar-nav {
			
 
				-  text-align: center!important;
			
 
				-  color: #252525;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li h2 {
			
 
				-  margin-right: .6em;
			
 
				-  margin-left: .6em;
			
 
				-  font-size: 1.3em;
			
 
				-  color: #9d9ea0;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li .ms-g {
			
 
				-  background: #404042;
			
 
				-  color: #fff;
			
 
				-  text-align: center;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li .ms-g .am-icon-btn {
			
 
				-  background: #404042;
			
 
				-  color: #fff;
			
 
				-  line-height: 1.5em;
			
 
				-  height: 1.5em;
			
 
				-}
			
 
				-.ms-people-heard .ms-admin-sidebar-list li .ms-g .ms-icon-btn-font {
			
 
				-  font-size: small;
			
 
				-  font-weight: 100;
			
 
				-  line-height: 2em;
			
 
				-  color: #ffffff;
			
 
				-}
			
 
				-
			
 
				-.ms-login {
			
 
				-  background-color: #f3f5f7;
			
 
				-  display: none;
			
 
				-}
			
 
				-.ms-login .ms-health {
			
 
				-  margin: 0 auto;
			
 
				-  margin-top: 1em;
			
 
				-}
			
 
				-.ms-login .ms-health .iconfont {
			
 
				-  font-size: inherit;
			
 
				-}
			
 
				-.ms-login .ms-input-label {
			
 
				-  background-color: #fff;
			
 
				-}
			
 
				-.ms-login .ms-valiDateCode {
			
 
				-  border: 1px;
			
 
				-  height: 2em;
			
 
				-  border-color: #000000;
			
 
				-}
			
 
				-.ms-login .ms-login-form {
			
 
				-  margin-top: 1.6em;
			
 
				-}
			
 
				-.ms-login-form	input::-webkit-input-placeholder{
			
 
				-	color: #ccc;
			
 
				-	font-size:1.3rem;
			
 
				-}
			
 
				-.ms-login .ms-logBtn {
			
 
				-  background-color: #009aff;
			
 
				-  border-color: #009aff;
			
 
				-  margin: 0 auto;
			
 
				-  margin-top: 10%;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-center-button,#ms-password{
			
 
				-	background-color: #009aff;
			
 
				-  	border-color: #009aff;
			
 
				-}
			
 
				-.ms-login input {
			
 
				-  border-color: #d9dbda;
			
 
				-}
			
 
				-
			
 
				-.ms-order-list {
			
 
				-  background: #f3f5f7 !important;
			
 
				-  width: 100%;
			
 
				-  height: 100%;
			
 
				-}
			
 
				-.ms-order-list a {
			
 
				-  font-size: 0.8em;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs {
			
 
				-  margin: 0;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-active {
			
 
				-  background-color: #ffffff !important;
			
 
				-  line-height: 2.5em;
			
 
				-  border-bottom: 0.1em solid #f3f5f7;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-active .am-active {
			
 
				-  border-bottom: 0.1em solid #f15353;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-active .am-active a {
			
 
				-  color: #f15353;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-active .am-active:after {
			
 
				-  border-bottom-color: #ffffff;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-active a {
			
 
				-  font-weight: 600;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table {
			
 
				-  border: 0.1em solid #ffffff;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url(http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif) no-repeat center;
			
 
				-  background-size: 15%;
			
 
				-  position: fixed;
			
 
				-  z-index: 1000;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel {
			
 
				-  padding: 0em 0em 0em;
			
 
				-  background: #ffffff;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-nothing {
			
 
				-  margin: 15px;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all {
			
 
				-  background: #ffffff;
			
 
				-  padding-left: 0.8em;
			
 
				-  padding-right: 0.8em;
			
 
				-  margin: 0.8em 0 0.8em 0;
			
 
				-  border-bottom: 0.1em solid #f3f5f7;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-number {
			
 
				-  color: black;
			
 
				-  font-size: 0.9em;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-number .ms-order-state {
			
 
				-  font-size: 0.9em;
			
 
				-  line-height: 1em;
			
 
				-  color: #f15353;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-ul-list {
			
 
				-  margin-bottom: 0;
			
 
				-  margin: 0 0 0.4em 0;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-ul-list .ms-order-li {
			
 
				-  padding-top: 0;
			
 
				-  padding-bottom: 0;
			
 
				-  border: 0.1em solid #ffffff;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-ul-list .ms-order-li .ms-order-title {
			
 
				-  color: black;
			
 
				-  font-size: 0.9em;
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  -webkit-box-orient: vertical;
			
 
				-  display: -webkit-box;
			
 
				-  height: 4rem;
			
 
				-  line-height: 2rem;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-money {
			
 
				-  height: 3.8em;
			
 
				-  line-height: 3.8em;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-money .ms-money-color {
			
 
				-  color: red;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-money .ms-order-payment a {
			
 
				-  margin-top: 0.8em;
			
 
				-  border: 0.1em solid #f15353;
			
 
				-  color: #f15353;
			
 
				-  line-height: 2.2em;
			
 
				-  height: 2.2em;
			
 
				-  text-align: center;
			
 
				-  width: 6em;
			
 
				-  display: block;
			
 
				-  border-radius: 0.4em;
			
 
				-}
			
 
				-.ms-order-list .ms-order-tabs .ms-order-table .ms-order-tab-panel .ms-order-list-all .ms-order-money .ms-order-delete a {
			
 
				-  margin-top: 0.8em;
			
 
				-  border: 0.1em solid #9e9e9e;
			
 
				-  color: #9e9e9e;
			
 
				-  line-height: 2.2em;
			
 
				-  height: 2.2em;
			
 
				-  text-align: center;
			
 
				-  width: 6em;
			
 
				-  display: block;
			
 
				-  border-radius: 0.4em;
			
 
				-}
			
 
				-
			
 
				-.ms-order-comment .ms-order-comment-main {
			
 
				-  padding: .6em 1em;
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main form .ms-color {
			
 
				-  color: red;
			
 
				-  float: left;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .loading-pic {
			
 
				-  width: 100%;
			
 
				-  height: 300px;
			
 
				-  background: url(http://cdn.mingsoft.net/skin/manager/4.6.0/images/loading.gif) no-repeat center;
			
 
				-  background-size: 15%;
			
 
				-  z-index: 1000;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-imgComment {
			
 
				-  height: 4.5em;
			
 
				-  width: 4.5em;
			
 
				-  margin-right: 1em;
			
 
				-  float: left;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-order-comment-textarea {
			
 
				-  margin: 0.5em 0px;
			
 
				-  overflow: hidden;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-comment-pic {
			
 
				-  margin-bottom: 1em;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-comment-pic .ms-imgComment {
			
 
				-  height: 4.5em;
			
 
				-  width: 4.5em;
			
 
				-  margin-right: 1em;
			
 
				-  float: left;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-comment-pic .ms-float-left {
			
 
				-  float: left;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-comment-pic .ms-order-comment-img {
			
 
				-  width: 3em;
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-comment-pic .ms-clear {
			
 
				-  clear: both;
			
 
				-}
			
 
				-.ms-order-comment .ms-commentKuang {
			
 
				-  border: 0.1em solid #999;
			
 
				-  height: 13.5em;
			
 
				-  padding: 0.7em;
			
 
				-  overflow: hidden;
			
 
				-  margin-top: 1em;
			
 
				-}
			
 
				-.ms-order-comment  .ms-top {
			
 
				-  margin-top: 1em;
			
 
				-}
			
 
				-.ms-order-comment .ms-top .ms-right {
			
 
				-  margin-right: 3.5em;
			
 
				-}
			
 
				-.ms-order-comment .ms-top .ms-font-color {
			
 
				-  color: #7b7b7b;
			
 
				-  font-size: 0.88em;
			
 
				-}
			
 
				-.ms-order-comment .ms-top .ms-color {
			
 
				-  color: red;
			
 
				-  float: left;
			
 
				-}
			
 
				-.ms-order-comment .ms-order-comment-main .ms-btComment {
			
 
				-  background-color: #c00;
			
 
				-  margin-top: 1em;
			
 
				-  border: none;
			
 
				-  padding: 0.8em;
			
 
				-}
			
 
				-
			
 
				-.ms-list-item-text {
			
 
				-  margin-top: 3.5em;
			
 
				-  margin-top: 2em!important;
			
 
				-}
			
 
				-.ms-list-news-bd {
			
 
				-  border: 0;
			
 
				-}
			
 
				-.ms-order-detail-ul-bottom {
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-.ms-order-detail {
			
 
				-  background: #f3f5f7 !important;
			
 
				-  border: 0;
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-body {
			
 
				-  background-color: #fff!important;
			
 
				-}
			
 
				-.ms-order-detail .ms-panel {
			
 
				-  background-color: #fffaf4;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom {
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-g-size {
			
 
				-  font-size: small;
			
 
				-  padding-top: 0.5em;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-panel-height {
			
 
				-  height: .3em;
			
 
				-  margin-bottom: 0;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-panel-bd {
			
 
				-  background: url(../images/background.png);
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-orderdetail-img {
			
 
				-  overflow: hidden;
			
 
				-  background: url(../images/finish.png) no-repeat center center;
			
 
				-  background-size: 5.5em;
			
 
				-  margin-top: 3.5em;
			
 
				-  margin-top: 2em!important;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-orderdetail-li {
			
 
				-  list-style: none;
			
 
				-  font-size: small;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-orderdetail-float {
			
 
				-  margin-left: 0.5em;
			
 
				-  margin-bottom: 0.5em;
			
 
				-  margin-top: 0.5em;
			
 
				-  margin-right: 0.5em;
			
 
				-  list-style: none;
			
 
				-  font-size: small;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-panel-bd-hight {
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-margin-bottom .ms-panel-bd-hight .ms-order-a {
			
 
				-  color: black;
			
 
				-  margin-left: -0.3em;
			
 
				-}
			
 
				-.ms-order-detail .ms-list-news-default {
			
 
				-  margin: 0;
			
 
				-}
			
 
				-.ms-order-detail .ms-list-news-default .ms-order-detail-ul-bottom {
			
 
				-  margin-bottom: 0.6em;
			
 
				-}
			
 
				-.ms-order-detail .ms-list-news-default .ms-order-detail-ul-bottom .ms-list-margin {
			
 
				-  margin-left: 0.7em;
			
 
				-}
			
 
				-.ms-order-detail #ms-order-detail-img {
			
 
				-  padding-left: 0.5em;
			
 
				-}
			
 
				-.ms-order-detail .ms-orderdetail-a {
			
 
				-  font-size: small;
			
 
				-  color: black;
			
 
				-}
			
 
				-.ms-order-detail .ms-order-detail-title {
			
 
				-  overflow: hidden;
			
 
				-  text-overflow: ellipsis;
			
 
				-  -webkit-line-clamp: 2;
			
 
				-  display: -webkit-box;
			
 
				-  width: 70%;
			
 
				-  float: left;
			
 
				-  height: 3em;
			
 
				-}
			
 
				-.ms-order-detail .ms-fl {
			
 
				-  margin-right: 1em;
			
 
				-  color: red;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd {
			
 
				-  margin-bottom: 0;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd {
			
 
				-  padding-bottom: 0;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-price {
			
 
				-  margin-left: -0.3em;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-color {
			
 
				-  color: red;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-list-news {
			
 
				-  margin-right: 0;
			
 
				-  margin-left: 0;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-list-news .ms-list-textear {
			
 
				-  text-align: right;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-navbar-nav {
			
 
				-  background: #f3f5f7!important;
			
 
				-}
			
 
				-.ms-order-detail .ms-bd .ms-panelbd .ms-navbar-nav a {
			
 
				-  height: 37px;
			
 
				-}
			
 
				-
			
 
				-.ms-register {
			
 
				-  background-color: #f3f5f7;
			
 
				-  display: none;
			
 
				-}
			
 
				-.ms-register .ms-health {
			
 
				-  margin: 0 auto;
			
 
				-  margin-top: 1em;
			
 
				-}
			
 
				-.ms-health a{
			
 
				-	color: #009aff;
			
 
				-}
			
 
				-.ms-register .ms-health .iconfont {
			
 
				-  font-size: inherit;
			
 
				-}
			
 
				-.ms-register .ms-valiDateCode {
			
 
				-  border: 1px;
			
 
				-  height: 2em;
			
 
				-  border-color: #000000;
			
 
				-}
			
 
				-.ms-register .ms-login-form {
			
 
				-  margin-top: 1.6em;
			
 
				-}
			
 
				-.ms-register .ms-logBtn {
			
 
				-  background-color: #009aff;
			
 
				-  border-color: #009aff;
			
 
				-  margin: 0 auto;
			
 
				-  margin-top: 10%;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-register input {
			
 
				-  border-color: #d9dbda;
			
 
				-}
			
 
				-.ms-register .ms-input-bgcolor {
			
 
				-  background-color: #fff;
			
 
				-}
			
 
				-
			
 
				-.ms-pay-way {
			
 
				-  background: #f3f5f7;
			
 
				-}
			
 
				-.ms-pay-way .ms-order-info {
			
 
				-  border-bottom: 1px #ddd solid;
			
 
				-  margin-bottom: 10px;
			
 
				-  background: #fff;
			
 
				-  padding: 1em 1rem;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose {
			
 
				-  border-top: 1px #ddd solid;
			
 
				-  background: #fff;
			
 
				-  padding: 1rem;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .ms-group-radio {
			
 
				-  line-height: 2em;
			
 
				-  padding-left: 2em;
			
 
				-  padding-top: .2rem;
			
 
				-  font-weight: normal;
			
 
				-  padding-bottom: .2rem;
			
 
				-  width: 100%;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .ms-group-radio input[type=radio] {
			
 
				-  float: right;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .am-divider-dotted {
			
 
				-  margin: 0px;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .ms-zfb {
			
 
				-  background: url(../images/pay_zfb.png) 0 50% no-repeat;
			
 
				-  background-size: 1.5rem 1.5rem;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .ms-wx {
			
 
				-  background: url(../images/pay_wx.png) 0 50% no-repeat;
			
 
				-  background-size: 1.5rem 1.5rem;
			
 
				-}
			
 
				-.ms-pay-way .ms-pay-choose .ms-btn-submit {
			
 
				-  width: 100%;
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/head-file.htm
+++ b/src/main/webapp/templets/1/default/m/people/head-file.htm
@@ -1,52 +0,0 @@
 
				-<meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				-<meta name="description" content="{ms:global.descrip/}">
			
 
				-<meta name="keywords" content="{ms:global.keyword/}">
			
 
				-<meta name="viewport" id="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			
 
				-
			
 
				-<!-- Set render engine for 360 browser -->
			
 
				-<meta name="renderer" content="webkit">
			
 
				-
			
 
				-<!-- No Baidu Siteapp-->
			
 
				-<meta http-equiv="Cache-Control" content="no-siteapp" />
			
 
				-
			
 
				-<!-- Add to homescreen for Chrome on Android -->
			
 
				-<meta name="mobile-web-app-capable" content="yes">
			
 
				-<link rel="icon" sizes="192x192" href="{ms:global.host/}/global/images/logo.png">
			
 
				-
			
 
				-<!-- Add to homescreen for Safari on iOS -->
			
 
				-<meta name="apple-mobile-web-app-capable" content="yes">
			
 
				-<meta name="apple-mobile-web-app-status-bar-style" content="black">
			
 
				-<meta name="apple-mobile-web-app-title" content="Amaze UI" />
			
 
				-<link rel="apple-touch-icon-precomposed" href="{ms:global.host/}/global/images/logo.png">
			
 
				-
			
 
				-<!-- Tile icon for Win8 (144x144 + tile color) -->
			
 
				-<meta name="msapplication-TileImage" content="{ms:global.host/}/global/images/logo.png">
			
 
				-<meta name="msapplication-TileColor" content="#0e90d2">
			
 
				-
			
 
				-<!--引入样式-->
			
 
				-<!--小图标 -->
			
 
				-<link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
			
 
				-	
			
 
				-<link rel="stylesheet" href="{ms:global.host/}/plugins/amazeui/2.7.2/css/amazeui.min.css">
			
 
				-<link rel="stylesheet" href="{ms:global.host/}/plugins/amazeui/2.7.2/css/app.css">
			
 
				-<!-- vue框架所需要的资源 -->
			
 
				-<script src="{ms:global.host/}/plugins/hammerjs/2.0.8/hammer.min.js"></script>
			
 
				-<script src="{ms:global.host/}/plugins/vue/2.3.3/vue.min.js"></script>
			
 
				-<script src="{ms:global.host/}/plugins/vue.touch/2.0/vue-touch.js"></script>
			
 
				-	
			
 
				-	<!-- 铭飞接口 -->
			
 
				-<script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-<script src="{ms:global.host/}/plugins/seajs/3.0.0/sea.js"></script>
			
 
				-
			
 
				-<link rel="stylesheet" href="{ms:global.host/}/{ms:global.style/}/people/css/ms.mall.m.people.css">
			
 
				-
			
 
				-<script>
			
 
				-    ms.config({ 
			
 
				-        base:"{ms:global.host/}", 
			
 
				-        filter: {
			
 
				-            people:{
			
 
				-                loginUrl:"{ms:global.host/}" 
			
 
				-            }
			
 
				-        }
			
 
				-    }); 
			
 
				-</script>
			
--- a/src/main/webapp/templets/1/default/m/people/head.htm
+++ b/src/main/webapp/templets/1/default/m/people/head.htm
@@ -1,45 +0,0 @@
 
				-			<!--头部导航条-->
			
 
				-			<div class="ms-people-heard">
			
 
				-				<ul class="am-list admin-sidebar-list ms-admin-sidebar-list" id="collapase-nav-1">
			
 
				-					<li class="am-panel">
			
 
				-						<div data-am-widget="titlebar" class="am-titlebar am-titlebar-default ms-header">
			
 
				-							<a :href="backBtn">
			
 
				-								<h2 class="iconfont">&#xe80d;</h2>
			
 
				-							</a>
			
 
				-							<nav class="am-titlebar-nav ms-titlebar-nav">
			
 
				-								<p class="" v-text="title">加载中</p>
			
 
				-							</nav>
			
 
				-							<h2 class="iconfont" data-am-collapse="{parent: '#collapase-nav-1', target: '#user-nav'}">&#xe80c;</h2>
			
 
				-						</div>
			
 
				-						<ul class="am-list am-collapse " id="user-nav">
			
 
				-							<div class="am-g ms-g">
			
 
				-								<div class="am-u-sm-3">
			
 
				-									<a href="{ms:global.host/}">
			
 
				-										<span class="am-icon-btn"><i class="iconfont">&#xe818;</i></span>
			
 
				-										<div class="ms-icon-btn-font">首页</div>
			
 
				-									</a>
			
 
				-								</div>
			
 
				-								<div class="am-u-sm-3">
			
 
				-									<a href="{ms:global.host/}/people/favorite.do">
			
 
				-										<span class="am-icon-btn"><i class="iconfont">&#xe8de;</i></span>
			
 
				-										<div class="ms-icon-btn-font">收藏</div>
			
 
				-									</a>
			
 
				-								</div>
			
 
				-								<div class="am-u-sm-3">
			
 
				-									<a href="{ms:global.host/}/people/cart.do">
			
 
				-										<span class="am-icon-btn"><i class="iconfont">&#xe957;</i></span>
			
 
				-										<div class="ms-icon-btn-font">购物车</div>
			
 
				-									</a>
			
 
				-								</div>
			
 
				-								<div class="am-u-sm-3">
			
 
				-									<a href="{ms:global.host/}/people/center.do">
			
 
				-										<span class="am-icon-btn "><i class="iconfont">&#xe93e;</i></span>
			
 
				-										<div class="ms-icon-btn-font">个人中心</div>
			
 
				-									</a>
			
 
				-								</div>
			
 
				-							</div>
			
 
				-						</ul>
			
 
				-					</li>
			
 
				-				</ul>
			
 
				-			</div>
			
 
				-			
			
--- a/src/main/webapp/templets/1/default/m/people/images/background.png
+++ b/src/main/webapp/templets/1/default/m/people/images/background.png
--- a/src/main/webapp/templets/1/default/m/people/images/bg-upload.png
+++ b/src/main/webapp/templets/1/default/m/people/images/bg-upload.png
--- a/src/main/webapp/templets/1/default/m/people/images/btn.png
+++ b/src/main/webapp/templets/1/default/m/people/images/btn.png
--- a/src/main/webapp/templets/1/default/m/people/images/cart-active.png
+++ b/src/main/webapp/templets/1/default/m/people/images/cart-active.png
--- a/src/main/webapp/templets/1/default/m/people/images/cart-goods-top.png
+++ b/src/main/webapp/templets/1/default/m/people/images/cart-goods-top.png
--- a/src/main/webapp/templets/1/default/m/people/images/cart-input.png
+++ b/src/main/webapp/templets/1/default/m/people/images/cart-input.png
--- a/src/main/webapp/templets/1/default/m/people/images/cart.png
+++ b/src/main/webapp/templets/1/default/m/people/images/cart.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-bg.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-bg.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-head.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-head.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-icon_feedback.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-icon_feedback.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-icon_help.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-icon_help.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-icon_member.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-icon_member.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-icon_personal.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-icon_personal.png
--- a/src/main/webapp/templets/1/default/m/people/images/center-insider.png
+++ b/src/main/webapp/templets/1/default/m/people/images/center-insider.png
--- a/src/main/webapp/templets/1/default/m/people/images/cloth.jpg
+++ b/src/main/webapp/templets/1/default/m/people/images/cloth.jpg
--- a/src/main/webapp/templets/1/default/m/people/images/finish.png
+++ b/src/main/webapp/templets/1/default/m/people/images/finish.png
--- a/src/main/webapp/templets/1/default/m/people/images/header-bg.png
+++ b/src/main/webapp/templets/1/default/m/people/images/header-bg.png
--- a/src/main/webapp/templets/1/default/m/people/images/img.jpg
+++ b/src/main/webapp/templets/1/default/m/people/images/img.jpg
--- a/src/main/webapp/templets/1/default/m/people/images/location-border.png
+++ b/src/main/webapp/templets/1/default/m/people/images/location-border.png
--- a/src/main/webapp/templets/1/default/m/people/images/pay_wx.png
+++ b/src/main/webapp/templets/1/default/m/people/images/pay_wx.png
--- a/src/main/webapp/templets/1/default/m/people/images/pay_zfb.png
+++ b/src/main/webapp/templets/1/default/m/people/images/pay_zfb.png
--- a/src/main/webapp/templets/1/default/m/people/less/center.less
+++ b/src/main/webapp/templets/1/default/m/people/less/center.less
@@ -1,165 +0,0 @@
 
				-div.ms-center {
			
 
				-    overflow: hidden;
			
 
				-    background-color: #f3f5f7;
			
 
				-    //头像panel的样式
			
 
				-    .ms-panel-margin{
			
 
				-        margin-bottom: 0.5em;
			
 
				-        font-family: Arial, sans-serif;
			
 
				-        //头像下的导航居中样式
			
 
				-        .ms-auto{
			
 
				-            text-align: center;
			
 
				-			padding: 0.5em;
			
 
				-			width:33.33333333%;
			
 
				-        }
			
 
				-        //头像背景色样式
			
 
				-        .ms-content-bg{
			
 
				-            background: url(../images/center-bg.png) no-repeat bottom;
			
 
				-			background-size: 100% 100%;
			
 
				-			width: 100%;
			
 
				-            //我的订单部分的样式
			
 
				-            .am-list-news-hd{
			
 
				-                padding: 0em;
			
 
				-                .am-list{
			
 
				-                    margin: .6em;
			
 
				-                    .ms-center-portrait{
			
 
				-                        margin-right: 1em;
			
 
				-                        height: 73px;
			
 
				-                        width: 73px;
			
 
				-                        background: #f7f7f7;
			
 
				-                        border-radius: 100%;
			
 
				-                        .ms-head{
			
 
				-                            width: 73px;
			
 
				-                            height: 73px;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    .ms-center-name-img{
			
 
				-                        margin-top: .6em;
			
 
				-                        padding-left: 0em;
			
 
				-                        width:65%;
			
 
				-                        h3{
			
 
				-                            margin-bottom: .4em;
			
 
				-                            a{
			
 
				-                                color: #ffffff;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        .am-list-item-text{
			
 
				-                            width: 7.4em;
			
 
				-                            img{
			
 
				-                                width: 100%;
			
 
				-                                height: 100%;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                .am-list>li{
			
 
				-                    background-color: rgba(255, 255, 255, .05);
			
 
				-                    border: none;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        //字体颜色和大小
			
 
				-        .ms-color{
			
 
				-            color: #666;
			
 
				-			font-size: 0.95em;
			
 
				-			font-weight: 100;
			
 
				-        }
			
 
				-        .ms-background-color{
			
 
				-            background-color: rgba(255, 255, 255, 0);
			
 
				-            .ms-update-padding{
			
 
				-                padding-top: 0.2em;
			
 
				-                padding-bottom: 0.3em;
			
 
				-                .ms-font-color{
			
 
				-                    color: #666;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-margin{
			
 
				-        margin: 0;
			
 
				-    }
			
 
				-    .ms-delete-padding{
			
 
				-        padding: 0;
			
 
				-        .ms-menu-4{
			
 
				-            padding: 0.5em;
			
 
				-            text-align: center;
			
 
				-            .ms-color{
			
 
				-                color: #666;
			
 
				-                font-size: 1.6em;
			
 
				-            }
			
 
				-            .ms-font{
			
 
				-                font-size: 0.8em;
			
 
				-                color: #666;
			
 
				-                font-weight: 100;
			
 
				-            }
			
 
				-            img{
			
 
				-                margin: 0.5em 0;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-center-title{
			
 
				-        border-bottom: white;
			
 
				-    }
			
 
				-    //个人信息
			
 
				-    .ms-center-list{
			
 
				-        padding: 0px;
			
 
				-        .ms-center-address{
			
 
				-            margin-bottom: -0.6em;
			
 
				-        }
			
 
				-        li{
			
 
				-            padding: 0.8em 1.0em;
			
 
				-            font-size: 0.9em;
			
 
				-            line-height: 1.8em;
			
 
				-            span{
			
 
				-                color: #888;
			
 
				-            }
			
 
				-            .ms-center-address-border{
			
 
				-                border: white;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-center-button{
			
 
				-            width: 90%;
			
 
				-            margin: 1em auto;
			
 
				-        }
			
 
				-        .ms-center-list-a{
			
 
				-            padding: 0;
			
 
				-            color: #555;
			
 
				-            display: inline;
			
 
				-        }
			
 
				-        .ms-center-border-top{
			
 
				-            border-top: white;
			
 
				-        }
			
 
				-        .ms-center-border-bottom{
			
 
				-            border-bottom: white;
			
 
				-        }
			
 
				-    }
			
 
				-    //底部样式
			
 
				-    .ms-footer{
			
 
				-        font-size: 0.6em;
			
 
				-        padding: 0;
			
 
				-    }
			
 
				-    .ms-sex-padding{
			
 
				-        padding-bottom:1em;
			
 
				-    }
			
 
				-    .active{
			
 
				-        color: #dd514c;
			
 
				-    }
			
 
				-}
			
 
				-div.ms-people-info{
			
 
				-    background-color:#fff;
			
 
				-    .ms-info-title{
			
 
				-        color:#666;
			
 
				-    }
			
 
				-    .ms-iconfont{
			
 
				-        font-size: 1.4rem;
			
 
				-    }
			
 
				-    .am-list {
			
 
				-        .am-list-item-dated{
			
 
				-            a.ms-info-operate{
			
 
				-                padding-right: 0px
			
 
				-            }
			
 
				-        } 
			
 
				-    }
			
 
				-    .ms-center-button{
			
 
				-        margin-bottom: 10px;
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/less/head.less
+++ b/src/main/webapp/templets/1/default/m/people/less/head.less
@@ -1,43 +0,0 @@
 
				-.ms-people-heard{
			
 
				-    .ms-admin-sidebar-list{
			
 
				-        margin-bottom: 0em;
			
 
				-        li{
			
 
				-            border: none;
			
 
				-            margin-bottom: 0px;
			
 
				-            .ms-header{
			
 
				-                background: #efefef url(../images/header-bg.png) repeat-x 0 0;
			
 
				-                margin: 0em!important;
			
 
				-                color: #9d9ea0;
			
 
				-                font-weight: 100;
			
 
				-                background-size: 100% 2.5em;
			
 
				-                .ms-titlebar-nav{
			
 
				-                    text-align: center!important;
			
 
				-                    color: #252525;
			
 
				-                }
			
 
				-            }
			
 
				-            h2{
			
 
				-                margin-right: .6em;
			
 
				-                margin-left: .6em;
			
 
				-                font-size: 1.3em;
			
 
				-                color: #9d9ea0;
			
 
				-            }
			
 
				-            .ms-g{
			
 
				-                background: #404042;
			
 
				-                color: #fff;
			
 
				-                text-align: center;
			
 
				-                .am-icon-btn{
			
 
				-                    background: #404042;
			
 
				-                    color: #fff;
			
 
				-                    line-height: 1.5em;
			
 
				-                    height: 1.5em;
			
 
				-                }
			
 
				-                .ms-icon-btn-font{
			
 
				-                    font-size: small;
			
 
				-                    font-weight: 100;
			
 
				-                    line-height: 2em;
			
 
				-                    color: #ffffff;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/less/login.less
+++ b/src/main/webapp/templets/1/default/m/people/less/login.less
@@ -1,32 +0,0 @@
 
				-.ms-login {
			
 
				-	background-color: #f3f5f7;
			
 
				-	display: none;
			
 
				-	.ms-health {
			
 
				-		margin: 0 auto;
			
 
				-		margin-top: 1em;
			
 
				-		.iconfont {
			
 
				-			font-size: inherit;
			
 
				-		}
			
 
				-	}
			
 
				-	.ms-input-label {
			
 
				-		background-color: #fff;
			
 
				-	}
			
 
				-	.ms-valiDateCode {
			
 
				-		border: 1px;
			
 
				-        height: 2em;
			
 
				-        border-color: #000000;
			
 
				-	}
			
 
				-	.ms-login-form {
			
 
				-		margin-top: 1.6em;
			
 
				-	}
			
 
				-	.ms-logBtn {
			
 
				-		background-color: #f23030;
			
 
				-        border-color: #ff9793;
			
 
				-        margin: 0 auto;
			
 
				-        margin-top: 10%;
			
 
				-        width: 100%;
			
 
				-	}
			
 
				-	input {
			
 
				-		border-color: #d9dbda;
			
 
				-	}
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/less/password-change.less
+++ b/src/main/webapp/templets/1/default/m/people/less/password-change.less
@@ -1,15 +0,0 @@
 
				- @color: #f3f5f7;
			
 
				- .ms-password-change {
			
 
				-     background: @color!important;
			
 
				-     .ms-form {
			
 
				-         margin: 1em;
			
 
				-     }
			
 
				-     .ms-btn {
			
 
				-         color: #fff;
			
 
				-         background-color: #ddd;
			
 
				-     }
			
 
				-     .ms-text {
			
 
				-      font-size: .8em;
			
 
				-      font-weight: 200;
			
 
				-    }
			
 
				- }
			
--- a/src/main/webapp/templets/1/default/m/people/less/password-forget-1.less
+++ b/src/main/webapp/templets/1/default/m/people/less/password-forget-1.less
@@ -1,45 +0,0 @@
 
				- .ms-password-forget {
			
 
				-     background: #f4f5f7;
			
 
				-     min-height: 25em;
			
 
				-     .ms-form-group {
			
 
				-         margin-left: 1em;
			
 
				-         margin-right: 1em;
			
 
				-         margin-top: 1.5em;
			
 
				-         .ms-input-label {
			
 
				-             background-color: #fff;
			
 
				-             border: 1px solid #eee;
			
 
				-         }
			
 
				-         input {
			
 
				-             .ms-input-label {
			
 
				-                 background-color: #fff;
			
 
				-                 border: 1px solid #eee;
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				-     .ms-input-group {
			
 
				-         margin-left: 1em;
			
 
				-         margin-right: 1em;
			
 
				-         .ms-input-label {
			
 
				-             background-color: #fff;
			
 
				-             border: 1px solid #eee;
			
 
				-             .ms-valiDateCode {
			
 
				-                 border: 0.1em;
			
 
				-                 height: 2em;
			
 
				-                 border-color: #000000;
			
 
				-             }
			
 
				-         }
			
 
				-     }
			
 
				-     .ms-btn {
			
 
				-         margin-top: 1.5em;
			
 
				-         margin-left: 1em;
			
 
				-         margin-right: 1em;
			
 
				-         background-color: #ddd;
			
 
				-     }
			
 
				-     .ms-submit {
			
 
				-         color: #fff;
			
 
				-         width: 100%;
			
 
				-     }
			
 
				-     .ms-input {
			
 
				-         height: 2em;
			
 
				-     }
			
 
				- }
			
--- a/src/main/webapp/templets/1/default/m/people/less/password-forget-2.less
+++ b/src/main/webapp/templets/1/default/m/people/less/password-forget-2.less
@@ -1,43 +0,0 @@
 
				-.ms-password-forget-2 {
			
 
				-    background-color: #f3f5f7;
			
 
				-    min-height: 25em;
			
 
				-    .ms-margin {
			
 
				-        margin-top: 2em;
			
 
				-        .ms-text-warning {
			
 
				-            color: #d73d3c;
			
 
				-            font-size: 1em;
			
 
				-            font-weight: 500;
			
 
				-        }
			
 
				-        .ms-margin-text {
			
 
				-            margin-bottom: 1em;
			
 
				-            .ms-text {
			
 
				-                font-size: .9em;
			
 
				-            }
			
 
				-            .ms-num {
			
 
				-                font-size: .85em;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-monospace {
			
 
				-            margin-top: 5em;
			
 
				-            font-size: .9em;
			
 
				-            .ms-link-text {
			
 
				-                margin-left: -0.5em;
			
 
				-                text-decoration: underline;
			
 
				-            }
			
 
				-        }
			
 
				-        .am-input-group {
			
 
				-            .ms-btn {
			
 
				-                border-color: #f3f5f7;
			
 
				-                background-color: #ddd;
			
 
				-            }
			
 
				-            .ms-text {
			
 
				-                font-size: .9em;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-submit {
			
 
				-            color: #fff;
			
 
				-            margin-top: 2em;
			
 
				-            width: 100%;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/less/password-forget-3.less
+++ b/src/main/webapp/templets/1/default/m/people/less/password-forget-3.less
@@ -1,33 +0,0 @@
 
				-.ms-password-forget-3 {
			
 
				-    background: #f3f5f7!important;
			
 
				-    .ms-form {
			
 
				-        margin: 1em;
			
 
				-    }
			
 
				-    .ms-span {
			
 
				-        font-size: 0.8em;
			
 
				-        margin-left: 1.5em;
			
 
				-        margin-right: 1.5em;
			
 
				-        color: #383030;
			
 
				-        .ms-btn {
			
 
				-            text-align: center;
			
 
				-            color: #fff;
			
 
				-            margin-top: 2em;
			
 
				-            .ms-submit {
			
 
				-                color: #fff;
			
 
				-                width: 100%;
			
 
				-            }
			
 
				-        }
			
 
				-        .ms-monospace {
			
 
				-            margin-top: 5em;
			
 
				-            font-size: .9em;
			
 
				-            .ms-link-text {
			
 
				-                margin-left: -0.5em;
			
 
				-                text-decoration: underline;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-text {
			
 
				-        font-size: .8em;
			
 
				-        font-weight: 200;
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/less/register.less
+++ b/src/main/webapp/templets/1/default/m/people/less/register.less
@@ -1,32 +0,0 @@
 
				-.ms-register {
			
 
				-    background-color: #f3f5f7;
			
 
				-    display:none;
			
 
				-    .ms-health{
			
 
				-        margin: 0 auto;
			
 
				-        margin-top: 1em;
			
 
				-        .iconfont{
			
 
				-            font-size: inherit;
			
 
				-        }
			
 
				-    }
			
 
				-    .ms-valiDateCode{
			
 
				-        border: 1px;
			
 
				-        height: 2em;
			
 
				-        border-color: #000000;
			
 
				-    }
			
 
				-    .ms-login-form {
			
 
				-        margin-top: 1.6em;
			
 
				-    }
			
 
				-    .ms-logBtn {
			
 
				-		background-color: #f23030;
			
 
				-        border-color: #ff9793;
			
 
				-        margin: 0 auto;
			
 
				-        margin-top: 10%;
			
 
				-        width: 100%;
			
 
				-	}
			
 
				-    input {
			
 
				-		border-color: #d9dbda;
			
 
				-	}
			
 
				-    .ms-input-bgcolor{
			
 
				-        background-color: #fff;
			
 
				-    }
			
 
				-}
			
--- a/src/main/webapp/templets/1/default/m/people/login.htm
+++ b/src/main/webapp/templets/1/default/m/people/login.htm
@@ -1,172 +0,0 @@
 
				-<!doctype html>
			
 
				-<html class="no-js">
			
 
				-	<head>
			
 
				-		<meta charset="utf-8">
			
 
				-		<title>登录</title>
			
 
				-    	<#include "/head-file.htm" />
			
 
				-	</head>
			
 
				-
			
 
				-	<body style="background-color: #f3f5f7;">
			
 
				-		<!--头部导航条-->
			
 
				-		<div class="ms-people-heard">
			
 
				-			<ul class="am-list admin-sidebar-list ms-admin-sidebar-list" id="collapase-nav-1">
			
 
				-				<li class="am-panel">
			
 
				-					<div data-am-widget="titlebar" class="am-titlebar am-titlebar-default ms-header">
			
 
				-						<h2 class="iconfont" onclick="javascript:history.back(-1);">&#xe80d;</h2>
			
 
				-						<nav class="am-titlebar-nav ms-titlebar-nav">
			
 
				-							<p class="">登录</p>
			
 
				-						</nav>
			
 
				-						<h2 class="iconfont"></h2>
			
 
				-					</div>
			
 
				-					
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-		</div>
			
 
				-		<!--头部导航条end-->
			
 
				-		<div class="ms-login" id="vue-ms-login">
			
 
				-			<form class="am-form ms-login-form">
			
 
				-				<fieldset>
			
 
				-					<div class="am-form-group">
			
 
				-						<input type="text" v-model="peopleName" name="peopleName" class="am-form-field  am-radius" placeholder="用户名/已绑定邮箱" v-on:input="active" maxlength="30">
			
 
				-					</div>
			
 
				-
			
 
				-					<div class="am-form-group">
			
 
				-
			
 
				-						<input type="password" v-model="peoplePassword" name="peoplePassword" class="am-form-field  am-radius" placeholder="请输入密码" v-on:input="active" maxlength="20">
			
 
				-					</div>
			
 
				-
			
 
				-					<div class="am-form-group am-input-group">
			
 
				-
			
 
				-						<input type="text" v-model="rand_code" name="rand_code" class=" am-form-field am-radius" placeholder="必填，4个字符" v-on:input="active"  maxlength="4">
			
 
				-						<span class="am-input-group-label ms-input-label">
			
 
				-							<img src="" v-on:click="code" class="ms-valiDateCode am-fr" id="codeImg"/>
			
 
				-						</span>
			
 
				-					</div>
			
 
				-					<v-touch type="button" v-on:tap="login" v-bind:class="{'am-disabled':isActive}" class="am-btn am-btn-danger am-radius ms-logBtn" data-am-loading="{loadingText: '登录中...'}">登 录</v-touch>
			
 
				-
			
 
				-					<div class="ms-health">
			
 
				-						<div>
			
 
				-							<a href="#">
			
 
				-								<i class="iconfont">&#xe98d;</i>找回密码
			
 
				-							</a>
			
 
				-							<a href="{ms:global.host/}/register.do" class="am-fr">
			
 
				-								<i class="iconfont">&#xe683;</i>快速注册
			
 
				-							</a>
			
 
				-						</div>
			
 
				-					</div>
			
 
				-				</fieldset>
			
 
				-			</form>
			
 
				-		</div>
			
 
				-		
			
 
				-		<script type="text/javascript">
			
 
				-			//vue文档：https://cn.vuejs.org/v2/guide/
			
 
				-			//touch文档：https://github.com/vuejs/vue-touch/tree/next
			
 
				-			ms.load(["ms","ms.people","ms.mweixin"],function(ms,mpeople,mweixin){
			
 
				-				var vm = new Vue({
			
 
				-				  	el: '#vue-ms-login',
			
 
				-				  	data:{
			
 
				-				  		isActive:true,  //设置一个状态 为true的时候 登录按钮禁用，false时按钮启用
			
 
				-					  	peopleName:'',  //定义登录表单的model值，便于获取表单元素值进行操作
			
 
				-					  	peoplePassword:'',
			
 
				-					  	rand_code:'',
			
 
				-				  	},
			
 
				-				  	created: function () {  //在vue创建后显示整个登录页面内容
			
 
				-				  		$(".ms-login").show();
			
 
				-				  	},
			
 
				-				  	methods:{
			
 
				-				  		active: function(){
			
 
				-				  			//判断用户名、密码、验证码都输入后才启动登录按钮
			
 
				-						    if (!validator.isNull(this.rand_code) && !validator.isNull(this.peoplePassword) && !validator.isNull(this.peopleName)){
			
 
				-						    	this.isActive = false;
			
 
				-						    }else{
			
 
				-						    	this.isActive = true;
			
 
				-						    }
			
 
				-				  		},
			
 
				-				  		//调用登录接口
			
 
				-						login: function (){
			
 
				-							var _obj = this
			
 
				-							var $this = event.target;
			
 
				-							$($this).button('loading');
			
 
				-							_obj.isActive = true;
			
 
				-						    //验证用户名
			
 
				-						    if (!validator.isLength(_obj.peopleName,{min:3,max:30})){
			
 
				-						        alert("用户名为3~30个字符");
			
 
				-						        _obj.isActive = false;
			
 
				-						        $($this).button('reset');
			
 
				-						        return;
			
 
				-						    }else{
			
 
				-						    	if(_obj.peopleName.indexOf(" ") >=0){
			
 
				-						    		alert("用户名不能包含空格");
			
 
				-							        _obj.isActive = false;
			
 
				-							        $($this).button('reset');
			
 
				-							        return;
			
 
				-						    	}
			
 
				-						    }
			
 
				-						    //验证密码
			
 
				-						    if (!validator.isLength(_obj.peoplePassword,{min:6,max:20})){
			
 
				-						        alert("密码为6~20个字符");
			
 
				-						        _obj.isActive = false;
			
 
				-						        $($this).button('reset');
			
 
				-						        return;
			
 
				-						    }
			
 
				-						    //验证验证码
			
 
				-						    if (_obj.rand_code.length !== 4){
			
 
				-						        alert("验证码为4位字符");
			
 
				-						        _obj.isActive = false;
			
 
				-						        $($this).button('reset');
			
 
				-						        return;
			
 
				-						    }
			
 
				-						    //判断登录表信息是否填入正确  并返回相应的参数
			
 
				-						    mpeople.checkLogin($(".ms-login-form").serialize(),function(json){
			
 
				-						        if (json.result) {
			
 
				-						            location.href='{ms:global.host/}/people/center.do'
			
 
				-						            
			
 
				-						        }else{
			
 
				-						            alert(json.resultMsg);
			
 
				-						            vm.code();
			
 
				-						        }
			
 
				-						        _obj.isActive = false;
			
 
				-						        $($this).button('reset');
			
 
				-						    });
			
 
				-						},
			
 
				-				  		//点击更换验证码
			
 
				-						code: function (event) {								
			
 
				-							ms.code("codeImg");
			
 
				-					    },
			
 
				-					    //如果已登录则跳转到个人中心
			
 
				-					    center:function(){
			
 
				-					    	mpeople.checkLoginStatus(function(json) {
			
 
				-								if(mweixin.isWeixin()) {
			
 
				-									if(json.result) {
			
 
				-										location.href='{ms:global.host/}/people/center.do'
			
 
				-									}else{
			
 
				-										location.href=mweixin.authLink({link:location.href,appId:"wx7cce6e06b8270c8a"});
			
 
				-									}
			
 
				-								}else{
			
 
				-									if(json.result) {
			
 
				-										location.href='{ms:global.host/}/people/center.do'
			
 
				-									}
			
 
				-								}
			
 
				-
			
 
				-							})
			
 
				-					    }
			
 
				-				  	}
			
 
				-				})
			
 
				-				vm.code();
			
 
				-				vm.center();
			
 
				-			})
			
 
				-		</script>
			
 
				-
			
 
				-
			
 
				-
			
 
				-		<!--[if (gte IE 9)|!(IE)]><!-->
			
 
				-		<!--<![endif]-->
			
 
				-		<!--[if lte IE 8 ]>
			
 
				-		<script src="http://libs.baidu.com/jquery/1.11.3/jquery.min.js"></script>
			
 
				-		<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
			
 
				-		<script src="assets/js/amazeui.ie8polyfill.min.js"></script>
			
 
				-		<![endif]-->
			
 
				-		<script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
			
 
				-	</body>
			
 
				-
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/people/password-change.htm
+++ b/src/main/webapp/templets/1/default/m/people/password-change.htm
@@ -1,101 +0,0 @@
 
				-<!doctype html>
			
 
				-<html class="no-js">
			
 
				-
			
 
				-  <head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <title>修改密码</title>
			
 
				-
			
 
				-    <#include "/head-file.htm" />
			
 
				-
			
 
				-  </head>
			
 
				-
			
 
				-
			
 
				-  <body style="background-color:#f3f5f7;">
			
 
				-    <div class="ms-password-change" id="vue-ms-password-change">
			
 
				-      <!--头部导航条-->
			
 
				-      <#include "/head.htm" />
			
 
				-
			
 
				-      <!--添加收获地址列表-->
			
 
				-      <form class="am-form ms-form">
			
 
				-        <div class="am-form-group">
			
 
				-          <label for="doc-ipt-email-1" class="ms-text">请填写旧密码</label>
			
 
				-          <input type="password" v-model="peopleOldPassword" v-on:input="active" name="peopleOldPassword" class="ms-text" id="doc-ipt-email-1" placeholder="请填写旧密码">
			
 
				-        </div>
			
 
				-        <div class="am-form-group">
			
 
				-          <label for="doc-ipt-pwd-1" class="ms-text">请填写新密码</label>
			
 
				-          <input type="password" v-model="peoplePassword" v-on:input="active"  name="peoplePassword" class="ms-text" id="doc-ipt-pwd-1" placeholder="6-20位，不能与旧密码相同">
			
 
				-        </div>
			
 
				-          <v-touch type="button" v-on:tap="changePassword" v-bind:class="{'am-disabled':isActive}" class="am-btn am-btn-danger am-radius  am-btn-block" id='ms-password'>确认</v-touch>
			
 
				-      </form>
			
 
				-      <div>
			
 
				-      <script type="text/javascript">
			
 
				-      ms.load(["ms","ms.people"],function(ms,mpeople){
			
 
				-        var vu = new Vue({
			
 
				-          el: '#vue-ms-password-change',
			
 
				-          data:{
			
 
				-            title:'修改密码',
			
 
				-            backBtn:"javascript:history.back()",
			
 
				-            isActive:true,
			
 
				-            peopleOldPassword:"",
			
 
				-            peoplePassword:"",
			
 
				-          },
			
 
				-          methods: {
			
 
				-            active: function(){
			
 
				-              //判断用户名、密码、验证码都输入后才启动登录按钮
			
 
				-              if (!validator.isNull(this.peopleOldPassword) && !validator.isNull(this.peoplePassword)){
			
 
				-                this.isActive = false;
			
 
				-              }else{
			
 
				-                this.isActive = true;
			
 
				-              }
			
 
				-            },
			
 
				-            changePassword: function(event){
			
 
				-
			
 
				-              if(!validator.isLength(this.peopleOldPassword,{min:6,max:20})){
			
 
				-                alert("旧密码为6-20个字符");
			
 
				-                return;
			
 
				-              }
			
 
				-              if(!validator.isLength(this.peoplePassword,{min:6,max:20})){
			
 
				-                alert("新密码为6-20个字符");
			
 
				-                return;
			
 
				-              }
			
 
				-              if(this.peoplePassword.indexOf(" ") >=0){
			
 
				-                alert("新密码不能包含空格");
			
 
				-                return;
			
 
				-              }
			
 
				-              if(this.peopleOldPassword == this.peoplePassword){
			
 
				-                alert("新密码不能与旧密码相同");
			
 
				-              }else{
			
 
				-               ms.people.changePassword($("form").serialize(),function(returnJson){
			
 
				-                    if(returnJson.result){
			
 
				-                      alert("密码修改成功，请重新登录")
			
 
				-                      $.ajax({
			
 
				-			                    type: "POST",
			
 
				-			                    url: "{ms:global.host/}/people/quit.do",
			
 
				-			                    success: function(msg) {
			
 
				-			                    }
			
 
				-			                })
			
 
				-                      location.href="{ms:global.host/}/login.do";
			
 
				-                    }else{
			
 
				-                      alert("旧密码错误");
			
 
				-                    };
			
 
				-                })
			
 
				-              }
			
 
				-            
			
 
				-            }
			
 
				-          }
			
 
				-        });
			
 
				-      });
			
 
				-      </script>
			
 
				-
			
 
				-        <!--[if (gte IE 9)|!(IE)]><!-->
			
 
				-        
			
 
				-        <!--<![endif]-->
			
 
				-        <!--[if lte IE 8 ]>
			
 
				-<script src="http://libs.baidu.com/jquery/1.11.3/jquery.min.js"></script>
			
 
				-<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
			
 
				-<script src="assets/js/amazeui.ie8polyfill.min.js"></script>
			
 
				-<![endif]-->
			
 
				-        <script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
			
 
				-  </body>
			
 
				-
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/m/people/register.htm
+++ b/src/main/webapp/templets/1/default/m/people/register.htm
@@ -1,191 +0,0 @@
 
				-<!doctype html>
			
 
				-<html class="no-js">
			
 
				-	<head>
			
 
				-		<meta charset="utf-8">
			
 
				-		<title>注册</title>
			
 
				-    	<#include "/head-file.htm" />
			
 
				-	</head>
			
 
				-
			
 
				-	<body style="background-color:#f3f5f7;">
			
 
				-		<!--头部导航条-->
			
 
				-		<div class="ms-people-heard">
			
 
				-			<ul class="am-list admin-sidebar-list ms-admin-sidebar-list" id="collapase-nav-1">
			
 
				-				<li class="am-panel">
			
 
				-					<div data-am-widget="titlebar" class="am-titlebar am-titlebar-default ms-header">
			
 
				-						<h2 class="iconfont" onclick="javascript:history.back(-1);">&#xe80d;</h2>
			
 
				-						<nav class="am-titlebar-nav ms-titlebar-nav">
			
 
				-							<p class="">注册</p>
			
 
				-						</nav>
			
 
				-						<h2 class="iconfont"></h2>
			
 
				-					</div>
			
 
				-					
			
 
				-				</li>
			
 
				-			</ul>
			
 
				-		</div>
			
 
				-		<!--头部导航条end-->
			
 
				-		<div class="ms-register" id="vue-ms-register">
			
 
				-			<form class="am-form ms-login-form">
			
 
				-				<fieldset>
			
 
				-					<div class="am-form-group">
			
 
				-						<input type="text" name="peopleName" v-model="peopleName" class="am-form-field  am-radius" placeholder="用户名3-30位字符" v-on:input="active" maxlength="30">
			
 
				-					</div>
			
 
				-					<div class="am-form-group">
			
 
				-						<input type="password" name="peoplePassword" v-model="peoplePassword" class="am-form-field  am-radius" placeholder="请设置6-20登录密码" v-on:input="active" maxlength="20">
			
 
				-					</div>
			
 
				-					<div class="am-form-group">
			
 
				-						<input type="password" name="rePassword" v-model="rePassword" class="am-form-field  am-radius" placeholder="确认密码" v-on:input="active" maxlength="20">
			
 
				-					</div>
			
 
				-					<!--div class="am-form-group">
			
 
				-						<input type="email" name="peopleMail" v-model="peopleMail" class="am-form-field  am-radius" placeholder="输入常用邮箱" v-on:input="active">
			
 
				-					</div-->
			
 
				-					<div class="am-form-group am-input-group">
			
 
				-						<input type="text" name="rand_code" v-model="rand_code" class="am-form-field am-radius" placeholder="请输入验证码" v-on:input="active" maxlength="4">
			
 
				-						<v-touch  v-on:tap="randCode" class="am-input-group-label ms-input-bgcolor">
			
 
				-							<img id="picCode" class="ms-valiDateCode am-fr"/>
			
 
				-						</v-touch>
			
 
				-					</div>
			
 
				-					<p>
			
 
				-						<v-touch type="button" v-on:tap="register" v-bind:class="{'am-disabled':isActive}"  class="am-btn am-btn-danger am-radius ms-logBtn" data-am-loading="{loadingText: '注册中...'}">注册</v-touch>
			
 
				-					</p>
			
 
				-					<small>注意：邮箱仅由于保存，注册成功后可到会员中心绑定邮箱，绑定成功后可用邮箱登录</small>
			
 
				-				</fieldset>
			
 
				-			</form>
			
 
				-		</div>
			
 
				-		<script type="text/javascript">
			
 
				-		ms.load(["ms","ms.people","ms.mweixin"],function(ms,mpeople,mweixin){
			
 
				-			if(mweixin.isWeixin()) {
			
 
				-			    location.href=mweixin.authLink({link:location.href,appId:"wx7cce6e06b8270c8a"});
			
 
				-			}
			
 
				-			var vue = new Vue({
			
 
				-			    el: '#vue-ms-register',
			
 
				-			    data:{
			
 
				-			    	peopleName:'',  //定义注册表单的model值，便于获取表单元素值进行操作
			
 
				-			    	peoplePassword:'',
			
 
				-			    	rePassword:'',
			
 
				-			    	peopleMail:'',
			
 
				-			    	rand_code:'',
			
 
				-			    	isActive:true,  //设置一个状态 为true的时候 注册按钮禁用，false时按钮启用
			
 
				-			    },
			
 
				-			  	created: function () {  //在vue创建后显示整个注册页面内容
			
 
				-			  		$(".ms-register").show();
			
 
				-			  	},
			
 
				-				methods: {
			
 
				-					active: function(){
			
 
				-			  			//判断用户名、密码、确认密码、邮箱、验证码都输入后才启动登录按钮
			
 
				-					    if (!validator.isNull(this.peopleName) && !validator.isNull(this.peoplePassword) && !validator.isNull(this.rePassword) && !validator.isNull(this.rand_code)){
			
 
				-					    	this.isActive = false;
			
 
				-					    }else{
			
 
				-					    	this.isActive = true;
			
 
				-					    }
			
 
				-			  		},
			
 
				-			  		//注册
			
 
				-					register: function(){
			
 
				-						var _obj = this;
			
 
				-						var $this = event.target;
			
 
				-						$($this).button('loading');
			
 
				-						_obj.isActive = true;
			
 
				-            			var pattern=new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]","i");
			
 
				-
			
 
				-						//验证用户名
			
 
				-					    if (!validator.isLength(this.peopleName,{min:3,max:30})){
			
 
				-					        alert("用户名为3-30个字符");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }else{
			
 
				-					    	if(this.peopleName.indexOf(" ") >=0){
			
 
				-					    		alert("用户名不能包含空格");
			
 
				-					    		_obj.isActive = false;
			
 
				-					    		$($this).button('reset');
			
 
				-					        	return;
			
 
				-					    	}
			
 
				-					    	if(pattern.test(this.peopleName)){
			
 
				-				                alert("用户名不能包含特殊字符");
			
 
				-					    		_obj.isActive = false;
			
 
				-					    		$($this).button('reset');
			
 
				-					        	return;
			
 
				-			                }
			
 
				-					    }
			
 
				-					    //验证密码
			
 
				-					    if (!validator.isLength(this.peoplePassword,{min:6,max:20})){
			
 
				-					        alert("密码为6~20个字符");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }else{
			
 
				-					    	if(this.peoplePassword.indexOf(" ") >=0){
			
 
				-					    		alert("密码不能包含空格");
			
 
				-					    		_obj.isActive = false;
			
 
				-					    		$($this).button('reset');
			
 
				-					        	return;
			
 
				-					    	}
			
 
				-					    }
			
 
				-					    //确认密码
			
 
				-					    if (!validator.isLength(this.peoplePassword,{min:6,max:20})){
			
 
				-					        alert("密码为6~20个字符");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }else if(this.peoplePassword != this.rePassword){
			
 
				-					    	alert(" 两次密码输入不一致");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }
			
 
				-					    //邮箱验证
			
 
				-					    /*if (!validator.isEmail(this.peopleMail)){
			
 
				-					        alert("请输入正确的邮箱");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }*/
			
 
				-					    //验证验证码
			
 
				-					    if (this.rand_code.length !== 4){
			
 
				-					        alert("验证码为4位字符");
			
 
				-					        _obj.isActive = false;
			
 
				-					        $($this).button('reset');
			
 
				-					        return;
			
 
				-					    }
			
 
				-						//接口调用
			
 
				-					    mpeople.register($("form").serialize(),function(returnJson){
			
 
				-					    	if(returnJson.result) {
			
 
				-					        	alert('注册成功');
			
 
				-					        	location.href='{ms:global.host/}/login.do';
			
 
				-					        }else{
			
 
				-					        	alert(returnJson.resultMsg);
			
 
				-					        	_obj.isActive = false;
			
 
				-					        	$($this).button('reset');
			
 
				-					        	vue.randCode();
			
 
				-					        }
			
 
				-					    })
			
 
				-					},
			
 
				-					randCode: function(){
			
 
				-					    //验证码加载与点击刷新
			
 
				-					    ms.code("picCode");
			
 
				-					},
			
 
				-					//如果已登录则跳转到个人中心
			
 
				-				    center:function(){
			
 
				-				    	mpeople.checkLoginStatus(function(json) {
			
 
				-							if(json.result) {
			
 
				-								location.href='{ms:global.host/}/people/center.do'
			
 
				-							}
			
 
				-						})
			
 
				-				    }
			
 
				-				}
			
 
				-			})
			
 
				-			vue.randCode();
			
 
				-			vm.center();
			
 
				-		})
			
 
				-		</script>
			
 
				-		<!--[if (gte IE 9)|!(IE)]><!-->
			
 
				-		<script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
			
 
				-		<!--<![endif]-->
			
 
				-		<!--[if lte IE 8 ]>
			
 
				-		<script src="http://libs.baidu.com/jquery/1.11.3/jquery.min.js"></script>
			
 
				-		<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
			
 
				-		<script src="assets/js/amazeui.ie8polyfill.min.js"></script>
			
 
				-		<![endif]-->
			
 
				-		<script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
			
 
				-	</body>
			
 
				-
			
 
				-</html>
			
--- a/src/main/webapp/templets/1/default/menu-left.htm
+++ b/src/main/webapp/templets/1/default/menu-left.htm
@@ -1,10 +1,10 @@
 
				 <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/}/53/index.html'>
			
 
				+        <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/}/59/index.html'>
			
 
				+        <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'>
			
@@ -13,7 +13,7 @@
 
				         <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/}/19/141/index.html>
			
 
				+        <a target="_blank" href='{ms:global.url/}/lianxiwomen19/lianxiwomen/index.html'>
			
 
				             <li>联系我们<span class="ms-content-left-li-more">></span></li>
			
 
				         </a>
			
 
				     </ul>
			
--- a/src/main/webapp/templets/1/default/people/login.htm
+++ b/src/main/webapp/templets/1/default/people/login.htm
@@ -58,7 +58,7 @@
 
				         <div class="ms-footer">
			
 
				             <p>
			
 
				                 <span>
			
 
				-                    <a href='{ms:global.url/}/53/index.html'>关于我们</a>
			
 
				+                    <a href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				                 </span>
			
 
				                 <span>|</span>
			
 
				                 <span>
			
@@ -66,7 +66,7 @@
 
				                 </span>
			
 
				                 <span>|</span>
			
 
				                 <span>
			
 
				-                    <a target="_blank" href='{ms:global.url/}/19/index.html'>联系我们</a>
			
 
				+                    <a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
			
 
				                 </span>
			
 
				             </p>
			
 
				             <p>版权所有 @铭飞科技有限公司2012-2018保留一切权利</p>
			
--- a/src/main/webapp/templets/1/default/people/register.htm
+++ b/src/main/webapp/templets/1/default/people/register.htm
@@ -47,7 +47,7 @@
 
				             <div class="ms-footer">
			
 
				                 <p>
			
 
				                     <span>
			
 
				-                        <a href='{ms:global.url/}/53/index.html'>关于我们</a>
			
 
				+                        <a href='{ms:global.url/}/guanyuwomen53/index.html'>关于我们</a>
			
 
				                     </span>
			
 
				                     <span>|</span>
			
 
				                     <span>
			
@@ -55,7 +55,7 @@
 
				                     </span>
			
 
				                     <span>|</span>
			
 
				                     <span>
			
 
				-                        <a target="_blank" href='{ms:global.url/}/19/index.html'>联系我们</a>
			
 
				+                        <a target="_blank" href='{ms:global.url/}/lianxiwomen19/index.html'>联系我们</a>
			
 
				                     </span>
			
 
				                 </p>
			
 
				                 <p>版权所有 @铭飞科技有限公司2012-2018保留一切权利</p>