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

# Conflicts:
#	src/assets/language/en.json
#	src/assets/language/zh.json
#	src/styles/doSugar/index.less
#	src/styles/uniPay/index.less
#	src/views/device/deviceSearch.vue
#	src/views/device/doSugar.vue
#	src/views/login.vue
#	src/views/robotRanking.vue
#	src/views/uniPay/index.vue

src/assets/language/en.json

@@ -284,6 +284,7 @@
     "addAlarmClock": "Add alarm clock",
     "modify": "modify",
     "furnHeadStatus": "Furnace head status",
+    "deviceStatus": "Device status",
     "opened": "Opened",
     "closed": "Closed",
     "weekday2": "weekday",
@@ -298,13 +299,17 @@
     "deletionSucceeded": "Deletion succeeded",
     "commonOperations": "Remote operating equipment",
     "equipmentNo": "Equipment No",
+    "restart": "Restart device",
     "restartFurnaceHead": "Restart furnace head",
     "sleep": "sleep",
     "openCloseFurnaceHead": "Open/close furnace head",
     "openFurnHead": "Open furnace head",
+    "openDevice": "Open device",
     "closeFurnHead": "Close furnace head",
+    "closeDevice": "Close device",
     "remoteDoorOpening": "Remote door opening",
     "remoteSugarMaking": "Remote sugar making",
+    "remoteProduction": "Remote production",
     "outDoor": "Outer door",
     "inDoor": "Inner door",
     "status": "Status",
@@ -376,8 +381,11 @@
     "submitAndPushDeviceUpdates": "Submit and push device updates",
     "clickToSelectPattern": "Click to select pattern",
     "pleaseSelectAPattern": "Please select a pattern",
+    "clickToSelectTaste": "Click to choose flavor",
+    "pleaseSelectTaste": "Please choose the flavor",
+    "todaysMakeList": "Make Today List",
     "todaysSugarList": "Make a sugar list today",
-    "submitToMakeSugar": "Submit to make sugar",
+    "submitToMakeSugar": "Submit",
     "viewResults": "View Results",
     "dataOverview": "Data Overview",
     "search": "search",
@@ -390,6 +398,9 @@
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Machine unique code",
     "furnaceHeadTemperature": "furnace head temperature",
+    "stirringTemperature": "Stirring temperature",
+    "cornGeneratorTemperature": "Corn generator temperature",
+    "cupQuantity": "Cup quantity",
     "temperatureInCabinet": "Temperature in cabinet",
     "humidityInCabinet": "Humidity in cabinet",
     "showGoods": "Block or display goods",

src/assets/language/zh.json

@@ -24,7 +24,7 @@
     "coinsNotes": "硬币+纸币",
     "creditCard": "信用卡",
     "electronicPayment": "电子支付",
-    "mainSweepOfAlipay":"支付宝主扫",
+    "mainSweepOfAlipay": "支付宝主扫",
     "weChatScanning": "微信主扫",
     "antiScanningOfAlipay": "支付宝反扫",
     "weChatBackScanning": "微信反扫",
@@ -94,8 +94,8 @@
     "affiliatedMerchantsPlaceholder": "请输入所属商家",
     "advertisingOrderLabel": "广告顺序",
     "advertisingOrderPlaceholder": "请输入广告顺序",
-    "machineType":"机器类型",
-    "machineTypePlace":"请选择所属机器类型",
+    "machineType": "机器类型",
+    "machineTypePlace": "请选择所属机器类型",
     "advertisingDurationLabel": "广告时长",
     "advertisingDurationPlaceholder": "请输入广告时长",
     "playbackTimesLabel": "播放次数",
@@ -112,11 +112,11 @@
     "picture": "图片",
     "video": "视频",
     "pictureAddressLabel": "图片地址",
-    "pictureAddressPlaceholder":"请输入图片地址",
+    "pictureAddressPlaceholder": "请输入图片地址",
     "thumbnailAddressLabel": "缩略图地址",
-    "thumbnailAddressPlaceholder":"请输入缩略图地址",
+    "thumbnailAddressPlaceholder": "请输入缩略图地址",
     "videoLinkLabel": "视频链接",
-    "videoLinkPlaceholder":"请输入视频链接",
+    "videoLinkPlaceholder": "请输入视频链接",
     "submit": "提交",
     "modifyAdvertisement": "修改广告",
     "addAds": "添加广告",
@@ -132,46 +132,46 @@
     "delete": "删除",
     "push": "推送",
     "creationTime": "创建时间",
-    "delPopTitle":"操作确认",
-    "cancelTxt":"我再想想",
-    "confirmDel":"确认删除",
-    "delPopContent":"确认进行删除操作吗？",
-    "delTips":"请先选择需要删除的数据",
-    "advertRule":{
-      "sysTitle":"广告规则",
-      "total":"共",
-      "rules":"条规则",
-      "add":"添加",
-      "delete":"删除",
-      "push":"推送",
-      "edit":"编辑",
-      "createTime":"创建时间",
-      "selected":"已选中",
-      "individual":"个",
-      "cancel":"取消",
-      "confirmDel":"确认删除",
-      "addRule":{
-        "title":"添加规则",
-        "editTitle":"编辑规则",
-        "ruleName":"规则名称",
-        "ruleNamePlace":"请输入规则名称",
-        "adType":"广告类型",
-        "adTypePlace":"请选择广告类型",
-        "userName":"所属商家",
-        "userNamePlace":"请输入所属商家",
-        "AScreen":"A屏",
-        "AScreenPlace":"请选择A屏",
-        "BScreen":"B屏",
-        "BScreennPlace":"请选择B屏",
-        "submit":"提交规则",
-        "search":"搜索",
-        "selectAd":"请选择广告",
-        "pushMerchant":"推送商家",
-        "pushMerchantPlace":"用英文的逗号隔开，结尾也要有逗号",
-        "screen":"筛选",
-        "adScreen":"广告筛选",
-        "adName":"广告名称",
-        "adNamePlace":"请输入广告名称"
+    "delPopTitle": "操作确认",
+    "cancelTxt": "我再想想",
+    "confirmDel": "确认删除",
+    "delPopContent": "确认进行删除操作吗？",
+    "delTips": "请先选择需要删除的数据",
+    "advertRule": {
+      "sysTitle": "广告规则",
+      "total": "共",
+      "rules": "条规则",
+      "add": "添加",
+      "delete": "删除",
+      "push": "推送",
+      "edit": "编辑",
+      "createTime": "创建时间",
+      "selected": "已选中",
+      "individual": "个",
+      "cancel": "取消",
+      "confirmDel": "确认删除",
+      "addRule": {
+        "title": "添加规则",
+        "editTitle": "编辑规则",
+        "ruleName": "规则名称",
+        "ruleNamePlace": "请输入规则名称",
+        "adType": "广告类型",
+        "adTypePlace": "请选择广告类型",
+        "userName": "所属商家",
+        "userNamePlace": "请输入所属商家",
+        "AScreen": "A屏",
+        "AScreenPlace": "请选择A屏",
+        "BScreen": "B屏",
+        "BScreennPlace": "请选择B屏",
+        "submit": "提交规则",
+        "search": "搜索",
+        "selectAd": "请选择广告",
+        "pushMerchant": "推送商家",
+        "pushMerchantPlace": "用英文的逗号隔开，结尾也要有逗号",
+        "screen": "筛选",
+        "adScreen": "广告筛选",
+        "adName": "广告名称",
+        "adNamePlace": "请输入广告名称"
       }
     }
   },
@@ -201,28 +201,28 @@
   },
   "apkManage": {
     "apkManagement": "apk管理",
-    "version":"版本号",
-    "versionInfo":"版本信息",
-    "model":"型号",
-    "add":{
-      "addTitle":"添加",
-      "editTitle":"修改",
-      "version":"版本号",
-      "versionPlace":"请输入版本号",
-      "versionName":"版本名",
-      "versionNamePlace":"请输入版本名",
-      "model":"型号",
-      "modelPlace":"请选择型号",
-      "forceUpdate":"强制更新",
-      "forceUpdatePlace":"请选择是否强制更新",
-      "apkSize":"apk大小",
-      "apkSizePlace":"请输入apk大小",
-      "downloadLink":"下载链接",
-      "downloadLinkPlace":"请输入下载链接",
-      "versionIntroduction":"版本介绍",
-      "versionIntroductionPlace":"请输入版本介绍",
-      "yes":"是",
-      "no":"否"
+    "version": "版本号",
+    "versionInfo": "版本信息",
+    "model": "型号",
+    "add": {
+      "addTitle": "添加",
+      "editTitle": "修改",
+      "version": "版本号",
+      "versionPlace": "请输入版本号",
+      "versionName": "版本名",
+      "versionNamePlace": "请输入版本名",
+      "model": "型号",
+      "modelPlace": "请选择型号",
+      "forceUpdate": "强制更新",
+      "forceUpdatePlace": "请选择是否强制更新",
+      "apkSize": "apk大小",
+      "apkSizePlace": "请输入apk大小",
+      "downloadLink": "下载链接",
+      "downloadLinkPlace": "请输入下载链接",
+      "versionIntroduction": "版本介绍",
+      "versionIntroductionPlace": "请输入版本介绍",
+      "yes": "是",
+      "no": "否"
     }
   },
   "device": {
@@ -235,10 +235,10 @@
     "weekday": "工作日(周一至周五)",
     "weekend": "周末(周六至周日)",
     "custom": "自定义",
-	"messageReceiver1":"设备报警联系人1",
-	"messageReceiver2":"设备报警联系人2",
-	"messageReceiver3":"设备报警联系人3",
-	"equipmentmessageReceiverPlaceholder":"请输入手机号",
+    "messageReceiver1": "设备报警联系人1",
+    "messageReceiver2": "设备报警联系人2",
+    "messageReceiver3": "设备报警联系人3",
+    "equipmentmessageReceiverPlaceholder": "请输入手机号",
     "repetitionsLabel": "重复次数",
     "repetitionsPlaceholder": "请输入重复次数",
     "alarmTypeLabel": "闹钟类型",
@@ -280,7 +280,8 @@
     "timeSwitch": "定时开关",
     "addAlarmClock": "添加闹钟",
     "modify": "修改",
-    "furnHeadStatus":"炉头状态",
+    "furnHeadStatus": "炉头状态",
+    "deviceStatus": "设备状态",
     "opened": "已开启",
     "closed": "已关闭",
     "weekday2": "工作日",
@@ -291,23 +292,27 @@
     "thursday": "周四",
     "friday": "周五",
     "saturday": "周六",
-    "sunday":"周日",
+    "sunday": "周日",
     "deletionSucceeded": "删除成功",
     "commonOperations": "远程操作设备",
     "equipmentNo": "设备编号",
+    "restart": "重启设备",
     "restartFurnaceHead": "重启炉头",
     "sleep": "睡眠",
     "openCloseFurnaceHead": "开启/关闭炉头",
     "openFurnHead": "开启炉头",
+    "openDevice": "开启设备",
     "closeFurnHead": "关闭炉头",
+    "closeDevice": "关闭设备",
     "remoteDoorOpening": "远程开门",
-	"outDoor": "外 门",
-	"inDoor": "内 门",
-	"status": "状 态",
-	"openRemind": "提醒",
-	"openRemindOut": "是否切换外门开关?",
-	"openRemindIn": "是否切换内门开关?",
+    "outDoor": "外 门",
+    "inDoor": "内 门",
+    "status": "状 态",
+    "openRemind": "提醒",
+    "openRemindOut": "是否切换外门开关?",
+    "openRemindIn": "是否切换内门开关?",
     "remoteSugarMaking": "远程做糖",
+    "remoteProduction": "远程制作",
     "modulation": "音量调节",
     "equipmentRecharge": "设备充值",
     "parameterSetting": "参数设置",
@@ -320,7 +325,7 @@
     "open": "开启",
     "close": "关闭",
     "success": "成功",
-    "sysOffSuccess":"系统脱机成功",
+    "sysOffSuccess": "系统脱机成功",
     "remoteDoorOpeningSucceeded": "远程开门成功",
     "enterAnyInformationToSearch": "输入以下任意信息进行搜索",
     "equipmentCodeLabel": "设备编码",
@@ -370,11 +375,14 @@
     "onlinePayment": "线上支付",
     "offlinePayment": "线下支付",
     "onlineAndOfflinePayment": "线上/线下支付",
-    "submitAndPushDeviceUpdates":"提交并推送到设备更新",
+    "submitAndPushDeviceUpdates": "提交并推送到设备更新",
     "clickToSelectPattern": "点击选择花型",
+    "clickToSelectTaste": "点击选择口味",
     "pleaseSelectAPattern": "请选择花型",
+    "pleaseSelectTaste": "请选择口味",
     "todaysSugarList": "今日做糖列表",
-    "submitToMakeSugar": "提交做糖",
+    "todaysMakeList": "今日制作列表",
+    "submitToMakeSugar": "提交",
     "viewResults": "查看结果",
     "dataOverview": "设备管理",
     "search": "搜索",
@@ -384,18 +392,21 @@
     "sleepState": "睡眠状态",
     "sleeping": "睡眠中",
     "notSleeping": "未睡眠",
-	  "sleepDesc": "睡眠描述",
-	  "SuspendBusiness": "暂停营业",
-	  "sleepDescPlace": "请输入睡眠描述",
+    "sleepDesc": "睡眠描述",
+    "SuspendBusiness": "暂停营业",
+    "sleepDescPlace": "请输入睡眠描述",
     "lastRefreshTime": "最近刷新时间",
     "machineUniqueCode": "机器唯一编码",
     "furnaceHeadTemperature": "炉头温度",
     "temperatureInCabinet": "柜内温度",
     "humidityInCabinet": "柜内湿度",
-	  "showGoods": "屏蔽/显示商品",
-	  "editCheck": "是否确认更改？",
-	  "unknownError": "未知错误！",
-    "degree":"度",
+    "stirringTemperature": "搅拌温度",
+    "cornGeneratorTemperature": "玉米发生器温度",
+    "cupQuantity": "杯子剩余量",
+    "showGoods": "屏蔽/显示商品",
+    "editCheck": "是否确认更改？",
+    "unknownError": "未知错误！",
+    "degree": "度",
     "volume": "音量",
     "alarmContent": "报警内容",
     "eliminateAlarm": "消除报警",
@@ -410,41 +421,41 @@
     "pleaseSelectAMachine": "请选择机器",
     "quantityPurchased": "购买的数量",
     "pleaseEnterThePurchaseQuantity": "请输入购买数量",
-	"download": "下载",
-	"downloading": "下载中...",
+    "download": "下载",
+    "downloading": "下载中...",
     "month": "月",
     "weChat": "微信",
     "alipay": "支付宝",
     "placeOrder": "提交订单",
     "orderNumber": "订单号",
     "price": "价格",
-    "tagSet":{
-      "title":"编辑标签",
-      "addTag":"添加标签",
-      "tag":"标签",
-      "allTags":"所有标签",
-      "sumbmit":"提交",
-      "cancel":"取消",
-      "confirm":"确定"
+    "tagSet": {
+      "title": "编辑标签",
+      "addTag": "添加标签",
+      "tag": "标签",
+      "allTags": "所有标签",
+      "sumbmit": "提交",
+      "cancel": "取消",
+      "confirm": "确定"
     },
-    "sysOffline":"系统脱机",
-    "modifyPrice":"修改价格",
-    "modifyPricePage":{
-      "title":"商品价格调整",
-      "equipmentName":"设备名称",
-      "total":"共",
-      "goods":"个商品",
-      "batchModify":"批量修改",
-      "modify":"修改",
-      "submit":"提交",
-      "batchPrice":"批量价格",
-      "batchPricePlace":"请输入批量价格",
-      "modifySubmit":"修改提交"
+    "sysOffline": "系统脱机",
+    "modifyPrice": "修改价格",
+    "modifyPricePage": {
+      "title": "商品价格调整",
+      "equipmentName": "设备名称",
+      "total": "共",
+      "goods": "个商品",
+      "batchModify": "批量修改",
+      "modify": "修改",
+      "submit": "提交",
+      "batchPrice": "批量价格",
+      "batchPricePlace": "请输入批量价格",
+      "modifySubmit": "修改提交"
+    },
+    "showGoodsPage": {
+      "title": "商品显示设置",
+      "equipmentName": "设备名称"
     },
-	"showGoodsPage":{
-		"title":"商品显示设置",
-		"equipmentName":"设备名称"
-	},
     "customLogo": {
       "customLogo": "自定义Logo",
       "logoLabel": "修改Logo",
@@ -453,55 +464,55 @@
       "registerButton": "提交",
       "customLogoSucceed": "定制logo成功"
     },
-	"devicePasswordPage":{
-		"title": "修改机器密码",
-		"equipmentName": "设备名称",
-		"adminPassword": "管理员密码",
-		"guestPassword": "次管理员密码",
-		"deivcePwd": "机器密码",
-		"checkDeivcePwd": "确认密码",
-		"passwordPlaceholder": "请输入6位数以上密码",
-		"passwordCheckRequired": "请再次输入密码进行确认",
-		"passwordMatch": "两次密码不一致"
-	},
-	"changePassword": "修改机器密码",
-	"deleteDevice": "删除设备",
-	"viewLogs": "查看日志",
-    "noPosition":"暂无定位",
-    "equipLocation":"设备位置",
-    "position":"定位",
-    "view":"查看",
-    "oneKeyFeed":"一键补料",
-    "replenishment":"补料",
-    "whiteSugar":"白糖",
-    "redSugar":"红糖",
-    "yellowSugar":"黄糖",
-    "blueSugar":"蓝糖",
-    "stick":"棍子",
-    "water":"清水",
-    "wasteWater":"废水",
-	"sentSuccessfully": "发送请求成功",
-    "turnOffHibe":"关闭休眠",
-    "enableSleep":"开启休眠",
-    "communiChannel":"通信通道",
-    "tweets":"个推",
-    "mq":"Mq",
-    "versionNo":"版本号",
-    "url":"url",
-    "urlPlace":"请输入url",
-    "update":"更新",
-    "sureUpdate":"确定需要更新吗",
-    "coupon":"优惠券",
-    "adRule":"广告规则",
-    "editAdRule":{
-      "title":"编辑规则",
-      "ruleName":"规则名称",
-      "ruleNamePlace":"请输入规则名称",
-      "submitPush":"提交并推送",
-      "adRulePlace":"请先选择广告规则"
+    "devicePasswordPage": {
+      "title": "修改机器密码",
+      "equipmentName": "设备名称",
+      "adminPassword": "管理员密码",
+      "guestPassword": "次管理员密码",
+      "deivcePwd": "机器密码",
+      "checkDeivcePwd": "确认密码",
+      "passwordPlaceholder": "请输入6位数以上密码",
+      "passwordCheckRequired": "请再次输入密码进行确认",
+      "passwordMatch": "两次密码不一致"
+    },
+    "changePassword": "修改机器密码",
+    "deleteDevice": "删除设备",
+    "viewLogs": "查看日志",
+    "noPosition": "暂无定位",
+    "equipLocation": "设备位置",
+    "position": "定位",
+    "view": "查看",
+    "oneKeyFeed": "一键补料",
+    "replenishment": "补料",
+    "whiteSugar": "白糖",
+    "redSugar": "红糖",
+    "yellowSugar": "黄糖",
+    "blueSugar": "蓝糖",
+    "stick": "棍子",
+    "water": "清水",
+    "wasteWater": "废水",
+    "sentSuccessfully": "发送请求成功",
+    "turnOffHibe": "关闭休眠",
+    "enableSleep": "开启休眠",
+    "communiChannel": "通信通道",
+    "tweets": "个推",
+    "mq": "Mq",
+    "versionNo": "版本号",
+    "url": "url",
+    "urlPlace": "请输入url",
+    "update": "更新",
+    "sureUpdate": "确定需要更新吗",
+    "coupon": "优惠券",
+    "adRule": "广告规则",
+    "editAdRule": {
+      "title": "编辑规则",
+      "ruleName": "规则名称",
+      "ruleNamePlace": "请输入规则名称",
+      "submitPush": "提交并推送",
+      "adRulePlace": "请先选择广告规则"
     },
-    "flowerType":"花型种类",
-    "flowerTypePlace":"请选择花型种类"
+    "flowerType": "花型种类",
+    "flowerTypePlace": "请选择花型种类"
   },
   "discountCode": {
     "discountCodeNoLabel": "优惠码编号",
@@ -513,7 +524,7 @@
     "usageTime": "使用时间",
     "clickQuery": "点击查询",
     "selectFullTime": "选择完整时间",
-    "discountCode":"优惠码",
+    "discountCode": "优惠码",
     "total": "共",
     "discountCodesInTotal": "个优惠码",
     "search": "搜索",
@@ -531,12 +542,12 @@
     "aSingleGenerationCannotExceed": "单次生成不能超过200个",
     "pleaseEnterTheValidityPeriod": "请输入有效期",
     "Months": "个月",
-    "noMoreThanMonths":"(不超过3个月)",
+    "noMoreThanMonths": "(不超过3个月)",
     "type": "类型",
     "deductionRoll": "抵扣卷",
     "discount2": "打折",
     "deductionPriceLabdel": "抵扣价格",
-    "deductionPricePlaceholder":"请输入抵扣价格",
+    "deductionPricePlaceholder": "请输入抵扣价格",
     "enterNumber": "输入数字",
     "paymentMethod": "支付方式",
     "weChat": "微信",
@@ -547,30 +558,30 @@
     "theValidityPeriodCannotExceedMonths": "有效期不能超过3个月",
     "discountCannotBeGreaterThan": "折扣不能大于10",
     "successfulProductionOfDiscountCode": "生产优惠码成功",
-    "applDiscCode":"申请优惠码"
+    "applDiscCode": "申请优惠码"
   },
   "distributionSet": {
     "distributionSettings": "分销设置",
-    "total":"共",
-    "leftTitle":"条分销设置",
-    "rightAdd":"添加设备分销人",
-    "equipName":"设备名称",
-    "partners":"合作商",
-    "distProp":"分销比例",
-    "applTime":"申请时间",
-    "reviewed":"已审核",
-    "apprPend":"待审批",
-    "addDist":{
-      "title":"添加分销人",
-      "editTitle":"编辑分销人",
-      "clientId":"设备编码",
-      "autoBrought":"自动带出",
-      "clientIdPlace":"请选择设备编码",
-      "myDistProport":"我的分销比例",
-      "distInof":"分销信息",
-      "platDistRange":"平台分销比例范围为0-100",
-      "distPropRange":"分销比例范围为0-100",
-      "notDelMore":"不能再删除了"
+    "total": "共",
+    "leftTitle": "条分销设置",
+    "rightAdd": "添加设备分销人",
+    "equipName": "设备名称",
+    "partners": "合作商",
+    "distProp": "分销比例",
+    "applTime": "申请时间",
+    "reviewed": "已审核",
+    "apprPend": "待审批",
+    "addDist": {
+      "title": "添加分销人",
+      "editTitle": "编辑分销人",
+      "clientId": "设备编码",
+      "autoBrought": "自动带出",
+      "clientIdPlace": "请选择设备编码",
+      "myDistProport": "我的分销比例",
+      "distInof": "分销信息",
+      "platDistRange": "平台分销比例范围为0-100",
+      "distPropRange": "分销比例范围为0-100",
+      "notDelMore": "不能再删除了"
     }
   },
   "home": {
@@ -582,7 +593,7 @@
     "totalIncome": "收入总额",
     "productNum": "销售量",
     "numberOfOrders": "订单数",
-	"salesAmount": "销售额",
+    "salesAmount": "销售额",
     "commonTools": "常用工具",
     "deviceManagement": "设备管理",
     "discountCode": "优惠码",
@@ -598,10 +609,10 @@
     "apkMan": "apk管理",
     "customLogo": "定制logo",
     "logMan": "日志管理",
-    "notificationPop":{
-      "notification":"通知",
-      "nextTime":"下次再看",
-      "roger":"不再显示"
+    "notificationPop": {
+      "notification": "通知",
+      "nextTime": "下次再看",
+      "roger": "不再显示"
     }
   },
   "airwallex": {
@@ -633,7 +644,7 @@
     "nameOfLegalPerson/IndividualLabel": "法人/个人姓名",
     "nameOfLegalPerson/IndividualPlaceholder": "请输入法人/个人姓名",
     "phoneNumberOfLegalPerson/IndividualLabel": "法人/个人手机号",
-    "phoneNumberOfLegalPerson/IndividualPlaceholder":"请输入法人/个人手机号",
+    "phoneNumberOfLegalPerson/IndividualPlaceholder": "请输入法人/个人手机号",
     "IDLabel": "身份证",
     "IDPlaceholder": "请输入身份证",
     "validityOfIDCard": "身份证有效期",
@@ -676,13 +687,13 @@
     "approvalPassed": "审核已通过",
     "clickHereToFillInAgainAndSubmitForReview": "点击这里重新填写并提交审核",
     "nextGoToUploadIDPhotos": "下一步,去上传证件照片",
-    "uploYourIdCard":"请上传身份证",
-    "uploPortrait":"上传人像面",
-    "uploNatiEmblem":"上传国徽面",
-    "businessLicensePlace":"请上传企业营业执照",
-    "businessLicense":"企业营业执照",
-    "accountOpeningLicensePlace":"请上传开户许可证",
-    "accountOpeningLicense":"开户许可证照片",
+    "uploYourIdCard": "请上传身份证",
+    "uploPortrait": "上传人像面",
+    "uploNatiEmblem": "上传国徽面",
+    "businessLicensePlace": "请上传企业营业执照",
+    "businessLicense": "企业营业执照",
+    "accountOpeningLicensePlace": "请上传开户许可证",
+    "accountOpeningLicense": "开户许可证照片",
     "frontOfIDCardLabel": "身份证正面",
     "frontOfIDCardPlaceholder": "请输入身份证正面图片路径",
     "backOfIDCardLabel": "身份证背面",
@@ -695,7 +706,7 @@
     "withdrawalSucceeded": "撤回成功",
     "uploadSucceeded": "上传成功",
     "signingSuccessfully": "签约成功",
-    "exceedPictSize":"图片大小不能超过2M"
+    "exceedPictSize": "图片大小不能超过2M"
   },
   "merchantManage": {
     "merchantManagement": "商户管理",
@@ -723,11 +734,11 @@
     "fullNamePlaceholder": "请输入姓名",
     "passwordLabel": "密码",
     "passwordPlaceholder": "请输入密码",
-    "leavBlanToIndiNoModi":"留空表示不修改",
+    "leavBlanToIndiNoModi": "留空表示不修改",
     "confirmPasswordLabel": "确认密码",
     "confirmPasswordPlaceholder": "请输入确认密码",
     "mailboxPlaceholder": "请输入邮箱",
-    "telephonePlaceholder":"请输入电话",
+    "telephonePlaceholder": "请输入电话",
     "merchantFilingNumberLabel": "商户报备号",
     "merchantFilingNumberPlaceholder": "请输入商户报备号",
     "domesticOrNot": "是否国内",
@@ -768,7 +779,7 @@
     "orderDetails": "订单明细",
     "exportToExcel": "导出 excel",
     "equipmentNo": "设备编号",
-	  "equipmentName": "设备名称",
+    "equipmentName": "设备名称",
     "tradeName": "商品名称",
     "dividingDomesticService": "分佣",
     "business": "商家",
@@ -785,10 +796,10 @@
     "offlinePayment": "线下支付",
     "paymentSucceeded": "支付成功",
     "unpaid": "未支付",
-    "paid":"已支付",
-    "refundInProgress":"退款中",
+    "paid": "已支付",
+    "refundInProgress": "退款中",
     "refunded": "已退款",
-    "whole":"全部",
+    "whole": "全部",
     "noPaymentRequired": "无需支付",
     "coin": "硬币",
     "notes": "纸币",
@@ -808,7 +819,7 @@
     "equipmentNoPlaceholder": "请输入设备编号",
     "orderDate": "订单日期",
     "startTime": "开始时间",
-    "to":"至",
+    "to": "至",
     "endTime": "结束时间",
     "clickSearch": "点击搜索",
     "selectFullTime": "选择完整时间",
@@ -840,7 +851,7 @@
       "orderNoPlace":"请输入订单编号",
       "busiName":"商户名称",
       "busiNamePlace":"请输入商户名称",
-      "clearFilter":"清空条件", 
+      "clearFilter":"清空条件",
       "filter":"筛选",
       "mainOver":"大陆/海外",
       "mainOverPlace":"请选择大陆/海外",
@@ -878,8 +889,8 @@
     "systemOffline": "系统脱机",
     "labelMan": "标签管理",
     "apkMan": "apk管理",
-    "merchantMan":"商户管理",
-	"accountOperation": "账户操作",
+    "merchantMan": "商户管理",
+    "accountOperation": "账户操作",
     "modifyRole": "修改角色",
     "whole": "全部",
     "roleAddedSuccessfully": "添加角色成功",
@@ -973,31 +984,30 @@
     "corporateAccountNo": "对公账号",
     "personalAccount": "个人账号",
     "filterAccounts": "筛选账户",
-    "inTotal":"共2条",
+    "inTotal": "共2条",
     "exportToExcel": "导出excel",
-    "account":"账号",
-    "settAmount":"已结算金额",
-    "amouToBeSettled":"待结算金额",
-    "lastSettTime":"上次结算时间",
-    "search":{
-      "title":"根据以下条件筛选商户账户",
-      "screen":"筛选",
-      "business":"商家",
-      "account":"账户",
-      "busiPlaceholder":"请选择商家",
-      "accoPlaceholder":"请输入账号"
+    "account": "账号",
+    "settAmount": "已结算金额",
+    "amouToBeSettled": "待结算金额",
+    "lastSettTime": "上次结算时间",
+    "search": {
+      "title": "根据以下条件筛选商户账户",
+      "screen": "筛选",
+      "business": "商家",
+      "account": "账户",
+      "busiPlaceholder": "请选择商家",
+      "accoPlaceholder": "请输入账号"
     },
-    "settleProcess":{
-      "settleAmount":"结算金额",
-      "settleAmountPlaceholder":"请输入结算金额",
-      "notAccountNum":"不计算账号",
-      "notAccountNumPlaceholder":"请输入不计算账号",
-      "settleProcess":"结算处理",
-      "title":"请再次确认是否进行结算",
-      "cancelTxt":"再想想",
-      "confrimTxt":"进行结算"
+    "settleProcess": {
+      "settleAmount": "结算金额",
+      "settleAmountPlaceholder": "请输入结算金额",
+      "notAccountNum": "不计算账号",
+      "notAccountNumPlaceholder": "请输入不计算账号",
+      "settleProcess": "结算处理",
+      "title": "请再次确认是否进行结算",
+      "cancelTxt": "再想想",
+      "confrimTxt": "进行结算"
     }
-
   },
   "taskMessage": {
     "equipmentInitializationApproval": "设备初始化审批",
@@ -1028,21 +1038,21 @@
     "cancel": "取消",
     "operationSucceeded": "操作成功",
     "taskMessage": "任务消息",
-    "toViewAppro":"查看待审批的申请",
-    "whole":"全部",
-    "unapproved":"未审核",
-    "equipmentInit":{
-      "searchPop":{
-        "title":"请输入以下任意条件进行查询",
-        "equipmentNo":"设备编码",
-        "equipmentNoPlace":"请输入设备编码",
-        "managementSystemID":"管理系统ID",
-        "managementSystemIDPlace":"请输入管理系统ID",
-        "merchantName":"商家名称",
-        "merchantNamePlace":"请输入商家名称",
-        "state":"状态",
-        "statePlace":"请选择状态",
-        "filterBtn":"点击查询"
+    "toViewAppro": "查看待审批的申请",
+    "whole": "全部",
+    "unapproved": "未审核",
+    "equipmentInit": {
+      "searchPop": {
+        "title": "请输入以下任意条件进行查询",
+        "equipmentNo": "设备编码",
+        "equipmentNoPlace": "请输入设备编码",
+        "managementSystemID": "管理系统ID",
+        "managementSystemIDPlace": "请输入管理系统ID",
+        "merchantName": "商家名称",
+        "merchantNamePlace": "请输入商家名称",
+        "state": "状态",
+        "statePlace": "请选择状态",
+        "filterBtn": "点击查询"
       }
     },
     "joinpayMchCheck":{
@@ -1083,19 +1093,19 @@
     }
   },
   "uniPay": {
-    "selfRecharging":"自充值",
+    "selfRecharging": "自充值",
     "machine": "机器",
     "pleaseSelectAMachine": "请选择机器",
-    "pattern":"花型",
+    "pattern": "花型",
     "pleaseSelectAPattern": "请选择花型",
-    "paymentMethod":"支付方式",
-    "weChat":"微信",
+    "paymentMethod": "支付方式",
+    "weChat": "微信",
     "alipay": "支付宝",
     "placeOrder": "提交订单",
     "orderNumber": "订单号"
   },
   "changePassword": {
-    "changePassword":"修改密码",
+    "changePassword": "修改密码",
     "passwordLabel": "登录密码",
     "passwordPlaceholder": "请输入6位数以上密码",
     "passwordRequired": "请输入6位数以上密码",
@@ -1103,8 +1113,8 @@
     "passwordCheckPlaceholder": "请再次输入密码进行确认",
     "passwordCheckRequired": "请再次输入密码进行确认",
     "registerButton": "提交",
-    "inconsistentPasswords":"两次密码不一致,请确认密码正确",
-    "pwdEditSucess":"密码修改成功"
+    "inconsistentPasswords": "两次密码不一致,请确认密码正确",
+    "pwdEditSucess": "密码修改成功"
   },
   "forgetPassword": {
     "header": "忘记密码",
@@ -1138,7 +1148,7 @@
     "forgetPassWord": "忘记密码 ?",
     "regusterButton": "点击注册",
     "loginButton": "登录",
-    "loginSucess":"登陆成功"
+    "loginSucess": "登陆成功"
   },
   "register": {
     "header": "用户注册",
@@ -1175,8 +1185,8 @@
     "emailCodeRequired": "请输入邮箱验证码",
     "registerButton": "注册",
     "replaysInSeconds": "秒后可重发",
-	  "emailRegistration": "邮箱注册",
-	  "phoneRegistration": "手机注册"
+    "emailRegistration": "邮箱注册",
+    "phoneRegistration": "手机注册"
   },
   "robotRanking": {
     "machineSalesRanking":"机器销售排行榜",
@@ -1218,7 +1228,7 @@
     "mailbox": "邮箱",
     "mailboxPlace": "请输入邮箱",
     "associateParent": "关联上级",
-    "associateParentPlace":"请输入关联上级",
+    "associateParentPlace": "请输入关联上级",
     "commonOperations": "常用操作",
     "taskMessage": "任务消息",
     "withdrawalAccountNo": "提现账号",
@@ -1240,37 +1250,37 @@
     "bindCommit": "绑定微信",
     "bindSuccess": "绑定成功"
   },
-  "labelMan":{
-    "title":"标签管理",
-    "merchant":"商户",
-    "machine":"机器",
-    "labelName":"标签名",
-    "add":{
-      "name":"标签名称",
-      "namePlace":"请输入标签名称",
-      "type":"类型",
-      "typePlace":"请选择类型",
-      "merchant":"商家列表",
-      "merchantPlace":"请选择商家列表",
-      "machine":"机器列表",
-      "machinePlace":"请选择机器列表"
+  "labelMan": {
+    "title": "标签管理",
+    "merchant": "商户",
+    "machine": "机器",
+    "labelName": "标签名",
+    "add": {
+      "name": "标签名称",
+      "namePlace": "请输入标签名称",
+      "type": "类型",
+      "typePlace": "请选择类型",
+      "merchant": "商家列表",
+      "merchantPlace": "请选择商家列表",
+      "machine": "机器列表",
+      "machinePlace": "请选择机器列表"
     }
   },
-  "kSelectPop":{
-    "cancel":"取消",
-    "confirm":"确定",
-    "allCheck":"全选",
-    "selectTitle":"请选择"
+  "kSelectPop": {
+    "cancel": "取消",
+    "confirm": "确定",
+    "allCheck": "全选",
+    "selectTitle": "请选择"
   },
-  "common":{
-    "noMoreTxt":"没有更多了",
-    "loadingTxt":"加载中...",
-    "search":"搜索",
-    "noDataTxt":"当前时间没有数据",
-    "reqFailClkReload":"请求失败，点击重新加载"
+  "common": {
+    "noMoreTxt": "没有更多了",
+    "loadingTxt": "加载中...",
+    "search": "搜索",
+    "noDataTxt": "当前时间没有数据",
+    "reqFailClkReload": "请求失败，点击重新加载"
   },
-  "kCascader":{
-    "selectRegion":"请选择所在地区"
+  "kCascader": {
+    "selectRegion": "请选择所在地区"
   },
   "paramNames": {
     "D405": "炉头低速",
@@ -1310,17 +1320,15 @@
     "M506": "外循环按钮"
   },
   "accountOperation": {
-  	"title": "账户操作",
-  	"accountAuthority": "账户权限",
-	"distributionSettings": "分销设置",
-	"withdrawalAccountNo": "提现账号",
-	"standbyWithdrawalAccountNo": "备用提现账号",
-	"merchantManagement": "商户管理",
-	"labelMan": "标签管理"
-
+    "title": "账户操作",
+    "accountAuthority": "账户权限",
+    "distributionSettings": "分销设置",
+    "withdrawalAccountNo": "提现账号",
+    "standbyWithdrawalAccountNo": "备用提现账号",
+    "merchantManagement": "商户管理",
+    "labelMan": "标签管理"
   },
-  "wechat":{
+  "wechat": {
     "headerName": "绑定微信"
-
   }
 }

src/service/device/index.js

@@ -33,11 +33,13 @@ export function sleepEquipment(params) {
 }
 
 // 远程开门
-/* export function openDoor(params) {
+export function openDoor(params) {
   return axios.post(`/SZWL-SERVER/tEquipment/openDoor?${stringToUrl(params)}`, params);
-} */
+}
+
+// 新版远程开门，包含内门外门
 export function Api_openDoor(params) {
-    return axios.get(`/SZWL-SERVER/tEquipment/openDoor`, {params})
+    return axios.get(`/SZWL-SERVER/tEquipment/openDoors`, {params})
 }
 
 // 系统脱机

src/views/apkManage/add.vue

@@ -198,6 +198,14 @@ export default {
         name: "280en",
         id: "280en",
       },
+      {
+        name: "POP320ch",
+        id: "POP320ch",
+      },
+      {
+        name: "POP320en",
+        id: "POP320en",
+      }
     ]);
     const busiPopFieldName = reactive({
       text: "name",

src/views/device/deviceOper.vue

@@ -1,12 +1,7 @@
 <template>
   <!-- 设备常见操作弹窗 -->
-  <van-dialog
-      class-name="operDialog"
-      width="auto"
-      v-model:show="show"
-      :showConfirmButton="false"
-      :showCancelButton="false"
-  >
+  <van-dialog class-name="operDialog" width="auto" v-model:show="show" :showConfirmButton="false"
+    :showCancelButton="false">
     <slot name="title">
       <div class="van-dialog__header">{{ $t("device.commonOperations") }}</div>
       <div class="txt1" style="padding: 0.2em 1em">
@@ -21,39 +16,30 @@
     <div class="operBox">
       <div class="operItem" @click="restartFurnace()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/restart.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/restart.png" />
         </div>
-        <div class="operText">{{ $t("device.restartFurnaceHead") }}</div>
+        <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 class="operImg" src="../../assets/device/operIcon/sleep.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"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
         </div>
-        <div class="operText">{{ $t("device.openFurnHead") }}</div>
+        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.openDevice") }}</div>
+        <div v-else class="operText">{{ $t("device.openFurnHead") }}</div>
       </div>
       <div class="operItem" @click="openOffFurnace(0)">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/onOff.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
         </div>
-        <div class="operText">{{ $t("device.closeFurnHead") }}</div>
+        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.closeDevice") }}</div>
+        <div v-else class="operText">{{ $t("device.closeFurnHead") }}</div>
       </div>
       <!--     <div class="operItem" @click="openDoorFun()">
               <div class="operIcon">
@@ -66,10 +52,7 @@
             </div> -->
       <div class="operItem" @click="openDoorFun()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/openDoor.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/openDoor.png" />
         </div>
         <div class="operText">{{ $t("device.remoteDoorOpening") }}</div>
       </div>
@@ -77,132 +60,93 @@
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/doSugar.png" />
         </div>
-        <div class="operText">{{ $t("device.remoteSugarMaking") }}</div>
+        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.remoteProduction") }}</div>
+        <div v-else class="operText">{{ $t("device.remoteSugarMaking") }}</div>
       </div>
       <div class="operItem" @click="alarmClock()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/alarmClock.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/alarmClock.png" />
         </div>
         <div class="operText">{{ $t("device.timeSwitch") }}</div>
       </div>
       <div class="operItem" @click="modulation()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/modulation.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/modulation.png" />
         </div>
         <div class="operText">{{ $t("device.modulation") }}</div>
       </div>
       <div class="operItem" @click="recharge()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/recharge.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/recharge.png" />
         </div>
         <div class="operText">{{ $t("device.equipmentRecharge") }}</div>
       </div>
       <div class="operItem" @click="paramSetPush()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/paramsSet.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/paramsSet.png" />
         </div>
         <div class="operText">{{ $t("device.parameterSetting") }}</div>
       </div>
       <div class="operItem" @click="saveProportionPush()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/saveProportion.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/saveProportion.png" />
         </div>
         <div class="operText">{{ $t("device.addDistributor") }}</div>
       </div>
       <div v-if="isRole('M17')" class="operItem" @click="tuojiEquipmentFun()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/tuoji.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/tuoji.png" />
         </div>
         <div class="operText">{{ $t("device.sysOffline") }}</div>
       </div>
       <div class="operItem" @click="modifyPriceClk()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/editPrice.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/editPrice.png" />
         </div>
         <div class="operText">{{ $t("device.modifyPrice") }}</div>
       </div>
       <div class="operItem" @click="showGoodsClk()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/showGoods.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/showGoods.png" />
         </div>
         <div class="operText">{{ $t("device.showGoods") }}</div>
       </div>
-      <div class="operItem" @click="changePasswordClk()">
+      <div v-if="device.machineType === '1'" class="operItem" @click="changePasswordClk()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/password.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/password.png" />
         </div>
         <div class="operText">{{ $t("device.changePassword") }}</div>
       </div>
       <!-- 删除设备 -->
       <div v-if="user.type < 2" class="operItem" @click="deleteDevice()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/deletedevice.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/deletedevice.png" />
         </div>
         <div class="operText">{{ $t("device.deleteDevice") }}</div>
       </div>
       <!-- 日志功能 -->
       <div v-if="user.type < 2" class="operItem" @click="viewLogs()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/viewLogs.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/viewLogs.png" />
         </div>
         <div class="operText">{{ $t("device.viewLogs") }}</div>
       </div>
       <!-- 定制logo -->
       <div v-if="user.type < 2" class="operItem" @click="customLogo()">
         <div class="operIcon">
-          <img
-              class="operImg"
-              src="../../assets/device/operIcon/customLogo.png"
-          />
+          <img class="operImg" src="../../assets/device/operIcon/customLogo.png" />
         </div>
         <div class="operText">{{ $t("device.customLogo.customLogo") }}</div>
       </div>
     </div>
   </van-dialog>
-  <van-dialog
-      v-model:show="operCheckShow"
-      :title="$t('device.operationConfirmation')"
-      :showConfirmButton="false"
-      :showCancelButton="false"
-  >
+  <van-dialog v-model:show="operCheckShow" :title="$t('device.operationConfirmation')" :showConfirmButton="false"
+    :showCancelButton="false">
     <div class="operCheckBox">
       <div class="block5 flex-col"></div>
       <span class="word10">{{
-          $t("device.pleaseConfirmAgainWhetherToOperate")
-        }}</span>
+        $t("device.pleaseConfirmAgainWhetherToOperate")
+      }}</span>
       <div class="block6 flex-row justify-between">
         <div class="mod7 flex-col" @click="operCheckClear()">
           <span class="info5">{{ $t("device.IllThinkAboutItAgain") }}</span>
@@ -221,7 +165,7 @@ import { onMounted, ref } from "vue";
 import {
   setFurnace,
   sleepEquipment,
-  // openDoor,
+  openDoor,
   deviceTuoji,
   delOneDevice,
 } from "../../service/device";
@@ -267,9 +211,9 @@ export default {
       show.value = true;
       // isSleep=true，机器属于休眠状态，按钮是关闭休眠
       if (device.value.isSleep) {
-        sleepTitle.value=t("device.turnOffHibe");
-      }else{
-        sleepTitle.value=t("device.enableSleep");
+        sleepTitle.value = t("device.turnOffHibe");
+      } else {
+        sleepTitle.value = t("device.enableSleep");
       }
     };
     // 重启炉头
@@ -296,15 +240,20 @@ export default {
           operCheckShow.value = true;
         }; */
     const openDoorFun = () => {
-      router.push({ path: "openDoor", query: { deviceId: device.value.id } });
+      if (device.value.machineType === '1' || device.value.equimentType === 'MG280') {
+        operType.value = 4;
+        operCheckShow.value = true;
+      } else {
+        router.push({ path: "openDoor", query: { deviceId: device.value.id } });
+      }
     };
     // 日志功能
     const viewLogs = () => {
-      router.push({ path: "viewLogs", query: {deviceId: device.value.id }});
+      router.push({ path: "viewLogs", query: { deviceId: device.value.id } });
     };
     // 定制logo
     const customLogo = () => {
-      router.push({ path: "customLogo", query: {deviceId: device.value.id }});
+      router.push({ path: "customLogo", query: { deviceId: device.value.id } });
     }
     // 音量调节
     const modulation = () => {
@@ -312,7 +261,7 @@ export default {
     };
     // 远程做糖
     const doSugar = () => {
-      router.push({ path: "doSugar", query: { deviceId: device.value.id } });
+      router.push({ path: "doSugar", query: { deviceId: device.value.id , machineType: device.value.machineType } });
     };
     // 定时开关
     const alarmClock = () => {
@@ -396,11 +345,10 @@ export default {
         });
         if (data.code) {
           Toast.success(
-              `${
-                  device.value.eqeStatus === 0
-                      ? t("device.close")
-                      : t("device.open")
-              }${t("device.success")}`
+            `${device.value.eqeStatus === 0
+              ? t("device.close")
+              : t("device.open")
+            }${t("device.success")}`
           );
           device.value.eqeStatus = device.value.eqeStatus === 0 ? 1 : 0;
           operCheckShow.value = false;
@@ -409,15 +357,15 @@ export default {
         }
       }
       // 远程开门
-      /*     if (operType.value === 4) {
-              const { data } = await openDoor({ equipmentId: device.value.id });
-              if (data.code) {
-                Toast.success(t("device.remoteDoorOpeningSucceeded"));
-                operCheckShow.value = false;
-              } else {
-                Toast.fail(data.message);
-              }
-            } */
+      if (operType.value === 4) {
+        const { data } = await openDoor({ equipmentId: device.value.id });
+        if (data.code) {
+          Toast.success(t("device.remoteDoorOpeningSucceeded"));
+          operCheckShow.value = false;
+        } else {
+          Toast.fail(data.message);
+        }
+      }
       // 系统脱机
       if (operType.value === 5) {
         const { data } = await deviceTuoji({ id: device.value.id });
@@ -444,7 +392,7 @@ export default {
       // 关闭弹窗
       show.value = false;
       // 触发操作完成回调
-      emit("operfinish",true);
+      emit("operfinish", true);
     };
     const isRole = (key) => {
       return user.menuCodeList.filter((type) => key === type).length > 0;

src/views/device/deviceSearch.vue

@@ -184,6 +184,10 @@ export default {
       {
         text: 'MG280',
         value: 'MG280',
+      },
+      {
+        text: 'POP320',
+        value: 'POP320',
       }
     ]); // 设备机型级联选项
     const equimentTypeFinish = ({ selectedOptions }) => {

src/views/device/deviceSet.vue

@@ -7,39 +7,39 @@
         <div class="bd3 flex-col">
           <div class="mod1 flex-col">
             <span class="word2">{{ $t("device.essentialInformation") }}</span>
-            <img class="pic1" referrerpolicy="no-referrer" title=""
-                 src="../../assets/device/line.png" />
+            <img class="pic1" referrerpolicy="no-referrer"
+              src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
           </div>
           <div class="mod2 flex-col"></div>
         </div>
         <van-field colon readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
-                   placeholder="" />
+          placeholder="" />
         <div class="cust_vantBorder">
           <van-field colon required clearable v-model="deviceDetal.name" name="name"
-                     :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
+            :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.equipmentNamePlaceholder'),
               },
             ]" />
           <van-field colon clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
-                     :placeholder="$t('device.equipmentRemarksPlaceholder')" />
+            :placeholder="$t('device.equipmentRemarksPlaceholder')" />
         </div>
         <van-field colon readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`"
-                   placeholder="" />
+          placeholder="" />
         <!-- 地区 -->
         <div v-if="areaShow" class="bd7 l-flex-between">
           <div class="l-flex-RC">
             <div class="cust_vantBorder">
               <div class="filedInpPad">
                 <van-field colon @click-input="fieldValueInpClk" readonly clearable v-model="fieldValue"
-                           :label="`${$t('device.affiliatedArea')}`" :placeholder="$t('user.regionPlace')">
+                  :label="`${$t('device.affiliatedArea')}`" :placeholder="$t('user.regionPlace')">
                   <template #right-icon>
                     <div class="l-flex-RC">
                       <van-icon v-if="fieldValue" @click="
                         fieldValue = '';
                       deviceDetal.areaId = '';
-                                                " class="o-mr-6" name="clear" />
+                      " class="o-mr-6" name="clear" />
                       <van-icon @click="fieldValueInpClk" name="arrow-down" />
                     </div>
                   </template>
@@ -59,11 +59,11 @@
           </van-field>
         </div>
         <van-field colon readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
-                   placeholder="" />
+          placeholder="" />
         <!-- mg280才有到期时间 -->
         <template v-if="deviceDetal?.equimentType?.indexOf('mg280') !== -1">
           <van-field colon readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
-                     placeholder="" />
+            placeholder="" />
         </template>
         <div class="bd9 l-f">
           <van-field colon readonly :label="`${$t('device.equipmentLabel')}`" placeholder="">
@@ -107,7 +107,7 @@
             </template>
           </van-field>
         </div>
-        <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
+        <!-- <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
           <template #input>
             <div class="l-flex-RC">
               <span>{{ couponStatusNameComp }}</span>
@@ -115,18 +115,18 @@
                           inactive-value="0" />
             </div>
           </template>
-        </van-field>
+        </van-field> -->
         <div class="cust_vantBorder">
           <van-field colon required clearable v-model="deviceDetal.operationalName" name="operationalName"
-                     :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
+            :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.nameOfOperatorPlaceholder'),
               },
             ]" />
           <van-field colon required clearable v-model="deviceDetal.operationalPhone" name="operationalPhone"
-                     :label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
-                     :rules="[
+            :label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
+            :rules="[
               {
                 required: true,
                 message: $t('device.operatorTelephonePlaceholder'),
@@ -134,36 +134,36 @@
             ]" />
 
           <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
-                     :placeholder="$t('device.advertisingRulesPlaceholder')" />
+            :placeholder="$t('device.advertisingRulesPlaceholder')" />
         </div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver1"
-                     :label="`${$t('device.messageReceiver1')}:`"
-                     :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver1')}:`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver2"
-                     :label="`${$t('device.messageReceiver2')}:`"
-                     :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver2')}:`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver3"
-                     :label="`${$t('device.messageReceiver3')}:`"
-                     :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver3')}:`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
         <van-field colon readonly label-width="18%" :label="`${$t('device.paymentMethod')}`" placeholder="">
           <template #input>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="deviceDetal.payType" direction="horizontal">
                 <van-radio name="0" icon-size="18px">{{
-                    $t("device.onlinePayment")
-                  }}</van-radio>
+                  $t("device.onlinePayment")
+                }}</van-radio>
                 <van-radio name="1" icon-size="18px">{{
-                    $t("device.offlinePayment")
-                  }}</van-radio>
+                  $t("device.offlinePayment")
+                }}</van-radio>
                 <van-radio name="2" icon-size="18px">{{
-                    $t("device.onlineAndOfflinePayment")
-                  }}</van-radio>
+                  $t("device.onlineAndOfflinePayment")
+                }}</van-radio>
               </van-radio-group>
             </div>
           </template>
@@ -175,18 +175,18 @@
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.channel" direction="horizontal">
                   <van-radio name="1" icon-size="18px">{{
-                      $t("device.tweets")
-                    }}</van-radio>
+                    $t("device.tweets")
+                  }}</van-radio>
                   <van-radio name="2" icon-size="18px">{{
-                      $t("device.mq")
-                    }}</van-radio>
+                    $t("device.mq")
+                  }}</van-radio>
                 </van-radio-group>
               </div>
             </template>
           </van-field>
         </template>
         <!-- 花型种类 -->
-        <template v-if="isAdmind">
+        <template v-if="isAdmind && machineType === '0'">
           <van-field colon readonly :label="`${$t('device.flowerType')}`" placeholder="">
             <template #input>
               <div class="van-cell__value van-field__value radioBox">
@@ -205,27 +205,27 @@
         <!-- url -->
         <div v-if="isAdmind" class="cust_vantBorder">
           <van-field colon clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
-                     :placeholder="$t('device.urlPlace')">
+            :placeholder="$t('device.urlPlace')">
             <template #button>
               <van-button @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
-                }}&nbsp;&nbsp;</van-button>
+              }}&nbsp;&nbsp;</van-button>
             </template>
           </van-field>
         </div>
         <div class="l-flex-center o-mtb-30">
           <van-button round type="primary" class="info7" native-type="submit">{{
-              $t("device.submitAndPushDeviceUpdates") }}</van-button>
+            $t("device.submitAndPushDeviceUpdates") }}</van-button>
         </div>
 
       </div>
     </van-form>
     <!-- 地区弹窗 -->
     <kCascader @getareaname="getAreaName" :selectId="deviceDetal.areaId" @areapopfinish="areaPopFinish"
-               ref="kCascaderRef"></kCascader>
+      ref="kCascaderRef"></kCascader>
     <!-- 更新弹窗 -->
     <kDialog :dialogTitle="$t('user.logOutTips')" :cancelBtnTxt="$t('user.cancelLog')"
-             :confirmBtnTxt="$t('user.confirmLog')" ref="kDialogRef" :dialogContent="$t('device.sureUpdate')"
-             @confirmclk="confirmClk">
+      :confirmBtnTxt="$t('user.confirmLog')" ref="kDialogRef" :dialogContent="$t('device.sureUpdate')"
+      @confirmclk="confirmClk">
     </kDialog>
   </div>
 </template>
@@ -233,15 +233,15 @@
 // 导入接口
 import { Api_getAdRuleDetail } from "@/service/advertManage";
 // 引入弹窗
-import kDialog from "../../components/commom/kDialog/index.vue";
+import kDialog from "@/components/commom/kDialog/index.vue";
 // 导入公用方法
-import { setLocal, getLoginUser, styleUrl } from "@/common/js/utils";
+import { setLocal, getLoginUser } from "@/common/js/utils";
 // 导入vuex
 import { useStore } from "vuex";
 // 导入接口
 import { Api_getGetEquipmentToLabel } from "@/service/labelMan";
 // 导入地区弹窗
-import kCascader from "../../components/commom/kCascader/index.vue";
+import kCascader from "@/components/commom/kCascader/index.vue";
 import { computed, onMounted, reactive, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
 import { useRoute, useRouter } from "vue-router";
@@ -254,6 +254,7 @@ import {
 import { Toast } from "vant";
 import { useI18n } from "vue-i18n";
 import dateUtil from "@/utils/dateUtil";
+import { styleUrl } from "../../common/js/utils";
 
 export default {
   name: "deviceSet",
@@ -281,8 +282,6 @@ export default {
     const { t } = useI18n();
     const route = useRoute();
     const router = useRouter();
-    // 加载样式
-    styleUrl('deviceSet');
     const deviceDetal = ref({
       name: "",
       selfName: "",
@@ -308,8 +307,12 @@ export default {
     };
     // 是否管理员
     const isAdmind = ref(false);
+    // 设备类型
+    const machineType = ref('0');
     // 初始化页面获取列表
     onMounted(async () => {
+      // 加载样式
+      styleUrl('deviceSet');
       // 从标签设置回来
       // let tagList = sessionStorage.getItem("tagList") || "[]";
       // tagsList.arr = JSON.parse(tagList);
@@ -324,15 +327,15 @@ export default {
     // 获取标签
     const getLabelDetail = () => {
       Api_getGetEquipmentToLabel({ equipmentId: route.query.deviceId }).then(
-          (res) => {
-            console.log("res", res);
-            if (res.data.code === "00000") {
-              tagsList.arr = res.data.data;
-              // 储存数据到vuex
-              store.commit("MUTA_LABELLIST", tagsList.arr);
-              setLocal("deviceSet-tagsList", JSON.stringify(tagsList.arr));
-            }
+        (res) => {
+          console.log("res", res);
+          if (res.data.code === "00000") {
+            tagsList.arr = res.data.data;
+            // 储存数据到vuex
+            store.commit("MUTA_LABELLIST", tagsList.arr);
+            setLocal("deviceSet-tagsList", JSON.stringify(tagsList.arr));
           }
+        }
       );
     };
 
@@ -360,6 +363,9 @@ export default {
             getDetail(data.data.timeRuleId);
           }
         }
+        if (data.data.machineType === '1') {
+          machineType.value = '1';
+        }
       } else {
         Toast.fail(data.message);
       }
@@ -496,10 +502,11 @@ export default {
       couponStatusNameComp,
       toEditAdRule,
       adRuleList,
+      machineType,
     };
   },
 };
 </script>
 <style lang="less" scoped>
-@import "@/common/style/common";
+@import "../../common/style/common";
 </style>

src/views/device/doSugar.vue

@@ -7,26 +7,53 @@
         <div class="block3 flex-col"></div>
         <span class="info2">{{ $t('device.equipmentName') }}：{{ deviceDetal ? deviceDetal.name : '' }}</span>
       </div>
-      <van-field v-model="fieldValue" is-link readonly :label="$t('device.clickToSelectPattern')"
-                 :placeholder="$t('device.pleaseSelectAPattern')" @click="show = true" />
-      <van-popup v-model:show="show" round position="bottom">
-        <van-cascader v-model="cascaderValue" :title="$t('device.pleaseSelectAPattern')" :options="options"
-                      @close="show = false" @finish="onFinish" >
-          <template #option="{ option }">
-            <div class="cascader-item">
-              <van-image :src="option.imgUrl" width="50px" height="50px"></van-image>
-              <div class="cascader-label">{{ option.value }}</div>
-            </div>
-          </template>
-        </van-cascader>
-      </van-popup>
-      <div class="textRow o-pr-20">
-        <span @click="pushToDaySugarList">{{ $t('device.todaysSugarList') }}>></span>
+      <div v-if="machineType === '1'">
+        <van-field v-model="fieldValue" is-link readonly
+          :label="$t('device.clickToSelectTaste')"
+          :placeholder="$t('device.pleaseSelectTaste')"
+          @click="show = true" />
+        <van-popup v-model:show="show" round position="bottom">
+          <van-cascader v-model="cascaderValue" :title="$t('device.pleaseSelectAPattern')" :options="options"
+            @close="show = false" @finish="onFinish">
+            <template #option="{ option }">
+              <div class="cascader-item">
+                <van-image :src="option.imgUrl" width="50px" height="50px"></van-image>
+                <div class="cascader-label">{{ option.value }}</div>
+              </div>
+            </template>
+          </van-cascader>
+        </van-popup>
+        <div class="textRow o-pr-20">
+          <span @click="pushToDaySugarList">{{ $t('device.todaysMakeList')}}>></span>
+        </div>
+        <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
+          $t('device.submitToMakeSugar') }}</span></div>
+        <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
+          @click="checkData()">{{ $t('device.viewResults') }}</van-button>
+      </div>
+      <div v-else>
+        <van-field v-model="fieldValue" is-link readonly :label="$t('device.clickToSelectPattern')"
+          :placeholder="$t('device.pleaseSelectAPattern')" @click="show = true" />
+        <van-popup v-model:show="show" round position="bottom">
+          <van-cascader v-model="cascaderValue" :title="$t('device.pleaseSelectAPattern')" :options="options"
+            @close="show = false" @finish="onFinish">
+            <template #option="{ option }">
+              <div class="cascader-item">
+                <van-image :src="option.imgUrl" width="50px" height="50px"></van-image>
+                <div class="cascader-label">{{ option.value }}</div>
+              </div>
+            </template>
+          </van-cascader>
+        </van-popup>
+        <div class="textRow o-pr-20">
+          <span @click="pushToDaySugarList">{{ $t('device.todaysSugarList') }}>></span>
+        </div>
+        <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
+          $t('device.submitToMakeSugar') }}</span></div>
+        <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
+          @click="checkData()">{{ $t('device.viewResults') }}</van-button>
+
       </div>
-      <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span
-          class="txt3">{{ $t('device.submitToMakeSugar') }}</span></div>
-      <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
-                  @click="checkData()">{{ $t('device.viewResults') }}</van-button>
     </div>
   </div>
 </template>
@@ -45,6 +72,7 @@ export default {
     const route = useRoute();
     const router = useRouter();
     const deviceId = route.query.deviceId;
+    const machineType = route.query.machineType;
     const deviceDetal = ref(null);
     const show = ref(false);
     const fieldValue = ref('');
@@ -62,7 +90,6 @@ export default {
     onMounted(async () => {
       styleUrl('doSugar')
       getDeviceDetalFun();
-      // console.log(deviceId);
     });
 
     const showSugarPhoto = (no) => {
@@ -113,7 +140,7 @@ export default {
     };
 
     const pushToDaySugarList = async () => {
-      router.push({ path: 'toDaySugarList', query: { deviceId: deviceId}})
+      router.push({ path: 'toDaySugarList', query: { deviceId: deviceId } })
     }
 
     return {
@@ -129,6 +156,7 @@ export default {
       checkData,
       pushToDaySugarList,
       showSugarPhoto,
+      machineType
     };
   },
   components: { sHeader },

src/views/device/index.vue

@@ -60,7 +60,7 @@
                   <div class="l-flex-RC">
                     <!-- 报警标志 -->
                     <div v-if="item.hasTodayAlarm" class="box4 flex-col">
-                      <!-- <img class="pic1" src="../../assets/home/M4.png" /> -->
+                      <!-- <img class="pic1" src="../../assets/device/alarm.png" /> -->
                     </div>
                     <div class="layer2 flex-col" :class="{
                       deviceOn: item.eqeStatus === 1,
@@ -110,7 +110,8 @@
                     <van-button type="primary">重启</van-button>
                   </span> -->
                   <div class="word4 o-ptb-10">
-                    <span class="word3 o-pr-5">{{ $t("device.furnHeadStatus") }}: </span>
+                    <span class="word3 o-pr-5" v-if="item.machineType == '0' || item.machineType == null">{{ $t("device.furnHeadStatus") }}: </span>
+                    <span class="word3 o-pr-5" v-else>{{ $t("device.deviceStatus") }}: </span>
                     <span>{{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }}
                     </span>
                     <!-- <div class="l-flex-RC">
@@ -131,7 +132,7 @@
                       }}</van-button>
                     </span>
                   </div>
-                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between">
+                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between" v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
                     <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}：{{
                       item.furnaceTm
                     }}{{ $t("device.degree") }}</van-col>
@@ -141,7 +142,17 @@
                     <van-col class="word5">{{ $t("device.humidityInCabinet") }}：{{ item.cabinetHd
                     }}{{ $t("device.degree") }}</van-col>
                   </van-row>
-                  <template v-if="item.isMaterialUse === '1'">
+                  <van-row class="layer5 o-ptb-10 kBordBott" justify="space-between" v-else>
+                    <van-col class="word5">{{ $t("device.stirringTemperature") }}：{{
+                      item.stirTm
+                    }}{{ $t("device.degree") }}</van-col>
+                    <van-col class="word5">{{ $t("device.cornGeneratorTemperature") }}：{{
+                      item.cornGeneratorTm
+                    }}{{ $t("device.degree") }}</van-col>
+                    <van-col class="word5">{{ $t("device.cupQuantity") }}：{{ item.cupQuantity
+                    }}</van-col>
+                  </van-row>
+                  <template v-if="item.isMaterialUse === '1' && (item.machineType == '0' || item.machineType == null)" >
                     <van-row justify="space-between" class="sugarTxt o-ptb-10 kBordBott">
                       <van-col>
                         {{ $t("device.whiteSugar") }}：{{ $M_FormatCalcuDecial(item.whiteSugar) }}%
@@ -237,8 +248,8 @@ import {
   Api_getReplenishment,
   changeSleepDesc,
 } from "../../service/device/index";
-import deviceSearch from "./deviceSearch.vue";
-import deviceOper from "./deviceOper.vue";
+import deviceSearch from "./deviceSearch";
+import deviceOper from "./deviceOper";
 import { useRouter } from "vue-router";
 import dateUtil from "../../utils/dateUtil";
 import { useI18n } from "vue-i18n";

src/views/device/openDoor.vue

@@ -59,7 +59,7 @@ import { useRoute } from 'vue-router';
 import { getDeviceDetal, Api_openDoor } from '@/service/device'
 import { Toast, Dialog } from 'vant';
 import { useI18n } from "vue-i18n";
-import {styleUrl} from "../../common/js/utils";
+import { styleUrl } from "../../common/js/utils";
 
 export default {
   setup() {

src/views/login.vue

@@ -1,9 +1,7 @@
 <template>
   <!-- 登录 -->
   <div class="login">
-    <s-header
-        :name="sys ? sys.title : $t('public.sysName')"
-    ></s-header>
+    <s-header :name="sys ? sys.title : $t('public.sysName')" :noback="true"></s-header>
     <div class="loginLogoBox l-re">
       <div class="loginLogo"></div>
       <div class="l-ab pointer languageCon" @click="languageClk">
@@ -17,49 +15,33 @@
     </div>
     <div class="loginFormBox">
       <van-form @submit="onSubmit">
-        <van-field
-            v-model="userName"
-            name="userName"
-            label=""
-            :placeholder="$t('login.userNameInput')"
-            :rules="[{ required: true, message: $t('login.userNameInput') }]"
-        />
-        <van-field
-            v-model="userPwd"
-            type="password"
-            name="userPwd"
-            label=""
-            :placeholder="$t('login.passWordInput')"
-            :rules="[{ required: true, message: $t('login.passWordInput') }]"
-        />
+        <van-field v-model="userName" name="userName" label="" :placeholder="$t('login.userNameInput')"
+          :rules="[{ required: true, message: $t('login.userNameInput') }]" />
+        <van-field v-model="userPwd" type="password" name="userPwd" label="" :placeholder="$t('login.passWordInput')"
+          :rules="[{ required: true, message: $t('login.passWordInput') }]" />
         <div class="checkedPasswordBox">
           <van-checkbox icon-size="18px" class="checkedPassWord" v-model="checked">
             {{ $t("login.checkedPassWord") }}
           </van-checkbox>
           <span class="forgetPassWord" @click="forgetPassword">{{
-              $t("login.forgetPassWord")
-            }}</span>
+            $t("login.forgetPassWord")
+          }}</span>
         </div>
         <br>
         <br>
         <!-- 微信登录 -->
         <div v-if="isInWeChat" class="loginWithWechatClass">
           <van-button class="wechat-btn" type="primary" size="large" @click="wxLoginHandler">
-            <van-icon name="wechat" color="#1bd66c" size="40" class="wechat-icon"/>
+            <van-icon name="wechat" color="#1bd66c" size="40" class="wechat-icon" />
           </van-button>
         </div>
 
         <div class="buttonBox">
-          <van-button
-              round
-              type="primary"
-              class="register"
-              @click="registerClick"
-          >{{ $t("login.regusterButton") }}
+          <van-button round type="primary" class="register" @click="registerClick">{{ $t("login.regusterButton") }}
           </van-button>
           <van-button round type="primary" native-type="submit">{{
-              $t("login.loginButton")
-            }}
+            $t("login.loginButton")
+          }}
           </van-button>
         </div>
       </van-form>
@@ -69,15 +51,15 @@
 
 <script>
 import md5 from "js-md5";
-import {onMounted, ref, computed, reactive} from "vue";
-import {Toast, Dialog, Button} from "vant";
-import {login, getSys, getOpenid} from "@/service/login";
-import {setLocal, getLocal, navigatorLanguage, styleUrl} from "@/common/js/utils";
-import sHeader from "@/components/SimpleHeader";
-import {useRoute, useRouter} from "vue-router";
-import {useI18n} from "vue-i18n";
+import { onMounted, ref, computed, reactive } from "vue";
+import { Toast, Dialog, Button } from "vant";
+import { login, getSys, getOpenid } from "../service/login";
+import { setLocal, getLocal, navigatorLanguage, styleUrl } from "../common/js/utils";
+import sHeader from "../components/SimpleHeader";
+import { useRoute, useRouter } from "vue-router";
+import { useI18n } from "vue-i18n";
 // vant 组件的中英文切换
-import {Locale} from "vant";
+import { Locale } from "vant";
 // 引入英文语言包
 import enUS from "vant/es/locale/lang/en-US";
 // 引入简体中文语言包
@@ -86,7 +68,7 @@ import zhCN from "vant/es/locale/lang/zh-CN";
 export default {
   setup() {
     let languageName = ref(getLocal("curLang"));
-    const {locale, t} = useI18n();
+    const { locale, t } = useI18n();
     // 语言点击
     const languageClk = () => {
       if (languageName.value === "zh") {
@@ -132,7 +114,7 @@ export default {
       }
     });
     const getSysFun = async () => {
-      const {data} = await getSys({
+      const { data } = await getSys({
         relationAdminId: route.query.relation_admin_id,
       });
       if (data.code === "00000") {
@@ -143,7 +125,7 @@ export default {
     };
     // 登录
     const onSubmit = async (values) => {
-      const {data} = await login({
+      const { data } = await login({
         username: values.userName,
         password: md5(values.userPwd),
         hostName: 'Sunzee',
@@ -178,7 +160,7 @@ export default {
       state.isLoading = true;
       try {
         // 用户静默授权，获取 用户信息
-        const {data} = await getOpenid();
+        const { data } = await getOpenid();
         console.log("微信登录:", data)
         if (data.code === "00000") {
           window.location.href = data.data;