Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev

public/static/index/css/achievement.css

@@ -187,6 +187,7 @@
   display: flex;
   border-radius: 1rem;
   margin-top: 1.25rem;
+
 }
 .orico_Page_achievement .achievementMain .tech .techcontent .techcon div {
   width: 50%;
@@ -195,6 +196,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  margin: 1.5625rem;
 }
 .orico_Page_achievement .achievementMain .tech .techcontent .techcon .text img {
   margin-top: 5rem;
@@ -223,6 +225,7 @@
   font-family: inherit;
 }
 .orico_Page_achievement .achievementMain .tech .techcontent .techcon .tech-img img {
-  margin: 1.5625rem;
+ 
   width: -webkit-fill-available;
+  width:100%;
 }

public/static/index/css/article_category.css

@@ -72,18 +72,20 @@
 }
 .orico_Page_category .categoryMain .tabConten .tbmain {
   position: relative;
-  margin: 2% 0;
-  width: 100%;
+  padding: 2% 1.5rem;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
 }
 .orico_Page_category .categoryMain .tabConten .tbmain .Contenitem {
   float: left;
-  width: 29.1%;
+  width: 30.1%;
   height: auto;
-  margin: 0 0 1.5rem 1.5rem;
+  margin: 0 0 1.4% 0;
   background: #f5f5f5;
   padding: 1rem;
   position: relative;
-  min-height: 32rem;
+  /* min-height: 32rem; */
   overflow: hidden;
 }
 .orico_Page_category .categoryMain .tabConten .tbmain .Contenitem a {

public/static/index/css/topic_nas_index.css

@@ -17,8 +17,9 @@
 }
 
 .jjfabgimg {
-	width: 20.1875rem;
-	height: 37.6875rem;
+	/* width: 20.1875rem; */
+  width:100%;
+	/* height: 37.6875rem; */
 	border-radius: 0.375rem;
 }
 
@@ -179,91 +180,34 @@
 	.nars-cate .narscatecenter .cate-column .smallcateit {
 		height: 5.45rem;
 	}
+  .nars-jjfa .jjfa-title,.nars-wlj .wlj-title{
+    font-size: 2.75rem !important;
+  }
+  .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide {
+    font-size: 1rem !important;
+    position: relative;
+    overflow-y: auto;
+    height:auto !important;
+  }
+  .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide .jjfa-ct .st{
+    font-size: 1rem !important;
+  }
+  .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide .jjfa-info .jjfa-sp-title{
+    font-size: 1.25rem!important;
+    padding: 0 !important;
+  }
+  .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide:hover .jjfa-info{
+    padding: 0 0.5rem !important;
+  }
+  .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide .jjfa-info .jjfa-a,.nars-wlj .wltitem .wljcpinfo .if-info{
+    font-size: 1rem !important;
+    line-height: 1.25rem !important;
+  }
+  .nars-wlj .wltitem .wljcpinfo .if-title{
+    font-size: 1.25rem!important;
+  }
 }
 
-@media screen and (min-width:1281px) and (max-width:1360px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 12.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 17.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 7.45rem;
-	}
-}
-
-@media screen and (min-width:1361px) and (max-width:1460px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 13.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 18.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 8.45rem;
-	}
-}
-
-@media screen and (min-width:1461px) and (max-width:1660px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 15.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 24.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 6.45rem;
-	}
-}
-
-@media screen and (min-width:1661px) and (max-width:1760px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 15.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 23.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 7.45rem;
-	}
-}
-
-@media screen and (min-width:1761px) and (max-width:1960px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 16.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 24.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 8.45rem;
-	}
-}
-
-@media screen and (min-width:1980px) {
-	.nars-cate .narscatecenter .cate-column .cateit {
-		height: 18.25rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .bigcateit {
-		height: 26.05rem;
-	}
-
-	.nars-cate .narscatecenter .cate-column .smallcateit {
-		height: 10.45rem;
-	}
-}
 
 .nars-cate .narscatecenter .cate-column .cateit .pp1 {
 	margin-top: 2.625rem;
@@ -342,7 +286,7 @@
 .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide {
 	position: relative;
 	width: 20.1875rem;
-	height: 37.6875rem;
+	/* height: 37.6875rem; */
 	border-radius: 0.375rem;
 }
 
@@ -351,13 +295,15 @@
 	top: 0;
 	text-align: center;
 	width: 100%;
-	width: 100%;
 	height: 5.125rem;
 	background: #3231FF;
 	line-height: 5.125rem;
 	color: #fff;
 	border-top-right-radius: 0.375rem;
 	border-top-left-radius: 0.375rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .nars-jjfa .jjfaSwiper .swiper-wrapper .swiper-slide .jjfa-ct .st {
@@ -507,4 +453,88 @@
 	font-size: 2.5rem;
 	text-align: center;
 	cursor: pointer;
+}
+
+@media screen and (min-width:1281px) and (max-width:1360px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 12.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 17.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 7.45rem;
+	}
+}
+
+@media screen and (min-width:1361px) and (max-width:1460px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 13.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 18.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 8.45rem;
+	}
+}
+
+@media screen and (min-width:1461px) and (max-width:1660px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 15.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 24.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 6.45rem;
+	}
+}
+
+@media screen and (min-width:1661px) and (max-width:1760px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 15.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 23.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 7.45rem;
+	}
+}
+
+@media screen and (min-width:1761px) and (max-width:1960px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 16.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 24.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 8.45rem;
+	}
+}
+
+@media screen and (min-width:1980px) {
+	.nars-cate .narscatecenter .cate-column .cateit {
+		height: 18.25rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .bigcateit {
+		height: 26.05rem;
+	}
+
+	.nars-cate .narscatecenter .cate-column .smallcateit {
+		height: 10.45rem;
+	}
 }