Skip to content
GitLab
"jetbrains:/idea/checkout/git" did not exist on "3a6a7d9dd9267860f629b3051f3e3506a29677c3"
Commit ae182545 authored by panpp's avatar panpp
Browse files

Merge remote-tracking branch 'origin/master'

parents 4e03ca33 ca7677f4
Expand all Hide whitespace changes
Inline Side-by-side
src/main/webapp/templets/1/default/m/less/about.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/less/advice.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/less/base.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/less/case-list.less deleted 100644 → 0
View file @ 4e03ca33
.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%;
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/less/index.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/less/news-list.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
}
src/main/webapp/templets/1/default/m/less/news-show.less deleted 100644 → 0
View file @ 4e03ca33
.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;
}
}
}
}
}
\ No newline at end of file
src/main/webapp/templets/1/default/m/news-list.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/news-show.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/center.htm deleted 100644 → 0
View file @ 4e03ca33
<!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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/head-file.htm deleted 100644 → 0
View file @ 4e03ca33
<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>
\ No newline at end of file
src/main/webapp/templets/1/default/m/people/head.htm deleted 100644 → 0
View file @ 4e03ca33
<!--头部导航条-->
<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>
\ No newline at end of file
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