소스 검색

style:“优化文本自适应屏幕”

soobin 1 년 전
부모
커밋
e52f1b0a33

+ 12 - 0
src/App.vue

@@ -116,6 +116,18 @@ span,
 p {
   // color: #333333;
   font-family: "Arial", sans-serif;
+  font-size: 0.35rem;
+  // .van-dialog {
+  //   font-size: 0.4rem;
+  // }
+  .van-checkbox__icon {
+    font-size: 0.5rem;
+  }
+
+  .van-dialog {
+    width: 85%;
+  }
+
 }
 
 html {

+ 1 - 1
src/components/SimpleHeader.vue

@@ -78,7 +78,7 @@ export default {
 
   .simple-header-name {
     white-space: nowrap;
-    font-size: 16px;
+    font-size: 0.45rem;
     font-weight: 600;
   }
 }

+ 15 - 15
src/components/commom/kDialog/index.less

@@ -22,51 +22,51 @@
       }
 
       .block6 {
-        width: 265px;
-        height: 34px;
-        margin: 20px auto;
+        // width: 265px;
+        // height: 34px;
+        margin: 0.5rem 0;
+        padding: 0 0.8rem;
 
         .mod7 {
-          border-radius: 17px;
-          height: 34px;
+          border-radius: 0.5rem;
+          height: 1rem;
           border: 1px solid rgba(77, 106, 221, 1);
-          width: 120px;
+          width: 3rem;
           justify-content: center;
           align-items: center;
 
           .info5 {
             overflow-wrap: break-word;
             color: rgba(77, 106, 221, 1);
-            font-size: 15px;
+            font-size: 0.35rem;
             font-family: PingFangSC-Medium;
             text-align: center;
             // white-space: nowrap;
-            line-height: 15px;
+            line-height: 0.35rem;
             display: block;
           }
         }
 
         .mod8 {
           background-color: rgba(77, 106, 221, 1);
-          border-radius: 17px;
-          height: 34px;
-          width: 120px;
+          border-radius: 0.5rem;
+          height: 1rem;
+          width: 3rem;
           justify-content: center;
           align-items: center;
 
           .info6 {
             overflow-wrap: break-word;
             color: rgba(255, 255, 255, 1);
-            font-size: 15px;
+            font-size: 0.35rem;
             font-family: PingFangSC-Medium;
             text-align: center;
             // white-space: nowrap;
-            line-height: 15px;
+            line-height: 0.35rem;
             display: block;
           }
         }
       }
-    }
-
+    }   
   }
 }

+ 2 - 2
src/components/dateSelectList/index.less

@@ -15,10 +15,10 @@
         text-align: center;
         overflow-wrap: break-word;
         color: rgba(64, 77, 116, 1);
-        font-size: 14px;
+        font-size: 0.35rem;
         text-align: center;
         white-space: nowrap;
-        line-height: 34px;
+        line-height: 1rem;
         border-right: 1px solid #B9BAD0;
         &:last-child{
           border-right: none;

+ 1 - 0
src/components/typeSelectList/index.less

@@ -25,6 +25,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         padding: 0 8px;
+        font-size: 0.3rem;
       }
     }
 

+ 70 - 70
src/styles/alarmClock/index.less

@@ -8,51 +8,51 @@
 
   .bd1 {
     width: 100%;
-    height: 439px;
+    // height: 439px;
 
     .section5 {
       background-color: rgba(255, 255, 255, 1);
-      z-index: 91;
-      height: 54px;
-      margin-top: 1px;
+      // z-index: 91;
+      // height: 54px;
+      // margin-top: 1px;
       width: 100%;
       position: relative;
 
       .layer1 {
-        width: 84px;
-        height: 20px;
-        margin: 17px 0 0 15px;
+        // width: 84px;
+        // height: 20px;
+        margin: 0.5rem 0.5rem;
 
         .ImageText1 {
-          height: 20px;
-          width: 84px;
+          // height: 20px;
+          // width: 84px;
 
           .layer1 {
-            width: 84px;
-            height: 20px;
+            width: 2.4rem;
+            // height: 20px;
             margin: 0 auto;
 
             .bd2 {
-              width: 20px;
-              height: 20px;
+              width: 0.5rem;
+              height: 0.5rem;
               background: url('../../assets/device/add.png');
               background-size: 100%;
             }
 
             .TextGroup1 {
-              height: 20px;
-              width: 56px;
+              // height: 20px;
+              // width: 56px;
 
               .word2 {
-                width: 56px;
-                height: 20px;
+                // width: 56px;
+                // height: 20px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 14px;
+                font-size: 0.4rem;
                 font-family: PingFangSC-Medium;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 20px;
+                font-size: 0.4rem;
                 display: block;
               }
             }
@@ -81,98 +81,98 @@
         .bd3 {
           .word3 {
             width: auto;
-            height: 30px;
+            // height: 0.5rem;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 22px;
+            font-size: 0.5rem;
             font-family: PingFangSC-Medium;
             text-align: left;
             white-space: nowrap;
-            line-height: 30px;
+            line-height: 0.7rem;
             display: block;
           }
 
           .info2 {
             width: auto;
-            height: 18px;
+            // height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 13px;
+            font-size: 0.3rem;
             text-align: left;
             // white-space: nowrap;
-            line-height: 18px;
+            line-height: 0.6rem;
             display: block;
-            margin: -2px 0 0 2px;
+            // margin: -2px 0 0 2px;
           }
         }
       }
 
       .TextGroup3 {
-        height: 38px;
+        // height: 38px;
         width: 40%;
 
         .main2 {
-          width: auto;
-          height: 38px;
+          // width: auto;
+          // height: 38px;
 
           .word4 {
-            width: auto;
-            height: 18px;
+            // width: auto;
+            // height: 0.3rem;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 13px;
+            font-size: 0.3rem;
             text-align: left;
-            white-space: nowrap;
-            line-height: 18px;
+            // white-space: nowrap;
+            line-height: 0.6rem;
             display: block;
           }
 
           .txt3 {
-            width: auto;
-            height: 18px;
+            // width: auto;
+            // height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 13px;
+            font-size: 0.3rem;
             text-align: left;
-            white-space: nowrap;
-            line-height: 18px;
-            margin-top: 2px;
+            // white-space: nowrap;
+            line-height: 0.4rem;
+            margin-top: 0.2rem;
             display: block;
           }
         }
       }
 
       .ImageText2 {
-        height: 17px;
+        // height: 17px;
         width: 15%;
         // margin: 9px 0 0 5px;
-        margin-top: 5px;
+        // margin-top: 5px;
 
         .group3 {
-          width: 40px;
-          height: 17px;
+          // width: 40px;
+          // height: 17px;
 
           .group4 {
-            width: 13px;
-            height: 14px;
+            width: 0.4rem;
+            height: 0.5rem;
             background: url('../../assets/delete.png') top center no-repeat;
             background-size: 100%;
-            margin-top: 1px;
+            // margin-top: 1px;
           }
 
           .TextGroup4 {
-            height: 17px;
-            width: 24px;
+            // height: 17px;
+            // width: 24px;
 
             .info3 {
-              width: 24px;
-              height: 17px;
+              // width: 24px;
+              // height: 17px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 12px;
+              font-size: 0.4rem;
               text-align: left;
               white-space: nowrap;
-              line-height: 17px;
+              line-height: 0.5rem;
               display: block;
             }
           }
@@ -181,46 +181,46 @@
 
       .bd4 {
         width: 15%;
-        height: 36px;
+        // height: 36px;
         // margin: 10px 0 0 15px;
 
         .outer1 {
-          width: 40px;
-          height: 17px;
-          margin-left: 5px;
+          // width: 40px;
+          // height: 17px;
+          // margin-left: 5px;
 
           .main3 {
-            width: 12px;
-            height: 12px;
+            width: 0.4rem;
+            height: 0.4rem;
             background: url('../../assets/edit.png') top center no-repeat;
             background-size: 100%;
-            margin-top: 1px;
+            // margin-top: 1px;
           }
 
           .word5 {
-            width: 24px;
-            height: 17px;
+            // width: 24px;
+            // height: 17px;
             overflow-wrap: break-word;
             color: #4d6add;
-            font-size: 12px;
+            font-size: 0.4rem;
             text-align: left;
             white-space: nowrap;
-            line-height: 17px;
+            line-height: 0.4rem;
             display: block;
           }
         }
 
         .word6 {
-          width: 39px;
-          height: 18px;
+          // width: 39px;
+          // height: 18px;
           overflow-wrap: break-word;
           color: rgba(77, 193, 147, 1);
-          font-size: 13px;
+          font-size: 0.45rem;
           text-align: left;
-          white-space: nowrap;
-          line-height: 18px;
+          // white-space: nowrap;
+          line-height: 0.8rem;
           display: block;
-          margin: 1px 0 0 2px;
+          // margin: 1px 0 0 2px;
 
           &.close {
             color: rgba(197, 197, 205, 1);

+ 110 - 125
src/styles/device/index.less

@@ -12,29 +12,29 @@
 
     .deviceBox1 {
       .searchRow {
-        margin: 18px 15px;
+        padding: 0.5rem 0.5rem;
 
         .bd3 {
-          width: 87px;
-          height: 16px;
+          width: 2.1rem;
+          // height: 16px;
 
           .outer4 {
-            width: 16px;
-            height: 16px;
+            width: 0.4rem;
+            height: 0.4rem;
             background: url("../../assets/home/titleIcon.png") top center no-repeat;
             background-size: 100%;
           }
 
           .txt2 {
-            width: 65px;
-            height: 15px;
+            // width: 65px;
+            // height: 15px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 15px;
+            font-size: 0.4rem;
             font-family: PingFangSC-Semibold;
             text-align: left;
             white-space: nowrap;
-            line-height: 15px;
+            line-height: 0.4rem;
             display: block;
           }
         }
@@ -44,8 +44,8 @@
           cursor: pointer;
 
           .label2 {
-            width: 20px;
-            height: 20px;
+            width: 0.5rem;
+            height: 0.5rem;
             margin-right: 5px;
           }
         }
@@ -58,81 +58,82 @@
 
       .bd1 {
         width: 100%;
-        height: 108px;
+        // height: 108px;
         background: url(../../assets/home/outer.png) no-repeat;
         background-size: 100% 100%;
+        padding: 0.8rem 0.2rem;
 
         .box2 {
-          width: 100%;
-          height: 100%;
+          // width: 100%;
+          // height: 100%;
 
           .TextGroup3 {
-            height: 57px;
-            width: 48px;
+            // height: 57px;
+            // width: 48px;
 
             .group1 {
-              width: 48px;
-              height: 57px;
+              // width: 48px;
+              // height: 57px;
 
               .word4 {
-                height: 26px;
+                // height: 26px;
                 overflow-wrap: break-word;
                 color: rgba(223, 94, 76, 1);
-                font-size: 22px;
+                font-size: 0.7rem;
                 font-family: Helvetica;
                 text-align: center;
                 white-space: nowrap;
-                line-height: 26px;
+                line-height: 1rem;
                 display: block;
               }
 
               .info1 {
-                height: 17px;
+                // height: 17px;
                 overflow-wrap: break-word;
                 color: rgba(135, 135, 166, 1);
-                font-size: 12px;
+                font-size: 0.375rem;
                 text-align: center;
                 white-space: nowrap;
-                line-height: 17px;
-                margin-top: 14px;
+                line-height: 1rem;
+                // margin-top: 14px;
                 display: block;
               }
             }
           }
 
-          .TextGroup4 {
-            height: 57px;
-            width: 48px;
-
-            .main6 {
-              width: 48px;
-              height: 57px;
-
-              .word5 {
-                height: 26px;
-                overflow-wrap: break-word;
-                color: rgba(223, 94, 76, 1);
-                font-size: 22px;
-                font-family: Helvetica;
-                text-align: center;
-                white-space: nowrap;
-                line-height: 26px;
-                display: block;
-              }
-
-              .word6 {
-                height: 17px;
-                overflow-wrap: break-word;
-                color: rgba(135, 135, 166, 1);
-                font-size: 12px;
-                text-align: center;
-                white-space: nowrap;
-                line-height: 17px;
-                margin-top: 14px;
-                display: block;
-              }
-            }
-          }
+          // .TextGroup4 {
+          //   height: 57px;
+          //   // width: 48px;
+
+          //   .main6 {
+          //     width: 48px;
+          //     height: 57px;
+
+          //     .word5 {
+          //       height: 26px;
+          //       overflow-wrap: break-word;
+          //       color: rgba(223, 94, 76, 1);
+          //       font-size: 22px;
+          //       font-family: Helvetica;
+          //       text-align: center;
+          //       white-space: nowrap;
+          //       line-height: 26px;
+          //       display: block;
+          //     }
+
+          //     .word6 {
+          //       height: 17px;
+          //       overflow-wrap: break-word;
+          //       color: rgba(135, 135, 166, 1);
+          //       font-size: 12px;
+          //       text-align: center;
+          //       white-space: nowrap;
+          //       line-height: 17px;
+          //       margin-top: 14px;
+          //       display: block;
+          //     }
+          //   }
+          // }
         }
       }
     }
@@ -150,7 +151,7 @@
 
           .bd1 {
             width: 100%;
-            height: 15px;
+            // height: 15px;
 
             .layer1 {
               background-color: #8096ec;
@@ -161,29 +162,30 @@
             }
 
             .txtBox {
-              width: 200px;
+              width: 4.5rem;
               // overflow: auto;
 
               .txt1 {
                 white-space: nowrap;
                 color: rgba(64, 77, 116, 1);
-                font-size: 15px;
+                font-size: 0.4rem;
                 font-family: PingFangSC-Medium;
                 text-align: left;
-                line-height: 15px;
+                line-height: 0.7rem;
                 display: block;
                 margin: 3px 0 0 6px;
-                overflow: hidden;
+                // overflow: hidden;
+                white-space: normal;
                 text-overflow: ellipsis;
               }
             }
 
             .layer2 {
-              height: 18px;
+              height: 0.5rem;
               background: url("../../assets/device/powerOff.png") 100% no-repeat;
               background-size: 100%;
-              width: 18px;
-              margin-left: 30px;
+              width: 0.5rem;
+              // margin-left: 30px;
 
               &.layerLeft {
                 margin-left: 5px;
@@ -205,7 +207,8 @@
           .txt1 {
             width: 100%;
             color: rgba(64, 77, 116, 1);
-            font-size: 14px;
+            font-size: 0.375rem;
+            line-height: 0.5rem;;
             display: flex;
             align-items: center;
           }
@@ -225,17 +228,13 @@
             .contentWord {
               width: 100%;
               padding: 10px 10px;
-              // overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 14px;
+              font-size: 0.375rem;
               text-align: left;
               flex-wrap: wrap; 
-              // white-space: nowrap;
-              // text-overflow: ellipsis;
-              line-height: 14px;
+              line-height: 0.375rem;
               display: flex;
               align-items: center;
-              // justify-content: space-between;
 
               .word10 {
                 width: 65%
@@ -282,30 +281,31 @@
               .clickable-link {
                 text-decoration: underline;
                 cursor: pointer;
-                font-size: 14px;
+                font-size: 0.375rem;
                 width: 75%;
+                line-height: 0.5rem;;
               }
 
             }
 
-            .word11 {
-              width: 95%;
-              padding: 10px 10px;
-              // overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 14px;
-              text-align: left;
-              // white-space: nowrap;
-              // text-overflow: ellipsis;
-              line-height: 14px;
-              display: flex;
-              align-items: center;
-              // justify-content: space-between;
-
-              .word12 {
-                width: 65%;
-              }
-            }
+            // .word11 {
+            //   width: 95%;
+            //   padding: 10px 10px;
+            //   // overflow-wrap: break-word;
+            //   color: rgba(64, 77, 116, 1);
+            //   font-size: 14px;
+            //   text-align: left;
+            //   // white-space: nowrap;
+            //   // text-overflow: ellipsis;
+            //   line-height: 14px;
+            //   display: flex;
+            //   align-items: center;
+            //   // justify-content: space-between;
+
+            //   .word12 {
+            //     width: 65%;
+            //   }
+            // }
 
 
             .van-button--primary {
@@ -331,16 +331,6 @@
                 font-size: 14px;
               }
 
-              // .word2 {
-              //   width: 100%;
-              //   padding: 0 0;
-
-              //   .van-field__control {
-              //     border: 0.5px solid #ccc;
-              //     /* 添加边框 */
-              //   }
-              // }
-
               .word3 {
                 color: rgba(64, 77, 116, 1);
                 width: 70%;
@@ -350,12 +340,7 @@
                 color: #4d6add;
                 padding: 0 0 0px 5px;
               }
-            }
-
-            // .clickable-link:active {
-            //   color: rgb(26, 49, 117);
-            // }
-            
+            }           
 
             .layer5 {
               width: 100%;
@@ -364,21 +349,21 @@
                 // width: 33.33%;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 14px;
+                font-size: 0.375rem;
                 text-align: left;
-                line-height: 13px;
+                line-height: 0.375rem;
                 display: block;
                 padding: 10px 10px;
               }
 
-              .word6 {
-                // width: 33.33%;
-                overflow-wrap: break-word;
-                color: rgba(64, 77, 116, 1);
-                font-size: 14px;
-                line-height: 13px;
-                display: block;
-              }
+              // .word6 {
+              //   // width: 33.33%;
+              //   overflow-wrap: break-word;
+              //   color: rgba(64, 77, 116, 1);
+              //   font-size: 14px;
+              //   line-height: 13px;
+              //   display: block;
+              // }
             }
 
             .info1 {
@@ -424,20 +409,20 @@
             .editDeviceBtnCon {
 
               .box2 {
-                width: 18px;
-                height: 20px;
+                width: 0.5rem;
+                height: 0.5rem;
                 background: url("../../assets/order/gotoRight.png") no-repeat;
                 background-size: 100%;
-                margin-top: 2px;
+                // margin-top: 0.2rem;
               }
 
               .c-text-14 {
                 display: inline-block;
                 /* 将行内文本转为块级元素 */
-                padding: 4px 7px;
+                padding: 0.1rem 0.5rem;
                 /* 添加内边距 */
                 background-color: #df5e4c;
-                border-radius: 14px;
+                border-radius: 0.5rem;
                 /* 添加圆角效果 */
                 color: #fff;
                 /* 设置文本颜色 */
@@ -605,8 +590,8 @@
 
           .sugarTxt {
             color: rgba(64, 77, 116, 1);
-            font-size: 14px;
-            line-height: 14px;
+            font-size: 0.375rem;
+            line-height: 0.375rem;
             padding: 10px 10px;
           }
 

+ 18 - 21
src/styles/deviceOper/index.less

@@ -74,50 +74,47 @@
     }
 
     .block6 {
-        width: 265px;
-        height: 34px;
-        margin: 20px auto;
+        // width: 265px;
+        // height: 34px;
+        margin: 0.5rem 0;
+        padding: 0 0.8rem;
 
         .mod7 {
-            border-radius: 17px;
-            height: 34px;
+            border-radius: 0.5rem;
+            height: 1rem;
             border: 1px solid #4d6add;
-            width: 120px;
+            width: 3rem;
             justify-content: center;
             align-items: center;
 
             .info5 {
-                width: auto;
-                height: 13px;
                 overflow-wrap: break-word;
-                color: #4d6add;
-                font-size: 15px;
+                color: rgba(77, 106, 221, 1);
+                font-size: 0.35rem;
                 font-family: PingFangSC-Medium;
                 text-align: center;
-                white-space: nowrap;
-                line-height: 15px;
+                // white-space: nowrap;
+                line-height: 0.35rem;
                 display: block;
             }
         }
 
         .mod8 {
-            background-color: #4d6add;
-            border-radius: 17px;
-            height: 34px;
-            width: 120px;
+            background-color: rgba(77, 106, 221, 1);
+            border-radius: 0.5rem;
+            height: 1rem;
+            width: 3rem;
             justify-content: center;
             align-items: center;
 
             .info6 {
-                width: auto;
-                height: 13px;
                 overflow-wrap: break-word;
                 color: rgba(255, 255, 255, 1);
-                font-size: 15px;
+                font-size: 0.35rem;
                 font-family: PingFangSC-Medium;
                 text-align: center;
-                white-space: nowrap;
-                line-height: 15px;
+                // white-space: nowrap;
+                line-height: 0.35rem;
                 display: block;
             }
         }

+ 26 - 22
src/styles/forgetPassword/index.less

@@ -1,15 +1,15 @@
 .forgetPassword {
     .forgetPasswordFormBox {
-        width: 313px;
+        // width: 313px;
         margin: 30px auto;
         text-align: center;
 
         .van-form {
             .van-cell {
-                width: 313px;
-                height: 38px;
+                // width: 313px;
+                // height: 38px;
                 padding: 0;
-                font-size: 13px;
+                font-size: 0.35rem;
                 margin: 0 auto;
                 margin-top: 20px;
                 overflow: visible;
@@ -28,8 +28,8 @@
                 }
 
                 .van-field__control {
-                    height: 38px;
-                    line-height: 38px;
+                    height: 1.2rem;
+                    line-height: 1.2rem;
                     padding: 6px;
                     border-radius: 2px;
                     border: 0.5px solid rgba(185, 186, 208, 1);
@@ -52,30 +52,34 @@
                         background: #4d6add;
                     }
 
-                    .van-icon-success::before {
-                        content: '';
-                        background: #fff;
-                        width: 40%;
-                        height: 40%;
-                        position: absolute;
-                        top: 30%;
-                        left: 30%;
-                        border-radius: 100%;
-                    }
+                    // .van-icon-success::before {
+                    //     content: '';
+                    //     background: #fff;
+                    //     width: 40%;
+                    //     height: 40%;
+                    //     position: absolute;
+                    //     top: 30%;
+                    //     left: 30%;
+                    //     border-radius: 100%;
+                    // }
 
                     .van-radio__icon--checked+.van-radio__label {
                         color: #4d6add;
                     }
+
+                    .van-radio__icon .van-icon {
+						font-size: 0.4rem;	
+					}
                 }
             }
 
             .word1 {
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 13px;
+                font-size: 0.4rem;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 13px;
+                line-height: 0.4rem;
                 display: block;
                 margin: 34px 0 0 0;
             }
@@ -83,21 +87,21 @@
             .word2 {
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 13px;
+                font-size: 0.4rem;
                 text-align: left;
                 white-space: nowrap;
                 line-height: 13px;
                 display: block;
-                margin: 14px 0 0 0;
+                margin: 0.5rem 0 0 0;
             }
 
             .register {
                 background-color: rgba(77, 106, 221, 1);
                 border-radius: 17px;
                 height: 34px;
-                width: 220px;
+                width: 4rem;
                 margin-top: 60px;
-                font-size: 15px;
+                // font-size: 0.4rem;
                 font-family: PingFangSC-Medium;
             }
         }

+ 227 - 172
src/styles/home/index.less

@@ -13,53 +13,53 @@
 
     .nameDeviceRow {
       width: 100%;
-      height: 40px;
+      // height: 40px;
       flex-direction: row;
       align-items: center;
       background: url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
-      font-size: 11px;
+      font-size: 0.4rem;
       color: rgba(135, 135, 166, 1);
       text-align: left;
       font-family: PingFangSC-Medium;
       justify-content: space-between;
-      padding: 0 15px;
+      padding: 0.3rem 0.5rem;
 
       .lineCon {
         width: 1px;
-        height: 20px;
+        height: 0.8rem;
         border: 1px solid #B9BAD0;
         transform: scale(0.6);
       }
 
       .txt3 {
         // flex:1;
-        height: 16px;
+        // height: 16px;
         overflow-wrap: break-word;
         color: rgba(64, 77, 116, 1);
-        font-size: 15px;
+        font-size: 0.4rem;
         white-space: nowrap;
-        line-height: 16px;
+        line-height: 0.4rem;
         display: block;
       }
 
       .info3 {
         // width: 47px;
-        height: 16px;
+        // height: 16px;
         overflow-wrap: break-word;
         white-space: nowrap;
-        line-height: 16px;
-        font-size: 15px;
+        line-height: 0.4rem;
+        font-size: 0.4rem;
         // margin-left: 36px;
         display: block;
       }
 
       .word2 {
-        font-size: 15px;
-        height: 16px;
+        font-size: 0.4rem;
+        // height: 0.5rem;
         overflow-wrap: break-word;
         white-space: nowrap;
-        line-height: 16px;
+        line-height: 0.4rem;
         // margin-left: 14px;
         display: block;
       }
@@ -67,36 +67,36 @@
 
     .titleBox {
       width: 100%;
-      height: 30px;
-      margin: 12px 0;
+      // height: 30px;
+      margin: 0.3rem 0;
+      padding: 0 0.3rem;
+
 
       .layer2 {
-        width: 100%;
-        height: 25px;
+        // width: 100%;
+        // height: 25px;
+        width: 2.15rem;
 
         .section5 {
-          width: 14px;
-          height: 16px;
+          width: 0.4rem;
+          height: 0.4rem;
           background: url("../../assets/home/titleIcon.png") top center no-repeat;
           background-size: 100%;
-          margin-left: 15px;
+          // margin-left: 15px;
         }
 
         .TextGroup2 {
-          width: 56px;
-          height: 14px;
+          // width: 56px;
+          // height: 14px;
 
           .txt4 {
-            width: 56px;
-            height: 14px;
-            margin-left: 8px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 14px;
+            font-size: 0.4rem;
             font-family: PingFangSC-Semibold;
             text-align: left;
             white-space: nowrap;
-            line-height: 14px;
+            line-height: 0.4rem;
             display: block;
           }
         }
@@ -110,164 +110,217 @@
       }
     }
 
-    .outer5 {
+    .salesData {
       background: url("../../assets/home/outer.png") top center no-repeat;
       background-size: 100% 100%;
       width: 100%;
-      margin-top: 20px;
-
-      .block5 {
-        width: 100%;
-        padding: 20px 30px;
-        cursor: pointer;
+      margin-top: 0.5rem;
+      padding: 0.5rem 0.5rem;
 
-        .topTitle {
-          width: 100%;
-          height: 17px;
+      // .block5 {
+      //   width: 100%;
+      //   cursor: pointer;
 
-          .txt10 {
-            height: 17px;
-            overflow-wrap: break-word;
-            color: #4d6add;
-            font-size: 14px;
-            text-align: center;
-            white-space: nowrap;
-            line-height: 17px;
-          }
-
-          .layer4 {
-            width: 17px;
-            height: 17px;
-            background: url('../../assets/home/gotoRight.png') top center no-repeat;
-            background-size: 100%;
-          }
+      .topTitle {
+        width: 100%;
+        // height: 17px;
+
+        .txt10 {
+          // height: 17px;
+          overflow-wrap: break-word;
+          color: #4d6add;
+          font-size: 0.35rem;
+          text-align: center;
+          white-space: nowrap;
+          line-height: 0.5rem;
         }
 
-        .outerBox {
-          margin: 21px 0;
+        .layer4 {
+          width: 0.5rem;
+          height: 0.5rem;
+          background: url('../../assets/home/gotoRight.png') top center no-repeat;
+          background-size: 100%;
         }
+      }
 
-        .main4 {
-          width: 33%;
-          height: 58px;
+      .salesDataBox {
+        margin: 0.6rem 0;
 
-          .main5 {
-            width: 100%;
-            height: 30px;
+        .dataGroup {
+          width: 33.3%;
+          // height: 58px;
 
-            .word8 {
-              width: auto;
-              height: 20px;
-              padding-right: 21px;
+          .dataGroupBox {
+            // width: 100%;
+            // height: 30px;
+
+            .currencySymbol {
+              // width: auto;
+              // height: 20px;
+              // padding-right: 0.5rem;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 14px;
+              font-size: 0.4rem;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 20px;
-              margin-top: 8px;
+              line-height: 0.4rem;
+              margin-top: 0.25rem;
               display: block;
             }
 
-            .word9 {
-              height: 30px;
+            .dataNum {
+              // width: 49px;
+              // height: 30px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 22px;
+              font-size: 0.6rem;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 30px;
-              margin-left: -20px;
+              line-height: 0.6rem;
+              // margin-left: -20px;
+              margin-top: 0.1rem;
               display: block;
             }
           }
 
-          .info5 {
-            width: 100%;
-            height: 17px;
+          .dataText {
+            // width: 100%;
+            // height: 17px;
             overflow-wrap: break-word;
             color: rgba(135, 135, 166, 1);
-            font-size: 15px;
+            font-size: 0.35rem;
             text-align: center;
             white-space: nowrap;
-            line-height: 17px;
+            line-height: 0.35rem;
             display: block;
-            margin-top: 11px;
-          }
-        }
-
-        .TextGroup7 {
-          height: 58px;
-          width: 33%;
-
-          .mod3 {
-            width: 100%;
-            height: 58px;
-            align-items: center;
-
-            .txt8 {
-              height: 30px;
-              overflow-wrap: break-word;
-              color: rgba(223, 94, 76, 1);
-              font-size: 22px;
-              font-family: PingFangSC-Semibold;
-              text-align: center;
-              white-space: nowrap;
-              line-height: 30px;
-              display: block;
-            }
-
-            .info6 {
-              height: 17px;
-              overflow-wrap: break-word;
-              color: rgba(135, 135, 166, 1);
-              font-size: 15px;
-              text-align: center;
-              white-space: nowrap;
-              line-height: 17px;
-              margin-top: 11px;
-              display: block;
-            }
-          }
-        }
-
-        .TextGroup8 {
-          height: 58px;
-          width: 33%;
-
-          .outer6 {
-            width: 100%;
-            height: 58px;
-            align-items: center;
-
-            .txt9 {
-              height: 30px;
-              overflow-wrap: break-word;
-              color: rgba(223, 94, 76, 1);
-              font-size: 22px;
-              font-family: PingFangSC-Semibold;
-              text-align: center;
-              white-space: nowrap;
-              line-height: 30px;
-              display: block;
-            }
-
-            .word10 {
-              height: 17px;
-              overflow-wrap: break-word;
-              color: rgba(135, 135, 166, 1);
-              font-size: 15px;
-              text-align: center;
-              white-space: nowrap;
-              line-height: 17px;
-              margin-top: 11px;
-              display: block;
-            }
+            margin-top: 0.35rem;
           }
         }
       }
+
+      // .main4 {
+      //   width: 33%;
+      //   height: 58px;
+
+      //   .main5 {
+      //     width: 100%;
+      //     height: 30px;
+
+      //     .word8 {
+      //       width: auto;
+      //       height: 20px;
+      //       padding-right: 21px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(223, 94, 76, 1);
+      //       font-size: 14px;
+      //       font-family: PingFangSC-Semibold;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 20px;
+      //       margin-top: 8px;
+      //       display: block;
+      //     }
+
+      //     .word9 {
+      //       height: 30px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(223, 94, 76, 1);
+      //       font-size: 22px;
+      //       font-family: PingFangSC-Semibold;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 30px;
+      //       margin-left: -20px;
+      //       display: block;
+      //     }
+      //   }
+
+      //   .info5 {
+      //     width: 100%;
+      //     height: 17px;
+      //     overflow-wrap: break-word;
+      //     color: rgba(135, 135, 166, 1);
+      //     font-size: 15px;
+      //     text-align: center;
+      //     white-space: nowrap;
+      //     line-height: 17px;
+      //     display: block;
+      //     margin-top: 11px;
+      //   }
+      // }
+
+      // .TextGroup7 {
+      //   height: 58px;
+      //   width: 33%;
+
+      //   .mod3 {
+      //     width: 100%;
+      //     height: 58px;
+      //     align-items: center;
+
+      //     .txt8 {
+      //       height: 30px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(223, 94, 76, 1);
+      //       font-size: 22px;
+      //       font-family: PingFangSC-Semibold;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 30px;
+      //       display: block;
+      //     }
+
+      //     .info6 {
+      //       height: 17px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(135, 135, 166, 1);
+      //       font-size: 15px;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 17px;
+      //       margin-top: 11px;
+      //       display: block;
+      //     }
+      //   }
+      // }
+
+      // .TextGroup8 {
+      //   height: 58px;
+      //   width: 33%;
+
+      //   .outer6 {
+      //     width: 100%;
+      //     height: 58px;
+      //     align-items: center;
+
+      //     .txt9 {
+      //       height: 30px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(223, 94, 76, 1);
+      //       font-size: 22px;
+      //       font-family: PingFangSC-Semibold;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 30px;
+      //       display: block;
+      //     }
+
+      //     .word10 {
+      //       height: 17px;
+      //       overflow-wrap: break-word;
+      //       color: rgba(135, 135, 166, 1);
+      //       font-size: 15px;
+      //       text-align: center;
+      //       white-space: nowrap;
+      //       line-height: 17px;
+      //       margin-top: 11px;
+      //       display: block;
+      //     }
+      //   }
+      // }
+      // }
     }
 
     .Chart1 {
@@ -278,46 +331,47 @@
 
     .outer9 {
       width: 100%;
-      height: 54px;
+      // height: 54px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
+      padding: 0.2rem 0.5rem;
 
       .main24 {
-        width: 100%;
+        // width: 100%;
 
         .ImageText10 {
-          height: 14px;
-          margin-left: 20px;
-          width: 78px;
+          // height: 14px;
+          // margin-left: 20px;
+          width: 2.2rem;
 
           .wrap2 {
-            width: 78px;
-            height: 14px;
+            // width: 78px;
+            // height: 14px;
 
             .outer10 {
-              z-index: 2;
+              // z-index: 2;
               position: relative;
-              width: 14px;
-              height: 14px;
+              width: 0.35rem;
+              height: 0.4rem;
               border: 2px rgba(128, 150, 236, 1);
               background: url("../../assets/home/commonTools.png") center no-repeat;
               background-size: 100%;
             }
 
             .TextGroup13 {
-              height: 14px;
-              width: 56px;
+              // height: 14px;
+              // width: 56px;
 
               .txt13 {
-                width: 56px;
-                height: 14px;
+                // width: 56px;
+                // height: 0.4rem;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 14px;
+                font-size: 0.4rem;
                 font-family: PingFangSC-Semibold;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 14px;
+                line-height: 0.4rem;
                 display: block;
               }
             }
@@ -333,7 +387,7 @@
 
       .main25 {
         width: 33%;
-        height: 100px;
+        height: 3rem;
         justify-content: space-around;
 
         // margin: 0 26px 27px 0;
@@ -343,8 +397,8 @@
         } */
 
         .mod7 {
-          height: 55px;
-          width: 55px;
+          height: 1.5rem;
+          width: 1.5rem;
           margin: 0 auto;
           align-items: center;
           justify-content: center;
@@ -355,21 +409,22 @@
 
           .info15 {
             width: 100%;
-            height: 14px;
+            // height: 14px;
             overflow-wrap: break-word;
             color: rgba(135, 135, 166, 1);
-            font-size: 12px;
+            font-size: 0.4rem;
             text-align: center;
             // white-space: nowrap;
-            line-height: 14px;
+            line-height: 0.4rem;
             display: block;
           }
         }
       }
     }
   }
-  
+
 }
+
 .van-floating-bubble {
   background-color: #557ffd;
 }

+ 65 - 52
src/styles/login/index.less

@@ -6,15 +6,15 @@
 
     .loginLogoBox {
         width: 100%;
-        height: 180px;
+        height: 4.5rem;
         text-align: center;
         position: relative;
 
         .loginLogo {
-            width: 216px;
-            height: 87px;
+            width: 5rem;
+            height: 2rem;
             position: absolute;
-            top: 40px;
+            top: 1.5rem;
             left: 50%;
             transform: translateX(-50%);
             background: url("../../assets/login/logo.png");
@@ -22,11 +22,11 @@
         }
 
         .languageCon {
-            width: 60px;
-            right: 15px;
-            top: 10px;
+            width: 2rem;
+            right: 0.5rem;
+            top: 0.3rem;
             border: 1px solid #4d6add;
-            padding: 2px 3px;
+            padding: 0.1rem 0.2rem;
             border-radius: 10px;
             color: #4d6add;
 
@@ -37,45 +37,45 @@
         width: 100%;
 
         .loginTitle {
-            height: 28px;
             overflow-wrap: break-word;
             color: #404d74;
-            font-size: 20px;
+            font-size: 0.55rem;
             font-family: PingFangSC-Medium;
             text-align: center;
             white-space: nowrap;
-            line-height: 28px;
+            line-height: 0.55rem;
             display: block;
-            margin: 8px auto 0 auto;
-            font-weight: 600;
+            margin: 0.1rem auto 0 auto;
+            font-weight: 500;
         }
     }
 
     .loginFormBox {
         width: 100%;
-        margin-top: 38px;
+        margin-top: 1rem;;
 
-        .van-field__body {
-            height: 38px;
-        }
+        // .van-field__body {
+        //     // height: 2rem;
+        // }
+
+        // .van-field__value {
+        //     padding-bottom: 0.7rem;
+        // }
 
         .van-form .van-cell {
-            width: 281px;
-            height: 38px;
-            background-color: rgba(255, 255, 255, 1);
-            border-radius: 2px;
-            border: 0.5px solid rgba(185, 186, 208, 1);
+            width: 7rem;
             padding: 0;
             color: rgba(168, 168, 197, 1);
-            font-size: 13px;
             margin: 0 auto;
-            margin-top: 20px;
             overflow: visible;
 
             .van-field__control {
-                height: 38px;
-                line-height: 38px;
-                padding: 6px;
+                font-size: 0.35rem;
+                margin-bottom: 0.5rem;
+                padding: 0.2rem;
+                background-color: rgba(255, 255, 255, 1);
+                border-radius: 0.2rem;
+                border: 0.5px solid rgba(185, 186, 208, 1);
 
                 &:-internal-autofill-previewed,
                 &:-internal-autofill-selected {
@@ -84,48 +84,58 @@
                 }
             }
 
+            .van-field__error-message {
+                font-size: 0.35rem;
+                margin-top: -0.5rem;
+            }
+
             .van-field__control::-webkit-input-placeholder {
                 color: rgba(168, 168, 197, 1);
             }
+
+            &::after {
+                display: none;
+            }
+
         }
 
         .checkedPasswordBox {
-            width: 281px;
-            margin: 25px auto 0 auto;
-            font-size: 13px;
+            width: 7rem;
+            margin: 0.5rem auto 0 auto;
+            font-size: 0.4rem;
             color: #4d6add;
             display: flex;
             justify-content: space-between;
-            height: 13px;
-            line-height: 13px;
+            // height: 13px;
+            line-height: 0.4rem;
 
             .van-checkbox {
                 overflow: visible;
             }
 
-            .van-checkbox__icon {
-                font-size: 13px;
-            }
+            // .van-checkbox__icon {
+            //     font-size:  0.3rem;
+            // }
 
-            .van-checkbox__label {
-                line-height: 13px;
-            }
+            // .van-checkbox__label {
+            //     // line-height: 13px;
+            // }
 
             .van-checkbox__icon--checked .van-icon-success {
                 border-color: #4d6add;
                 background: #4d6add;
             }
 
-            .checkedPassWord .van-icon-success::before {
-                content: "";
-                background: #fff;
-                width: 40%;
-                height: 40%;
-                position: absolute;
-                top: 30%;
-                left: 30%;
-                border-radius: 100%;
-            }
+            // .checkedPassWord .van-icon-success::before {
+            //     content: "";
+            //     background: #fff;
+            //     width: 40%;
+            //     height: 40%;
+            //     position: absolute;
+            //     top: 30%;
+            //     left: 30%;
+            //     border-radius: 100%;
+            // }
 
             .van-checkbox__icon--checked+.van-checkbox__label {
                 color: #4d6add;
@@ -133,6 +143,8 @@
 
             .forgetPassWord {
                 cursor: pointer;
+                font-size:  0.35rem;
+                line-height:  0.35rem;
             }
         }
 
@@ -161,14 +173,15 @@
         }
 
         .buttonBox {
-            width: 281px;
-            margin: 20px auto 0 auto;
+            width: 7rem;
+            margin: 0.5rem auto 0 auto;
             display: flex;
             justify-content: space-between;
 
             .van-button {
-                width: 120px;
-                height: 34px;
+                width: 3rem;
+                // height: 34px;
+                // padding: 0.5rem 0.4rem;
                 border: 1px solid rgba(77, 106, 221, 1);
                 background-color: rgba(77, 106, 221, 1);
             }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 592 - 1043
src/styles/orderCenter/index.less


+ 22 - 16
src/styles/register/index.less

@@ -1,16 +1,16 @@
 .registerPage {
 	.registerFormBox {
 		width: 100%;
-		margin-top: 40px;
+		margin-top: 1rem;
 		text-align: center;
 
 		.van-form {
 			.van-cell {
 				width: 90%;
-				height: 38px;
+				height: 1rem;
 				padding: 0;
 				margin: 0 auto;
-				margin-top: 10px;
+				margin-top: 0.2rem;
 				overflow: visible;
 
 				&::after {
@@ -27,8 +27,8 @@
 				}
 
 				.van-field__control {
-					height: 38px;
-					line-height: 38px;
+					height: 1rem;
+					line-height: 1rem;
 					padding: 6px;
 					border-radius: 2px;
 					border: 0.5px solid rgba(185, 186, 208, 1);
@@ -36,9 +36,9 @@
 
 				.van-field__label {
 					display: flex;
-					height: 38px;
+					height: 1rem;
 					align-items: center;
-					width: 80px;
+					width: 2rem;
 				}
 
 				.radioBox {
@@ -58,17 +58,23 @@
 						background: #4d6add;
 					}
 
-					.van-icon-success::before {
-						content: '';
-						background: #fff;
-						width: 40%;
-						height: 40%;
-						position: absolute;
-						top: 30%;
-						left: 29%;
-						border-radius: 100%;
+					.van-radio__icon .van-icon {
+						font-size: 0.35rem;
+						
 					}
 
+
+					// .van-icon-success::before {
+					// 	content: '';
+					// 	background: #fff;
+					// 	width: 40%;
+					// 	height: 40%;
+					// 	position: absolute;
+					// 	top: 30%;
+					// 	left: 29%;
+					// 	border-radius: 100%;
+					// }
+
 					.van-radio__icon--checked+.van-radio__label {
 						color: #4d6add;
 					}

+ 15 - 15
src/styles/robotRanking/index.less

@@ -247,35 +247,35 @@ button:active {
                 .mod1 {
 
                     .section1 {
-                        margin: 15px 15px;
+                        margin: 0.5rem 0.5rem;
 
                         .ImageText1 {
-                            height: 16px;
-                            margin-top: 1px;
-                            width: 55%;
+                            // height: 16px;
+                            // margin-top: 1px;
+                            // width: 55%;
 
                             .group4 {
-                                width: 40%;
-                                height: 16px;
+                                width: 2.2rem;
+                                // height: 16px;
 
                                 .layer3 {
-                                    width: 16px;
-                                    height: 16px;
+                                    width: 0.5rem;
+                                    height: 0.5rem;
                                     margin-right: 5px;
                                     background: url("../../assets/home/titleIcon.png") top center no-repeat;
                                     background-size: 100%;
                                 }
 
                                 .word3 {
-                                    width: auto;
-                                    height: 14px;
+                                    // width: auto;
+                                    // height: 14px;
                                     overflow-wrap: break-word;
                                     color: rgba(64, 77, 116, 1);
-                                    font-size: 15px;
+                                    font-size: 0.5rem;
                                     font-family: PingFangSC-Semibold;
                                     text-align: left;
                                     white-space: nowrap;
-                                    line-height: 15px;
+                                    line-height: 0.5rem;
                                     display: block;
                                 }
                             }
@@ -286,9 +286,9 @@ button:active {
                             cursor: pointer;
 
                             .label2 {
-                                width: 20px;
-                                height: 20px;
-                                margin-right: 5px;
+                                width: 0.5rem;
+                                height: 0.5rem;
+                                // margin-right: 5px;
                             }
                         }
                     }

+ 5 - 3
src/styles/role/index.less

@@ -138,6 +138,7 @@
 }
 
 .operCheckBox {
+  
   .block5 {
     background-color: rgba(215, 215, 226, 1);
     border-radius: 2px;
@@ -161,9 +162,10 @@
   }
 
   .block6 {
-    width: 265px;
-    height: 34px;
-    margin: 20px auto;
+    // width: 265px;
+    // height: 34px;
+    margin: 0.5rem 0;
+    padding: 0 0.8rem;
 
     .mod7 {
       border-radius: 17px;

+ 18 - 16
src/styles/user/index.less

@@ -44,11 +44,11 @@
             margin-top: 2px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 14px;
+            font-size: 0.35rem;
             font-family: PingFangSC-Medium;
             text-align: left;
             white-space: nowrap;
-            line-height: 20px;
+            line-height: 0.5rem;
             display: block;
             margin-left: 15px;
         }
@@ -59,11 +59,12 @@
         width: 80%;
         margin: 0 auto;
         margin-top: 30px;
-        line-height: 1.7;
+        // line-height: 1.7;
 
         .userText {
-            font-size: 14px;
+            font-size: 0.35rem;
             font-family: PingFangSC-Medium;
+            line-height: 0.6rem;
             margin: 0;
         }
 
@@ -71,19 +72,19 @@
             width: 1px;
             height: 3.5em;
             font-size: 14px;
-            background: #e7eaf7;
+            background: #bdc9ff6c;
         }
     }
 
     .userInfoBox {
         // margin-top: 25px;
-        padding: 0px 15px 20px;
+        padding: 0px 0.5rem 0.5rem;
 
         .userInfo {
             // width: 87%;
             margin: 0 auto;
             justify-content: flex-start;
-            margin-top: 20px;
+            margin-top: 0.5rem;
             position: relative;
 
             .filedInpPad {
@@ -95,20 +96,20 @@
             .editIcon {
                 position: absolute;
                 right: 0;
-                font-size: 18px;
+                font-size: 0.5rem;
                 color: #4d6add;
             }
 
             .userInfoLeft {
-                width: 76px;
+                width: 2.5rem;
             }
 
             .relationClass {
                 // padding: 0;
 
                 .van-field__control {
-                    height: 38px;
-                    line-height: 38px;
+                    // height: 38px;
+                    line-height: 0.5rem;
                     padding: 6px;
                     border-radius: 2px;
                     background: #fff;
@@ -119,9 +120,9 @@
                 .van-field__button {
                     background-color: #4d6add;
                     color: #fff;
-                    padding: 0 1em;
+                    padding: 0 0.3rem;
                     margin-left: 15px;
-                    border-radius: 1em;
+                    border-radius: 0.5rem;
                 }
             }
         }
@@ -146,7 +147,7 @@
 
             .taskListRow {
                 width: 100%;
-                height: 53px;
+                height: 1.5rem;
                 flex-wrap: wrap;
 
                 .taskIcon {
@@ -290,7 +291,7 @@
 
                 .taskRight {
                     width: 87%;
-                    height: 100%;
+                    // height: 100%;
                     position: relative;
                     border-bottom: 1px solid #e7eaf7;
 
@@ -306,7 +307,8 @@
                     }
 
                     .taskTitle {
-                        line-height: 53px;
+                        line-height: 1.5rem;
+                        font-size: 0.375rem;
                     }
                 }
             }

+ 6 - 6
src/views/device/index.vue

@@ -18,7 +18,7 @@
               <div class="main5 flex-row justify-between">
                 <van-popover v-model:show="showPopover" placement="left-start" theme="dark" :actions="actions" @select="selectLabel">
                   <template #reference>
-                    <van-icon name="bars" class="fixed-icon o-pr-15" size="23" color="#4d6add" />
+                    <van-icon name="bars" class="fixed-icon o-pr-15" style="font-size: 0.55rem;" color="#4d6add" />
                   </template>
                 </van-popover>
                 <img class="label2" src="../../assets/device/searchIcon.png" @click="searchClick" />
@@ -40,10 +40,10 @@
                     }}</span>
                   </div>
                 </div>
-                <div @click="eqeStatusClk('')" class="TextGroup4 flex-col">
-                  <div class="main6 flex-col justify-between align-center">
-                    <span class="word5">{{ equipStatus.machineTotalNum }}</span>
-                    <span class="word6">{{
+                <div @click="eqeStatusClk('')" class="TextGroup3 flex-col">
+                  <div class="group1 flex-col justify-between align-center">
+                    <span class="word4">{{ equipStatus.machineTotalNum }}</span>
+                    <span class="info1">{{
                       $t("device.totalNumberOfEquipment")
                     }}</span>
                   </div>
@@ -281,7 +281,7 @@
                       }}</span>
                       <div class="box2 flex-col"></div>
                     </div>
-                    <div class="l-flex-RC o-ml-30" @click="deviceOprShow(item)">
+                    <div class="l-flex-RC" @click="deviceOprShow(item)">
                       <span class="c-text-14">{{
                         $t("device.commonOperations")
                       }}</span>

+ 22 - 22
src/views/home/index.vue

@@ -5,7 +5,7 @@
       <s-header :name="sys ? sys.title : $t('public.sysName')" :noback="true" :isFixed="false"></s-header>
       <!-- 留言滚动条 -->
       <template v-if="noticeContent.title">
-        <van-notice-bar @click="noticeClk" mode="link" :scrollable="true" color="rgba(64,77,116,1)" background="#fff"
+        <van-notice-bar @click="noticeClk" mode="link" :scrollable="true" color="rgba(64,77,116,1)" background="#fff" style="font-size: 0.375rem;"
           left-icon="volume-o" :text="noticeContent.title" />
       </template>
       <div class="intervalRow"></div>
@@ -20,53 +20,53 @@
       </div>
       <!-- 没有数据概览M14权限的人看不到数据概览和ECharts -->
       <!-- 数据概览 -->
-      <div v-if="showDataDiv" class="titleBox flex-col">
-        <div class="layer2 l-flex-RC">
+      <!-- <div v-if="showDataDiv" class="titleBox flex-col">
+        <div class="layer2 flex-row justify-between">
           <div class="section5 flex-col"></div>
           <div class="TextGroup2 flex-col">
             <span class="txt4">{{ $t("home.dataOverview") }}</span>
           </div>
         </div>
-      </div>
+      </div> -->
       <!-- 时间选择 -->
       <dateSelectList v-if="showDataDiv" @update="update($event)"></dateSelectList>
       <typeSelectList v-if="showDataDiv" :isHome="true" @upselectdata="upselectdata($event)"></typeSelectList>
       <!-- 订单数据 -->
       <div v-if="showDataDiv" class="o-plr-8 o-pt-10">
-        <div class="outer5 flex-col" @click="pushOrderCenter">
-          <div class="block5 flex-col">
+        <div class="salesData flex-col" @click="pushOrderCenter">
+          <!-- <div class="block5 flex-col"> -->
             <div class="topTitle flex-row justify-end">
               <span class="txt10">{{ $t("home.orderData") }}</span>
               <div class="layer4 flex-col"></div>
             </div>
-            <div class="outerBox flex-row">
-              <div class="main4 flex-col justify-between">
-                <div class="main5 flex-row justify-center">
+            <div class="salesDataBox flex-row">
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-row justify-center">
                   <!-- 首页 - 订单数据 - 收入总额¥ -->
                   <!-- <span class="word8">&yen;</span> -->
-                  <span class="word8">{{ currencySymbol }}</span>
-                  <span class="word9">{{ salesVolume.toFixed(2) }}</span>
+                  <span class="currencySymbol">{{ currencySymbol }}</span>
+                  <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
                 </div>
-                <span class="info5">{{ $t("home.totalIncome") }}</span>
+                <span class="dataText">{{ $t("home.totalIncome") }}</span>
               </div>
-              <div class="TextGroup7 flex-col">
-                <div class="mod3 flex-col justify-between">
-                  <span class="txt8">{{ salesNumber }}</span>
-                  <span class="info6">{{ $t("home.productNum") }}</span>
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-col justify-between">
+                  <span class="dataNum">{{ salesNumber }}</span>
+                  <span class="dataText">{{ $t("home.productNum") }}</span>
                 </div>
               </div>
-              <div class="TextGroup8 flex-col">
-                <div class="outer6 flex-col justify-between">
-                  <span class="txt9">{{ orderNumber }}</span>
-                  <span class="word10">{{ $t("home.numberOfOrders") }}</span>
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-col justify-between">
+                  <span class="dataNum">{{ orderNumber }}</span>
+                  <span class="dataText">{{ $t("home.numberOfOrders") }}</span>
                 </div>
               </div>
             </div>
           </div>
-        </div>
+        <!-- </div> -->
       </div>
       <!-- 时间 -->
-      <div v-if="showDataDiv" class="c-text-c c-text-18">
+      <div v-if="showDataDiv" class="c-text-c" style="font-size: 0.5rem; margin-top: 0.1rem;">
         {{ Format_time(dateSelect.startDate, 'YYYY-MM-DD') }}--{{ Format_time(dateSelect.endDate, 'YYYY-MM-DD') }}
       </div>
       <!-- ECharts

+ 2 - 2
src/views/login.vue

@@ -24,8 +24,8 @@
           :rules="[{ required: true, message: $t('login.userNameInput') }]" />
         <van-field v-model="userPwd" type="password" name="userPwd" label="" :placeholder="$t('login.passWordInput')"
           :rules="[{ required: true, message: $t('login.passWordInput') }]" />
-        <div class="checkedPasswordBox">
-          <van-checkbox icon-size="18px" class="checkedPassWord" v-model="checked">
+        <div class="checkedPasswordBox l-flex-RC">
+          <van-checkbox style="font-size: 0.5rem;" class="checkedPassWord" v-model="checked">
             {{ $t("login.checkedPassWord") }}
           </van-checkbox>
           <span class="forgetPassWord" @click="forgetPassword">{{

+ 106 - 103
src/views/orderCenter/index.vue

@@ -27,114 +27,115 @@
         <img class="img1" referrerpolicy="no-referrer" src="@/assets/line.png" />
         <dateSelectList @update="update($event)"></dateSelectList>
         <typeSelectList @upselectdata="upselectdata($event)"></typeSelectList>
+        <!-- 销售数据 -->
         <div v-if="!noData(salesVolume, salesNumber, orderNumber)" class="o-plr-8 o-pt-15">
-          <div class="outer5 flex-col">
-            <div class="block5 flex-col">
-              <div class="outerBox flex-row">
-                <div class="main4 flex-col justify-between">
-                  <div class="main5 flex-row justify-center">
+          <div class="salesData flex-col">
+            <!-- <div class="block5 flex-col"> -->
+              <div class="salesDataBox flex-row">
+                <div class="dataGroup flex-col">
+                  <div class="dataGroupBox flex-row">
                     <!-- 订单中心 - 收入总额¥ -->
                     <!-- <span class="word8">&yen;</span> -->
-                    <span class="word8">{{ currencySymbol }}</span>
-                    <span class="word9">{{ salesVolume.toFixed(2) }}</span>
+                    <span class="currencySymbol">{{ currencySymbol }}</span>
+                    <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
                   </div>
-                  <span class="info5">{{ $t("home.totalIncome") }}</span>
+                  <span class="dataText">{{ $t("home.totalIncome") }}</span>
                 </div>
-                <div class="TextGroup7 flex-col">
-                  <div class="mod3 flex-col justify-between">
-                    <span class="txt8">{{ salesNumber }}</span>
-                    <span class="info6">{{ $t("home.productNum") }}</span>
+                <div class="dataGroup flex-col">
+                  <div class="dataGroupBox flex-col justify-between">
+                    <span class="dataNum">{{ salesNumber }}</span>
+                    <span class="dataText">{{ $t("home.productNum") }}</span>
                   </div>
                 </div>
-                <div class="TextGroup8 flex-col">
-                  <div class="outer6 flex-col justify-between">
-                    <span class="txt9">{{ orderNumber }}</span>
-                    <span class="word10">{{ $t("home.numberOfOrders") }}</span>
+                <div class="dataGroup flex-col">
+                  <div class="dataGroupBox flex-col justify-between">
+                    <span class="dataNum">{{ orderNumber }}</span>
+                    <span class="dataText">{{ $t("home.numberOfOrders") }}</span>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
+          <!-- </div> -->
         </div>
         <kNoData v-else></kNoData>
-        <div class="o-mt-5" style="height: 10px; background: #f5f5f5"></div>
+        <!-- <div class="o-mt-5" style="height: 10px; background: #f5f5f5"></div> -->
         <!-- 时间 -->
-        <div class="c-text-c c-text-18">
+        <div class="c-text-c" style="font-size: 0.45rem; margin-top: 0.4rem;">
           {{ Format_time(searchParams.startDate, 'YYYY-MM-DD') }}--{{ Format_time(searchParams.endDate, 'YYYY-MM-DD')
           }}
         </div>
-        <div class="group7 flex-col justify-center">
+        <div class="OrderHead flex-col justify-center">
           <div class="main9 flex-col justify-between">
             <div class="wrap1 flex-row justify-between">
               <div class="ImageText7 flex-col">
                 <div class="mod5 flex-row justify-between">
                   <div class="block3 flex-col"></div>
-                  <div class="TextGroup7 flex-col">
+                  <div class="TextGroup7 flexOrderExcelIcon-col">
                     <span class="info3">{{ $t('orderCenter.orderDetails') }}</span>
                   </div>
                 </div>
               </div>
-              <div class="ImageText8 flex-col" @click="gotoOrderExcel()">
-                <div class="bd3 flex-row justify-between">
-                  <span class="info4 flex-col">{{ $t('orderCenter.exportToExcel') }}</span>
-                  <div class="outer3 flex-col"></div>
+              <!-- 导出订单 -->
+              <div class="OrderExcel flex-col" @click="gotoOrderExcel()">
+                <div class="flex-row justify-between">
+                  <span class="OrderExcelTxt flex-col">{{ $t('orderCenter.exportToExcel') }}</span>
+                  <div class="OrderExcelIcon flex-col"></div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div class="section1 flex-col">
-          <div class="group8 flex-col">
-            <div class="section4 flex-col">
+        <div class="orderList flex-col">
+          <!-- <div class="group8 flex-col"> -->
+            <!-- <div class="section4 flex-col"> -->
               <div v-for="(item, index) in orderList" :key="index">
                 <div class="section5 flex-col" @click="orderClick(item)">
-
                   <van-card :thumb="showSugerPhoto(item)">
                     <template #title>
-                      <span class="word13">{{ $t('orderCenter.tradeName') }}:{{ item.productName }}</span>
+                      <span class="tradeName">{{ $t('orderCenter.tradeName') }}:{{ item.productName }}</span>
                     </template>
                     <template #desc>
-                      <span class="word11">{{ $t('orderCenter.equipmentName') }}:{{ item.es }}</span>
+                      <span class="equipmentName">{{ $t('orderCenter.equipmentName') }}:{{ item.es }}</span>
                     </template>
                     <template #price>
-                      <div class="pricBox flex-row align-end" :class="{ orderError: item.status === 0 }">
-                        <span class="txt9">{{ item.statusText }}:
-                          <span v-if="user.ifForeign === '0'" class="word14 o-ptb-8">
-                            {{ $t('orderCenter.dividingDomesticService') }} :{{ currencySymbol }}{{ showSubcom(item) }}
-                          </span>
+                      <div class="pricBox flex-row" :class="{ orderError: item.status === 0 }">
+                        <span class="payType">{{ item.statusText }}:
                         </span>
                         <!-- 订单明细 - 线下支付 ¥ -->
-                        <span class="info5">{{ currencySymbol }}</span>
-                        <span class="word12" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
-                        <span class="word12" v-else>{{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -
-      item.refundAmount).toFixed(2) }}</span>
+                        <span class="currencySymbol">{{ currencySymbol }}</span>
+                        <span class="orderPrice" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
+                        <span class="orderPrice" v-else>
+                          {{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -item.refundAmount).toFixed(2) }}</span>
                       </div>
+                      <span v-if="user.ifForeign === '0'" class="giveAway">
+                        {{ $t('orderCenter.dividingDomesticService') }} :{{ currencySymbol }}{{ showSubcom(item) }}
+                      </span>
                     </template>
                     <template #price-top>
-                      <span class="time_01"
-                        :style="user.ifForeign == '0' ? 'margin-top: 20px;' : 'margin-top: 40px;'">{{
-      $t('orderCenter.paymentTime') }}:{{ showOrderTime(item, 1) }}</span>
+                      <span class="orderTime"
+                        :style="user.ifForeign == '0' ? '' : 'margin-top: 6vw;'">
+                        {{ $t('orderCenter.paymentTime') }}:{{ showOrderTime(item, 1) }}</span>
                     </template>
                     <template #footer>
                       <span v-if="item.status === 3">x{{ item.refundQuantity }}</span>
-                      <span v-else>x{{ item.refundQuantity == null ? item.productNumber : (item.productNumber -
-      item.refundQuantity) }}</span>
+                      <span v-else>x{{ item.refundQuantity == null ? item.productNumber : (item.productNumber - item.refundQuantity) }}</span>
                     </template>
                   </van-card>
-                  <div v-if="typeof item.status === 'undefined'" class="main11 flex-col orderSuccess"></div>
-                  <div v-else class="main11 flex-col" :class="{
-      orderSuccess: item.status === 1 && (user.ifForeign == '0' || user.ifForeign == null),
-      coinOrderSuccess: item.status === 1 && user.ifForeign == '1',
-      orderError: item.status === 0,
-      refunding: item.status === 2,
-      refunded: item.status === 3,
-    }"></div>
+                  <div v-if="typeof item.status === 'undefined'" class="payPic flex-col orderSuccess"></div>
+                  <div v-else class="payPic flex-col" 
+                    :class="{ orderSuccess: item.status === 1 && (user.ifForeign == '0' || user.ifForeign == null),
+                            coinOrderSuccess: item.status === 1 && user.ifForeign == '1',
+                            orderError: item.status === 0,
+                            refunding: item.status === 2,
+                            refunded: item.status === 3,
+                          }">
+                  </div>
                 </div>
                 <!-- <div class="section6 flex-col"></div> -->
               </div>
               <van-back-top />
-            </div>
-          </div>
+            <!-- </div> -->
+          <!-- </div> -->
         </div>
       </van-list>
     </div>
@@ -142,65 +143,67 @@
     <orderSearch ref="searchRef" @search="search($event)"></orderSearch>
     <!-- 退款弹窗 -->
     <van-popup v-model:show="refundType" position="bottom" round>
-      <div class="refundBox flex-col">
-        <div class="section1 flex-col">
-          <div class="group3 flex-col">
-            <div class="TextGroup1 l-flex-center">
-              <div class="outer1 flex-col">
+      <div class="orderPopBox flex-col">
+        <!-- <div class="section1 flex-col"> -->
+          <!-- <div class="group3 flex-col"> -->
+            <div class="popTopBox l-flex-center">
+              <div class="popTopTxtBox flex-col">
                 <!-- <span class="txt4">这里是设备名称</span> -->
-                <span class="info1">{{ $t('orderCenter.business') }}</span>
-                <span class="txt5">+ {{ refundObject.refundAmount == null ? refundObject.price.toFixed(2) :
+                <span class="business">{{ $t('orderCenter.business') }}</span>
+                <span class="incomePrice">+ {{ refundObject.refundAmount == null ? refundObject.price.toFixed(2) :
       (refundObject.price - refundObject.refundAmount).toFixed(2) }}</span>
               </div>
             </div>
-            <div class="layer1 flex-col"></div>
+            <div class="line flex-col"></div>
             <!-- <div class="layer2 flex-row justify-between">
               <span class="info2">{{ $t('orderCenter.accountBalance') }}</span>
               <span class="txt6">{{ accountDetail.altAvilBalance }}</span>
             </div> -->
-            <div class="layer3 flex-row justify-between">
-              <span class="word2">{{ $t('orderCenter.orderNo') }}</span>
-              <span class="info3">{{ refundObject.sn }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.orderNo') }}</span>
+              <span class="content">{{ refundObject.sn }}</span>
             </div>
-            <div v-if="refundObject.status != 0 && user.ifForeign === '0'" class="layer3 flex-row justify-between">
-              <span class="word2">{{ $t('orderCenter.orderSerialNumberLabel') }}</span>
-              <span class="info3">{{ refundObject.trxNo }}</span>
+            <div v-if="refundObject.status != 0 && user.ifForeign === '0'" class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.orderSerialNumberLabel') }}</span>
+              <span class="content">{{ refundObject.trxNo }}</span>
             </div>
-            <div class="layer3 flex-row justify-between">
-              <span class="word2">{{ $t('orderCenter.commodity') }}</span>
-              <span class="info3">{{ refundObject.productName }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.commodity') }}</span>
+              <span class="content">{{ refundObject.productName }}</span>
             </div>
-            <div class="layer4 flex-row justify-between">
-              <span class="word3">{{ $t('orderCenter.distribution') }}</span>
-              <span class="word4">{{ showSubcom(refundObject) }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.distribution') }}</span>
+              <span class="content">{{ showSubcom(refundObject) }}</span>
             </div>
-            <div class="layer4 flex-row justify-between">
-              <span class="word3">{{ $t('orderCenter.equipmentNo') }}</span>
-              <span class="word4">{{ refundObject.clientId }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.equipmentNo') }}</span>
+              <span class="content">{{ refundObject.clientId }}</span>
             </div>
-            <div class="layer5 flex-row justify-between">
-              <span class="txt7">{{ $t('orderCenter.state') }}</span>
-              <span class="word5">{{ showStatus(refundObject) }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.state') }}</span>
+              <span class="content">{{ showStatus(refundObject) }}</span>
             </div>
-            <div class="layer6 flex-row justify-between">
-              <span class="word6">{{ $t('orderCenter.paymentMethod') }}</span>
-              <span class="word7">{{ showPayType(refundObject) }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.paymentMethod') }}</span>
+              <span class="content">{{ showPayType(refundObject) }}</span>
             </div>
-            <div class="layer6 flex-row justify-between">
-              <span class="word6">{{ refundObject.status === 1? $t('orderCenter.paymentTime') : refundObject.status === 3? $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}</span>
-              <span class="word7">{{ showOrderTime(refundObject, 1) }}</span>
+            <div class="orderDetailBox flex-row justify-between">
+              <span class="title">
+                {{ refundObject.status === 1 ? $t('orderCenter.paymentTime') : refundObject.status ===3 ? $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}
+              </span>
+              <span class="content">{{ showOrderTime(refundObject, 1) }}</span>
             </div>
-            <div v-if="refundObject.status === 3" class="layer7 flex-row justify-between">
-              <span class="word8">{{ $t('orderCenter.refunded') }}</span>
-              <span class="info4">{{ refundObject.refundAmount }}</span>
+            <div v-if="refundObject.status === 3" class="orderDetailBox flex-row justify-between">
+              <span class="title">{{ $t('orderCenter.refunded') }}</span>
+              <span class="content">{{ refundObject.refundAmount }}</span>
             </div>
-            <div v-if="refundObject.status === 3 && orderType == '3'" class="layer7 flex-row justify-between">
-              <span class="word8">退款原因</span>
-              <span class="info4">{{ refundObject.refundReason }}</span>
+            <div v-if="refundObject.status === 3 && orderType == '3'" class="orderDetailBox flex-row justify-between">
+              <span class="title">退款原因</span>
+              <span class="content">{{ refundObject.refundReason }}</span>
             </div>
-            <div class="layer6 flex-row justify-between l-flex-center"
+            <div class="orderDetailBox flex-row justify-between l-flex-center"
               v-if="(refundObject.status != 0 && refundObject.status != 2) && orderType == '3'">
-              <span class="word6 o-mr-40">是否开发票</span>
+              <span class="title o-mr-40">是否开发票</span>
               <van-radio-group v-model="isInvoice" direction="horizontal">
                 <van-radio :name="1">是</van-radio>
                 <van-radio :name="0">否</van-radio>
@@ -213,23 +216,23 @@
             </van-field>
             <!-- 发起退款 -->
             <!-- 非已付款订单,线下订单要隐藏按钮 -->
-            <div style="display: flex; justify-content: center;">
+            <div style="display: flex; justify-content: center; padding-bottom: 1rem;">
               <van-button size="small"
                 v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2 && orderType != '3'"
                 @click="sentRefundMessage(refundObject)" round type="primary"
-                style="padding: 20px 30px;margin-top: 20px;" color="#4dc193">
+                style="padding: 0.5rem 0.6rem; margin-top: 0.8rem;" color="#4dc193">
                 退款提醒
               </van-button>
-              <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 20px;">
+              <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 0.5rem;">
               </div>
               <van-button size="small"
                 v-if="(refundObject.status === 1 && user.ifForeign === '0') || (refundObject.status === 1 && user.ifForeign === '1' && refundObject.isAir === '1')"
-                @click="noticeClk(refundObject)" round type="primary" style="padding: 20px 30px; margin-top: 20px;">
+                @click="noticeClk(refundObject)" round type="primary" style="padding: 0.5rem 0.6rem; margin-top: 0.8rem;">
                 {{ $t('orderCenter.initiateRefund') }}
               </van-button>
             </div>
-          </div>
-        </div>
+          <!-- </div> -->
+        <!-- </div> -->
       </div>
     </van-popup>
     <!-- 退款弹窗 -->
@@ -238,11 +241,11 @@
       <template #content>
         <div class="refundBox l-flex-RC" style="overflow-y: auto; overflow-x: hidden; max-height: 40vh;">
           <div v-for="(item, index) in orderDetails" :key="index" class="card01">
-            <van-checkbox v-model="isChecked[index]" @change="checkGood(index)" icon-size="20px"></van-checkbox>
+            <van-checkbox v-model="isChecked[index]" @change="checkGood(index)" icon-size="0.5rem"></van-checkbox>
             <van-card :price="item.price.toFixed(2)" :title="item.productName" :thumb="showSugarPic(item.productNo)">
               <template #footer>
                 <van-stepper v-model="refundNum[index]" @plus="plusRefundGood(index)" @minus="minusRefundGood(index)"
-                  theme="round" button-size="22" disable-input
+                  theme="round" button-size="0.55rem" disable-input
                   :max="item.refundQuantity == null ? item.productNumber : (item.productNumber - item.refundQuantity)" />
               </template>
             </van-card>

+ 8 - 7
src/views/orderCenter/orderSearch.vue

@@ -104,7 +104,7 @@ export default {
     // 提交搜索表单触发搜索
     const onSubmit = () => {
       console.log('startTime.value', startTime.value)
-      if (userName.value == '' && sn.value == '' && trxNo.value == '' && clientId.value == '') {
+      if (userName.value == '' && sn.value == '' && trxNo.value == '' && clientId.value == '' && startTime.value == '' && endTime.value == '') {
         // if (startTime.value != '' || endTime.value != '') {
         //   Toast("请输入正确时间");
         //   return;
@@ -112,12 +112,13 @@ export default {
           showToast("请输入搜索条件");
         return;
         // }
-      } else {
-        if (startTime.value == '' || endTime.value == '') {
-          showToast("请输入指定订单日期");
-          return;
-        }
-      }
+      } 
+      // else {
+      //   if (startTime.value == '' || endTime.value == '') {
+      //     showToast("请输入指定订单日期");
+      //     return;
+      //   }
+      // }
       const searchParam = {
         userName: userName.value,
         sn: sn.value,

+ 4 - 4
src/views/register.vue

@@ -25,8 +25,8 @@
           <div class="van-cell__title van-field__label"><span>{{ $t('register.country') }}</span></div>
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="ifForeign" direction="horizontal">
-              <van-radio name="0" icon-size="18px">{{ $t('register.chinese') }}</van-radio>
-              <van-radio name="1" icon-size="18px">{{ $t('register.other') }}</van-radio>
+              <van-radio name="0">{{ $t('register.chinese') }}</van-radio>
+              <van-radio name="1">{{ $t('register.other') }}</van-radio>
             </van-radio-group>
           </div>
         </div>
@@ -36,8 +36,8 @@
             <div class="van-cell__title van-field__label"><span>{{ $t('register.logonMode') }}</span></div>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group class="o-pr-18" v-model="logonMode" direction="horizontal">
-                <van-radio name="10" icon-size="18px" :value="0">{{ $t('register.phoneRegistration') }}</van-radio>
-                <van-radio name="11" icon-size="18px" :value="1">{{ $t('register.emailRegistration') }}</van-radio>
+                <van-radio name="10" :value="0">{{ $t('register.phoneRegistration') }}</van-radio>
+                <van-radio name="11" :value="1">{{ $t('register.emailRegistration') }}</van-radio>
               </van-radio-group>
             </div>
           </div>

+ 6 - 6
src/views/user.vue

@@ -173,20 +173,20 @@
           <!-- 切换支付平台 -->
           <div v-if="chaSzPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.szPayType") }}: </span>
-            <div class="cust_vantBorder o-pl-15">
-              <van-switch :model-value="sunzeePay" active-color="#0090fa" inactive-color="#30c25c" size="21px"
+            <div class="cust_vantBorder o-pl-5">
+              <van-switch :model-value="sunzeePay" active-color="#0090fa" inactive-color="#30c25c" style="font-size: 0.5rem;"
                 @update:model-value="changeSunzeePay" />
             </div>
-            <span class="o-pl-50">{{ $t("user.currentChoose") }}: {{ sunzeePay ? "汇付" : "汇聚" }}</span>
+            <span class="o-pl-10">{{ $t("user.currentChoose") }}: {{ sunzeePay ? "汇付" : "汇聚" }}</span>
           </div>
 
           <div v-if="chaScPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.scPayType") }}: </span>
-            <div class="cust_vantBorder o-pl-15">
-              <van-switch :model-value="sevencloudPay" active-color="#0090fa" inactive-color="#30c25c" size="21px"
+            <div class="cust_vantBorder o-pl-5">
+              <van-switch :model-value="sevencloudPay" active-color="#0090fa" inactive-color="#30c25c" style="font-size: 0.5rem;"
                 @update:model-value="changeSevenCloudPay" />
             </div>
-            <span class="o-pl-50">{{ $t("user.currentChoose") }}: {{ sevencloudPay ? "汇付" : "汇聚" }}</span>
+            <span class="o-pl-10">{{ $t("user.currentChoose") }}: {{ sevencloudPay ? "汇付" : "汇聚" }}</span>
           </div>
         </div>
       </div>