fix: 验证码未点击发送时可传递值

style: 样式优化，按钮并排
style: 睡眠图标切换

src/assets/language/en.json

@@ -357,8 +357,8 @@
     "pleaseSelectThePowerOnStatus": "Please select the power on status",
     "equipmentStatus": "Equipment Status",
     "pleaseSelectTheDeviceStatus": "Please select the device status",
-    "emptyingConditions": "Emptying Conditions",
-    "clickSearch": "Click Search",
+    "emptyingConditions": "Clear condition",
+    "clickSearch": "Click search",
     "spunSugar": "棉花糖",
     "popcorn": "popcorn",
     "sz": "Sunzee",
@@ -403,7 +403,7 @@
     "totalNumberOfEquipment": "Total number of equipment",
     "affiliatedMerchants": "Business Owner",
     "sleepState": "Sleep State",
-    "sleeping": "sleeping",
+    "sleeping": "Sleeping zzZ",
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Device Code",
@@ -494,8 +494,8 @@
     "stick": "stick",
     "water": "water",
     "wasteWater": "wasteWater",
-    "turnOffSleep": "Turn off Sleep",
-    "turnOnSleep": "Turn on Sleep",
+    "turnOffSleep": "Sleeping zzZ",
+    "turnOnSleep": "Not sleeping",
     "communiChannel": "Communication channel",
     "tweets": "Tweets",
     "mq": "MQ",

src/assets/language/zh.json

@@ -400,7 +400,7 @@
     "totalNumberOfEquipment": "总设备数",
     "affiliatedMerchants": "所属商家",
     "sleepState": "睡眠状态",
-    "sleeping": "睡眠中",
+    "sleeping": "睡眠中zzZ",
     "notSleeping": "未睡眠",
     "sleepDesc": "睡眠描述",
     "SuspendBusiness": "暂停营业",
@@ -511,8 +511,8 @@
     "water": "清水",
     "wasteWater": "废水",
     "sentSuccessfully": "发送请求成功",
-    "turnOffSleep": "关闭睡眠",
-    "turnOnSleep": "开启睡眠",
+    "turnOffSleep": "睡眠中zzZ",
+    "turnOnSleep": "未睡眠",
     "communiChannel": "通信通道",
     "tweets": "个推",
     "mq": "MQ",

src/views/device/deviceOper.vue

@@ -21,12 +21,15 @@
         <div v-if="device.machineType === '1'" class="operText">{{ $t("device.restart") }}</div>
         <div v-else class="operText">{{ $t("device.restartFurnaceHead") }}</div>
       </div>
+
       <div class="operItem" @click="sleepEquipmentFun()">
         <div class="operIcon">
-          <img class="operImg" src="../../assets/device/operIcon/sleep.png" />
+          <img v-if="sleepIcon === '0'" class="operImg" src="../../assets/device/operIcon/awake.png" />
+          <img v-else class="operImg" src="../../assets/device/operIcon/offSleep.png" />
         </div>
         <div class="operText">{{ sleepTitle }}</div>
       </div>
+
       <div class="operItem" @click="openOffFurnace(1)">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
@@ -226,6 +229,9 @@ export default {
     const operType = ref("");
     // 休眠按钮
     const sleepTitle = ref(t("device.turnOnSleep"));
+    // 睡眠图标
+    const sleepIcon = ref('0');
+
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
@@ -235,11 +241,13 @@ export default {
     const showOper = (e) => {
       device.value = e;
       show.value = true;
-      // isSleep=true，机器属于休眠状态，按钮是关闭休眠
+      // isSleep=true，机器处于睡眠状态，按钮是关闭睡眠
       if (device.value.isSleep) {
         sleepTitle.value = t("device.turnOffSleep");
+        sleepIcon.value = '1';
       } else {
         sleepTitle.value = t("device.turnOnSleep");
+        sleepIcon.value = '0';
       }
     };
     const closeOper = () => {
@@ -456,6 +464,7 @@ export default {
       deleteDevice,
       // viewPosiClk,
       changePasswordClk,
+      sleepIcon,
     };
   },
   components: {},

src/views/register.vue

@@ -164,7 +164,7 @@ export default {
         ifForeign: ifForeign.value,
         // phone: phone.value,
         // email: email.value,
-        phoneOrEmail: phoneOrEmailStr,
+        phoneOrEmail: phone.value || email.value,
         code: code.value,
         companyType: '0'
       });