Pārlūkot izejas kodu

5.2.0皮肤修改

guwd 4 gadi atpakaļ
vecāks
revīzija
5cb958100b

+ 76 - 73
src/main/webapp/template/1/default/about.htm

@@ -1,42 +1,42 @@
 <html>
- <head> 
-  <meta charset="utf-8"> 
-  <title>{ms:global.name/}</title> 
-  <meta http-equiv="content-type" content="text/html"> 
-  <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
-  <meta name="viewport" content="initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no,width=device-width"> 
-  <meta name="format-detection" content="telephone=no"> 
-  <meta name="app-mobile-web-app-capable" content="yes"> 
-  <meta name="app-mobile-web-app-status-bar-style" content="black-translucent"> 
-  <meta name="keywords" content="{ms:global.keyword/}"> 
-  <meta name="description" content="{ms:global.descrip/}"> 
-  <script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script> 
-  <link rel="stylesheet" href="{ms:global.host/}/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.host/}/static/plugins/animate/4.1.0/animate.min.css"> 
-  <script src="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.js"></script> 
-  <link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.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> 
-  <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> 
+ <head>
+  <meta charset="utf-8">
+  <title>{ms:global.name/}</title>
+  <meta http-equiv="content-type" content="text/html">
+  <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
+  <meta name="viewport" content="initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no,width=device-width">
+  <meta name="format-detection" content="telephone=no">
+  <meta name="app-mobile-web-app-capable" content="yes">
+  <meta name="app-mobile-web-app-status-bar-style" content="black-translucent">
+  <meta name="keywords" content="{ms:global.keyword/}">
+  <meta name="description" content="{ms:global.descrip/}">
+  <script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script>
+  <link rel="stylesheet" href="{ms:global.host/}/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.host/}/static/plugins/animate/4.1.0/animate.min.css">
+  <script src="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.js"></script>
+  <link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.12.0/index.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>
+  <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>
         ms.base = "";
-    </script> 
+    </script>
   <style>
         [v-cloak]{
             display: none;
         }
-    </style> 
- </head> 
- <body> 
-  <div id="app" v-cloak> 
-   <#include "nav.htm" /> 
-   <div class="news"> 
-    <div class="body"> 
+    </style>
+ </head>
+ <body>
+  <div id="app" v-cloak>
+   <#include "nav.htm" />
+   <div class="news">
+    <div class="body">
      <div class="left">
       {ms:channel type='parent'}
       <span class="title"> ${field.typetitle} </span>
@@ -52,22 +52,22 @@
       {/ms:channel}
       </#if>
      </div>
-     <div class="right"> 
-      <div class="ms-channel-path"> 
-       <span class="ms-channel-path-label"> 当前位置: </span> 
-       <a href="/" class="ms-channel-path-index"> 首页 </a> {ms:channel type="path"} 
-       <i class="iconfont icon-youjiantou"></i> 
-       <a href="{ms:global.url/}${field.typelink}" class="ms-channel-path-link"> ${field.typetitle} </a> {/ms:channel} 
-      </div> 
+     <div class="right">
+      <div class="ms-channel-path">
+       <span class="ms-channel-path-label"> 当前位置: </span>
+       <a href="/" class="ms-channel-path-index"> 首页 </a> {ms:channel type="path"}
+       <i class="iconfont icon-youjiantou"></i>
+       <a href="{ms:global.url/}${field.typelink}" class="ms-channel-path-link"> ${field.typetitle} </a> {/ms:channel}
+      </div>
       <span class="big-title"> </span>
-      <div class="news-body"> 
-       <span> ${field.content} </span> 
-      </div> 
-     </div> 
-    </div> 
-   </div> 
-   <#include "footer.htm" /> 
-  </div>   
+      <div class="news-body">
+       <span> ${field.content} </span>
+      </div>
+     </div>
+    </div>
+   </div>
+   <#include "footer.htm" />
+  </div>
   <script>
 var app = new Vue({
     el: '#app',
@@ -89,7 +89,7 @@ var app = new Vue({
     created(){
     }
 })
-</script> 
+</script>
   <style>
     body {
         background-color:#fff;
@@ -99,7 +99,7 @@ var app = new Vue({
         webkit-box-sizing:border-box;
     }
 
-    .news 
+    .news
     {
             align-items:flex-start;
             flex-direction:row;
@@ -115,7 +115,7 @@ var app = new Vue({
             padding-left:0px;
             margin-top:0px;
     }
-    .news .body 
+    .news .body
     {
             padding-bottom:20px;
             flex-wrap:nowrap;
@@ -127,7 +127,7 @@ var app = new Vue({
             padding-top:20px;
             padding-left:0px;
     }
-    .news .body .left 
+    .news .body .left
     {
             padding-bottom:0px;
             flex-wrap:nowrap;
@@ -141,7 +141,7 @@ var app = new Vue({
             margin-top:0px;
             height:100%;
     }
-    .news .body .left .title 
+    .news .body .left .title
     {
             border-bottom-color:#C0C4CC;
             color:#C0C4CC;
@@ -156,7 +156,7 @@ var app = new Vue({
             margin-top:0px;
             height:40px;
     }
-    .news .body .left .sub-title-sel 
+    .news .body .left .sub-title-sel
     {
             background-color:#F2F6FC;
             color:#409EFF;
@@ -169,7 +169,7 @@ var app = new Vue({
             margin-top:2px;
             height:40px;
     }
-    .news .body .left .sub-title 
+    .news .body .left .sub-title
     {
             color:#5F5F5F;
             flex-direction:row;
@@ -181,7 +181,7 @@ var app = new Vue({
             margin-top:0px;
             height:40px;
     }
-    .news .body .right 
+    .news .body .right
     {
             padding-bottom:0px;
             flex-wrap:nowrap;
@@ -196,7 +196,7 @@ var app = new Vue({
             margin-top:0px;
             height:100%;
     }
-    .news .body .right .ms-channel-path 
+    .news .body .right .ms-channel-path
     {
             margin-right:auto;
             align-items:center;
@@ -211,7 +211,7 @@ var app = new Vue({
             height:30px;
             margin-left:auto;
     }
-    .news .body .right .ms-channel-path span 
+    .news .body .right .ms-channel-path span
     {
             color:#909399;
             flex-direction:row;
@@ -219,7 +219,7 @@ var app = new Vue({
             display:inline-block;
             font-size:16PX;
     }
-    .news .body .right .ms-channel-path .ms-channel-path-index 
+    .news .body .right .ms-channel-path .ms-channel-path-index
     {
             cursor:pointer;
             color:#000;
@@ -228,10 +228,10 @@ var app = new Vue({
             margin-bottom:0px;
             margin-top:0px;
     }
-    .news .body .right .ms-channel-path >i 
+    .news .body .right .ms-channel-path >i
     {
     }
-    .news .body .right .ms-channel-path .ms-channel-path-link 
+    .news .body .right .ms-channel-path .ms-channel-path-link
     {
             cursor:pointer;
             color:#000;
@@ -240,7 +240,7 @@ var app = new Vue({
             margin-bottom:0px;
             margin-top:0px;
     }
-    .news .body .right .big-title 
+    .news .body .right .big-title
     {
             text-align:center;
             flex-direction:row;
@@ -251,7 +251,7 @@ var app = new Vue({
             padding-left:0px;
             margin-top:10px;
     }
-    .news .body .right .news-body 
+    .news .body .right .news-body
     {
             flex-direction:column;
             display:flex;
@@ -267,7 +267,7 @@ var app = new Vue({
             padding-left:0px;
             margin-top:0px;
     }
-    .news .body .right .news-body span 
+    .news .body .right .news-body span
     {
             flex-direction:row;
             word-wrap:break-word;
@@ -275,7 +275,7 @@ var app = new Vue({
             font-size:14px;
     }
 @media (max-width: 768px){
-        .news 
+        .news
         {
                 align-items:center;
                 flex-direction:row;
@@ -291,7 +291,7 @@ var app = new Vue({
                 padding-left:0px;
                 margin-top:0px;
         }
-        .news .body 
+        .news .body
         {
                 padding-bottom:20px;
                 flex-wrap:nowrap;
@@ -303,7 +303,11 @@ var app = new Vue({
                 padding-top:20px;
                 padding-left:0px;
         }
-        .news .body .right 
+
+ .news .body .left {
+  width: 100%;
+ }
+        .news .body .right
         {
                 padding-bottom:0px;
                 flex-wrap:nowrap;
@@ -317,7 +321,7 @@ var app = new Vue({
                 padding-left:0px;
                 margin-top:0px;
         }
-        .news .body .right .ms-channel-path 
+        .news .body .right .ms-channel-path
         {
                 align-items:center;
                 flex-direction:row;
@@ -333,14 +337,14 @@ var app = new Vue({
                 margin-top:10px;
                 height:30px;
         }
-        .news .body .right .ms-channel-path span 
+        .news .body .right .ms-channel-path span
         {
                 flex-direction:row;
                 word-wrap:break-word;
                 display:inline-block;
                 font-size:14PX;
         }
-        .news .body .right .ms-channel-path .ms-channel-path-index 
+        .news .body .right .ms-channel-path .ms-channel-path-index
         {
                 cursor:pointer;
                 color:#000;
@@ -349,7 +353,7 @@ var app = new Vue({
                 margin-bottom:0px;
                 margin-top:0px;
         }
-        .news .body .right .ms-channel-path .ms-channel-path-link 
+        .news .body .right .ms-channel-path .ms-channel-path-link
         {
                 cursor:pointer;
                 color:#000;
@@ -358,7 +362,7 @@ var app = new Vue({
                 margin-bottom:0px;
                 margin-top:0px;
         }
-        .news .body .right .big-title 
+        .news .body .right .big-title
         {
                 flex-direction:row;
                 word-wrap:break-word;
@@ -366,7 +370,7 @@ var app = new Vue({
                 font-size:22PX;
                 padding-left:0px;
         }
-        .news .body .right .news-body 
+        .news .body .right .news-body
         {
                 margin-right:0px;
                 padding-bottom:0px;
@@ -378,7 +382,6 @@ var app = new Vue({
                 margin-bottom:0px;
                 padding-top:0px;
                 margin-top:0px;
-                height:300px;
                 margin-left:0px;
         }
 

+ 5 - 3
src/main/webapp/template/1/default/css/app.css

@@ -63,9 +63,7 @@
     height: 100%;
 }
 
-.ms-nav .body .nav-h5:hover {
-    background-color: #EEEEEE;
-}
+
 
 .ms-nav .body .nav-h5 .nav-h5-icon {
     font-size: 28PX;
@@ -153,6 +151,7 @@
     justify-content: center;
     height: 32px;
     margin-left: 0px;
+    margin-bottom: 0px;
 }
 
 .ms-nav .body .nav-search .ms-search-input .ms-search-input-div {
@@ -489,6 +488,7 @@
         position: absolute;
         padding-left: 10px;
         height: 100vh;
+        z-index: 2;
     }
 
     .ms-nav .body .nav-h5 .nav-h5-body .nav-h5-item {
@@ -692,6 +692,8 @@
         padding-top: 0px;
         padding-left: 0px;
         justify-content: flex-start;
+        height: unset;
+
     }
 
     .ms-footer .body .top .top-left .foot-nav {

+ 1 - 0
src/main/webapp/template/1/default/empty.htm

@@ -0,0 +1 @@
+空

+ 3 - 3
src/main/webapp/template/1/default/footer.htm

@@ -12,11 +12,11 @@
    </div> 
    <div class="top-right"> 
     <div class="qr"> 
-     <img title="" alt="" src="https://iph.href.lu/100x100" class="pic"> 
-     <span class="text"> 公众号 </span> 
+     <img title="" alt="" src="{ms:global.host/}/{ms:global.style/}/images/sw.png" class="pic">
+     <span class="text"> 商务微信 </span>
     </div> 
     <div class="qr"> 
-     <img title="" alt="" src="https://iph.href.lu/100x100" class="pic"> 
+     <img title="" alt="" src="{ms:global.host/}/{ms:global.style/}/images/gzh.png" class="pic">
      <span class="text"> 公众号 </span> 
     </div> 
    </div> 

BIN
src/main/webapp/template/1/default/images/gzh.png


BIN
src/main/webapp/template/1/default/images/sw.png


+ 25 - 16
src/main/webapp/template/1/default/index.htm

@@ -51,10 +51,10 @@ Vue.use(VueAwesomeSwiper)
         }
     </style> 
  </head> 
- <body> 
-  <div id="app" v-cloak> 
-   <#include "nav.htm" /> 
-   <div class="ms-banner"> 
+ <body>
+  <div id="app" v-cloak>
+   <#include "nav.htm" />
+   <div class="ms-banner">
     <swiper class="ms-vue-awesome-swiper" :options="{
 slidesPerView : 1,
 spaceBetween: 0,
@@ -68,10 +68,15 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
      <div class="swiper-button-next " slot="button-next"> 
      </div> 
      <!--静态图片--> 
-     <!--动态图片--> {ms:arclist typeid=1329357285870346241 size=3 } 
-     <swiper-slide> 
-      <a href="[field.link/]" target="_blank"> <img src="{@ms:file field.litpic/}" width="100%" height="100%"> </a> 
-     </swiper-slide> {/ms:arclist} 
+     <!--动态图片-->
+     {ms:arclist typeid=1329357285870346241 size=3 }
+     <swiper-slide>
+      <a href="[field.source/]" target="_blank" style="width:100%;height: 100%">
+       <div style="background-image: url('{@ms:file field.litpic/}');background-size: cover; background-position: center; width:100%;height: 100%">
+       </div>
+      </a>
+     </swiper-slide>
+     {/ms:arclist}
     </swiper> 
    </div> 
    <div class="about">
@@ -85,7 +90,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
        <span> ${field.title} </span> 
       </div> 
       <div class="desc"> 
-       <span> ${field.keyword} </span>
+       <span> ${field.descrip} </span>
       </div> 
      </div> 
     </div> {/ms:arclist} 
@@ -95,7 +100,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
      <span> 核心产品 </span> 
     </div> 
     <div class="body">
-      {ms:arclist typeid='1329257213283344385'} 
+      {ms:arclist flag='c' typeid='1329257213283344385'}
      <div class="prod"> 
       <div class="pic"> 
        <img title="" alt="" src="{@ms:file field.litpic/}"> 
@@ -113,7 +118,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
       {ms:arclist flag='c' typeid='1329257282518720513'} 
      <div class="left"> 
       <img title="" alt="" src="{@ms:file field.litpic/}"> 
-      <a href="{ms:global.url/}${field.link}" target="_blank" class="title"> 显示内容 </a> 
+      <a href="{ms:global.url/}${field.link}" target="_blank" class="title"> ${field.title} </a>
       <span class="desc"> ${field.descrip} </span> 
      </div> {/ms:arclist} 
      <div class="right">
@@ -132,7 +137,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
     </div> 
     <div class="more"> 
     </div> 
-    <a href="{ms:global.url/}/news/index.html" class="more"> 更多产品 </a> 
+    <a href="{ms:global.url/}/news/index.html" class="more"> 更多新闻 </a>
    </div> 
    <#include "footer.htm" /> 
   </div>   
@@ -166,7 +171,9 @@ var app = new Vue({
         moz-box-sizing:border-box;
         webkit-box-sizing:border-box;
     }
-
+    .swiper-button-prev, .swiper-button-next{
+     color: #fff;
+    }
     .ms-banner 
     {
             flex-wrap:nowrap;
@@ -175,7 +182,7 @@ var app = new Vue({
             width:100%;
             box-sizing:border-box;
             margin-top:0px;
-            height:400px;
+            height:630px;
     }
     .ms-banner .ms-vue-awesome-swiper 
     {
@@ -319,6 +326,8 @@ var app = new Vue({
             font-size:16PX;
             padding-top:0px;
             margin-top:20px;
+     line-height: 32px;
+
     }
     .product 
     {
@@ -1064,7 +1073,7 @@ var app = new Vue({
                 margin-bottom:0px;
                 padding-top:0px;
                 margin-top:0px;
-                height:280px;
+                height:100%;
         }
         .news .body .left .title 
         {
@@ -1197,12 +1206,12 @@ var app = new Vue({
         }
         .news .body .right .news-item .news-body .desc 
         {
+         display: none;
                 padding-bottom:0px;
                 color:#B5B5B5;
                 text-align:left;
                 flex-direction:row;
                 word-wrap:break-word;
-                display:inline-block;
                 padding-right:0px;
                 font-size:14PX;
                 padding-top:0px;

+ 0 - 113
src/main/webapp/template/1/default/map.htm.html

@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-    <style type="text/css">
-        html,body{margin:0;padding:0;}
-        .iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
-        .iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
-    </style>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
-</head>
-
-<body>
-<div style="height:828px;border:#ccc solid 1px;" id="dituContent"></div>
-</body>
-<script type="text/javascript">
-    function initMap(){
-        createMap();//
-        setMapEvent();//
-        addMapControl();//
-        addMarker();//
-    }
-
-    function createMap(){
-        var map = new BMap.Map("dituContent");//
-
-        var point = new BMap.Point(116.301313,39.832434);//
-        map.centerAndZoom(point,15);//�
-        window.map = map;//
-    }
-
-
-    function setMapEvent(){
-        map.enableDragging();//
-        map.enableScrollWheelZoom();//
-        map.enableDoubleClickZoom();//
-        map.enableKeyboard();//
-    }
-
-    //
-    function addMapControl(){
-        //
-        var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
-        map.addControl(ctrl_nav);
-        //
-        var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
-        map.addControl(ctrl_ove);
-        //
-        var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
-        map.addControl(ctrl_sca);
-    }
-
-    //
-    var markerArr = [{title:"中建材信云智联科技有限公司",content:"地址:北京市丰台区南四路环西路186号汉威国际广场二区9号楼2层",point:"116.301313|39.832434",isOpen:1,icon:{w:23,h:25,l:46,t:21,x:9,lb:12}}
-    ];
-    //
-    function addMarker(){
-        for(var i=0;i<markerArr.length;i++){
-            var json = markerArr[i];
-            var p0 = json.point.split("|")[0];
-            var p1 = json.point.split("|")[1];
-            var point = new BMap.Point(p0,p1);
-            var iconImg = createIcon(json.icon);
-            var marker = new BMap.Marker(point,{icon:iconImg});
-            var iw = createInfoWindow(i);
-            var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
-            marker.setLabel(label);
-            map.addOverlay(marker);
-            label.setStyle({
-                borderColor:"#808080",
-                color:"#333",
-                cursor:"pointer"
-            });
-
-            (function(){
-                var index = i;
-                var _iw = createInfoWindow(i);
-                var _marker = marker;
-                _marker.addEventListener("click",function(){
-                    this.openInfoWindow(_iw);
-                });
-                _iw.addEventListener("open",function(){
-                    _marker.getLabel().hide();
-                })
-                _iw.addEventListener("close",function(){
-                    _marker.getLabel().show();
-                })
-                label.addEventListener("click",function(){
-                    _marker.openInfoWindow(_iw);
-                })
-                if(!!json.isOpen){
-                    label.hide();
-                    _marker.openInfoWindow(_iw);
-                }
-            })()
-        }
-    }
-    //����InfoWindow
-    function createInfoWindow(i){
-        var json = markerArr[i];
-        var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
-        return iw;
-    }
-    //һ��Icon
-    function createIcon(json){
-        var icon = new BMap.Icon("http://app.baidu.com/map/images/us_mk_icon.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
-        return icon;
-    }
-
-    initMap();//
-</script>
-</html>

+ 12 - 6
src/main/webapp/template/1/default/nav.htm

@@ -1,19 +1,25 @@
-<div class="ms-nav"> 
+<#assign ids=field.parentids>
+<#assign typeid=field.typeid>
+<div class="ms-nav">
  <div class="body"> 
   <div class="logo"> 
    <img title="" alt="" src="{@ms:file global.logo/}" class="logo-pic"> 
    <img title="" alt="" src="https://www.mingsoft.net//template/1/ms/images/1596437934982.png" class="logo-desc"> 
   </div> 
-  <div @click="switchShow([&quot;1605172743000_96378&quot;]);" class="nav-h5"> 
+  <div @click="switchShow([&quot;1605172743000_96378&quot;]);" class="nav-h5">
    <i class="iconfont icon-caidan nav-h5-icon"></i> 
-   <div id="key_1605172743000_96378" class="nav-h5-body"> 
-    <a href="#" class="nav-h5-item"> 首页 </a> 
+   <div id="key_1605172743000_96378" class="nav-h5-body" style="display: none">
+    <a href="{ms:global.host/}" class="nav-h5-item"> 首页 </a>
+    {ms:channel flag='nav' type='top'}
+    <a href="<#if field.type==3>{ms:global.url/}${field.typeurl}<#else>{ms:global.url/}${field.typelink}</#if>" class="nav-h5-item <#if typeid==field.typeid || (ids?has_content && ids?index_of('${field.typeid}') gt -1)> sel</#if>">
+     ${field.typetitle}
+    </a>
+    {/ms:channel}
    </div> 
   </div> 
   <div class="nav-item"> 
    <a href="{ms:global.host/}" class="item"> 首页 </a>
-   <#assign ids=field.parentids>
-   <#assign typeid=field.typeid>
+
    {ms:channel flag='nav' type='top'}
    <a href="<#if field.type==3>{ms:global.url/}${field.typeurl}<#else>{ms:global.url/}${field.typelink}</#if>" class="item<#if typeid==field.typeid || (ids?has_content && ids?index_of('${field.typeid}') gt -1)> sel</#if>">
     ${field.typetitle}

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

@@ -321,7 +321,6 @@ var app = new Vue({
             margin-bottom:0px;
             padding-top:0px;
             margin-top:0px;
-            height:300px;
             margin-left:0px;
     }
     .content .body .right .news-body span 
@@ -578,6 +577,7 @@ var app = new Vue({
                 margin-top:0px;
                 height:300px;
                 margin-left:0px;
+          height: unset;
         }
         .content .body .right .news-body span 
         {

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

@@ -113,6 +113,15 @@ var app = new Vue({
      contentCount: ${(page.rcount)!0}
     },
     methods: {
+     switchShow:function(arr){
+      var that = this
+      arr.forEach(function(x){
+       let e = that.$el.querySelector("#key_"+x)
+       if(e){
+        e.style.display=e.style.display=='none'?'flex':'none'
+       }
+      })
+     },
      handleCurrentChange:function(val) {
       if(val==1) {
        location.href = "{ms:global.url/}/${field.categoryPath}/index.html";
@@ -468,6 +477,9 @@ var app = new Vue({
                 padding-left:0px;
                 justify-content:flex-start;
         }
+ .news .body .left {
+  width: 90%;
+ }
         .news .body .right
         {
                 padding-bottom:0px;
@@ -556,6 +568,7 @@ var app = new Vue({
                 margin-bottom:10px;
                 padding-top:0px;
                 padding-left:0px;
+         height: unset;
         }
         .news .body .right .right-body .news-item .pic
         {
@@ -567,7 +580,7 @@ var app = new Vue({
                 box-sizing:border-box;
                 margin-bottom:0px;
                 padding-top:0px;
-                height:120px;
+                height:unset;
         }
         .news .body .right .right-body .news-item .pic img
         {
@@ -620,6 +633,7 @@ var app = new Vue({
                 padding-left:0px;
                 margin-top:0px;
                 height:100px;
+         display: none;
         }
         .news .body .right .right-body .news-item .news-content .news-footer
         {

+ 3 - 5
src/main/webapp/template/1/default/product-detail.htm

@@ -68,8 +68,7 @@
         </div> 
        </div> 
        <div class="content"> 
-        <span class="label"> 详情 </span> 
-        <div class="content-body"> 
+        <div class="content-body">
          <span> ${field.content} </span> 
         </div> 
        </div> 
@@ -276,9 +275,9 @@ var app = new Vue({
     }
     .content .body .right .product .pic img 
     {
-            width:240px;
+            width:320px;
             padding-left:0px;
-            height:240px;
+            height:206px;
     }
     .content .body .right .product .pic .text 
     {
@@ -318,7 +317,6 @@ var app = new Vue({
             box-sizing:border-box;
             padding-top:10px;
             padding-left:0px;
-            height:240px;
     }
     .content .body .right .product .content .label 
     {

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

@@ -70,7 +70,7 @@
       </div>
       <div class="list">
        <div class="list-body">
-        {ms:arclist size=8 ispaging=true}
+        {ms:arclist size=6 ispaging=true}
         <div class="product">
          <img title="" alt="" src="{@ms:file field.litpic/}" />
          <a href="{ms:global.url/}${field.link}">
@@ -110,6 +110,15 @@ var app = new Vue({
      contentCount: ${(page.rcount)!0}
     },
     methods: {
+     switchShow:function(arr){
+      var that = this
+      arr.forEach(function(x){
+       let e = that.$el.querySelector("#key_"+x)
+       if(e){
+        e.style.display=e.style.display=='none'?'flex':'none'
+       }
+      })
+     },
      handleCurrentChange:function(val) {
       if(val==1) {
        location.href = "{ms:global.url/}/${field.categoryPath}/index.html";
@@ -282,7 +291,7 @@ var app = new Vue({
      padding-right: 0px;
      margin-right: 0px;
      padding-bottom: 0px;
-     height: 90%;
+     height: 800px;
      margin-bottom: 0px;
      position: absolute;
      padding-left: 0px;
@@ -315,7 +324,6 @@ var app = new Vue({
      padding-right: 0px;
      margin-right: 8px;
      padding-bottom: 0px;
-     height: 300px;
      margin-bottom: 8px;
      padding-left: 0px;
      box-sizing: border-box;
@@ -323,7 +331,7 @@ var app = new Vue({
      background-color: #FFFFFF;
      flex-direction: column;
      display: flex;
-     width: 239px;
+     width: 320px;
      margin-top: 0px;
     }
 
@@ -446,6 +454,7 @@ var app = new Vue({
   display: flex;
   padding-right: 0px;
   width: 90%;
+  height: unset;
   margin-bottom: 0px;
   box-sizing: border-box;
   padding-top: 0px;
@@ -499,7 +508,7 @@ var app = new Vue({
  .content .body .right .list {
   margin-right: 0px;
   padding-bottom: 0px;
-  flex-direction: row;
+  flex-direction: column;
   display: flex;
   padding-right: 0px;
   width: 100%;
@@ -509,6 +518,7 @@ var app = new Vue({
   padding-left: 0px;
   margin-top: 0px;
   height: unset;
+  position: unset;
  }
 
  .content .body .right .list .list-body {
@@ -521,8 +531,11 @@ var app = new Vue({
   box-sizing: border-box;
   margin-top: 0px;
   justify-content: center;
+  position: unset;
+ }
+ .content .body .right .list .page {
+  position:unset;
  }
-
  .content .body .right .list .list-body .product {
   background-color: #FFFFFF;
   flex-direction: column;
@@ -536,7 +549,6 @@ var app = new Vue({
   padding-top: 0px;
   padding-left: 0px;
   margin-top: 0px;
-  height: 300px;
  }
 
  .content .body .right .list .list-body .product img {