feat:"雪糕机增加解冻模式，优化时区选择功能"

src/assets/language/en.json

@@ -567,6 +567,7 @@
     "refrigeration": "Refrigeration mode",
     "keepFresh": "Fresh-keeping mode",
     "stir": "Stirring mode",
+    "thaw": "Thawing mode",
     "view": "view",
     "oneKeyFeed": "One key feeding",
     "replenishment": "Replenish",
@@ -1394,7 +1395,7 @@
     "emailCodeLabel": "Verification code",
     "emailCodePlaceholder": "Please enter the email verification code",
     "emailCodeRequired": "Please enter the email verification code",
-    "invitationCode": "Invitation Code (optional)",
+    "invitationCode": "Invitation Code",
     "invitationCodePlaceholder": "Please enter the invitation code",
     "registerButton": "Register",
     "replaysInSeconds": "Replays in seconds",
@@ -1484,7 +1485,7 @@
     "syncOldData": "Sync Data",
     "modifyLoc": "Modify Loc",
     "airwallex": "Airwallex",
-    "setTheTimezone": "Set timezone",
+    "setTheTimezone": "Timezone",
     "setTheTimezonePlace": "Please select a timezone",
     "currencySymbol": "Currency",
     "currencySymbolPlace": "Please enter currency symbol",

src/assets/language/ja.json

@@ -584,6 +584,7 @@
         "refrigeration": "冷却モードです",
         "keepFresh": "鮮度保持モードです",
         "stir": "撹拌モードです",
+        "thaw": "解凍モード",
         "view": "見る",
         "oneKeyFeed": "ワンタッチ補充",
         "replenishment": "補充",
@@ -1410,7 +1411,7 @@
         "emailCodeLabel": "メール認証コード",
         "emailCodePlaceholder": "メール認証コードを入力してください",
         "emailCodeRequired": "メール認証コードを入力してください",
-        "invitationCode": "招待コードです(任意)",
+        "invitationCode": "招待コードです",
         "invitationCodePlaceholder": "招待コードの入力をお願いします",
         "registerButton": "登録する",
         "replaysInSeconds": "数秒後に再送信できます",
@@ -1500,7 +1501,7 @@
         "syncOldData": "データ同期",
         "modifyLoc": "位置を修正する",
         "airwallex": "エアウォレックス",
-        "setTheTimezone": "タイムゾーンを設定する",
+        "setTheTimezone": "タイムゾーンです",
         "setTheTimezonePlace": "タイムゾーンを選択してください",
         "currencySymbol": "カスタム通貨",
         "currencySymbolPlace": "カスタム通貨を入力してください",

src/assets/language/zh.json

@@ -590,6 +590,7 @@
     "refrigeration": "制冷模式",
     "keepFresh": "保鲜模式",
     "stir": "搅拌模式",
+    "thaw": "解冻模式",
     "view": "查看",
     "oneKeyFeed": "一键补料",
     "replenishment": "补料",
@@ -1427,7 +1428,7 @@
     "header": "用户注册",
     "usernameLabel": "登录用户名",
     "usernamePlaceholder": "请输入登录用户名",
-    "usernameRequired": "登录用户名由字母或数字组成，且只能字母开头",
+    "usernameRequired": "由字母或数字组成，且只能字母开头",
     "nameLabel": "用户名称",
     "namePlaceholder": "请输入用户名称",
     "nameRequired": "请输入用户名称",
@@ -1464,7 +1465,7 @@
     "emailCodeLabel": "验证码",
     "emailCodePlaceholder": "请输入邮箱验证码",
     "emailCodeRequired": "请输入邮箱验证码",
-    "invitationCode": "邀请码(选填)",
+    "invitationCode": "邀请码",
     "invitationCodePlaceholder": "请输入邀请码",
     "registerButton": "注册",
     "replaysInSeconds": "秒后可重发",

src/components/commom/kTimezone/index.vue

@@ -8,8 +8,10 @@
 
 <script>
 import { ref, watch } from "vue";
+import { getLocal } from "@/common/js/utils";
 export default {
     setup(props, { emit }) {
+        const languageName = ref(getLocal("curLang"));
 
         const timezonePopshow = ref(false);
         const tzFieldValue = ref('');
@@ -25,43 +27,82 @@ export default {
             }
         };
 
-        const options = ref([
-            { text: 'UTC-10', value: 'Pacific/Honolulu' },
-            { text: 'UTC-9', value: 'America/Anchorage' },
-            { text: 'UTC-8', value: 'America/Los_Angeles' },
-            { text: 'UTC-7', value: 'America/Denver' },
-            { text: 'UTC-6', value: 'America/Chicago' },
-            { text: 'UTC-5', value: 'America/New_York' },
-            { text: 'UTC-4', value: 'America/Caracas' },
-            { text: 'UTC-3', value: 'America/Sao_Paulo' },
-            { text: 'UTC-2', value: 'Atlantic/South_Georgia' },
-            { text: 'UTC-1', value: 'Atlantic/Cape_Verde' },
-            { text: 'UTC+0', value: 'Europe/London' },
-            { text: 'UTC+1', value: 'Europe/Paris' },
-            { text: 'UTC+2', value: 'Europe/Helsinki' },
-            { text: 'UTC+3', value: 'Europe/Moscow' },
-            { text: 'UTC+4', value: 'Asia/Dubai' },
-            { text: 'UTC+5', value: 'Asia/Karachi' },
-            { text: 'UTC+6', value: 'Asia/Bishkek' },
-            { text: 'UTC+7', value: 'Asia/Bangkok' },
-            { text: 'UTC+8', value: 'Asia/Shanghai' },
-            { text: 'UTC+9', value: 'Asia/Tokyo' },
-            { text: 'UTC+10', value: 'Australia/Sydney' },
-            { text: 'UTC+11', value: 'Asia/Magadan' },
-            { text: 'UTC+12', value: 'Pacific/Auckland' },
-            // { text: '上海(UTC+8)', value: 'Asia/Shanghai' },
-            // { text: '東京(UTC+9)', value: 'Asia/Tokyo' },
-            // { text: 'NewYork(UTC-5)', value: 'America/New_York' },
-            // { text: 'Riyadh(UTC+3)', value: 'Asia/Riyadh' },
-            // { text: 'Paris(UTC+1)', value: 'Europe/Paris' },
-            // { text: 'London(UTC+0)', value: 'Europe/London' },
-            // { text: 'Madrid(UTC+1)', value: 'Europe/Madrid' },
-            // { text: 'São Paulo(UTC-3)', value: 'America/Sao_Paulo' },
-            // { text: 'Vancouver(UTC-8)', value: 'America/Vancouver' },
-            // { text: 'Edmonton(UTC-7)', value: 'America/Edmonton' },
-            // { text: 'Winnipeg(UTC-6)', value: 'America/Winnipeg' },
-            // { text: 'Toronto(UTC-5)', value: 'America/Toronto' },
-            // { text: 'Moncton(UTC-4)', value: 'America/Moncton' }
+        const options = ref(languageName.value === 'zh' ? [
+            { text: '(UTC-11:00)协调世界时-11', value: 'Pacific/Pago_Pago' },
+            { text: '(UTC-10:00)阿留申群岛', value: 'Pacific/Honolulu' },
+            { text: '(UTC-09:30)马克萨斯群岛', value: 'Pacific/Marquesas' },
+            { text: '(UTC-09:00)阿拉斯加', value: 'America/Anchorage' },
+            { text: '(UTC-08:00)太平洋时间(美国和加拿大)', value: 'America/Los_Angeles' },
+            { text: '(UTC-07:00)山地时间(美国和加拿大)', value: 'America/Denver' },
+            { text: '(UTC-06:00)中部时间(美国和加拿大)', value: 'America/Chicago' },
+            { text: '(UTC-05:00)东部时间(美国和加拿大)', value: 'America/New_York' },
+            { text: '(UTC-04:00)大西洋时间(加拿大)', value: 'America/Caracas' },
+            { text: '(UTC-03:30)纽芬兰', value: 'America/St_Johns' },
+            { text: '(UTC-03:00)巴西利亚，蒙德维的亚', value: 'America/Sao_Paulo' },
+            { text: '(UTC-02:00)格陵兰', value: 'Atlantic/South_Georgia' },
+            { text: '(UTC-01:00)佛得角群岛', value: 'Atlantic/Cape_Verde' },
+            { text: '(UTC+00:00)伦敦，里斯本，都柏林', value: 'Europe/London' },
+            { text: '(UTC+01:00)巴黎，哥本哈根，罗马', value: 'Europe/Paris' },
+            { text: '(UTC+02:00)雅典，耶路撒冷，开罗', value: 'Europe/Helsinki' },
+            { text: '(UTC+03:00)莫斯科，大马士革，科威特', value: 'Europe/Moscow' },
+            { text: '(UTC+03:30)德黑兰', value: 'Asia/Tehran' },
+            { text: '(UTC+04:00)埃里温，路易港', value: 'Asia/Dubai' },
+            { text: '(UTC+04:30)喀布尔', value: 'Asia/Kabul' },
+            { text: '(UTC+05:00)阿斯塔纳，伊斯兰堡', value: 'Asia/Karachi' },
+            { text: '(UTC+05:30)孟买，新德里', value: 'Asia/Kolkata' },
+            { text: '(UTC+05:45)加德满都', value: 'Asia/Kathmandu' },
+            { text: '(UTC+06:00)比什凯克，达卡', value: 'Asia/Bishkek' },
+            { text: '(UTC+06:30)仰光', value: 'Asia/Yangon' },
+            { text: '(UTC+07:00)科布多，曼谷，河内', value: 'Asia/Bangkok' },
+            { text: '(UTC+08:00)北京，乌鲁木齐', value: 'Asia/Shanghai' },
+            { text: '(UTC+08:45)尤克拉', value: 'Australia/Eucla' },
+            { text: '(UTC+09:00)大阪，东京，首尔', value: 'Asia/Tokyo' },
+            { text: '(UTC+09:30)达尔文，阿德莱德', value: 'Australia/Adelaide' },
+            { text: '(UTC+10:00)悉尼，关岛，霍巴特', value: 'Australia/Sydney' },
+            { text: '(UTC+10:30)豪勋爵岛', value: 'Australia/Lord_Howe' },
+            { text: '(UTC+11:00)马加丹，萨哈林', value: 'Asia/Magadan' },
+            { text: '(UTC+12:00)斐济，奥克兰', value: 'Pacific/Auckland' },
+            { text: '(UTC+12:45)查塔姆群岛', value: 'Pacific/Chatham' },
+            { text: '(UTC+13:00)努库阿洛法', value: 'Pacific/Tongatapu' },
+            { text: '(UTC+14:00)圣诞岛', value: 'Pacific/Kiritimati' }
+        ] : [
+            { text: '(UTC-11:00)Coordinated Universal Time-11', value: 'Pacific/Pago_Pago' },
+            { text: '(UTC-10:00)Aleutian Islands', value: 'Pacific/Honolulu' },
+            { text: '(UTC-09:30)Marquesas Islands', value: 'Pacific/Marquesas' },
+            { text: '(UTC-09:00)Alaska', value: 'America/Anchorage' },
+            { text: '(UTC-08:00)Pacific Time(US & Canada)', value: 'America/Los_Angeles' },
+            { text: '(UTC-07:00)Mountain Time(US & Canada)', value: 'America/Denver' },
+            { text: '(UTC-06:00)Central Time(US & Canada)', value: 'America/Chicago' },
+            { text: '(UTC-05:00)Eastern Time(US & Canada)', value: 'America/New_York' },
+            { text: '(UTC-04:00)Atlantic Time (Canada)', value: 'America/Caracas' },
+            { text: '(UTC-03:30)Newfoundland', value: 'America/St_Johns' },
+            { text: '(UTC-03:00)Brasilia, Montevideo', value: 'America/Sao_Paulo' },
+            { text: '(UTC-02:00)Greenland', value: 'Atlantic/South_Georgia' },
+            { text: '(UTC-01:00)Cape Verde Islands', value: 'Atlantic/Cape_Verde' },
+            { text: '(UTC+00:00)London, Lisbon, Dublin', value: 'Europe/London' },
+            { text: '(UTC+01:00)Paris, Copenhagen, Rome', value: 'Europe/Paris' },
+            { text: '(UTC+02:00)Athens, Jerusalem, Cairo', value: 'Europe/Helsinki' },
+            { text: '(UTC+03:00)Moscow, Damascus, Kuwait', value: 'Europe/Moscow' },
+            { text: '(UTC+03:30)Tehran', value: 'Asia/Tehran' },
+            { text: '(UTC+04:00)Yerevan, Port Louis', value: 'Asia/Dubai' },
+            { text: '(UTC+04:30)Kabul', value: 'Asia/Kabul' },
+            { text: '(UTC+05:00)Astana, Islamabad', value: 'Asia/Karachi' },
+            { text: '(UTC+05:30)Mumbai, New Delhi', value: 'Asia/Kolkata' },
+            { text: '(UTC+05:45)Kathmandu', value: 'Asia/Kathmandu' },
+            { text: '(UTC+06:00)Bishkek, Dhaka', value: 'Asia/Bishkek' },
+            { text: '(UTC+06:30)Yangon', value: 'Asia/Yangon' },
+            { text: '(UTC+07:00)Kobdo, Bangkok, Hanoi', value: 'Asia/Bangkok' },
+            { text: '(UTC+08:00)Beijing, Urumqi', value: 'Asia/Shanghai' },
+            { text: '(UTC+08:45)Eucla', value: 'Australia/Eucla' },
+            { text: '(UTC+09:00)Osaka, Tokyo, Seoul', value: 'Asia/Tokyo' },
+            { text: '(UTC+09:30)Darwin, Adelaide', value: 'Australia/Adelaide' },
+            { text: '(UTC+10:00)Sydney, Guam, Hobart', value: 'Australia/Sydney' },
+            { text: '(UTC+10:30)Lord Howe Island', value: 'Australia/Lord_Howe' },
+            { text: '(UTC+11:00)Magadan, Sakhalin', value: 'Asia/Magadan' },
+            { text: '(UTC+12:00)Fiji, Auckland', value: 'Pacific/Auckland' },
+            { text: '(UTC+12:45)Chatham Islands', value: 'Pacific/Chatham' },
+            { text: '(UTC+13:00)Nuku\'alofa', value: 'Pacific/Tongatapu' },
+            { text: '(UTC+14:00)Christmas Island', value: 'Pacific/Kiritimati' }
         ]);
 
 

src/styles/register/index.less

@@ -92,6 +92,7 @@
 		height: 34px;
 		width: 220px;
 		margin-top: 30px;
+		margin-bottom: 30px;
 		font-size: 15px;
 		font-family: PingFangSC-Medium;
 	}

src/views/device/deviceOper.vue

@@ -70,6 +70,13 @@
         </div>
         <div class="operText">{{ $t("device.keepFresh") }}</div>
       </div>
+      <!-- 雪糕机解冻模式 -->
+      <div v-if="device.machineType == '2'" class="operItem" @click="updateWorkingMode(3)">
+        <div class="operIcon">
+          <img class="operImg" src="../../assets/device/operIcon/thaw.png" />
+        </div>
+        <div class="operText">{{ $t("device.thaw") }}</div>
+      </div>
       <!--     <div class="operItem" @click="openDoorFun()">
               <div class="operIcon">
                 <img
@@ -614,7 +621,7 @@ export default {
           showFailToast(t("device.Failed"));
         }
       }
-      // 重启触摸屏
+      // 切换工作模式
       if (operType.value === 10) {
         const { data } = await changeWorkingMode({
           equipmentId: device.value.id,

src/views/register.vue

@@ -130,7 +130,7 @@
         </div>
         <br>
         <van-field v-model="inviteCode" name="inviteCode" :label="$t('register.invitationCode')"
-          :placeholder="$t('register.invitationCodePlaceholder')" />
+          :placeholder="$t('register.invitationCodePlaceholder')" :rules="[{ required: true, message: $t('register.invitationCodePlaceholder') }]" />
         <!-- 提交验证信息 -->
         <van-button round type="primary" class="register" native-type="submit">{{
           $t('register.registerButton')