wujj 5 éve
szülő
commit
40a809e655

+ 31 - 5
src/main/webapp/templets/1/default/about.htm

@@ -1,5 +1,31 @@
-<#include "head.htm">
-{ms:channel type=son}
-[field.typetitle/]
-{/ms:channel}
-==================
+<!DOCTYPE html>
+<html>
+    <head>
+        <#include "head-file.htm"/>
+    </head>
+
+    <body>
+        <#include "head.htm"/>
+        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/about_us.jpg) no-repeat center;">
+            <p class="banner_tit_about animated fadeInLeft">关于我们</p>
+            <p class="banner_tit_about_des animated fadeInRight">About us</p>
+        </div>
+        <div class="ms-content-about">
+            <div class="ms-content-main">
+                <#include "menu-left.htm"/>
+                <div class="ms-content-right">
+                    <div class="ms-content-right-position">
+                        <a href="{ms:global.host/}">首页</a>
+                        <span>></span>
+                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
+                    </div>
+                    <div class="ms-content-right-main">
+                        <div class="ms-content-right-main-title">{ms:field.title/}</div>
+                        <div class="ms-content-right-main-content">{ms:field.content/}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <#include "footer.htm"/>
+    </body>
+</html>

+ 5 - 5
src/main/webapp/templets/1/default/footer.htm

@@ -3,7 +3,7 @@
         <div class="ms-footer-left">
             <div class="ms-footer-left-column">
                 <span class="ms-footer-left-column-about">
-                	<a href='${global.url}/53/index.html'>关于我们</a>
+                	<a href='{ms:global.url/}/53/index.html'>关于我们</a>
                 </span>|
                 <span class="ms-footer-left-column-course">
                 	<a target="_blank" href='http://mingsoft.net/html/1//5527/index.html#faz'>发展历程</a>
@@ -15,12 +15,12 @@
             <span class="ms-footer-left-copyright">版权所有&copy;铭飞科技有限公司2012-2018保留一切权利</span>
         </div>
         <div class="ms-footer-right">
-            <img class='ms-footer-right-img-weixin' src="${global.host}/${global.style}/images/we-chat.png">
-            <a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="${global.host}/${global.style}/images/baidu.png"></a>
-            <a target="_blank" href='http://weibo.com/killfen'><img src="${global.host}/${global.style}/images/micro-blog.png"></a>
+            <img class='ms-footer-right-img-weixin' src="{ms:global.host/}/{ms:global.style/}/images/we-chat.png">
+            <a target="_blank" href='http://tieba.baidu.com/f?kw=%E9%93%AD%E9%A3%9E%E7%A7%91%E6%8A%80&fr=index&fp=0&ie=utf-8'><img class="ms-footer-right-baidu" src="{ms:global.host/}/{ms:global.style/}/images/baidu.png"></a>
+            <a target="_blank" href='http://weibo.com/killfen'><img src="{ms:global.host/}/{ms:global.style/}/images/micro-blog.png"></a>
         	<div class="ms-footer-right-weixin">
         		<p></p>
-        		<img alt="" src="${global.host}/${global.style}/images/weixin.jpg">
+        		<img alt="" src="{ms:global.host/}/{ms:global.style/}/images/weixin.jpg">
         	</div>
         </div>
     </div>

+ 28 - 28
src/main/webapp/templets/1/default/head-file.htm

@@ -1,36 +1,36 @@
-<title>${global.name}</title>
+<title>{ms:global.name/}</title>
 <meta charset="utf-8">
-<link rel="stylesheet" type="text/css" href="${global.host}/plugins/iconfont/1.0.0/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/base.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/index.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/advice.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/case-list.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/about.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/news-list.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/news-show.css">
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/center.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/base.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/index.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/advice.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/case-list.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/about.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-list.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/news-show.css">
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/center.css">
 
-<script src="${global.host}/plugins/jquery/1.9.1/jquery-1.9.1.js"></script>
-<script src="${global.host}/${global.style}/js/slider.js"></script>
-<script src="${global.host}/static/plugins/less/3.9.0/less.min.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/}/static/plugins/less/3.9.0/less.min.js"></script>
 <!--vue-懒加载-表单验证-->
-<script src="${global.host}/plugins/vue/2.6.9/vue.min.js"></script>
-<script src="${global.host}/plugins/validator/10.8.0/validator.min.js"></script>
+<script src="{ms:global.host/}/plugins/vue/2.6.9/vue.min.js"></script>
+<script src="{ms:global.host/}/plugins/validator/10.8.0/validator.min.js"></script>
 <!-- Element -->
-<link rel="stylesheet" href="${global.host}/plugins/element-ui/2.8.2/index.css">
-<script src="${global.host}/plugins/element-ui/2.8.2/index.js"></script>
+<link rel="stylesheet" href="{ms:global.host/}/plugins/element-ui/2.8.2/index.css">
+<script src="{ms:global.host/}/plugins/element-ui/2.8.2/index.js"></script>
 
-<link rel="stylesheet" type="text/css" href="${global.host}/${global.style}/css/animate.css">
-<script src="${global.host}/static/plugins/axios/0.18.0/axios.min.js"></script>
-<script src="${global.host}/static/plugins/ms/1.0.0/ms.js"></script>
-<script src="${global.host}/static/plugins/ms/1.0.0/ms.http.js"></script>
-<script src="${global.host}/static/plugins/ms/1.0.0/ms.util.js"></script>
-<script src="${global.host}/api/ms.people.min.js"></script>
-<script src="${global.host}/static/plugins/plupload/plupload.full.min.js"></script>
-<script src="${global.host}/static/plugins/qs/6.6.0/qs.min.js"></script>
-<script src="${global.host}/static/plugins/ms/1.0.0/ms.upload.js"></script>
+<link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/animate.css">
+<script src="{ms:global.host/}/static/plugins/axios/0.18.0/axios.min.js"></script>
+<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.js"></script>
+<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.http.js"></script>
+<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.util.js"></script>
+<script src="{ms:global.host/}/api/ms.people.min.js"></script>
+<script src="{ms:global.host/}/static/plugins/plupload/plupload.full.min.js"></script>
+<script src="{ms:global.host/}/static/plugins/qs/6.6.0/qs.min.js"></script>
+<script src="{ms:global.host/}/static/plugins/ms/1.0.0/ms.upload.js"></script>
 <script>
 	window.http = ms.http;
-	ms.base = "${global.host}";
-	ms.login = '${global.host}';
+	ms.base = "{ms:global.host/}";
+	ms.login = '{ms:global.host/}';
 </script>

+ 1 - 1
src/main/webapp/templets/1/default/index.htm

@@ -13,7 +13,7 @@
 </head>
 
 <body>
-<#include "head.htm" />
+<#include "head.htm">
 <!-- <div class="ms-banner">
     <img src="./images/banner.jpg">
 </div> -->

+ 3 - 3
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='${global.url}/53/index.html'>
+        <a target="_blank" href='{ms:global.url/}/53/index.html'>
             <li>关于我们<span class="ms-content-left-li-more">></span></li>
         </a>
-        <a target="_blank" href='${global.url}/59/index.html'>
+        <a target="_blank" href='{ms:global.url/}/59/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=${global.url}/19/141/index.html>
+        <a target="_blank" href={ms:global.url/}/19/141/index.html>
             <li>联系我们<span class="ms-content-left-li-more">></span></li>
         </a>
     </ul>

+ 1 - 1
src/main/webapp/templets/1/default/news-list.htm

@@ -15,7 +15,7 @@
                 <div class="ms-content-right-position">
                     <a href="{ms:global.host/}">首页</a>
                     <span>></span>
-                    <a href="{mts:field.typelink/}">{mts:field.typetitle/}</a>
+                    <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
                 </div>
                 <div class="ms-content-main-list">
 

+ 264 - 264
src/main/webapp/templets/1/default/news-show.htm

@@ -1,265 +1,265 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <#include "head-file.htm">
-        <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/jquery.sinaemotion.css" />
-        <script type="text/javascript" src="{ms:global.host/}/{ms:global.style/}/js/jquery.sinaEmotion.js"></script>
-    </head>
-
-    <body>
-        <#include "head.htm">
-        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/news2.png) no-repeat center;">
-            <p class="banner_tit_other animated fadeInLeft">公司动态</p>
-
-            <p class="banner_tit_other_des animated fadeInRight">Our company</p>
-        </div>
-        <div class="ms-content-about" id="news-show-vue">
-            <div class="ms-content-main">
-                <#include "menu-left.htm">
-                <div class="ms-content-right">
-                    <div class="ms-content-right-position">
-                        <a href="{ms:global.host/}">首页</a>
-                        <span>></span>
-                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
-                    </div>
-                    <div class="ms-content-right-main">
-                        <div class="ms-content-right-main-title" id="ms-content-right-main-title">
-                            <div class="ms-content-right-main-title-div">{ms:field.title/}</div>
-                            <div class="ms-content-right-main-icon">
-                                <div class="ms-content-icon-left">
-                                    <div class="ms-content-right-main-icon-source">来源:{ms:field.source/}
-                                        <span class="ms-content-right-vertical">|</span>
-                                    </div>
-                                    <div class="ms-content-right-main-icon-time">时间:{ms:field.date?string("yyyy-MM-dd")/}</div>
-                                </div>
-                                <div class="ms-content-icon-right">
-                                    <div class="ms-content-right-main-icon-clicks"></div>
-                                    <div class="ms-content-right-main-icon-num">{ms:field.hit/}
-                                        <span class="ms-content-right-vertical">|</span>
-                                    </div>
-                                    <div class="ms-content-right-main-icon-comment"></div>
-                                    <div class="ms-content-right-main-icon-num">
-                                        <span style="margin: 0;" v-text="commentsList.length"></span>
-                                        <span class="ms-content-right-vertical">|</span>
-                                    </div>
-                                    <div class="ms-content-right-main-icon-Fabulous"></div>
-                                    <div class="ms-content-right-main-icon-num" v-text="attentionNum"></div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="ms-content-right-main-content">
-                            <p>{ms:field.content/}</p><br/>
-                        </div>
-                        <div class="metfield">
-					        <p>上一篇:<a href="{ms:global.url/}{ms:pre.link/}">{ms:pre.title/}</a></p>
-					        <p>下一篇:<a href="{ms:global.url/}{ms:next.link/}">{ms:next.title/}</a></p>
-					    </div>
-                    </div>
-                    <div class="ms-content-right-main-content-Fabulous">
-                        <div class="ms-content-right-main-content-icon" @click="attentionNews" :class="{'ms-is-attention':isAttention}"></div>
-                    </div>
-                    <div class="ms-content-right-comment">
-                        <div class="ms-content-right-comment-input">
-                            <textarea v-model='isButAttention' class="emotion" type="text" name="comments" placeholder="我有话说..."></textarea>
-                            <div class="ms-content-right-comment-button">
-                                <div class="ms-content-right-comment-expression" id="ms-face"></div>
-                                <div class="ms-content-right-comment-submit" :class="{'ms-submit-comments-css':isButAttention.length>0}" @click="submitComments">提交</div>
-                            </div>
-                        </div>
-                        <div class="ms-content-right-comment-list">
-                            <div class="ms-content-right-comment-list-no-comment" style="display: none;" v-show="commentsList.length == 0">
-                                <img src="{ms:global.host/}/{ms:global.style/}/images/no-comment.png">
-                            </div>
-                            <template v-for="(comments,index) in commentsList">
-                                <div class="ms-content-right-comment-list-div" v-if="index <= listNum">
-                                    <div class="ms-content-right-comment-list-left">
-                                        <div class="ms-content-right-comment-list-portrait">
-                                            <img :src="'{ms:global.host/}'+ comments.puIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
-                                        </div>
-                                        <div class="ms-content-right-comment-list-content">
-                                            <div class="ms-content-right-comment-list-name" v-text="comments.puNickname"></div>
-                                            <div class="ms-content-right-comment-list-comment" v-html="vueAnalyticEmotion(comments.commentContent)"></div>
-                                        </div>
-                                    </div>
-                                    <!--<div class="ms-content-right-comment-list-right">
-                                        <div class="ms-content-right-main-icon-comment"></div>
-                                        <div class="ms-content-right-main-icon-Fabulous"></div>
-                                        <div class="ms-content-right-main-icon-num">28</div>
-                                    </div>-->
-                                </div>
-                            </template>
-                            <div class="ms-content-right-comment-list-div ms-content-right-active">
-                                <div class="ms-content-right-comment-list-div-more" @click="listNum = listNum +4" v-show="listNum < commentsList.length">
-                                    查看更多评论
-                                </div>
-                                <div class="ms-content-right-comment-list-div-no" v-show="listNum >= commentsList.length && commentsList.length != 0">
-                                    没有更多评论
-                                </div>
-                                <div class="ms-content-right-comment-list-div-load" style="display: none;">
-                                    <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <#include "footer.htm">
-    </body>
-    <script>
-        var newsShowVue = new Vue({
-            el: "#news-show-vue",
-            data: {
-                commentsList: [], //评论列表
-                attentionNum: 0, //点赞数
-                isAttention: false, //点赞状态
-                isButAttention: '', //按钮状态
-                listNum: 4, //列表数
-                loginStatus: '', //登录状态
-                vueAnalyticEmotion: function(val) {
-                    return AnalyticEmotion(val);
-                },
-            },
-            methods: {
-                //关注或者取消
-                attentionNews: function() {
-                    var obj = this;
-                    if(this.loginStatus != true) {
-                        alert("请先登录后重试");
-                        return;
-                    }
-                    if(obj.isAttention == false) {
-                        $.ajax({
-                            type: "POST",
-                            data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
-                            url: "{ms:global.host/}/people/attention/save.do",
-                            success: function(msg) {
-                                if(msg.result) {
-                                    obj.attentionNum++;
-                                    obj.isAttention = true;
-                                }
-                            },
-                            error: function() {
-                                alert("操作失败,请检查是否已经安装关注插件");
-                            }
-                        })
-                    } else {
-                        $.ajax({
-                            type: "POST",
-                            data: "basicId={ms:field.id/}&basicAttentionType=2",
-                            url: "{ms:global.host/}/people/attention/delete.do",
-                            success: function(msg) {
-                                if(msg.result) {
-                                    obj.attentionNum--;
-                                    obj.isAttention = false;
-                                }
-                            },
-                            error: function() {
-                                alert("操作失败,请检查是否已经安装关注插件");
-                            }
-                        })
-                    }
-                },
-                //关注
-                list: function() {
-                    var obj = this;
-                    $.ajax({
-                        type: "POST",
-                        data: "commentBasicId={ms:field.id/}",
-                        url: "{ms:global.host/}/comment/list.do",
-                        success: function(msg) {
-                            obj.commentsList = msg.list;
-                        }
-                    })
-                },
-                //提交
-                submitComments: function() {
-                    if(this.isButAttention == '') {
-                        return;
-                    }
-                    if(this.loginStatus != true) {
-                        alert("请先登录后重试");
-                        return;
-                    }
-                    var obj = this;
-                    $.ajax({
-                        type: "POST",
-                        data: "commentContent=" + $("textarea[name=comments]").val() + "&isCode=false&commentBasicId={ms:field.id/}",
-                        url: "{ms:global.host/}/people/comment/save.do",
-                        success: function(msg) {
-                            if(msg.result) {
-                                alert("评论成功");
-                                obj.list();
-                            } else {
-                                alert(msg.resultMsg);
-                            }
-                            obj.isButAttention = '';
-                        },
-                        error: function() {
-                            alert("评论失败,请检查是否已经安装评论插件");
-                        },
-                    })
-                }
-            },
-            mounted: function() {
-                $('#ms-face').SinaEmotion($('.emotion'));
-                var obj = this;
-                //登录状态
-                $.ajax({
-                    type: "POST",
-                    url: "{ms:global.host/}/checkLoginStatus.do",
-                    success: function(msg) {
-                        obj.loginStatus = msg.result;
-                    }
-                })
-
-                //关注数
-                $.ajax({
-                    type: "POST",
-                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
-                    url: "{ms:global.host/}/attention/count.do",
-                    success: function(msg) {
-                        obj.attentionNum = msg;
-                    }
-                })
-                //是否关注了
-                $.ajax({
-                    type: "POST",
-                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
-                    url: "{ms:global.host/}/people/attention/isExists.do",
-                    success: function(msg) {
-                        obj.isAttention = msg.result;
-                    }
-                })
-            },
-            beforeCreate: function() {
-                var obj = this;
-                var app_id = '1362404091';
-                $.ajax({
-                    async: true,
-                    dataType: 'jsonp',
-                    url: 'https://api.weibo.com/2/emotions.json?source=' + app_id,
-                    success: function(response) {
-                        var data = response.data;
-                        for(var i in data) {
-                            if(data[i].category == '') {
-                                data[i].category = '默认';
-                            }
-                            if(emotions[data[i].category] == undefined) {
-                                emotions[data[i].category] = new Array();
-                                categorys.push(data[i].category);
-                            }
-                            emotions[data[i].category].push({
-                                name: data[i].phrase,
-                                icon: data[i].icon
-                            });
-                            uSinaEmotionsHt.put(data[i].phrase, data[i].icon);
-                        }
-                        obj.list();
-                    }
-                });
-            },
-        })
-    </script>
-
+<!DOCTYPE html>
+<html>
+    <head>
+        <#include "head-file.htm">
+        <link rel="stylesheet" type="text/css" href="{ms:global.host/}/{ms:global.style/}/css/jquery.sinaemotion.css" />
+        <script type="text/javascript" src="{ms:global.host/}/{ms:global.style/}/js/jquery.sinaEmotion.js"></script>
+    </head>
+
+    <body>
+        <#include "head.htm">
+        <div class="ms-banner" style="background:url({ms:global.host/}/{ms:global.style/}/images/news2.png) no-repeat center;">
+            <p class="banner_tit_other animated fadeInLeft">公司动态</p>
+            
+            <p class="banner_tit_other_des animated fadeInRight">Our company</p>
+        </div>
+        <div class="ms-content-about" id="news-show-vue">
+            <div class="ms-content-main">
+                <#include "menu-left.htm">
+                <div class="ms-content-right">
+                    <div class="ms-content-right-position">
+                        <a href="{ms:global.host/}">首页</a>
+                        <span>></span>
+                        <a href="{ms:field.typelink/}">{ms:field.typetitle/}</a>
+                    </div>
+                    <div class="ms-content-right-main">
+                        <div class="ms-content-right-main-title" id="ms-content-right-main-title">
+                            <div class="ms-content-right-main-title-div">{ms:field.title/}</div>
+                            <div class="ms-content-right-main-icon">
+                                <div class="ms-content-icon-left">
+                                    <div class="ms-content-right-main-icon-source">来源:{ms:field.source/}
+                                        <span class="ms-content-right-vertical">|</span>
+                                    </div>
+                                    <div class="ms-content-right-main-icon-time">时间:{ms:field.date?string("yyyy-MM-dd")/}</div>
+                                </div>
+                                <div class="ms-content-icon-right">
+                                    <div class="ms-content-right-main-icon-clicks"></div>
+                                    <div class="ms-content-right-main-icon-num">{ms:field.hit/}
+                                        <span class="ms-content-right-vertical">|</span>
+                                    </div>
+                                    <div class="ms-content-right-main-icon-comment"></div>
+                                    <div class="ms-content-right-main-icon-num">
+                                        <span style="margin: 0;" v-text="commentsList.length"></span>
+                                        <span class="ms-content-right-vertical">|</span>
+                                    </div>
+                                    <div class="ms-content-right-main-icon-Fabulous"></div>
+                                    <div class="ms-content-right-main-icon-num" v-text="attentionNum"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="ms-content-right-main-content">
+                            <p>{ms:field.content/}</p><br/>
+                        </div>
+                        <div class="metfield">
+					        <p>上一篇:<a href="{ms:global.url/}{ms:pre.link/}">{ms:pre.title/}</a></p>
+					        <p>下一篇:<a href="{ms:global.url/}{ms:next.link/}">{ms:next.title/}</a></p>
+					    </div>
+                    </div>
+                    <div class="ms-content-right-main-content-Fabulous">
+                        <div class="ms-content-right-main-content-icon" @click="attentionNews" :class="{'ms-is-attention':isAttention}"></div>
+                    </div>
+                    <div class="ms-content-right-comment">
+                        <div class="ms-content-right-comment-input">
+                            <textarea v-model='isButAttention' class="emotion" type="text" name="comments" placeholder="我有话说..."></textarea>
+                            <div class="ms-content-right-comment-button">
+                                <div class="ms-content-right-comment-expression" id="ms-face"></div>
+                                <div class="ms-content-right-comment-submit" :class="{'ms-submit-comments-css':isButAttention.length>0}" @click="submitComments">提交</div>
+                            </div>
+                        </div>
+                        <div class="ms-content-right-comment-list">
+                            <div class="ms-content-right-comment-list-no-comment" style="display: none;" v-show="commentsList.length == 0">
+                                <img src="{ms:global.host/}/{ms:global.style/}/images/no-comment.png">
+                            </div>
+                            <template v-for="(comments,index) in commentsList">
+                                <div class="ms-content-right-comment-list-div" v-if="index <= listNum">
+                                    <div class="ms-content-right-comment-list-left">
+                                        <div class="ms-content-right-comment-list-portrait">
+                                            <img :src="'{ms:global.host/}'+ comments.puIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'">
+                                        </div>
+                                        <div class="ms-content-right-comment-list-content">
+                                            <div class="ms-content-right-comment-list-name" v-text="comments.puNickname"></div>
+                                            <div class="ms-content-right-comment-list-comment" v-html="vueAnalyticEmotion(comments.commentContent)"></div>
+                                        </div>
+                                    </div>
+                                    <!--<div class="ms-content-right-comment-list-right">
+                                        <div class="ms-content-right-main-icon-comment"></div>
+                                        <div class="ms-content-right-main-icon-Fabulous"></div>
+                                        <div class="ms-content-right-main-icon-num">28</div>
+                                    </div>-->
+                                </div>
+                            </template>
+                            <div class="ms-content-right-comment-list-div ms-content-right-active">
+                                <div class="ms-content-right-comment-list-div-more" @click="listNum = listNum +4" v-show="listNum < commentsList.length">
+                                    查看更多评论
+                                </div>
+                                <div class="ms-content-right-comment-list-div-no" v-show="listNum >= commentsList.length && commentsList.length != 0">
+                                    没有更多评论
+                                </div>
+                                <div class="ms-content-right-comment-list-div-load" style="display: none;">
+                                    <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <#include "footer.htm">
+    </body>
+    <script>
+        var newsShowVue = new Vue({
+            el: "#news-show-vue",
+            data: {
+                commentsList: [], //评论列表
+                attentionNum: 0, //点赞数
+                isAttention: false, //点赞状态
+                isButAttention: '', //按钮状态
+                listNum: 4, //列表数
+                loginStatus: '', //登录状态
+                vueAnalyticEmotion: function(val) {
+                    return AnalyticEmotion(val);
+                },
+            },
+            methods: {
+                //关注或者取消
+                attentionNews: function() {
+                    var obj = this;
+                    if(this.loginStatus != true) {
+                        alert("请先登录后重试");
+                        return;
+                    }
+                    if(obj.isAttention == false) {
+                        $.ajax({
+                            type: "POST",
+                            data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
+                            url: "{ms:global.host/}/people/attention/save.do",
+                            success: function(msg) {
+                                if(msg.result) {
+                                    obj.attentionNum++;
+                                    obj.isAttention = true;
+                                }
+                            },
+                            error: function() {
+                                alert("操作失败,请检查是否已经安装关注插件");
+                            }
+                        })
+                    } else {
+                        $.ajax({
+                            type: "POST",
+                            data: "basicId={ms:field.id/}&basicAttentionType=2",
+                            url: "{ms:global.host/}/people/attention/delete.do",
+                            success: function(msg) {
+                                if(msg.result) {
+                                    obj.attentionNum--;
+                                    obj.isAttention = false;
+                                }
+                            },
+                            error: function() {
+                                alert("操作失败,请检查是否已经安装关注插件");
+                            }
+                        })
+                    }
+                },
+                //关注
+                list: function() {
+                    var obj = this;
+                    $.ajax({
+                        type: "POST",
+                        data: "commentBasicId={ms:field.id/}",
+                        url: "{ms:global.host/}/comment/list.do",
+                        success: function(msg) {
+                            obj.commentsList = msg.list;
+                        }
+                    })
+                },
+                //提交
+                submitComments: function() {
+                    if(this.isButAttention == '') {
+                        return;
+                    }
+                    if(this.loginStatus != true) {
+                        alert("请先登录后重试");
+                        return;
+                    }
+                    var obj = this;
+                    $.ajax({
+                        type: "POST",
+                        data: "commentContent=" + $("textarea[name=comments]").val() + "&isCode=false&commentBasicId={ms:field.id/}",
+                        url: "{ms:global.host/}/people/comment/save.do",
+                        success: function(msg) {
+                            if(msg.result) {
+                                alert("评论成功");
+                                obj.list();
+                            } else {
+                                alert(msg.resultMsg);
+                            }
+                            obj.isButAttention = '';
+                        },
+                        error: function() {
+                            alert("评论失败,请检查是否已经安装评论插件");
+                        },
+                    })
+                }
+            },
+            mounted: function() {
+                $('#ms-face').SinaEmotion($('.emotion'));
+                var obj = this;
+                //登录状态
+                $.ajax({
+                    type: "POST",
+                    url: "{ms:global.host/}/checkLoginStatus.do",
+                    success: function(msg) {
+                        obj.loginStatus = msg.result;
+                    }
+                })
+
+                //关注数
+                $.ajax({
+                    type: "POST",
+                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
+                    url: "{ms:global.host/}/attention/count.do",
+                    success: function(msg) {
+                        obj.attentionNum = msg;
+                    }
+                })
+                //是否关注了
+                $.ajax({
+                    type: "POST",
+                    data: "basicAttentionBasicId={ms:field.id/}&basicAttentionType=2",
+                    url: "{ms:global.host/}/people/attention/isExists.do",
+                    success: function(msg) {
+                        obj.isAttention = msg.result;
+                    }
+                })
+            },
+            beforeCreate: function() {
+                var obj = this;
+                var app_id = '1362404091';
+                $.ajax({
+                    async: true,
+                    dataType: 'jsonp',
+                    url: 'https://api.weibo.com/2/emotions.json?source=' + app_id,
+                    success: function(response) {
+                        var data = response.data;
+                        for(var i in data) {
+                            if(data[i].category == '') {
+                                data[i].category = '默认';
+                            }
+                            if(emotions[data[i].category] == undefined) {
+                                emotions[data[i].category] = new Array();
+                                categorys.push(data[i].category);
+                            }
+                            emotions[data[i].category].push({
+                                name: data[i].phrase,
+                                icon: data[i].icon
+                            });
+                            uSinaEmotionsHt.put(data[i].phrase, data[i].icon);
+                        }
+                        obj.list();
+                    }
+                });
+            },
+        })
+    </script>
+
 </html>

+ 71 - 71
src/main/webapp/templets/1/default/search.htm

@@ -1,71 +1,71 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <#include "head-file.htm"/>
-    </head>
-    <body>
-        <#include "head.htm"/>
-        <div class="ms-banner">
-            <img src="${global.host}/${global.style}/images/search.jpg">
-        </div>
-        <div class="ms-content" id="body">
-            <div class="ms-content-main-list" id="ms-content-search">
-                <div class="ms-content-main-div">
-                    <div class="ms-content-main-div-prompt">您搜索的关键字
-                        <span>${search.content_title}</span>
-                        <!-- 共7个结果 -->
-                    </div>
-                    <ul class="ms-content-main-ul">
-                        <@arclist size=10 ispaging=true>
-                        <li>
-                            <a href="${global.url}/${field.link}">
-                                ${field.title}
-                                <span class="ms-content-main-li-time">${field.date?string("yyyy-MM-dd")}</span>
-                            </a>
-                        </li>
-                        </@arclist>
-                    </ul>
-                </div>
-                <div class="ms-content-main-page">
-	              	 <a class="ms-content-main-page-first" href="${page.index}">首页</a>
-		             <a class="ms-content-main-page-upper" href="${page.pre}">上一页</a>
-		             <a class="ms-content-main-page-next" href="${page.next}">下一页</a>
-		             <a class="ms-content-main-page-last" href="${page.last}">末页</a>
-	            </div>
-            </div>
-        </div>
-        <#include "footer.htm"/>
-    </body>
-</html>
-<script>
-new Vue({
-    el: "#body",
-    data: {
-       title: '',
-       list: [],
-    },
-    methods: {
-   	//上下页
-  	search:function(flag){
-  		var pageNo = ${search.pageNo};
-  		var total = ${page.total};
-  		if(flag){
-  			pageNo = pageNo==total ? total : pageNo +1;//下一页
-  		}else{
-  			pageNo = pageNo -1==0 ? 1 : pageNo-1;//上一页
-  		}
-  		window.location.href="${global.host}/cms/1/search.do?content_title=${search.content_title}&pageNo="+pageNo;
-  		window.event.returnValue=false;
-  	},
-  	//首页和尾页
-  	indexAndLast:function(pageNo){
-  		window.location.href="${global.host}/cms/1/search.do?content_title=${search.content_title}&pageNo="+pageNo;
-  		window.event.returnValue=false;
-  	},
-    },
- })
-    if($('.ms-content-main-ul li').length <= 0) {
-        $('.ms-content-main-page').remove();
-        $('.ms-content-main-ul').before("<div class='ms-content-main-div-nothing'>没找到相关记录</div>")
-    }
-</script>
+<!DOCTYPE html>
+<html>
+    <head>
+        <#include "head-file.htm"/>
+    </head>
+    <body>
+        <#include "head.htm"/>
+        <div class="ms-banner">
+            <img src="{ms:global.host/}/{ms:global.style/}/images/search.jpg">
+        </div>
+        <div class="ms-content" id="body">
+            <div class="ms-content-main-list" id="ms-content-search">
+                <div class="ms-content-main-div">
+                    <div class="ms-content-main-div-prompt">您搜索的关键字
+                        <span>{ms:search.content_title/}</span>
+                        <!-- 共7个结果 -->
+                    </div>
+                    <ul class="ms-content-main-ul">
+                        {ms:arclist size=10 ispaging=true}
+                        <li>
+                            <a href="{ms:global.url/}/[field.link/]">
+                                [field.title/]
+                                <span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
+                            </a>
+                        </li>
+                        {/ms:arclist}
+                    </ul>
+                </div>
+                <div class="ms-content-main-page">
+	              	 <a class="ms-content-main-page-first" href="{ms:page.index/}">首页</a>
+		             <a class="ms-content-main-page-upper" href="{ms:page.pre/}">上一页</a>
+		             <a class="ms-content-main-page-next" href="{ms:page.next/}">下一页</a>
+		             <a class="ms-content-main-page-last" href="{ms:page.last/}">末页</a>
+	            </div>
+            </div>
+        </div>
+        <#include "footer.htm"/>
+    </body>
+</html>
+<script>
+new Vue({
+    el: "#body",
+    data: {
+       title: '',
+       list: [],
+    },
+    methods: {
+   	//上下页
+  	search:function(flag){
+  		var pageNo = {ms:search.pageNo/};
+  		var total = {ms:page.total/};
+  		if(flag){
+  			pageNo = pageNo==total ? total : pageNo +1;//下一页
+  		}else{
+  			pageNo = pageNo -1==0 ? 1 : pageNo-1;//上一页
+  		}
+  		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
+  		window.event.returnValue=false;
+  	},
+  	//首页和尾页
+  	indexAndLast:function(pageNo){
+  		window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
+  		window.event.returnValue=false;
+  	},
+    },
+ })
+    if($('.ms-content-main-ul li').length <= 0) {
+        $('.ms-content-main-page').remove();
+        $('.ms-content-main-ul').before("<div class='ms-content-main-div-nothing'>没找到相关记录</div>")
+    }
+</script>