anderx лет назад: 4
Родитель
Сommit
94f9efb488

+ 0 - 14
.idea/artifacts/kede_web_hn_war.xml

@@ -1,14 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="kede-web-hn:war">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <module>kede-web-hn</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
-    <root id="archive" name="local.war">
-      <element id="artifact" artifact-name="kede-web-hn:war exploded" />
-    </root>
-  </artifact>
-</component>

+ 2 - 12
.idea/artifacts/kede_web_hn_war_exploded.xml

@@ -1,13 +1,6 @@
 <component name="ArtifactManager">
-  <artifact type="exploded-war" build-on-make="true" name="kede-web-hn:war exploded">
-    <output-path>$PROJECT_DIR$/out</output-path>
-    <properties id="maven-jee-properties">
-      <options>
-        <exploded>true</exploded>
-        <module>kede-web-hn</module>
-        <packaging>war</packaging>
-      </options>
-    </properties>
+  <artifact type="exploded-war" name="kede-web-hn:war exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/kede_web_hn_war_exploded</output-path>
     <root id="root">
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
@@ -101,9 +94,6 @@
           <element id="library" level="project" name="Maven: javax.xml.bind:jaxb-api:2.3.0" />
         </element>
       </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/target/kede-web-hn-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF" />
-      </element>
       <element id="javaee-facet-resources" facet="kede-web-hn/web/Web" />
     </root>
   </artifact>

+ 3 - 2
src/main/resources/props/config_local.properties

@@ -61,8 +61,9 @@ template.cacheable=false
 avatar.upload.host=//172.16.0.255:3000/upload
 #连接开�
 
-#portal.host=//kedejs.jishutao.com/portal/1.0.19
-portal.host=//172.16.0.52/portal/1.0.19
+portal.host=//kedejs.jishutao.com/portal/1.0.20
+#portal.host=//172.16.0.52/portal/1.0.19
+#portal.host=//172.16.0.255:3000/1.0.20
 
 static.host=//kedejs.jishutao.com/client/1.0.5
 #static.host=//172.16.0.52/client/1.0.5

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -61,7 +61,7 @@ template.cacheable=false
 
 
 #连接开�
-portal.host=//kedejs.jishutao.com/portal/1.0.19
+portal.host=//kedejs.jishutao.com/portal/1.0.20
 static.host=//kedejs.jishutao.com/client/1.0.5
 
 avatar.host=//kedejs.jishutao.com

+ 51 - 28
src/main/webapp/WEB-INF/views/common.html

@@ -387,14 +387,26 @@
                 <div class="down_left">
                     <p>友情链接</p>
                 </div>
-                <div class="swiper-container conts" id="swiper5s" style="color: white;max-height: 60px;">
-                    <div class="swiper-wrapper  swipers">
+            <div style="color:#7E7F7F">
+                <div style="overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical;width: 66vw;">
+                    <!--                <div class="swiper-slide links" style="display:flex" >-->
+                    <span class="spanLink" th:each="link:${links}" style="padding: 0 2px;display: inline-block">
+                        <a style="color:#7E7F7F;font-size: 12px" th:href="${link.url}" ><span th:text="${link.name}"></span></a>
+                        <!--                    </div>-->
+                </span>
+                </div>
+                <div style="display: flex;justify-content: right">
+                    <span class='spanLink' style='display:inline-block;'><a style='color:#7E7F7F' href='/portal/link'>MORE<span style='font-size:20px'>⋙</span></a></span>
+                </div>
+            </div>
+<!--                <div class="swiper-container conts" id="swiper5s" style="color: white;max-height: 60px;">-->
+<!--                    <div class="swiper-wrapper">-->
 
-<!--                        <div class="swipers">-->
+<!--&lt;!&ndash;                        <div class="swipers">&ndash;&gt;-->
 
-<!--                        </div>-->
-                    </div>
-                </div>
+<!--&lt;!&ndash;                        </div>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                </div>-->
 <!--            <div style="width: 100%;display: flex;justify-content: right;"><a style="color: white" th:href="${basePath+'/portal/link'}">MORE<sup>>>></sup></a></div>-->
 <!--                <div style="color:white;"><a th:href="${basePath+'/portal/link'}">More<sup>>>></sup></a></div>-->
             <div class="row" style="position: relative;">
@@ -475,12 +487,13 @@
                 <div class="down_left">
                     <p style="text-align: center;font-size: 17px;width: 80px">热门城市</p>
                 </div>
-                <div class="swiper-container " id="swiper6x" style="max-height:20px;margin:0 0 8px 8px">
-                    <div class="swiper-wrapper sliderCity">
-
-                        <!--                        <div class="swipers">-->
-
-                        <!--                        </div>-->
+                <div style="color:#7E7F7F;margin-bottom: 9px;">
+                    <div style="overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 1;-webkit-box-orient: vertical;width: 60vw;">
+                        <!--                <div class="swiper-slide links" style="display:flex" >-->
+                        <span class="spanLink" th:each="city:${popularCities}" style="padding: 0 4px;display: inline-block">
+                        <a style="color:#7E7F7F;font-size: 12px;" th:href="${city.url}" ><span th:text="${city.name}"></span></a>
+                            <!--                    </div>-->
+                </span>
                     </div>
                 </div>
             </div>
@@ -490,21 +503,38 @@
         <!-- 友情链接 -->
         <div class="links">
             <div class="container">
-                <h2 class="item-title" style="font-size: 18px;text-align: center;"><a style="color:white" href="javascript:;" >友情链接</a></h2>
-                <div class="swiper-container linkCont" id="swiper5ss" style="color: white;max-height: 20px;">
-                    <div class="swiper-wrapper swiperLinks">
-
+                <h2 class="item-title" style="font-size: 18px;text-align: center;"><a style="color:white">友情链接</a></h2>
+                <div style="color:#7E7F7F;">
+                    <div style="overflow: hidden;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    /*width: 66vw;*/
+                    ">
+                        <!--                <div class="swiper-slide links" style="display:flex" >-->
+                        <span class="spanLink" th:each="link:${links}" style="padding: 0 4px;display: inline-block">
+                        <a style="color:#7E7F7F;font-size: 12px" th:href="${link.url}" ><span th:text="${link.name}"></span></a>
+                            <!--                    </div>-->
+                </span>
+                    </div>
+                    <div style="display: flex;justify-content: right;flex: 1">
+                        <span class='spanLink' style='display:inline-block;'><a style='color:#7E7F7F' href='/portal/link'>MORE<span style='font-size:20px'>⋙</span></a></span>
                     </div>
-                </div>
             </div>
         </div>
+        </div>
         <!-- 热门城市 -->
         <div class="links" style="padding-bottom: 20px;">
             <div class="container">
-                <h2 class="item-title" style="font-size: 18px;text-align: center;"><a style="color:white" href="javascript:;" >热门城市</a></h2>
-                <div class="swiper-container contais" id="swiper6xs" style="color: white;max-height: 20px;">
-                    <div class="swiper-wrapper CitySlide">
-
+                <h2 class="item-title" style="font-size: 18px;text-align: center;"><a style="color:white">热门城市</a></h2>
+                <div style="color:#7E7F7F;">
+                    <div style="overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;">
+                        <!--                <div class="swiper-slide links" style="display:flex" >-->
+                        <span class="spanLink" th:each="city:${popularCities}" style="padding: 0 4px;display: inline-block">
+                        <a style="color:#7E7F7F;font-size: 12px;" th:href="${city.url}" ><span th:text="${city.name}"></span></a>
+                            <!--                    </div>-->
+                </span>
                     </div>
                 </div>
             </div>
@@ -633,10 +663,6 @@
     <!-- 导航栏效果、回到顶部 -->
     <script th:if="${type}!='houtai'" th:src="${portalHost+'/js/secode.js'}"></script>
     <script th:if="${type}!='houtai'" th:src="${portalHost+'/js/register.js'}"></script>
-    <script th:src="${portalHost+'/js/link.js'}"></script>
-    <script th:src="${portalHost+'/js/linkMobail.js'}"></script>
-    <script th:src="${portalHost+'/js/city.js'}"></script>
-    <script th:src="${portalHost+'/js/cityMobail.js'}"></script>
     <script th:inline="javascript">
         /*<![CDATA[*/
         window.globalConfig = {};
@@ -679,9 +705,6 @@
             s.parentNode.insertBefore(hm, s);
         })();
     </script>
-
-    <script th:src="${portalHost+'/js/swiper/swiper.min.js'}"></script>
-
     <th:block th:replace="${scripts}" />
 </th:block>
 

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/link.html

@@ -41,7 +41,7 @@
             <div style="padding:6px 20px;width:70vw;margin: 0 auto;">
               <h3>友情链接</h3>
               <div class="linkAll" style="margin: 6px 0;" >
-                      <span style="display: inline-block;padding-right: 6px;" th:each="link:${links}"><a style="color:#333" th:href="${link.url}" th:text="${link.name}"></a></span>
+                      <span class="spanLinkMore" style="display: inline-block;padding-right: 6px;" th:each="link:${links}"><a style="color:#7E7F7F" th:href="${link.url}" th:text="${link.name}"></a></span>
               </div>
             </div>
         </div>