Skip to content
GitLab
Commit ae182545 authored by panpp's avatar panpp
Browse files

Merge remote-tracking branch 'origin/master'

parents 4e03ca33 ca7677f4
Hide whitespace changes
Inline Side-by-side
src/main/webapp/templets/1/default/m/people/less/password-forget-3.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/less/register.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/login.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/password-change.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/register.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/menu-left.htm
View file @ ae182545
<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>
......
src/main/webapp/templets/1/default/people/login.htm
View file @ ae182545
......@@ -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>
......
src/main/webapp/templets/1/default/people/register.htm
View file @ ae182545
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment