Merge remote-tracking branch 'origin/sunzee-test' into sunzee-test

src/styles/device/index.less

@@ -42,11 +42,13 @@
         .main5 {
           width: 39px;
           height: 16px;
+          margin-left: -55px;
 
           .label2 {
-            width: 14px;
-            height: 14px;
+            width: 18px;
+            height: 18px;
             margin-top: 1px;
+            margin-right: 5px;
           }
 
           .TextGroup2 {
@@ -58,7 +60,8 @@
               height: 16px;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 11px;
+              font-size: 14px;
+              font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
               line-height: 16px;

src/styles/robotRanking/index.less

@@ -75,6 +75,35 @@ button:active {
     align-items: flex-end;
 }
 
+.group5 {
+    width: 39px;
+    height: 16px;
+    margin-left: -80px;
+    .icon2 {
+      width: 18px;
+      height: 18px;
+      margin-right: 5px;
+    }
+
+    .TextGroup2 {
+      height: 16px;
+      width: 22px;
+
+      .txt3 {
+        width: 22px;
+        height: 16px;
+        overflow-wrap: break-word;
+        color: rgba(64, 77, 116, 1);
+        font-size: 14px;
+        font-family: PingFangSC-Semibold;
+        text-align: center;
+        white-space: nowrap;
+        line-height: 16px;
+        display: block;
+      }
+    }
+}
+
 .robotRanking {
     background-color: #fff;
     position: relative;

src/views/accountPer/add.vue

@@ -9,7 +9,11 @@
             { required: true, message: $t('accountPer.usernamePlaceholder') },
           ]" />
         <van-field v-model="password" name="password" type="password" :label="$t('accountPer.passwordLabel')"
-          :placeholder="$t('accountPer.passwordPlaceholder')" />
+          :placeholder="$t('accountPer.passwordPlaceholder')" 
+          :rules="[
+            { required: true, message: $t('accountPer.passwordPlaceholder') },
+          ]"
+          />
         <van-field v-model="name" name="name" :label="$t('accountPer.nameLabel')"
           :placeholder="$t('accountPer.namePlaceholder')" :rules="[
             { required: true, message: $t('accountPer.namePlaceholder') },
@@ -181,7 +185,7 @@ export default {
       //   params.equipmentIds= [params.equipmentIds];
       // }
       if (pageTitle.value === t("accountPer.modifyAccount")) {
-        delete params.password;
+        // delete params.password;
         const { data } = await updataLoginUser(params);
         if (data.code === "00000") {
           Toast.success(t("accountPer.successfullyModifiedTheAccount"));

src/views/orderCenter/index.vue

@@ -16,6 +16,7 @@
                   </div>
                 </div>
               </div>
+              <!-- 订单中心搜索 -->
               <div class="ImageText2 flex-col" @click="searchClick()">
                 <div class="group5 flex-row justify-between">
                   <img class="icon2" src="../../assets/order/search.png" />

src/views/robotRanking.vue

@@ -18,8 +18,12 @@
                   </div>
                 </div>
                 <div @click="noticeClk" class="l-flex-RC">
-                  <img class="label2 o-mr-5" src="@/assets/device/searchIcon.png" />
-                  <span class="txt3">{{ $t("robotRanking.rankMethod") }}</span>
+                  <div class="group5 flex-row justify-between">
+                    <img class="label2 o-mr-5" src="@/assets/device/searchIcon.png" />
+                    <div class="TextGroup2 flex-col">
+                      <span class="txt3">{{ $t("robotRanking.rankMethod") }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
               <img class="img1" referrerpolicy="no-referrer"