up:5.4.3资源更新feat(template): 优化模板功能和样式

- 更新 footer.htm 中的联系方式和微信二维码
- 移除 head-file.htm 中的 app.css 引用
- 优化 header.htm 中的搜索框
- 更新 index.htm 中的图标和样式- 修改 message.htm 中的标题和提示信息
- 优化 news-detail.htm 的结构和交互
- 更新 product-list.htm 中的排序方式- 修复 public.js 中的滚动事件

src/main/webapp/template/1/default/head-file.htm

@@ -12,7 +12,6 @@
 <link rel="stylesheet" href="{ms:global.host/}static/plugins/animate/4.1.0/animate.min.css">
 <script src="{ms:global.host/}static/plugins/element-ui/2.15.7/index.min.js"></script>
 <link rel="stylesheet" href="{ms:global.host/}static/plugins/element-ui/2.15.7/theme-chalk/index.min.css">
-<link rel="stylesheet" href="{ms:global.host/}{ms:global.style/}/css/app.css">
 <!--网络请求框架-->
 <script src="{ms:global.host/}static/plugins/axios/0.18.0/axios.min.js"></script>
 <script src="{ms:global.host/}static/plugins/qs/6.6.0/qs.min.js"></script>

src/main/webapp/template/1/default/header.htm

@@ -8,8 +8,8 @@
         <div class="top_search"><em></em>
             <div class="search_con">
                 <form name="formsearch" action="/mcms/search.do" method="post">
-                    <input class="input1" type="text" name="content_title" id="p" placeholder="搜索" value="${search.content_title}">
-                    <input type="submit" class="bnts">
+                    <input class="input1" type="text" link name="content_title" id="p" placeholder="搜索" value="">
+                    <input type="submit" class="bnts" value="${search.content_title}">
                 </form>
             </div>
         </div>
@@ -103,8 +103,8 @@
         <div class="drawer-section search_div">
             <div class="search_con">
                 <form  name="formsearch" action="/mcms/search.do" method="post" target="_blank" style="height: 42px;">
-                    <input type="text" name="content_title" id="q" class="input1" placeholder="搜索" value=""/>
-                    <input type="submit"  class="bnt1"/>
+                    <input type="text" link name="content_title" id="q" class="input1" placeholder="搜索" value=""/>
+                    <input type="submit" value="" class="bnt1"/>
                 </form>
             </div>
         </div>

src/main/webapp/template/1/default/index.htm

@@ -11,7 +11,7 @@
     <meta http-equiv="Cache-Control" content="no-transform"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
     <meta name="applicable-device" content="pc,mobile"/>
-    <link href="/favicon.ico" rel="shortcut icon"/>
+  	<link href="{@ms:file global.foot.ico/}" rel="shortcut icon"/>
     <link href="/{ms:global.style/}css/style.css" rel="stylesheet"/>
     <link href="/{ms:global.style/}css/index.css" rel="stylesheet"/>
     <script src="/{ms:global.style/}js/jquery-1.8.3.min.js"></script>
@@ -101,13 +101,13 @@
             {ms:channel  typeid="1666653706550321163" }
             <li class="anim anim-1">
                 <a href="<#if field.type==3>{ms:global.html/}${field.typeurl}<#else>{ms:global.html/}${field.typelink}</#if>" title="${field.typetitle}">
-                <div class="imgs">
-                    <img src="{@ms:file field.typeico/}" alt="${field.typetitle}">
-                </div>
-                <div class="txts">
-                    <h2 class="f28">${field.typetitle}</h2>
-                    <p>${field.typeshorttitle}...</p>
-                </div>
+                    <div class="imgs">
+                        <img src="{@ms:file field.typeico/}" alt="${field.typetitle}">
+                    </div>
+                    <div class="txts">
+                        <h2 class="f28">${field.typetitle}</h2>
+                        <p>${field.typeshorttitle}...</p>
+                    </div>
                 </a>
             </li>
             {/ms:channel}

src/main/webapp/template/1/default/js/public.js

@@ -78,13 +78,18 @@
       $("body").removeClass("nav-hide");
     }
   }
-  $(window).mousewheel(function(e, delta) { //滚动条向上滚动
-      p = $(window).scrollTop();
-      if( p > $(window).height() ){
-        if (delta < 0) {
-          $("body").addClass("nav-hide");
-        } else { //上滚
-           $("body").removeClass("nav-hide");
-        }
+
+    window.onmousewheel = document.onmousewheel = document.onmousewheel = function(e){
+      e = e || window.event;
+      var delta = 0;
+      if (e.wheelDelta) {
+        delta = e.wheelDelta/120;
+      } else if (e.detail) {
+        delta = -e.detail/3;
       }
-  })
+      if (delta > 0) {
+        $("body").removeClass("nav-hide");
+      } else if (delta < 0) {
+       $("body").addClass("nav-hide");
+      }
+     }

src/main/webapp/template/1/default/message.htm

@@ -6,7 +6,7 @@
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
     <meta name="robots" content="index, follow"/>
-    <title>{ms:channel type="parent"}${field.typetitle}{/ms:channel}</title>
+    <title>{ms:channel type="self"}${field.typetitle}{/ms:channel}</title>
     <meta name="keywords" content="${field.typekeyword}">
     <meta name="description" content="${field.typedescrip}">
     <meta http-equiv="Cache-Control" content="no-transform"/>
@@ -32,7 +32,7 @@
 <body>
 <#include "header.htm" />
 <div class="o_big">
-    {ms:channel type="parent"}
+    {ms:channel type="self"}
    <img src="{@ms:file field.typelitpic/}" alt="CMS,免费CMS,免费开源Java CMS,CMS系统,Java CMS,CMS内容管理系统,企业CMS,HTML网页模板,CMS模板,CMS源码,网站源码,信创系统软件,安可系统,网站建设,模板网站,建站模板,建站工具,建站平台,建站工具"/>
    <h1>${field.typetitle}</h1>
     {/ms:channel}
@@ -175,7 +175,7 @@
                                         type: 'warning'
                                     });
                                 } else {
-                                    that.$alert('需要安装留言插件才能使用，请先进入后台MStore安装留言插件使用。推荐开发者分享的<a href="http://store.mingsoft.net/#/detail?id=310&type=plugin" target="_blank" style="color:#409EFF ">留言插件</a>', '留言插件提示', {
+                                    that.$alert('需要安装留言插件才能使用，请先进入后台MStore安装留言插件使用。<a href="http://store.mingsoft.net/#/detail?id=310&type=plugin" target="_blank">查看留言插件</a>', '留言插件提示', {
                                         dangerouslyUseHTMLString: true
                                     });
                                 }

src/main/webapp/template/1/default/news-detail.htm

@@ -18,6 +18,23 @@
     <script type="text/javascript" src="/{ms:global.style/}js/jquery.superslide.2.1.1.js">//pc导航</script>
     <script src="/{ms:global.style/}js/anim.js">//动画</script>
     <script type="text/javascript" src="/{ms:global.style/}js/basic.js"></script>
+    <script type="text/javascript" src="{ms:global.contextpath/}/static/plugins/vue/2.6.9/vue.min.js"></script>
+    <link rel="stylesheet" href="{ms:global.contextpath/}/static/plugins/minireset/0.0.2/minireset.min.css" />
+    <link rel="stylesheet" href="https://cdn.mingsoft.net/iconfont/iconfont.css" />
+    <link rel="stylesheet" href="{ms:global.contextpath/}/static/plugins/animate/4.1.0/animate.min.css">
+    <script src="{ms:global.contextpath/}/static/plugins/element-ui/2.15.8/index.min.js"></script>
+    <link rel="stylesheet" href="{ms:global.contextpath/}/static/plugins/element-ui/2.15.8/theme-chalk/index.min.css" />
+    <!--网络请求框架-->
+    <script src="{ms:global.contextpath/}/static/plugins/axios/1.7.3/axios.min.js"></script>
+    <script src="{ms:global.contextpath/}/static/plugins/qs/6.6.0/qs.min.js"></script>
+    <script src="{ms:global.contextpath/}/static/plugins/ms/3.0/ms.umd.js"></script>
+    <script src="{ms:global.contextpath/}/static/plugins/ms/3.0/ms-el-form.umd.js"></script>
+    <script>
+        ms.base= "{ms:global.contextpath/}"
+    </script>
+    <#include "component/ms-comment.htm" />
+    <#include "component/ms-mattention.htm" />
+
 </head>
 <body>
 <#include "header.htm" />
@@ -29,7 +46,7 @@
 <div class="wrap">
     <div class="product_a anim anim-1"></div>
 </div>
-<div class="news_bg">
+<div class="news_bg" id="app">
     <div class="wrap">
         <div class="about_x anim anim-2">
             <div class="show_t">${field.title}</div>
@@ -37,13 +54,109 @@
             <div class="con_id">
                 <div>${field.content}</div>
             </div>
+            <div>
+                <el-alert title="需要集成会员插件、关注插件、评论插件下面的功能才能正常使用" type="warning" :closable="false" />
+            </div>
+            <!--文章底部交互-start-->
+            <div class="detail-bottom-interaction">
+                <ms-mattention :data-id="dataId" data-type="文章点赞" icon="icon-zan" label="${field.title}"></ms-mattention>
+                <ms-mattention :data-id="dataId" data-type="文章点踩" icon="icon-cai" label="${field.title}"></ms-mattention>
+            </div>
+            <!--文章底部交互-end-->
             <div class="prenext">上一篇：<a href="<#if pre.link !=''>{ms:global.html/}${pre.link}<#else>javascript:;</#if>">${pre.title}</a></div>
             <div class="prenext">下一篇：<a href="<#if next.link !=''>{ms:global.html/}${next.link}<#else>javascript:;</#if>">${next.title}</a></div>
         </div>
+        <!--评论容器-start-->
+
+        <div class="w-comment-div">
+
+            <!--评论-start-->
+            <ms-comment :data-id="dataId" :page-no="pageNo" :data-type="dataType" :data-title="dataTitle"></ms-comment>
+            <!--评论-end-->
+        </div>
+        <!--评论容器-end-->
     </div>
 </div>
 <!--正文end-->
 <#include "footer.htm" />
 <script language="javascript" src="/{ms:global.style/}js/foot.js"></script><!--尾部end-->
+<script>
+    var app = new Vue({
+        el: '#app',
+        component(){
+        },
+        data: {
+            searchForm: {
+                keyword: ""
+            },
+            hotSearchKeywords: [],
+            //文章商品id
+            dataId: "${field.id}",
+            //当前页数
+            pageNo: ${(page.cur)!1},
+            // 业务名称(文章标题)
+            dataTitle: "${field.title}",
+            // 业务类型
+            dataType: "文章",
+        },
+        methods: {
+        },
+        computed(){
+        },
+        created(){
+        }
+    })
+</script>
+<style>
+    .detail-bottom-interaction {
+        text-align: left;
+        flex-direction: row;
+        padding-right: 0px;
+        display: flex;
+        box-sizing: border-box;
+        margin-left: 0px;
+        min-height: 50px;
+        margin-right: 0px;
+        flex-shrink: 0;
+        width: 1280px;
+        margin-bottom: 0px;
+        padding-top: 0px;
+        padding-left: 0px;
+        margin-top: 40px;
+    }
+
+
+
+    .detail-bottom-interaction .interaction-like {
+        min-height: 50px;
+        margin-right: 20px;
+        align-items: center;
+        flex-wrap: nowrap;
+        flex-direction: row;
+        display: flex;
+        flex-shrink: 0;
+        width: unset;
+        box-sizing: border-box;
+        margin-top: 0px;
+        height: 100%;
+    }
+
+
+
+    .detail-bottom-interaction .interaction-like .label {
+        margin-right: 5px;
+        font-size: 28PX;
+        margin-top: 0px;
+    }
+
+
+
+    .detail-bottom-interaction .interaction-like .value {
+        margin-right: 0px;
+        flex-direction: row;
+        word-wrap: break-word;
+        display: inline-block;
+    }
+</style>
 </body>
 </html>

src/main/webapp/template/1/default/product-list.htm

@@ -47,7 +47,7 @@
     </div>
     <div class="product_ul">
         <ul>
-            {ms:arclist size=6 ispaging=true}
+            {ms:arclist size=6 orderby='sort,date' order='desc' ispaging=true}
             <li class="anim anim-1">
                 <div class="product_b">
                     <#if field.outlink!="">