style:“优化部分样式，优化打包缓存”

src/assets/language/en.json

@@ -278,8 +278,8 @@
     "cancel": "cancel",
     "confirm": "confirm",
     "allMachines": "All machines",
-    "furnaceHeadOn": "Furnace head on",
-    "furnaceHeadClosed": "Furnace head closed",
+    "furnaceHeadOn": "Machine(Furnace head) on",
+    "furnaceHeadClosed": "Machine(Furnace head) closed",
     "startSleep": "Start Sleep",
     "endSleep": "End Sleep",
     "sleepDesc": "Sleep description",

src/assets/language/zh.json

@@ -278,8 +278,8 @@
     "cancel": "取消",
     "confirm": "确认",
     "allMachines": "全部机器",
-    "furnaceHeadOn": "炉头开启",
-    "furnaceHeadClosed": "炉头关闭",
+    "furnaceHeadOn": "设备（炉头）开启",
+    "furnaceHeadClosed": "设备（炉头）关闭",
     "startSleep": "开始休眠",
     "endSleep": "结束休眠",
     "successfullyAddedAlarmClock": "新增闹钟成功",

src/components/commom/kDialog/index.less

@@ -50,20 +50,21 @@
         .mod8 {
           background-color: rgba(77, 106, 221, 1);
           border-radius: 0.5rem;
-          height: 1rem;
-          width: 3rem;
+          // height: 1rem;
+          // width: 3rem;
           justify-content: center;
           align-items: center;
 
           .info6 {
             overflow-wrap: break-word;
             color: rgba(255, 255, 255, 1);
-            font-size: 0.35rem;
+            font-size: 13px;
             font-family: PingFangSC-Medium;
             text-align: center;
             // white-space: nowrap;
-            line-height: 0.35rem;
+            // line-height: 0.35rem;
             display: block;
+            width: auto;
           }
         }
       }

src/components/typeSelectList/index.less

@@ -24,8 +24,8 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        padding: 0 8px;
-        font-size: 0.3rem;
+        padding: 0 3px;
+        font-size: 13px;
       }
     }
 

src/styles/accountOperation/index.less

@@ -7,7 +7,7 @@
     overflow: auto;
 
     .taskListRow {
-      width: 100%;
+      // width: 100%;
       height: 53px;
       flex-wrap: wrap;
 

src/styles/accountPer/index.less

@@ -73,9 +73,9 @@
                 position: relative;
 
                 .itemBox {
-                    width: 100%;
-                    padding: 1.5em 1em;
-                    line-height: 1.8;
+                    // width: 100%;
+                    padding: 15px 15px;
+                    line-height: 25px;
                     border-bottom: 1px solid #e7eaf7;
                 }
 

src/styles/alarmClock/index.less

@@ -7,36 +7,38 @@
   overflow-x: hidden;
 
   .bd1 {
-    width: 100%;
+    // width: 100%;
     // height: 439px;
+    height: calc(100% - 44px);
 
     .section5 {
       background-color: rgba(255, 255, 255, 1);
       // z-index: 91;
       // height: 54px;
       // margin-top: 1px;
-      width: 100%;
+      // width: 100%;
       position: relative;
 
       .layer1 {
         // width: 84px;
         // height: 20px;
-        margin: 0.5rem 0.5rem;
+        margin: 10px 10px;
 
         .ImageText1 {
           // height: 20px;
           // width: 84px;
 
           .layer1 {
-            width: 2.4rem;
+            // width: 2.4rem;
             // height: 20px;
-            margin: 0 auto;
+            // margin: 0 auto;
 
             .bd2 {
-              width: 0.5rem;
-              height: 0.5rem;
+              width: 20px;
+              height: 20px;
               background: url('../../assets/device/add.png');
               background-size: 100%;
+              margin-right: 10px;
             }
 
             .TextGroup1 {
@@ -48,11 +50,11 @@
                 // height: 20px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 0.4rem;
+                font-size: 14px;
                 font-family: PingFangSC-Medium;
                 text-align: left;
                 white-space: nowrap;
-                font-size: 0.4rem;
+                font-size: 14px;
                 display: block;
               }
             }
@@ -71,7 +73,7 @@
     }
 
     .section6 {
-      width: 100%;
+      // width: 100%;
       padding: 10px 10px;
       height: 100px;
 
@@ -84,11 +86,11 @@
             // height: 0.5rem;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.5rem;
+            font-size: 18px;
             font-family: PingFangSC-Medium;
             text-align: left;
             white-space: nowrap;
-            line-height: 0.7rem;
+            line-height: 25px;
             display: block;
           }
 
@@ -97,10 +99,10 @@
             // height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.3rem;
+            font-size: 12px;
             text-align: left;
             // white-space: nowrap;
-            line-height: 0.6rem;
+            line-height: 18px;
             display: block;
             // margin: -2px 0 0 2px;
           }
@@ -120,10 +122,10 @@
             // height: 0.3rem;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.3rem;
+            font-size: 15px;
             text-align: left;
             // white-space: nowrap;
-            line-height: 0.6rem;
+            line-height: 20px;
             display: block;
           }
 
@@ -132,11 +134,11 @@
             // height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.3rem;
+            font-size: 14px;
             text-align: left;
             // white-space: nowrap;
-            line-height: 0.4rem;
-            margin-top: 0.2rem;
+            line-height: 20px;
+            margin-top: 5px;
             display: block;
           }
         }
@@ -144,7 +146,7 @@
 
       .ImageText2 {
         // height: 17px;
-        width: 15%;
+        // width: 15%;
         // margin: 9px 0 0 5px;
         // margin-top: 5px;
 
@@ -153,11 +155,11 @@
           // height: 17px;
 
           .group4 {
-            width: 0.4rem;
-            height: 0.5rem;
+            width: 15px;
+            height: 18px;
             background: url('../../assets/delete.png') top center no-repeat;
             background-size: 100%;
-            // margin-top: 1px;
+            margin-right: 5px;
           }
 
           .TextGroup4 {
@@ -169,10 +171,10 @@
               // height: 17px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 0.4rem;
+              font-size: 14px;
               text-align: left;
               white-space: nowrap;
-              line-height: 0.5rem;
+              line-height: 18px;
               display: block;
             }
           }
@@ -180,7 +182,7 @@
       }
 
       .bd4 {
-        width: 15%;
+        // width: 15%;
         // height: 36px;
         // margin: 10px 0 0 15px;
 
@@ -190,11 +192,11 @@
           // margin-left: 5px;
 
           .main3 {
-            width: 0.4rem;
-            height: 0.4rem;
+            width: 14px;
+            height: 14px;
             background: url('../../assets/edit.png') top center no-repeat;
             background-size: 100%;
-            // margin-top: 1px;
+            margin-right: 3px;
           }
 
           .word5 {
@@ -202,10 +204,10 @@
             // height: 17px;
             overflow-wrap: break-word;
             color: #4d6add;
-            font-size: 0.4rem;
+            font-size: 15px;
             text-align: left;
             white-space: nowrap;
-            line-height: 0.4rem;
+            line-height: 15px;
             display: block;
           }
         }
@@ -215,10 +217,10 @@
           // height: 18px;
           overflow-wrap: break-word;
           color: rgba(77, 193, 147, 1);
-          font-size: 0.45rem;
+          font-size: 15px;
           text-align: left;
           // white-space: nowrap;
-          line-height: 0.8rem;
+          line-height: 30px;
           display: block;
           // margin: 1px 0 0 2px;
 

src/styles/device/index.less

@@ -144,10 +144,10 @@
       .section1 {
         background-color: rgba(255, 255, 255, 1);
         margin-top: 1px;
-        width: 100%;
+        // width: 100%;
 
         .outer1 {
-          width: 100%;
+          // width: 100%;
 
           .bd1 {
             width: 100%;
@@ -222,7 +222,7 @@
           }
 
           .txt1 {
-            width: 100%;
+            // width: 100%;
             color: rgba(64, 77, 116, 1);
             font-size: 0.375rem;
             line-height: 0.5rem;;
@@ -243,7 +243,7 @@
             padding: 5px 5px;
 
             .contentWord {
-              width: 100%;
+              // width: 100%;
               padding: 10px 10px;
               color: rgba(64, 77, 116, 1);
               font-size: 0.375rem;
@@ -343,13 +343,13 @@
             }
 
             .layer3 {
-              width: 100%;
+              // width: 100%;
               display: flex;
               align-items: center;
 
               .word1 {
                 text-overflow: ellipsis;
-                width: 100%;
+                // width: 100%;
                 font-size: 14px;
               }
 

src/styles/doSugar/index.less

@@ -19,7 +19,7 @@
 
     .textRow {
         text-align: right;
-        width: 100%;
+        // width: 100%;
         color: #4d6add;
         font-size: 12px;
         line-height: 17px;
@@ -27,7 +27,7 @@
     }
 
     .box1 {
-        width: 100%;
+        // width: 100%;
         height: 237px;
 
         .block2 {

src/styles/forgetPassword/index.less

@@ -1,18 +1,18 @@
 .forgetPassword {
     .forgetPasswordFormBox {
         // width: 313px;
-        margin: 30px auto;
+        width: 100%;
+        // margin: 30px auto;
         text-align: center;
 
         .van-form {
             .van-cell {
-                // width: 313px;
-                // height: 38px;
-                padding: 0;
-                font-size: 0.35rem;
-                margin: 0 auto;
-                margin-top: 20px;
-                overflow: visible;
+				width: 90%;
+				height: 40px;
+				padding: 0;
+				margin: 0 auto;
+				margin-top: 15px;
+				overflow: visible;
 
                 &::after {
                     display: none;
@@ -28,8 +28,8 @@
                 }
 
                 .van-field__control {
-                    height: 1.2rem;
-                    line-height: 1.2rem;
+                    height: 40px;
+                    line-height: 20px;
                     padding: 6px;
                     border-radius: 2px;
                     border: 0.5px solid rgba(185, 186, 208, 1);
@@ -39,7 +39,7 @@
                     display: flex;
 
                     .van-radio-group--horizontal {
-                        width: 100%;
+                        // width: 100%;
                         justify-content: space-around;
                     }
 
@@ -76,23 +76,31 @@
             .word1 {
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 0.4rem;
+                font-size: 14px;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 0.4rem;
+                line-height: 14px;
                 display: block;
-                margin: 34px 0 0 0;
+                // margin: 34px 0 0 0;
+                width: 90%;
+				margin: 0 auto;
+				margin-top: 34px;
+				overflow: visible;
             }
 
             .word2 {
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 0.4rem;
+                font-size: 14px;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 13px;
+                line-height: 14px;
                 display: block;
-                margin: 0.5rem 0 0 0;
+                // margin: 34px 0 0 0;
+                width: 90%;
+				margin: 0 auto;
+				margin-top: 20px;
+				overflow: visible;
             }
 
             .register {

src/styles/home/index.less

@@ -12,7 +12,6 @@
     }
 
     .nameDeviceRow {
-      width: 100%;
       // height: 40px;
       flex-direction: row;
       align-items: center;
@@ -66,14 +65,12 @@
     }
 
     .titleBox {
-      width: 100%;
       // height: 30px;
       margin: 0.3rem 0;
       padding: 0 0.3rem;
 
 
       .layer2 {
-        // width: 100%;
         // height: 25px;
         width: 2.15rem;
 
@@ -113,7 +110,7 @@
     .salesData {
       background: url("../../assets/home/outer.png") top center no-repeat;
       background-size: 100% 100%;
-      width: 100%;
+      // width: 100%;
       margin-top: 0.5rem;
       padding: 0.5rem 0.5rem;
 
@@ -330,7 +327,7 @@
     }
 
     .outer9 {
-      width: 100%;
+      // width: 100%;
       // height: 54px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;

src/styles/login/index.less

@@ -63,7 +63,7 @@
         // }
 
         .van-form .van-cell {
-            width: 7rem;
+            width: 300px;
             padding: 0;
             color: rgba(168, 168, 197, 1);
             margin: 0 auto;
@@ -100,7 +100,7 @@
         }
 
         .checkedPasswordBox {
-            width: 7rem;
+            width: 300px;
             margin: 0.5rem auto 0 auto;
             font-size: 0.4rem;
             color: #4d6add;
@@ -143,8 +143,8 @@
 
             .forgetPassWord {
                 cursor: pointer;
-                font-size:  0.35rem;
-                line-height:  0.35rem;
+                font-size:  13px;
+                line-height:  13px;
             }
         }
 

src/styles/merchantManage/index.less

@@ -71,7 +71,7 @@
         }
 
         .main4 {
-            width: 100%;
+            // width: 100%;
             justify-content: space-between;
             padding: 15px;
 
@@ -82,10 +82,10 @@
                 height: 250px;
                 margin: 0 auto;
                 margin-bottom: 20px;
-                width: 100%;
+                // width: 100%;
 
                 .outer2 {
-                    width: 100%;
+                    // width: 100%;
                     padding: 20px;
 
                     .box2 {
@@ -206,10 +206,14 @@
                         justify-content: center;
 
                         .btn1 {
-                            margin: 0 30px;
+                            margin: 0 25px;
                             padding: 0 20px;
                         }
                     }
+
+                    .van-button__text {
+                        font-size: 12px;
+                    }
                 }
             }
         }
@@ -258,11 +262,11 @@
                     background-color: rgba(255, 255, 255, 1);
                     z-index: 24;
                     height: 54px;
-                    width: 100%;
+                    // width: 100%;
                     position: relative;
 
                     .section1 {
-                        width: 100%;
+                        // width: 100%;
                         height: 13px;
                         padding: 34px 80px;
 

src/styles/orderCenter/index.less

@@ -8,15 +8,15 @@
 
     .main3 {
       // width: 100%;
-      height: 1.5rem;
+      height: 60px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
       background-color: #f5f5f5;
 
       .group4 {
-        width: 100%;
+        // width: 100%;
         // height: 17px;
-        padding: 0 0.5rem;
+        padding: 0 20px;
 
         .ImageText1 {
           // height: 16px;
@@ -24,14 +24,15 @@
           // width: 87px;
 
           .outer2 {
-            width: 2.2rem;
+            // width: 50px;
             // height: 16px;
 
             .block1 {
-              width: 0.4rem;
-              height: 0.4rem;
+              width: 15px;
+              height: 15px;
               background: url("../../assets/home/titleIcon.png") top center no-repeat;
               background-size: 100%;
+              margin-right: 5px;
             }
 
             .TextGroup1 {
@@ -44,11 +45,11 @@
                 // height: 14px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
-                font-size: 0.4rem;
+                font-size: 14px;
                 font-family: PingFangSC-Semibold;
                 text-align: left;
                 white-space: nowrap;
-                line-height: 0.4rem;
+                line-height: 15px;
                 display: block;
               }
             }
@@ -60,7 +61,7 @@
           cursor: pointer;
 
           .label2 {
-            width: 0.5rem;
+            width: 16px;
             // height: 20px;
             // margin-right: 5px;
           }
@@ -71,15 +72,15 @@
     .salesData {
       background: url("../../assets/home/outer.png") top center no-repeat;
       background-size: 100% 100%;
-      width: 100%;
-      margin-top: 0.5rem;
+      // width: 100%;
+      margin-top: 20px;
 
       // .block5 {
       //   width: 100%;
-      padding: 0.3rem 0.5rem;
+      padding: 10px 20px;
 
       .salesDataBox {
-        margin: 0.6rem 0;
+        margin: 25px 0;
 
         .dataGroup {
           width: 33.3%;
@@ -95,12 +96,12 @@
               // padding-right: 0.5rem;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 0.4rem;
+              font-size: 15px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 0.4rem;
-              margin-top: 0.25rem;
+              line-height: 15px;
+              margin-top: 10px;
               display: block;
             }
 
@@ -109,13 +110,13 @@
               // height: 30px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 0.6rem;
+              font-size: 20px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 0.6rem;
+              line-height: 20px;
               // margin-left: -20px;
-              margin-top: 0.1rem;
+              margin-top: 5px;
               display: block;
             }
           }
@@ -125,95 +126,22 @@
             // height: 17px;
             overflow-wrap: break-word;
             color: rgba(135, 135, 166, 1);
-            font-size: 0.35rem;
+            font-size: 13px;
             text-align: center;
             white-space: nowrap;
-            line-height: 0.35rem;
+            line-height: 13px;
             display: block;
-            margin-top: 0.35rem;
+            margin-top: 15px;
           }
         }
       }
-
-
-      // .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: 12px;
-      //       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: 12px;
-      //       text-align: center;
-      //       white-space: nowrap;
-      //       line-height: 17px;
-      //       margin-top: 11px;
-      //       display: block;
-      //     }
-      //   }
-      // }
-
-      // }
     }
 
     .OrderHead {
-      height: 1.5rem;
-      margin-top: 0.5rem;
-      margin-bottom: 0.2rem;
-      width: 100%;
+      height: 50px;
+      margin-top: 10px;
+      margin-bottom: 15px;
+      // width: 100%;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-color: #fff;
       box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -221,7 +149,7 @@
 
       .main9 {
         // width: 100%;
-        padding: 2.5px 0.5rem;
+        padding: 2.5px 20px;
         // height: 30px;
         display: flex;
         align-items: center;
@@ -239,14 +167,15 @@
             // width: 79px;
 
             .mod5 {
-              width: 2.1rem;
+              // width: 30px;
               // height: 18px;
 
               .block3 {
-                width: 0.4rem;
-                height: 0.4rem;
+                width: 15px;
+                height: 15px;
                 background: url('../../assets/order/orderIcon.png') top center no-repeat;
                 background-size: 100%;
+                margin-right: 5px;
               }
 
               .TextGroup7 {
@@ -259,11 +188,11 @@
                   // height: 14px;
                   overflow-wrap: break-word;
                   color: rgba(64, 77, 116, 1);
-                  font-size: 0.4rem;
+                  font-size: 14px;
                   font-family: PingFangSC-Semibold;
                   text-align: left;
                   white-space: nowrap;
-                  line-height: 0.4rem;
+                  line-height: 14px;
                   display: block;
                 }
               }
@@ -274,16 +203,16 @@
             .OrderExcelTxt {
               overflow-wrap: break-word;
               color: #4d6add;
-              font-size: 0.35rem;
+              font-size: 14px;
               text-align: center;
               white-space: nowrap;
-              line-height: 0.35rem;
+              line-height: 14px;
               display: block;
             }
 
             .OrderExcelIcon {
-              width: 0.4rem;
-              height: 0.4rem;
+              width: 15px;
+              height: 15px;
               background: url('../../assets/order/gotoRight.png') top center no-repeat;
               background-size: 100%;
             }
@@ -292,8 +221,7 @@
       }
     }
 
-    .orderList {
-      width: 100%;
+    .orderList {      
       background-color: rgba(255, 255, 255, 1);
       // margin-top: 1px;
       width: 100%;
@@ -306,14 +234,14 @@
       // margin-top: 13px;
 
       .section5 {
-        width: 100%;
-        height: 45vw;
+        // width: 100%;
+        height: 170px;
         position: relative;
-        padding: 0.2rem 0.5rem;
+        padding: 10px 10px;
         background-color: #f5f5f5;
 
         .van-card {
-          height: 4.2rem;
+          height: 150px;
           background-color: #ffff;
           display: flex;
           align-items: center;
@@ -323,18 +251,17 @@
         }
 
         .van-card__header {
-          height: 3.5rem;
+          height: 120px;
         }
 
         .van-card__bottom {
-          height: 1.5rem;
-          // width: 50vw;
+          height: 50px;
         }
 
         .van-card__thumb {
-          margin-top: 0.5rem;
-          width: 2rem;
-          height: 2rem;
+          margin-top: 20px;
+          width: 85px;
+          height: 85px;
         }
 
         .van-image__img {
@@ -342,11 +269,11 @@
         }
 
         .tradeName {
-          width: 4rem;
+          width: 150px;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 0.325rem;
-          line-height: 0.5rem;
+          font-size: 13px;
+          line-height: 18px;
           display: block;
           overflow: hidden;
           text-overflow: ellipsis;
@@ -354,20 +281,20 @@
         }
 
         .equipmentName {
-          width: 4.25rem;
+          width: 150px;
           color: rgba(64, 77, 116, 1);
-          font-size: 0.325rem;
-          line-height: 0.5rem;
+          font-size: 13px;
+          line-height: 18px;
           display: block;
         }
 
         .orderTime {
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 0.25rem;
+          font-size: 11px;
           text-align: left;
           white-space: nowrap;
-          line-height: 0.5rem;
+          line-height: 14px;
           display: block;
         }
 
@@ -378,26 +305,26 @@
             // height: 0.325rem;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.3rem;
+            font-size: 11px;
             text-align: left;
             white-space: nowrap;
-            line-height: 0.5rem;
+            line-height: 14px;
             display: block;
-            padding-top: 0.15rem;
+            padding-top: 5px;
           }
 
           .currencySymbol {
             // height: 16px;
             overflow-wrap: break-word;
             color: rgba(77, 193, 147, 1);
-            font-size: 0.35rem;
+            font-size: 13px;
             font-family: PingFangSC-Semibold;
             text-align: center;
             white-space: nowrap;
-            line-height: 0.4rem;
+            line-height: 15px;
             display: block;
             // padding-right: 0.1rem;
-            padding-top: 0.1rem;
+            padding-top: 5px;
           }
 
           .orderPrice {
@@ -405,11 +332,11 @@
             // width: auto;
             overflow-wrap: break-word;
             color: rgba(77, 193, 147, 1);
-            font-size: 0.4rem;
+            font-size: 13px;
             font-family: PingFangSC-Semibold;
             text-align: left;
             white-space: nowrap;
-            line-height: 0.5rem;
+            line-height: 20px;
             padding-top: 0.05rem;
             display: block;
           }
@@ -421,35 +348,35 @@
           // height: 0.325rem;
           overflow-wrap: break-word;
           color: rgba(229, 154, 109, 1);
-          font-size: 0.3rem;
+          font-size: 10px;
           font-family: PingFangSC-Medium;
           text-align: left;
           white-space: nowrap;
-          line-height: 0.5rem;
+          line-height: 15px;
           display: block;
           // padding-top: 0.15rem;
         }
 
         .van-card__footer {
           position: absolute;
-          top: 35vw;
-          right: 5vw;
-          width: 10vw;
+          top: 125px;
+          right: 15px;
+          // width: 40px;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 0.3rem;
+          // font-size: 18px;
           white-space: nowrap;
-          line-height: 0.3rem;
+          // line-height: 20px;
           display: block;
         }
 
 
         .payPic {
           position: absolute;
-          top: 0.3rem;
-          right: 0.5rem;
-          width: 1.5rem;
-          height: 1.5rem;
+          top: 20px;
+          right: 15px;
+          width: 50px;
+          height: 50px;
 
           &.orderSuccess {
             background: url('../../assets/order/paySuccess.png') top center no-repeat;
@@ -481,18 +408,18 @@
   }
 
   .orderPopBox {
-    width: 100%;
+    // width: 100%;
     background-color: rgba(255, 255, 255, 1);
     // border-radius: 1vw 1vw 0 0;
-    height: 55vh;
-    padding: 5vw 5vw;
+    height: 420px;
+    padding: 10px 10px;
 
     // .section1 {
 
     // .group3 {
 
     .popTopBox {
-      height: 15vw;
+      height: 70px;
 
       .popTopTxtBox {
         // height: 71px;
@@ -515,11 +442,11 @@
           // height: 13px;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 4vw;
+          font-size: 15px;
           font-family: PingFangSC-Medium;
           text-align: center;
           white-space: nowrap;
-          line-height: 4vw;
+          line-height: 15px;
           display: block;
           // margin: 5vw 0 0 5vw;
         }
@@ -529,253 +456,68 @@
           // height: 30px;
           overflow-wrap: break-word;
           color: rgba(223, 94, 76, 1);
-          font-size: 6vw;
+          font-size: 20px;
           font-family: PingFangSC-Semibold;
           text-align: center;
           white-space: nowrap;
-          line-height: 6vw;
+          line-height: 20px;
           display: block;
           // margin: 5px 0 0 15px;
-          margin-top: 2vw;
+          margin-top: 8px;
         }
       }
     }
 
     .line {
       background-color: rgba(215, 215, 226, 1);
-      // border-radius: 2px;
-      // width: 100%;
       height: 1px;
-      margin: 5vw 0;
+      margin: 10px 0;
     }
 
-    // .layer2 {
-    //   width: 250px;
-    //   height: 18px;
-    //   margin: 30px 0 0 15px;
-
-    //   .info2 {
-    //     width: 52px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(135, 135, 166, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-
-    //   .txt6 {
-    //     width: 158px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(64, 77, 116, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-    // }
-
     .orderDetailBox {
-      // width: 50vw;
-      // height: 18px;
-      // margin: 8px 0 0 15px;
-      // overflow: auto;
-      margin-top: 3vw;
-      padding: 0 5vw;
+      margin-top: 10px;
+      padding: 0 15px;
 
       .title {
-        width: 25vw;
-        // height: 14px;
+        width: 100px;
         overflow-wrap: break-word;
         color: rgba(135, 135, 166, 1);
-        font-size: 0.35rem;
+        font-size: 13px;
         text-align: left;
         white-space: nowrap;
-        line-height: 0.5rem;
+        line-height: 16px;
         display: block;
       }
 
       .content {
-        width: 55vw;
-        // height: 18px;
+        width: 200px;
         overflow-wrap: break-word;
         color: rgba(64, 77, 116, 1);
-        font-size: 0.35rem;
-        text-align: left;
+        font-size: 13px;
+        text-align: right;
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
-        line-height: 0.5rem;
+        line-height: 16px;
         display: block;
       }
-
-      // .word6 {
-      //   // width: 52px;
-      //   // height: 18px;
-      //   overflow-wrap: break-word;
-      //   color: rgba(135, 135, 166, 1);
-      //   font-size: 0.35rem;
-      //   text-align: left;
-      //   white-space: nowrap;
-      //   line-height: 3.5vw;
-      //   display: block;
-      // }
-
     }
 
     .van-field__label {
-      width: 2rem;
+      width: 100px;
       color: rgba(135, 135, 166, 1);
-      font-size: 0.35rem;
+      font-size: 13px;
       text-align: left;
     }
 
     .van-field__control {
-      font-size: 0.35rem;
+      font-size: 13px;
     }
 
     .van-cell {
-      padding: 0 5vw;
-      margin-top: 2vw;
+      padding: 0 15px;
+      margin-top: 8px;
     }
-
-    // .layer4 {
-    //   width: 251px;
-    //   height: 18px;
-    //   margin: 8px 0 0 15px;
-
-    //   .word3 {
-    //     width: 52px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(135, 135, 166, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-
-    //   .word4 {
-    //     width: 159px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(64, 77, 116, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-    // }
-
-    // .layer5 {
-    //   width: 131px;
-    //   height: 18px;
-    //   margin: 8px 0 0 15px;
-
-    //   .txt7 {
-    //     width: 26px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(135, 135, 166, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-
-    //   .word5 {
-    //     width: 39px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(64, 77, 116, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-    // }
-
-    // .layer6 {
-    //   width: 144px;
-    //   height: 18px;
-    //   margin: 8px 0 0 15px;
-
-
-
-    //   .word7 {
-    //     width: 52px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(64, 77, 116, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-    // }
-
-    // .layer7 {
-    //   width: 221px;
-    //   height: 18px;
-    //   margin: 8px 0 0 15px;
-
-    //   .word8 {
-    //     width: 52px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(135, 135, 166, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-
-    //   .info4 {
-    //     width: 129px;
-    //     height: 18px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(64, 77, 116, 1);
-    //     font-size: 13px;
-    //     text-align: left;
-    //     white-space: nowrap;
-    //     line-height: 18px;
-    //     display: block;
-    //   }
-    // }
-
-
-    // .Button1 {
-    //   background-color: rgba(77, 106, 221, 1);
-    //   border-radius: 17px;
-    //   height: 34px;
-    //   width: 120px;
-    //   margin: 33px 0 0 113px;
-    //   text-align: center;
-
-    //   .info5 {
-    //     width: 60px;
-    //     overflow-wrap: break-word;
-    //     color: rgba(255, 255, 255, 1);
-    //     font-size: 15px;
-    //     font-family: PingFangSC-Medium;
-    //     text-align: center;
-    //     white-space: nowrap;
-    //     line-height: 34px;
-    //     display: block;
-    //   }
-    // }
-    // }
-    // }
   }
 
   .btnFooter {
@@ -793,7 +535,7 @@
 
     .totalRefund {
       color: #df5e4c;
-      font-size: 0.55rem;
+      font-size: 18px;
       font-family: PingFangSC-Semibold;
     }
 
@@ -867,6 +609,6 @@
   .van-button--primary {
     border-color: #4d6add;
     background-color: #4d6add;
-    font-size: 0.325rem;
+    // font-size: 0.325rem;
   }
 }

src/styles/orderExport/index.less

@@ -8,22 +8,22 @@
     .Body {
         z-index: 22;
         // position: relative;
-        width: 100%;
+        // width: 100%;
 
         .mod3 {
             background-color: rgba(255, 255, 255, 1);
-            width: 100%;
+            // width: 100%;
 
             .group1 {
                 width: 100%;
 
                 .titleBox {
-                    width: 100%;
+                    // width: 100%;
                     height: 16px;
                     margin: 20px 0;
 
                     .layer2 {
-                        width: 100%;
+                        // width: 100%;
                         height: 16px;
 
                         .section5 {
@@ -58,22 +58,22 @@
                 .dateSelectBox {
                     padding-top: 20px;
                     background: url("../../assets/home/line.png") top center no-repeat;
-                    background-size: 100% auto;
+                    background-size: 100%;
                 }
 
                 .mod7 {
                     background-color: rgba(255, 255, 255, 1);
                     height: 54px;
                     margin-top: 20px;
-                    width: 100%;
+                    // width: 100%;
 
                     .box1 {
-                        width: 100%;
+                        // width: 100%;
                         height: 37px;
                         margin-top: 17px;
 
                         .group4 {
-                            width: 100%;
+                            // width: 100%;
                             height: 19px;
                             padding: 0 19px;
 
@@ -139,7 +139,7 @@
                         }
 
                         .img2 {
-                            width: 100%;
+                            // width: 100%;
                             height: 2px;
                             margin-top: 16px;
                         }
@@ -153,7 +153,7 @@
                 }
 
                 .mod9 {
-                    width: 100%;
+                    // width: 100%;
                     padding: 10px 0;
 
                     .info7 {
@@ -198,7 +198,7 @@
                 }
 
                 .mod10 {
-                    width: 100%;
+                    // width: 100%;
                     padding: 5px 0;
 
                     .txt3 {
@@ -227,7 +227,7 @@
                 }
 
                 .info9 {
-                    width: 100%;
+                    // width: 100%;
                     padding: 10px 0;
                     overflow-wrap: break-word;
                     color: rgba(64, 77, 116, 1);

src/styles/paramsSet/index.less

@@ -66,7 +66,7 @@
                 display: flex;
 
                 .icon {
-                    width: 24px;
+                    width: 15px;
                     padding-right: 10px;
                 }
 
@@ -84,8 +84,8 @@
 
                 .section4 {
                     position: relative;
-                    width: 18px;
-                    height: 19px;
+                    width: 10px;
+                    height: 10px;
                     margin-right: 10px;
                     background: url(../../assets/device/currency1.png) 100% no-repeat;
 

src/styles/register/index.less

@@ -1,16 +1,16 @@
 .registerPage {
 	.registerFormBox {
 		width: 100%;
-		margin-top: 1rem;
+		margin-top: 20px;
 		text-align: center;
 
 		.van-form {
 			.van-cell {
 				width: 90%;
-				height: 1rem;
+				height: 40px;
 				padding: 0;
 				margin: 0 auto;
-				margin-top: 0.2rem;
+				margin-top: 15px;
 				overflow: visible;
 
 				&::after {
@@ -23,12 +23,12 @@
 				}
 
 				.van-button__text {
-					padding: 4px;
+					padding: 5px;
 				}
 
 				.van-field__control {
-					height: 1rem;
-					line-height: 1rem;
+					height: 40px;
+					line-height: 30px;
 					padding: 6px;
 					border-radius: 2px;
 					border: 0.5px solid rgba(185, 186, 208, 1);
@@ -36,16 +36,16 @@
 
 				.van-field__label {
 					display: flex;
-					height: 1rem;
+					height: 40px;
 					align-items: center;
-					width: 2rem;
+					width: 80px;
 				}
 
 				.radioBox {
 					display: flex;
 
 					.van-radio-group--horizontal {
-						width: 100%;
+						// width: 100%;
 						justify-content: space-around;
 					}
 

src/styles/role/index.less

@@ -1,8 +1,8 @@
-.accountPerPage {
+.rolePage {
   width: 100%;
 
   .accountPerBox {
-    width: 100%;
+    // width: 100%;
     height: calc(100% - 44px);
     overflow: auto;
     // background: #fff url('../../assets/accountPer/pageBg.png') top center no-repeat;
@@ -71,9 +71,9 @@
 
       .listItem {
         .itemBox {
-          width: 100%;
-          padding: 1.5em 1em;
-          line-height: 1.8;
+          // width: 100%;
+          padding: 15px 10px;
+          line-height: 20px;
           border-bottom: 1px solid #e7eaf7;
           display: flex;
 
@@ -81,7 +81,7 @@
             width: 70%;
 
             .itemRow {
-              width: 100%;
+              // width: 100%;
               display: flex;
               flex-wrap: wrap;
 

src/views/device/alarmClock.vue

@@ -14,12 +14,12 @@
             </div>
           </div>
         </div>
-        <img
-            class="img2"
-            referrerpolicy="no-referrer"
-            src="../../assets/line.png"
-        />
       </div>
+      <img
+          class="img2"
+          referrerpolicy="no-referrer"
+          src="../../assets/line.png"
+      />
       <div v-for="(item, index) in list" :key="index" >
         <div class="section6 l-flex-between kBordBott">
           <div class="TextGroup2 flex-col">

src/views/device/alarmClockSet/index.vue

@@ -3,7 +3,6 @@
   <div class="alarmClockSetPage flex-col">
     <s-header :name="$t('device.setAlarm')" :noback="false"></s-header>
     <div class="alarmClockSetBox flex-col">
-      <div style="width: 100%; height: 18px"></div>
       <van-field class="equipmentField" is-link readonly :label="$t('device.equipmentName')"
         :placeholder="$t('device.selectDevice')" v-model="equipmentIdsText" @click="equipmentShow = true" />
       <van-field v-model="hour" is-link readonly :label="$t('device.selectTime')" :placeholder="$t('device.selectTime')"

src/views/orderCenter/index.vue

@@ -142,7 +142,7 @@
     <!-- 搜索弹出框 -->
     <orderSearch ref="searchRef" @search="search($event)"></orderSearch>
     <!-- 退款弹窗 -->
-    <van-popup v-model:show="refundType" position="bottom" round>
+    <van-popup v-model:show="refundType" position="bottom" round closeable>
       <div class="orderPopBox flex-col">
         <!-- <div class="section1 flex-col"> -->
           <!-- <div class="group3 flex-col"> -->
@@ -177,7 +177,7 @@
             </div>
             <div class="orderDetailBox flex-row justify-between">
               <span class="title">{{ $t('orderCenter.equipmentNo') }}</span>
-              <span class="content">{{ refundObject.clientId }}</span>
+              <span class="content">{{ refundObject.clientId.slice(-6) }}</span>
             </div>
             <div class="orderDetailBox flex-row justify-between">
               <span class="title">{{ $t('orderCenter.state') }}</span>
@@ -216,18 +216,18 @@
             </van-field>
             <!-- 发起退款 -->
             <!-- 非已付款订单，线下订单要隐藏按钮 -->
-            <div style="display: flex; justify-content: center; padding-bottom: 1rem;">
+            <div style="display: flex; justify-content: center; padding-bottom: 20px;">
               <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: 0.5rem 0.6rem; margin-top: 0.8rem;" color="#4dc193">
+                style="padding: 15px 15px; margin-top: 20px;" color="#4dc193">
                 退款提醒
               </van-button>
-              <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 0.5rem;">
+              <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 20px;">
               </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: 0.5rem 0.6rem; margin-top: 0.8rem;">
+                @click="noticeClk(refundObject)" round type="primary" style="padding: 15px 15px; margin-top: 20px;">
                 {{ $t('orderCenter.initiateRefund') }}
               </van-button>
             </div>

src/views/role/add.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 角色权限 - 添加角色 -->
-  <div class="accountPerPage flex-col">
+  <div class="rolePage flex-col">
     <s-header :name="pageTitle" :noback="false"></s-header>
     <div class="accountPerBox flex-col">
       <van-form @submit="onSubmit">
@@ -14,7 +14,7 @@
             justify-content: flex-start;
           ">
           <van-checkbox v-for="(item, index) in menuCodeList" :key="index" :name="item.value"
-            style="width: 50%; padding: 1em">{{ item.label }}</van-checkbox>
+            style="width: 160px; padding: 10px">{{ item.label }}</van-checkbox>
         </van-checkbox-group>
         <!-- 操作 -->
         <van-row justify="space-around" style="padding: 1em">

src/views/role/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 角色权限设置 -->
-  <div class="accountPerPage flex-col">
+  <div class="rolePage flex-col">
     <s-header :name="$t('role.rolePermissionSettings')" :noback="false"></s-header>
     <!-- <s-header :name="$t('role.rolePermissionSettings')" :noback="false" targetPath="/accountPer"></s-header> -->
     <!-- <van-nav-bar :title="$t('role.rolePermissionSettings')" left-text="" left-arrow @click-left="onClickLeft" /> -->

vue.config.js

@@ -1,15 +1,22 @@
+const version = new Date().getTime();
 module.exports = {
   outputDir: 'shenze',
   publicPath: "/shenze",
   assetsDir: 'static',
   css: {
-    extract: false
+    // extract: false
+    extract: {
+      filename: `css/[name].${version}.css`,   
+      chunkFilename: `css/[name].${version}.css`
+    }
   },
-  filenameHashing: true,
+  filenameHashing: false,
   configureWebpack: {
     output: {
-      filename: '[name].[hash].js',
-      chunkFilename: '[id].[hash].chunk.js'
+      // filename: '[name].[hash].js',
+      // chunkFilename: '[id].[hash].chunk.js'
+      filename: `js/[name].${version}.js`,
+      chunkFilename: `js/[name].${version}.js`
     }
   },
   devServer: {