Skip to content

C
cms_sys
Commit 47003f17 authored by ms-dev's avatar ms-dev
Browse files
Options

优化静态资源文件、优化默认皮肤

parent d4f31141
Expand all Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 126 deletions
src/main/webapp/html/1/index.html 0 → 100644
View file @ 47003f17
This diff is collapsed.
src/main/webapp/html/1/m/index.html 0 → 100644
View file @ 47003f17
This diff is collapsed.
src/main/webapp/static/plugins/element-ui/2.8.2/index.css 0 → 100644
View file @ 47003f17
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/plugins/element-ui/2.8.2/index.js 0 → 100644
View file @ 47003f17
This diff is collapsed.
src/main/webapp/static/plugins/less/3.9.0/less.min.js 0 → 100644
View file @ 47003f17
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/templets/1/default/head-file.htm
View file @ 47003f17
<title>{ms:global.name/}</title> <title>{ms:global.name/}</title>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/iconfont/1.0.0/iconfont.css" /> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/advice.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/advice.less">
...@@ -9,22 +9,11 @@ ...@@ -9,22 +9,11 @@
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-list.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-list.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-show.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/news-show.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/center.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/center.less">
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="{ms:global.host/}/{ms:global.style/}/js/slider.js"></script> <script src="{ms:global.host/}/{ms:global.style/}/js/slider.js"></script>
<script src="http://cdn.mingsoft.net/plugins/less/2.5.3/less.min.js"></script> <script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/seajs/3.0.0/sea.js"></script> <script src="{ms:global.host/}/static/plugins/seajs/3.0.0/sea.js"></script>
<script src="http://cdn.mingsoft.net/model/1.0.0/main.min.js"></script>
<!--vue-懒加载-表单验证--> <!--vue-懒加载-表单验证-->
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script> <script src="{ms:global.host/}/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/validator/5.5.0/validator.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/animate.css"> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/animate.css">
<script>
ms.config({
base: "{ms:global.host/}",
filter: {
people: {
loginUrl: '{ms:global.host/}'
}
}
});
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/index.htm
View file @ 47003f17
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<#include "head-file.htm"> <#include "head-file.htm">
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
<script type="text/javascript" src="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script> <script type="text/javascript" src="{ms:global.host/}/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
</head> </head>
<body> <body>
......
src/main/webapp/templets/1/default/m/head-file.htm
View file @ 47003f17
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<title>{ms:global.name/}</title> <title>{ms:global.name/}</title>
<meta charset="utf-8"> <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"> <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="http://cdn.mingsoft.net/plugins/amazeui/2.7.2/css/amazeui.min.css" /> <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="http://cdn.mingsoft.net/plugins/iconfont/1.0.0/iconfont.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/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/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/about.less" />
...@@ -11,14 +11,13 @@ ...@@ -11,14 +11,13 @@
<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-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/news-show.less" />
<link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/advice.less" /> <link rel="stylesheet" type="text/less" href="{ms:global.host/}/{ms:global.style/}/less/advice.less" />
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="http://cdn.mingsoft.net/plugins/amazeui/2.7.2/js/amazeui.min.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/}/{ms:global.style/}/js/jiaoben.js"></script>
<script src="http://cdn.mingsoft.net/plugins/seajs/3.0.0/sea.js"></script> <script src="{ms:global.host/}/plugins/seajs/3.0.0/sea.js"></script>
<script src="http://cdn.mingsoft.net/model/1.0.0/main.min.js"></script>
<!--vue-懒加载-表单验证--> <!--vue-懒加载-表单验证-->
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script> <script src="{ms:global.host/}/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/validator/5.5.0/validator.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"> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/style.css">
<script> <script>
ms.config({ ms.config({
......
src/main/webapp/templets/1/default/m/index.htm
View file @ 47003f17
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<#include "/m/head-file.htm"> <#include "/m/head-file.htm">
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
<script type="text/javascript" src="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script> <script type="text/javascript" src="{ms:global.host/}/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
<body> <body>
<#include "/m/head.htm"> <#include "/m/head.htm">
<div id="indexVue"> <div id="indexVue">
......
src/main/webapp/templets/1/default/m/people/center.htm
View file @ 47003f17
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>修改资料</title> <title>修改资料</title>
<#include "/head-file.htm" /> <#include "/head-file.htm" />
<script src='http://cdn.mingsoft.net/plugins/plupload/plupload.full.min.js'></script> <script src='{ms:global.host/}/plugins/plupload/plupload.full.min.js'></script>
</head> </head>
<body> <body>
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<script type="text/javascript"> <script type="text/javascript">
ms.load(["ms","ms.people","ms.upload"],function(ms,mpeople,mupload){
var vm = new Vue({ var vm = new Vue({
el: "#mobile-index", el: "#mobile-index",
...@@ -267,8 +266,6 @@ ...@@ -267,8 +266,6 @@
}); });
vm.getInfo(); vm.getInfo();
});
</script> </script>
<!--[if (gte IE 9)|!(IE)]><!--> <!--[if (gte IE 9)|!(IE)]><!-->
...@@ -278,6 +275,6 @@ ...@@ -278,6 +275,6 @@
<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script> <script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
<script src="assets/js/amazeui.ie8polyfill.min.js"></script> <script src="assets/js/amazeui.ie8polyfill.min.js"></script>
<![endif]--> <![endif]-->
<script src="http://cdn.mingsoft.net/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script> <script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/head-file.htm
View file @ 47003f17
...@@ -11,33 +11,32 @@ ...@@ -11,33 +11,32 @@
<!-- Add to homescreen for Chrome on Android --> <!-- Add to homescreen for Chrome on Android -->
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<link rel="icon" sizes="192x192" href="http://cdn.mingsoft.net/global/images/logo.png"> <link rel="icon" sizes="192x192" href="{ms:global.host/}/global/images/logo.png">
<!-- Add to homescreen for Safari on iOS --> <!-- Add to homescreen for Safari on iOS -->
<meta name="apple-mobile-web-app-capable" content="yes"> <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-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Amaze UI" /> <meta name="apple-mobile-web-app-title" content="Amaze UI" />
<link rel="apple-touch-icon-precomposed" href="http://cdn.mingsoft.net/global/images/logo.png"> <link rel="apple-touch-icon-precomposed" href="{ms:global.host/}/global/images/logo.png">
<!-- Tile icon for Win8 (144x144 + tile color) --> <!-- Tile icon for Win8 (144x144 + tile color) -->
<meta name="msapplication-TileImage" content="http://cdn.mingsoft.net/global/images/logo.png"> <meta name="msapplication-TileImage" content="{ms:global.host/}/global/images/logo.png">
<meta name="msapplication-TileColor" content="#0e90d2"> <meta name="msapplication-TileColor" content="#0e90d2">
<!--引入样式--> <!--引入样式-->
<!--小图标 --> <!--小图标 -->
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/iconfont/1.0.0/iconfont.css" /> <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
<link rel="stylesheet" href="http://cdn.mingsoft.net/plugins/amazeui/2.7.2/css/amazeui.min.css"> <link rel="stylesheet" href="{ms:global.host/}/plugins/amazeui/2.7.2/css/amazeui.min.css">
<link rel="stylesheet" href="http://cdn.mingsoft.net/plugins/amazeui/2.7.2/css/app.css"> <link rel="stylesheet" href="{ms:global.host/}/plugins/amazeui/2.7.2/css/app.css">
<!-- vue框架所需要的资源 --> <!-- vue框架所需要的资源 -->
<script src="http://cdn.mingsoft.net/plugins/hammerjs/2.0.8/hammer.min.js"></script> <script src="{ms:global.host/}/plugins/hammerjs/2.0.8/hammer.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script> <script src="{ms:global.host/}/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/vue.touch/2.0/vue-touch.js"></script> <script src="{ms:global.host/}/plugins/vue.touch/2.0/vue-touch.js"></script>
<!-- 铭飞接口 --> <!-- 铭飞接口 -->
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="http://cdn.mingsoft.net/plugins/seajs/3.0.0/sea.js"></script> <script src="{ms:global.host/}/plugins/seajs/3.0.0/sea.js"></script>
<script src="http://cdn.mingsoft.net/model/4.6.0/main.min.js"></script>
<link rel="stylesheet" href="{ms:global.host/}/{ms:global.style/}/people/css/ms.mall.m.people.css"> <link rel="stylesheet" href="{ms:global.host/}/{ms:global.style/}/people/css/ms.mall.m.people.css">
......
src/main/webapp/templets/1/default/m/people/login.htm
View file @ 47003f17
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script> <script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
<script src="assets/js/amazeui.ie8polyfill.min.js"></script> <script src="assets/js/amazeui.ie8polyfill.min.js"></script>
<![endif]--> <![endif]-->
<script src="http://cdn.mingsoft.net/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script> <script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/password-change.htm
View file @ 47003f17
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
if(this.peopleOldPassword == this.peoplePassword){ if(this.peopleOldPassword == this.peoplePassword){
alert("新密码不能与旧密码相同"); alert("新密码不能与旧密码相同");
}else{ }else{
mpeople.people.changePassword($("form").serialize(),function(returnJson){ ms.people.changePassword($("form").serialize(),function(returnJson){
if(returnJson.result){ if(returnJson.result){
alert("密码修改成功，请重新登录") alert("密码修改成功，请重新登录")
$.ajax({ $.ajax({
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script> <script src="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
<script src="assets/js/amazeui.ie8polyfill.min.js"></script> <script src="assets/js/amazeui.ie8polyfill.min.js"></script>
<![endif]--> <![endif]-->
<script src="http://cdn.mingsoft.net/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script> <script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/register.htm
View file @ 47003f17
...@@ -178,14 +178,14 @@ ...@@ -178,14 +178,14 @@
}) })
</script> </script>
<!--[if (gte IE 9)|!(IE)]><!--> <!--[if (gte IE 9)|!(IE)]><!-->
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<!--<![endif]--> <!--<![endif]-->
<!--[if lte IE 8 ]> <!--[if lte IE 8 ]>
<script src="http://libs.baidu.com/jquery/1.11.3/jquery.min.js"></script> <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="http://cdn.staticfile.org/modernizr/2.8.3/modernizr.js"></script>
<script src="assets/js/amazeui.ie8polyfill.min.js"></script> <script src="assets/js/amazeui.ie8polyfill.min.js"></script>
<![endif]--> <![endif]-->
<script src="http://cdn.mingsoft.net/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script> <script src="{ms:global.host/}/plugins/AmazeUI/2.7.2/js/amazeui.min.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/templets/1/default/people/center.htm
View file @ 47003f17
...@@ -2,7 +2,18 @@ ...@@ -2,7 +2,18 @@
<html> <html>
<head> <head>
<#include "/head-file.htm" /> <#include "/head-file.htm" />
<script src="http://cdn.mingsoft.net/plugins/plupload/plupload.full.min.js"></script> <script src="{ms:global.host/}/static/plugins/plupload/plupload.full.min.js"></script>
<script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script>
<script src="{ms:global.host/}/static/plugins/validator/10.8.0/validator.min.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.http.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.util.js"></script>
<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.upload.js"></script>
<script src="{ms:global.host/}/api/ms.people.min.js"></script>
<script>
ms.base = "{ms:global.host/}";
ms.login = '{ms:global.host/}';
</script>
</head> </head>
<body> <body>
<#include "/head.htm" /> <#include "/head.htm" />
...@@ -27,14 +38,11 @@ ...@@ -27,14 +38,11 @@
<div class="ms-content-right-title">基本资料</div> <div class="ms-content-right-title">基本资料</div>
<div class="ms-content-right-form"> <div class="ms-content-right-form">
<form id="ms-center-form"> <form id="ms-center-form">
<div class="ms-content-data ms-content-data-head"> <div class="ms-content-data">
<span class="ms-content-head">头像</span> <span class="ms-content-nickname span">手机号</span>
<div class="ms-content-head-img"> <input @keyup="chanageBackgroundColor" type="text" name="peoplePhone" v-model="peopleInfo.peoplePhone">
<img :src="'{ms:global.host/}/'+peopleInfo.puIcon" onerror='this.src="http://cdn.mingsoft.net/global/images/msheader.png"'> <img class="ms-error-hide" src="{ms:global.host/}/{ms:global.style/}/images/error.png" :class="{'ms-error-show':errorText[0] != ''}" />
<div class="ms-content-head-upload"> <span class="ms-error-hide" v-text="errorText[0]" :class="{'ms-error-show':errorText[0] != ''}"></span>
<span id="browse">上传头像</span>
</div>
</div>
</div> </div>
<div class="ms-content-data"> <div class="ms-content-data">
<span class="ms-content-nickname span">昵称</span> <span class="ms-content-nickname span">昵称</span>
...@@ -58,12 +66,12 @@ ...@@ -58,12 +66,12 @@
</body> </body>
</html> </html>
<script type="text/javascript"> <script type="text/javascript">
ms.load(["ms", "ms.people", "http://cdn.mingsoft.net/model/4.6.0/ms.upload.min.js"], function(ms, mpeople, upload) {
var centerVue = new Vue({ var centerVue = new Vue({
el: "#center-vue", el: "#center-vue",
data: { data: {
peopleInfo: "", //个人信息 peopleInfo: "", //个人信息
puNickname: "", //昵称 puNickname: "", //昵称
peoplePhone: "", //手机号
butState: "确认", //按钮文字 butState: "确认", //按钮文字
errorText: ['', ''], //错误信息 errorText: ['', ''], //错误信息
}, },
...@@ -71,43 +79,8 @@ ...@@ -71,43 +79,8 @@
//修改信息 //修改信息
updateInfo: function() { updateInfo: function() {
var target = this; var target = this;
var pattern = new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]", "i");
if(target.peopleInfo.puNickname.indexOf(" ") >= 0) {
this.showPrompt("昵称不能包括空格", 1000, 0);
return;
}
if(target.peopleInfo.puNickname.length == 0) {
this.showPrompt('昵称不能为空', 1000, 0);
return;
}
if(pattern.test(target.peopleInfo.puNickname)) {
this.showPrompt("昵称不能包含特殊字符", 1000, 0);
return;
}
if(!validator.isLength(target.peopleInfo.puNickname, {
min: 0,
max: 20
})) {
this.showPrompt("昵称最大长度为20个字符", 1000, 0);
return;
}
if(target.peopleInfo.peopleMail.indexOf(" ") >= 0) {
this.showPrompt("邮箱不能包含空格", 1000, 1);
return;
}
if(target.peopleInfo.peopleMail.length == 0) {
this.showPrompt("邮箱不能为空", 1000, 1);
return;
}
var pattern = new RegExp("^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$")
if(!pattern.test(target.peopleInfo.peopleMail)) {
this.showPrompt("邮箱格式错误", 1000, 1);
return;
}
this.butState = '提交中...'; this.butState = '提交中...';
var data = "puIcon=" + $("input[name=puIcon]").eq($("input[name=puIcon]").length - 1).val() + "&puNickname=" + $("input[name=puNickname]").val() + "&peopleMail=" + $("input[name=peopleMail]").val(); ms.people.user.update(target.data, function(returnJson) { //更新用户信息
mpeople.people.user.update(data, function(returnJson) { //更新用户信息
if(returnJson.result) { if(returnJson.result) {
alert("修改成功"); alert("修改成功");
location.reload(); location.reload();
...@@ -121,7 +94,7 @@ ...@@ -121,7 +94,7 @@
//获取个人信息 //获取个人信息
getPeopleInfo: function() { getPeopleInfo: function() {
var target = this; var target = this;
mpeople.people.user.info(function(returnJson) { ms.people.user.info(function(returnJson) {
target.peopleInfo = returnJson; target.peopleInfo = returnJson;
target.puNickname = returnJson.puNickname; target.puNickname = returnJson.puNickname;
}) })
...@@ -154,20 +127,6 @@ ...@@ -154,20 +127,6 @@
mounted: function() { mounted: function() {
this.getPeopleInfo(); this.getPeopleInfo();
var target = this; var target = this;
upload.init("browse", "puIcon", "/peopleIcon/", {
"domClass": "display-img",
"size": "3000",
"afterMsg": "修改头像",
success: function(msg) {
var data = "puIcon=" + $("input[name=puIcon]").eq($("input[name=puIcon]").length - 1).val();
mpeople.people.user.update(data, function(returnJson) { //更新用户信息
target.peopleInfo.puIcon = $("input[name=puIcon]").eq($("input[name=puIcon]").length - 1).val();
alert("上传成功");
location.reload();
});
}
});
}, },
}) })
})
</script> </script>
\ No newline at end of file
src/main/webapp/templets/1/default/people/login.htm
View file @ 47003f17
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script> <script src="{ms:global.host/}/static/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/validator/5.5.0/validator.min.js"></script> <script src="{ms:global.host/}/static/plugins/validator/5.5.0/validator.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/less/2.5.3/less.min.js"></script> <script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
</head> </head>
<body> <body>
<div id="login"> <div id="login">
......
src/main/webapp/templets/1/default/people/password-change.htm
View file @ 47003f17
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
this.showPrompt("新密码与旧密码输入一致", 1000, 1); this.showPrompt("新密码与旧密码输入一致", 1000, 1);
} else { } else {
target.butText = "提交中..." target.butText = "提交中..."
mpeople.people.changePassword($("form").serialize(), function(returnJson) { ms.people.changePassword($("form").serialize(), function(returnJson) {
if(returnJson.result) { if(returnJson.result) {
alert("密码修改成功，请重新登录") alert("密码修改成功，请重新登录")
$.ajax({ $.ajax({
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
mounted: function() { mounted: function() {
//获取个人信息 //获取个人信息
var target = this; var target = this;
mpeople.people.user.info(function(returnJson) { ms.people.user.info(function(returnJson) {
target.peopleInfo = returnJson; target.peopleInfo = returnJson;
}) })
} }
......
src/main/webapp/templets/1/default/people/register.htm
View file @ 47003f17
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/login.less">
<link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less"> <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
<script src="http://cdn.mingsoft.net/plugins/jquery/1.9.1/jquery-1.9.1.js"></script> <script src="{ms:global.host/}/static/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
<script src="http://cdn.mingsoft.net/plugins/vue/2.3.3/vue.min.js"></script> <script src="{ms:global.host/}/static/plugins/vue/2.3.3/vue.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/validator/5.5.0/validator.min.js"></script> <script src="{ms:global.host/}/static/plugins/validator/5.5.0/validator.min.js"></script>
<script src="http://cdn.mingsoft.net/plugins/less/2.5.3/less.min.js"></script> <script src="{ms:global.host/}/static/plugins/less/3.9.0/less.min.js"></script>
</head> </head>
<body> <body>
<div id="login"> <div id="login">
...@@ -198,14 +198,14 @@ ...@@ -198,14 +198,14 @@
$.ajax({ $.ajax({
type: "post", type: "post",
data: $("#ms-login-form").serialize(), data: $("#ms-login-form").serialize(),
url: "register.do", url: "{ms:global.host/}/register.do",
success: function(msg) { success: function(msg) {
if(msg.result != true) { if(msg.result != true) {
alert(msg.resultMsg); alert(msg.resultMsg);
target.code(); target.code();
} else { } else {
alert("注册成功！"); alert("注册成功！");
$("body").append("<form action='{ms:global.host/}/login.do' id='goForm'></form>"); $("body").append("<form action='{ms:global.host/}/mcms/login.do' id='goForm'></form>");
$("#goForm").submit(); $("#goForm").submit();
} }
target.butState = '注册'; target.butState = '注册';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment