feat:“参数添加糖设置”

src/assets/language/en.json

@@ -1494,6 +1494,10 @@
     "D476": "Humidification ON Time",
     "D477": "Humidification start delay",
     "D478": "Humidification stop delay",
+    "D482": "White candy",
+    "D483": "Red candy",
+    "D484": "Yellow candy",
+    "D485": "Blue candy",
     "M504": "Differential Adjustment",
     "D218": "Sugar Pick Location X Settings",
     "D228": "Stick position X setting",

src/assets/language/ja.json

@@ -1510,6 +1510,10 @@
         "D476": "加湿ON時間",
         "D477": "加湿開始遅延",
         "D478": "加湿停止遅延",
+        "D482": "White candy",
+        "D483": "Red candy",
+        "D484": "Yellow candy",
+        "D485": "Blue candy",
         "M504": "ヒステリシス制御",
         "D218": "糖の位置X設定",
         "D228": "棒の位置X設定",

src/assets/language/zh.json

@@ -1516,6 +1516,10 @@
     "D476": "加湿ON时间",
     "D477": "加湿启动延时",
     "D478": "加湿停止延时",
+    "D482": "白糖",
+    "D483": "红糖",
+    "D484": "黄糖",
+    "D485": "蓝糖",
     "M504": "回差调节",
     "D218": "取糖位置X设置",
     "D228": "取棍位置X设置",

src/styles/taskMessage/index.less

@@ -84,12 +84,13 @@
       align-items: center;
 
       .bd3 {
-        width: 87px;
-        height: 16px;
+        // width: 87px;
+        // height: 16px;
 
         .outer4 {
-          width: 0.5rem;
-          height: 0.5rem;
+          width: 19px;
+          height: 19px;
+          margin-right: 5px;
           background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
           background-size: 100%;
 
@@ -111,20 +112,20 @@
 
         .txt2 {
           // width: 65px;
-          height: 0.4rem;
+          // height: 0.4rem;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 0.4rem;
+          font-size: 15px;
           font-family: PingFangSC-Semibold;
           text-align: left;
           white-space: nowrap;
-          line-height: 15px;
+          // line-height: 15px;
           display: block;
           font-weight: bold;
 
           .discountNumber {
-            font-size: 0.5rem;
-            color: red;
+            font-size: 18px;
+            color: #df5e4c;
           }
         }
       }

src/views/distributionSet/detail.vue

@@ -200,7 +200,8 @@ export default {
             router.back();
           }, 1000);
         } else if (res.data.code === 'B0001') {
-          showToast(t('distributionSet.addDist.hasExamine'));
+          // showToast(t('distributionSet.addDist.hasExamine'));
+          showToast(res.data.message);
         } else {
           showToast(t('distributionSet.addDist.submitFailed'));
         }

src/views/merchantManage/index.vue

@@ -139,7 +139,7 @@ export default {
             showSuccessToast(t('login.loginSucess'));
             localStorage.setItem('firstLogin', true);
             // 需要刷新页面，否则 axios.js 文件里的 token 不会被重置
-            // window.location.href = '/shenze/';
+            window.location.href = '/shenze/';
             setTimeout(() => {
               router.push("/home");
             }, 200);