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

app/index/view/pc/public/base.html

@@ -60,18 +60,17 @@
 				return 'unknown';
 			}
 		}
-	
-		$(window).ready(function () {
-			const deviceType = detectDeviceByResolution();
-			if (deviceType=='tablet') {
-				window.location.href = '?mtpl=1';
-			}
-		})
 		// $(window).ready(function () {
-		// 	if ($(window).width() < 1024) {
+		// 	const deviceType = detectDeviceByResolution();
+		// 	if (deviceType=='tablet') {
 		// 		window.location.href = '?mtpl=1';
 		// 	}
 		// })
+		$(window).ready(function () {
+			if ($(window).width() < 1024) {
+				window.location.href = '?mtpl=1';
+			}
+		})
 	</script>
 </head>
 

public/static/index/mobile/css/topic_nas_download.css

@@ -92,6 +92,7 @@
     align-items: center;
     cursor: pointer;
     margin-bottom: 0.625rem;
+    flex-direction: column;
 }
 
 .narsDowloadPc .nDtopCtMian .nDtopIt2 .nDitImg img {
@@ -119,3 +120,40 @@
     width: 50%;
     height: 50%;
 }
+.narsDowloadPc .nDtopCtMian .nDtopIt2 .nDitImg
+.narswljshow .nDtopIt2 .nDitImg .dwbt {
+    padding: 0.5rem 1.8rem;
+    background: #A1A7BF;
+    border-radius: 1.85rem;
+    color: #fff;
+    font-size: 0.85rem;
+    cursor: pointer;
+    margin-bottom: 14%;
+}
+
+.narswljshow .nDtopIt2 .nDitImg .dwbtactive {
+    background: #004CFA;
+}
+
+.narswljshow .nDtopIt2 .nDitImg .yy_name {
+    font-size: 1rem;
+    padding-bottom: 10px;
+    padding-top: 5px;
+    color: #000;
+    font-weight: bold;
+}
+.narswljshow .nDtopIt2 .nDitImg .nDitImg img {
+    width: 3.25rem;
+    height: 3.25rem;
+    padding: 1.25rem;
+    padding-bottom: 0.5rem;
+}
+.narswljshow .nDtopIt2 .nDitImg .dwbt {
+    padding: 0.5rem 1.8rem;
+    background: #A1A7BF;
+    border-radius: 1.85rem;
+    color: #fff;
+    font-size: 0.85rem;
+    cursor: pointer;
+    margin-bottom: 14%;
+}

public/static/index/pc/css/topic_nas_download.css

@@ -83,32 +83,11 @@
   justify-content: center;
   align-items: center;
   cursor: pointer;
-  flex-direction: column;
 }
 
 .narsDowloadPc .nDtopCtMian .nDtopIt2 .nDitImg img {
-  width: 3.25rem;
-  height: 3.25rem;
-  padding: 1.25rem;
-  padding-bottom: 0.5rem;
-}
-
-.narswljshow .nDtopIt2 .nDitImg .yy_name {
-  font-size: 1rem;
-  padding-bottom: 10px;
-  padding-top: 5px;
-  color: #000;
-  font-weight: bold;
-}
-
-.narswljshow .nDtopIt2 .nDitImg .dwbt {
-  padding: 0.5rem 1.8rem;
-  background: #A1A7BF;
-  border-radius: 1.85rem;
-  color: #fff;
-  font-size: 0.85rem;
-  cursor: pointer;
-  margin-bottom: 14%;
+  width: 126px;
+  height: 126px;
 }
 
 .narswljshow {
@@ -120,16 +99,13 @@
   display: flex;
   flex-direction: column;
 }
-
 .narsDowloadPc .nDtopCtMian .nDtopIt2 .nDitImg1{
    width: 291px;
 }
-
 .narsDowloadPc .narssben-us .nDtopIt2 .nDitImg img{
   width:70px !important;
   height:70px!important;
 }
-
 .narsDowloadPc .narssben-us .nDtopIt2  .dwbt {
   padding: 6px 38px;
   background: #a1a7bf;
@@ -139,11 +115,9 @@
   font-size: 16px;
   cursor: pointer;
 }
-
 .narssbshow .nDtopIt2  .dwbtactive {
   background: #004cfa;
 }
-
 .narssbshow .nDtopIt2 .nDitImg .yy_name {
   font-size: 18px;
   padding-bottom: 10px;