From 5cb958100b03e6587d2b3133613afdca99036fca Mon Sep 17 00:00:00 2001 From: guwd Date: Thu, 7 Jan 2021 09:09:40 +0800 Subject: [PATCH] =?UTF-8?q?5.2.0=E7=9A=AE=E8=82=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/template/1/default/about.htm | 149 +++++++++--------- .../webapp/template/1/default/css/app.css | 8 +- src/main/webapp/template/1/default/empty.htm | 1 + src/main/webapp/template/1/default/footer.htm | 6 +- .../webapp/template/1/default/images/gzh.png | Bin 0 -> 31816 bytes .../webapp/template/1/default/images/sw.png | Bin 0 -> 28780 bytes src/main/webapp/template/1/default/index.htm | 41 +++-- .../webapp/template/1/default/map.htm.html | 113 ------------- src/main/webapp/template/1/default/nav.htm | 18 ++- .../webapp/template/1/default/news-detail.htm | 2 +- .../webapp/template/1/default/news-list.htm | 16 +- .../template/1/default/product-detail.htm | 8 +- .../template/1/default/product-list.htm | 26 ++- 13 files changed, 160 insertions(+), 228 deletions(-) create mode 100644 src/main/webapp/template/1/default/empty.htm create mode 100644 src/main/webapp/template/1/default/images/gzh.png create mode 100644 src/main/webapp/template/1/default/images/sw.png delete mode 100644 src/main/webapp/template/1/default/map.htm.html diff --git a/src/main/webapp/template/1/default/about.htm b/src/main/webapp/template/1/default/about.htm index 56899944..98c23dc1 100755 --- a/src/main/webapp/template/1/default/about.htm +++ b/src/main/webapp/template/1/default/about.htm @@ -1,42 +1,42 @@ - - - {ms:global.name/} - - - - - - - - - - - - - - - - - - - - - + + + {ms:global.name/} + + + + + + + + + + + + + + + + + + + + + + - - -
- <#include "nav.htm" /> -
-
+ + + +
+ <#include "nav.htm" /> +
+
{ms:channel type='parent'} ${field.typetitle} @@ -52,22 +52,22 @@ {/ms:channel}
-
-
- 当前位置： - 首页 {ms:channel type="path"} - - ${field.typetitle} {/ms:channel} -
+
+
+ 当前位置： + 首页 {ms:channel type="path"} + + ${field.typetitle} {/ms:channel} +
-
- ${field.content} -
-
-
-
- <#include "footer.htm" /> -
+
+ ${field.content} +
+
+
+
+ <#include "footer.htm" /> +
+ - -
- <#include "nav.htm" /> -
+ +
+ <#include "nav.htm" /> +
- {ms:arclist typeid=1329357285870346241 size=3 } - - - {/ms:arclist} + + {ms:arclist typeid=1329357285870346241 size=3 } + + +
+
+ + + {/ms:arclist}
@@ -85,7 +90,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'} ${field.title}
- ${field.keyword} + ${field.descrip}
{/ms:arclist} @@ -95,7 +100,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'} 核心产品
- {ms:arclist typeid='1329257213283344385'} + {ms:arclist flag='c' typeid='1329257213283344385'}
@@ -113,7 +118,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'} {ms:arclist flag='c' typeid='1329257282518720513'}
- 显示内容 + ${field.title} ${field.descrip}
{/ms:arclist}
@@ -132,7 +137,7 @@ navigation: {nextEl: '.swiper-button-next',prevEl: '.swiper-button-prev'}
- 更多产品 + 更多新闻
<#include "footer.htm" />
@@ -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; diff --git a/src/main/webapp/template/1/default/map.htm.html b/src/main/webapp/template/1/default/map.htm.html deleted file mode 100644 index 98d0dae6..00000000 --- a/src/main/webapp/template/1/default/map.htm.html +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - -
- - - \ No newline at end of file diff --git a/src/main/webapp/template/1/default/nav.htm b/src/main/webapp/template/1/default/nav.htm index aa966431..6e1e36d3 100755 --- a/src/main/webapp/template/1/default/nav.htm +++ b/src/main/webapp/template/1/default/nav.htm @@ -1,19 +1,25 @@ -
+<#assign ids=field.parentids> +<#assign typeid=field.typeid> +
-
+
-
- 首页 +
首页 - <#assign ids=field.parentids> - <#assign typeid=field.typeid> + {ms:channel flag='nav' type='top'} ${field.typetitle} diff --git a/src/main/webapp/template/1/default/news-detail.htm b/src/main/webapp/template/1/default/news-detail.htm index 176aea54..a708b3cd 100755 --- a/src/main/webapp/template/1/default/news-detail.htm +++ b/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 { diff --git a/src/main/webapp/template/1/default/news-list.htm b/src/main/webapp/template/1/default/news-list.htm index 8feda32b..50039573 100755 --- a/src/main/webapp/template/1/default/news-list.htm +++ b/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 { diff --git a/src/main/webapp/template/1/default/product-detail.htm b/src/main/webapp/template/1/default/product-detail.htm index 1e2fc951..f45b5357 100755 --- a/src/main/webapp/template/1/default/product-detail.htm +++ b/src/main/webapp/template/1/default/product-detail.htm @@ -68,8 +68,7 @@
- 详情 -
+
${field.content}
@@ -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 { diff --git a/src/main/webapp/template/1/default/product-list.htm b/src/main/webapp/template/1/default/product-list.htm index 3b66969b..c47d3ddb 100755 --- a/src/main/webapp/template/1/default/product-list.htm +++ b/src/main/webapp/template/1/default/product-list.htm @@ -70,7 +70,7 @@
- {ms:arclist size=8 ispaging=true} + {ms:arclist size=6 ispaging=true}
@@ -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 {