优化英文版部分文字样式排版

src/assets/language/en.json

@@ -313,7 +313,7 @@
     "parameterSetting": "Parameter setting",
     "operationConfirmation": "Operation confirmation",
     "pleaseConfirmAgainWhetherToOperate": "Please confirm again whether to operate",
-	"IllThinkAboutItAgain": "I'll think about it again",
+	"IllThinkAboutItAgain": "Cancel",
     "restartSucceeded": "Restart succeeded",
     "deleteDeviceSucceed": "Delete device successfully",
     "sleepSuccessfully": "Sleep successfully",
@@ -1084,17 +1084,19 @@
     "phonePlaceholder": "Please enter your mobile number",
     "phoneRequired": "Please enter your mobile number",
     "seedVerCode": "Send verification code",
-    "codeLabel": "SMS verification code",
+    "codeLabel": "verification code",
     "codePlaceholder": "Please enter SMS verification code",
     "codeRequired": "Please enter SMS verification code",
     "emailLabel": "Mailbox",
     "emailPlaceholder": "Please enter your email address",
     "emailRequired": "Please enter your email address",
-    "emailCodeLabel": "Email verification code",
+    "emailCodeLabel": "Verification code",
     "emailCodePlaceholder": "Please enter the email verification code",
     "emailCodeRequired": "Please enter the email verification code",
     "registerButton": "Submit registration information",
-    "replaysInSeconds": "Replays in seconds"
+    "replaysInSeconds": "Replays in seconds",
+	"emailRegistration": "Email registration",
+	"phoneRegistration": "Phone registration"
   },
   "robotRanking": {
     "machineSalesRanking": "Machine sales ranking",

src/assets/language/zh.json

@@ -1092,11 +1092,13 @@
     "emailLabel": "邮箱",
     "emailPlaceholder": "请输入邮箱",
     "emailRequired": "请输入邮箱",
-    "emailCodeLabel": "邮箱验证码",
+    "emailCodeLabel": "验证码",
     "emailCodePlaceholder": "请输入邮箱验证码",
     "emailCodeRequired": "请输入邮箱验证码",
     "registerButton": "提交注册信息",
-    "replaysInSeconds": "秒后可重发"
+    "replaysInSeconds": "秒后可重发",
+	"emailRegistration": "邮箱注册",
+	"phoneRegistration": "手机注册"
   },
   "robotRanking": {
     "machineSalesRanking":"机器销售排行榜",

src/views/device/alarmClock.vue

@@ -196,10 +196,10 @@ export default {
       width: 100%;
       padding:10px 15px;
       .TextGroup2 {
-        width: 40%;
+        width: 20%;
         .bd3 {
           .word3 {
-            width: 55px;
+            width: auto;
             height: 30px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
@@ -211,7 +211,7 @@ export default {
             display: block;
           }
           .info2 {
-            width: 100%;
+            width: auto;
             height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
@@ -226,12 +226,12 @@ export default {
       }
       .TextGroup3 {
         height: 38px;
-        width: 52px;
+        width: 30%;
         .main2 {
-          width: 52px;
+          width: auto;
           height: 38px;
           .word4 {
-            width: 52px;
+            width: auto;
             height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
@@ -242,7 +242,7 @@ export default {
             display: block;
           }
           .txt3 {
-            width: 52px;
+            width: auto;
             height: 18px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
@@ -257,7 +257,7 @@ export default {
       }
       .ImageText2 {
         height: 17px;
-        width: 40px;
+        width: 10%;
         margin: 9px 0 0 32px;
         .group3 {
           width: 40px;
@@ -287,7 +287,7 @@ export default {
         }
       }
       .bd4 {
-        width: 41px;
+        width: 15%;
         height: 36px;
         margin: 10px 0 0 32px;
         .outer1 {

src/views/device/alarmClockSet/index.less

@@ -169,20 +169,20 @@
 
     .ImageText1 {
       height: 18px;
-      width: 109px;
+      width: auto;
       margin: 23px 0 0 15px;
 
       .mod4 {
         width: 109px;
-        height: 18px;
+        height: auto;
 
         .TextGroup1 {
           height: 13px;
           margin-top: 2px;
-          width: 65px;
+          width: auto;
 
           .info4 {
-            width: 65px;
+            width: auto;
             height: 13px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);

src/views/device/deviceOper.vue

@@ -545,12 +545,12 @@ export default {
   }
 
   .word10 {
-    width: 143px;
+    width: auto;
     height: 13px;
     overflow-wrap: break-word;
     color: rgba(64, 77, 116, 1);
     font-size: 13px;
-    text-align: left;
+    text-align: center;
     white-space: nowrap;
     line-height: 13px;
     display: block;
@@ -571,7 +571,7 @@ export default {
       align-items: center;
 
       .info5 {
-        width: 60px;
+        width: auto;
         height: 13px;
         overflow-wrap: break-word;
         color: rgba(77, 106, 221, 1);
@@ -593,7 +593,7 @@ export default {
       align-items: center;
 
       .info6 {
-        width: 30px;
+        width: auto;
         height: 13px;
         overflow-wrap: break-word;
         color: rgba(255, 255, 255, 1);

src/views/device/doSugar.vue

@@ -213,7 +213,7 @@ export default {
       margin: 50px auto;
 
       .txt3 {
-        width: 60px;
+        width: auto;
         height: 13px;
         overflow-wrap: break-word;
         color: rgba(255, 255, 255, 1);
@@ -223,7 +223,7 @@ export default {
         white-space: nowrap;
         line-height: 15px;
         display: block;
-        margin: 11px 0 0 80px;
+        margin: 11px 0 0 0px;
       }
     }
   }

src/views/device/modulation.vue

@@ -15,8 +15,8 @@
         />
       </div>
       <div class="box4 flex-row justify-between">
-        <span class="word3">{{$t('device.slideSliderToAdjustVolume')}}</span>
-        <span class="word4">{{volume}}</span>
+        <span class="word3">{{$t('device.slideSliderToAdjustVolume')}} : {{volume}}</span>
+        <!-- <span class="word4">{{volume}}</span> -->
       </div>
       <van-slider v-model="volume" :max="15"/>
       <van-button round type="primary" class="volumeChangeButton" @click="volumeChange()">{{$t('device.submitModification')}}</van-button>
@@ -154,11 +154,11 @@ export default {
       }
     }
     .box4 {
-      width: 147px;
+      width: 45%;
       height: 14px;
       margin: 19px 0 0 15px;
       .word3 {
-        width: 104px;
+        width: auto;
         height: 13px;
         overflow-wrap: break-word;
         color: rgba(64, 77, 116, 1);
@@ -170,7 +170,7 @@ export default {
         display: block;
       }
       .word4 {
-        width: 33px;
+        width: auto;
         height: 13px;
         overflow-wrap: break-word;
         color: rgba(64, 77, 116, 1);

src/views/register.vue

@@ -74,7 +74,7 @@
         </van-dropdown-menu> -->
         <van-tabs v-model:active="active" type="card" swipeable color="#8096ec" v-if="ifForeign === '0'">
 
-          <van-tab title="手机注册">
+          <van-tab :title="$t('register.phoneRegistration')">
             <!-- 手机号码 -->
             <van-field v-if="ifForeign === '0'" v-model="phone" name="phone" type="tel" :label="$t('register.phoneLabel')"
               :placeholder="$t('register.phonePlaceholder')"
@@ -84,6 +84,7 @@
                   $t('register.seedVerCode') : time + $t('register.replaysInSeconds') }}</van-button>
               </template>
             </van-field>
+			<br>
             <!-- 短信验证码 -->
             <van-field v-if="ifForeign === '0'" v-model="code" name="code" :label="$t('register.codeLabel')"
               :placeholder="$t('register.codePlaceholder')"
@@ -99,7 +100,7 @@
             </template>
           </van-field> -->
 
-          <van-tab title="邮箱注册">
+          <van-tab :title="$t('register.emailRegistration')">
             <!-- 邮箱 -->
             <van-field v-if="ifForeign === '0'" v-model="email" name="email" :label="$t('register.emailLabel')"
               :placeholder="$t('register.emailPlaceholder')"
@@ -110,6 +111,7 @@
                   $t('register.seedVerCode') : time + $t('register.replaysInSeconds') }}</van-button>
               </template>
             </van-field>
+			<br>
             <!-- 邮箱验证码 -->
             <van-field v-if="ifForeign === '0'" v-model="code" name="code" :label="$t('register.emailCodeLabel')"
               :placeholder="$t('register.emailCodePlaceholder')"
@@ -295,7 +297,7 @@ export default {
 
     /deep/ .van-form {
       .van-cell {
-        width: 313px;
+        width: 90%;
         height: 38px;
         background-color: rgba(255, 255, 255, 1);
         padding: 0;
@@ -338,9 +340,11 @@ export default {
         }
 
         .van-field__label {
+			display: flex;
           height: 38px;
+		  align-items: center;
           // line-height: 38px;
-          width: 6em;
+          width: 100px;
         }
 
         .radioBox {