Explorar el Código

style: 设置闹钟中英文适配
fix: 定位录入,定位修改

Ritchie hace 1 año
padre
commit
743a7db68a

+ 10 - 0
src/assets/language/en.json

@@ -532,6 +532,16 @@
     "flowerType": "Flower type",
     "flowerTypePlace": "Please select the flower type"
   },
+  "alarmClockSet": {
+    "monday":"Mon",
+    "tuesday":"Tue",
+    "wednesday":"Wed",
+    "thursday":"Thu",
+    "friday":"Fri",
+    "saturday":"Sat",
+    "sunday":"Sun",
+    "checkedAll": "PickAll"
+  },
   "discountCode": {
     "discountCodeNoLabel": "Discount code No",
     "discountCodeNoPlaceholder": "Please enter the discount code number",

+ 10 - 0
src/assets/language/zh.json

@@ -533,6 +533,16 @@
     "flowerType": "花型种类",
     "flowerTypePlace": "请选择花型种类"
   },
+  "alarmClockSet": {
+    "monday":"一",
+    "tuesday":"二",
+    "wednesday":"三",
+    "thursday":"四",
+    "friday":"五",
+    "saturday":"六",
+    "sunday":"日",
+    "checkedAll": "全选"
+  },
   "discountCode": {
     "discountCodeNoLabel": "优惠码编号",
     "discountCodeNoPlaceholder": "请输入优惠码编号",

+ 12 - 10
src/views/device/alarmClockSet/index.vue

@@ -13,7 +13,7 @@
           $t("device.selectTheNumberOfAlarmClockRepetitions")
         }}</span>
         <div class="o-pl-15 o-ptb-10">
-          <van-checkbox @click="checkedAllClk" v-model="checkedAll">全选</van-checkbox>
+          <van-checkbox @click="checkedAllClk" v-model="checkedAll">{{ $t("alarmClockSet.checkedAll") }}</van-checkbox>
         </div>
         <div class="l-flex-between dayCon">
           <div @click="selectDayClk(item.value)" class="dayName" :class="{ active: selectList.includes(item.value) }"
@@ -90,11 +90,12 @@ import {
 import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
 
+
 export default {
   name: "alarm-clock-set",
   components: { sHeader },
   setup() {
-
+    const { t } = useI18n();
     const onConfirm = ({ selectedValues }) => {
       console.log(selectedValues);
       currentTime.value = selectedValues;
@@ -102,34 +103,35 @@ export default {
       hour.value = selectedValues.join(':');
       console.log(hour.value);
     };
+    console.log(t("alarmClockSet.sunday"));
     // 周
     const weekDayList = ref([
       {
-        name: '日',
+        name: t("alarmClockSet.sunday"),
         value: '7',
       },
       {
-        name: '一',
+        name: t("alarmClockSet.monday"),
         value: '1',
       },
       {
-        name: '二',
+        name: t("alarmClockSet.tuesday"),
         value: '2',
       },
       {
-        name: '三',
+        name: t("alarmClockSet.wednesday"),
         value: '3',
       },
       {
-        name: '四',
+        name: t("alarmClockSet.thursday"),
         value: '4',
       },
       {
-        name: '五',
+        name: t("alarmClockSet.friday"),
         value: '5',
       },
       {
-        name: '六',
+        name: t("alarmClockSet.saturday"),
         value: '6',
       },
     ]);
@@ -163,7 +165,7 @@ export default {
         checkedAll.value = false;
       }
     }, { immediate: true, deep: true });
-    const { t } = useI18n();
+    
     const user = getLoginUser();
     const route = useRoute();
     const router = useRouter();

+ 2 - 2
src/views/fife/index.vue

@@ -9,8 +9,8 @@
                     :rules="[{ required: true, message: '请填写真实姓名' }]" />
                 <van-field v-model="phone" name="电话" label="电话" placeholder="手机号码"
                     :rules="[{ required: true, message: '请填写联系电话' }]" />
-                <van-field v-model="username" name="用户名" label="用户名" placeholder="用户名/登录账号"
-                    :rules="[{ required: true, message: '请填写用户名' }]" />
+                <van-field v-model="username" name="账号名称" label="账号名称" placeholder="登录账号名称"
+                    :rules="[{ required: true, message: '请填写账号名' }]" />
                 <van-field v-model="clientId" name="设备唯一码" label="设备唯一码" placeholder="设备唯一码" readonly
                     :rules="[{ required: true, message: '设备唯一码不能为空' }]" />
 

+ 5 - 2
src/views/fife/modifyLoc.vue

@@ -106,13 +106,16 @@ export default {
         }
 
         const locationCheck = ref({});
-
+        const loginUser = localStorage.getItem('loginUser');
+        const loginUserInfo = JSON.parse(loginUser);
+        const modUsername = ref(loginUserInfo.username);
+        // console.log("哈哈哈" , modUsername.value);
         // 提交表单
         const onSubmit = async () => {
             const locationCheck = {
                 modName: modName.value,
                 modPhone: modPhone.value,
-                // modUsername: modUsername.value,
+                modUsername: modUsername.value,
                 clientId: clientId.value,
                 country: country.value,
                 location: location.value