feat:"修改爆米花参数名称"

src/assets/language/en.json

@@ -463,10 +463,10 @@
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Machine Code",
-    "stirringTemperature": "Temperature two",
-    "cornGeneratorTemperature": "Temperature one",
+    "stirringTemperature": "Stirring temperature",
+    "cornGeneratorTemperature": "Corn generator temperature",
     "cupQuantity": "Cup quantity",
-    "bucketWeight": "Sugar bucket weight",
+    "bucketWeight": "Sugar oil weight",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "Generator temperature",
     "outsideTm": "Outside temperature",
@@ -1601,16 +1601,16 @@
     "M307": "Mixer motor"
   },
   "popParams": {
-    "D460": "NO.1095",
-    "D492": "NO.1091",
-    "D493": "NO.1092",
-    "D494": "NO.1093",
-    "D495": "NO.1094",
-    "D208": "NO.1084",
-    "D249": "NO.1034",
-    "D346": "NO.1052",
-    "D497": "NO.1096",
-    "D344": "NO.1083",
+    "D460": "Sugar drop factor",
+    "D492": "Chocolate factor",
+    "D493": "Caramel factor",
+    "D494": "Peach factor",
+    "D495": "Blueberry factor",
+    "D208": "Only X cups with remaining corn",
+    "D249": "Keep heating for X seconds after the first one pops",
+    "D346": "Max gen temp during making",
+    "D497": "Close door time after pickup",
+    "D344": "Blow cold air time",
     "M559": "Block the sugar shortage alarm",
     "M566": "Shield insulation heating wire fault alarm",
     "M568": "Shield generator air pump alarm",

src/assets/language/zh.json

@@ -473,10 +473,10 @@
     "furnaceHeadTemperature": "炉头温度",
     "temperatureInCabinet": "柜内温度",
     "humidityInCabinet": "柜内湿度",
-    "stirringTemperature": "温度二",
-    "cornGeneratorTemperature": "温度一",
+    "stirringTemperature": "搅拌温度",
+    "cornGeneratorTemperature": "玉米发生器温度",
     "cupQuantity": "杯子数量",
-    "bucketWeight": "糖桶总重量",
+    "bucketWeight": "糖油重量",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "发生器温度",
     "outsideTm": "柜外温度",
@@ -1673,16 +1673,16 @@
     "M307": "搅拌电机"
   },
   "popParams": {
-    "D460": "NO.1095",
-    "D492": "NO.1091",
-    "D493": "NO.1092",
-    "D494": "NO.1093",
-    "D495": "NO.1094",
-    "D208": "NO.1084",
-    "D249": "NO.1034",
-    "D346": "NO.1052",
-    "D497": "NO.1096",
-    "D344": "NO.1083",
+    "D460": "下糖系数",
+    "D492": "巧克力系数",
+    "D493": "焦糖系数",
+    "D494": "水蜜桃系数",
+    "D495": "蓝莓系数",
+    "D208": "剩下的玉米只能做X杯",
+    "D249": "第一颗爆开后继续加热X秒",
+    "D346": "制作时发生器最高温度",
+    "D497": "取餐后关门时间",
+    "D344": "吹冷风时间",
     "M559": "屏蔽缺糖报警",
     "M566": "屏蔽保温发热丝故障报警",
     "M568": "屏蔽发生器气泵报警",

src/common/js/countries.js

@@ -1055,6 +1055,7 @@ export const countriesData = [
       { text: "格罗宁根", value: "Groningen" },
       { text: "阿尔梅勒", value: "Almere" },
       { text: "马斯特里赫特", value: "Maastricht" },
+      { text: "海尔伦", value: "Heerlen" },
     ],
   },
   {

src/styles/paramsSet/index.less

@@ -120,7 +120,7 @@
 
             .txt3 {
                 display: flex;
-                width: 30%;
+                width: 45%;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 font-size: 12px;
@@ -130,11 +130,11 @@
             }
 
             .van-field__label {
-                width: 30%;
+                width: 45%;
             }
 
             .van-field__control {
-                width: 75%;
+                width: 55%;
                 border: 1px solid var(--van-border-color);
                 padding: 0.2em 0;
             }

src/views/settlement/index.vue

@@ -623,14 +623,14 @@ export default {
     // 营业执照有效开始日期
     const onConfirmEndDateLicense = ({ selectedValues }) => {
       addParams.endDateLicense = selectedValues.join("-");
-      huifuParams.licenseBeginDate = selectedValues.join("");
+      huifuParams.licenseEndDate = selectedValues.join("");
       showEndDateLicense.value = false;
       fieldUpdate();
     };
     // 营业执照有效截止日期
     const onConfirmBeginDateLicense = ({ selectedValues }) => {
       addParams.beginDateLicense = selectedValues.join("-");
-      huifuParams.licenseEndDate = selectedValues.join("");
+      huifuParams.licenseBeginDate = selectedValues.join("");
       showBeginDateLicense.value = false;
       fieldUpdate();
     };