fix:"优化部分文本，冰淇淋增加音量调节功能"

package.json

@@ -32,7 +32,7 @@
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.11.0",
     "tinymce": "^6.7.2",
-    "vant": "^4.8.0",
+    "vant": "^4.9.0",
     "vue": "^3.0.0",
     "vue-i18n": "^9.1.10",
     "vue-router": "^4.0.0-beta.13",

src/assets/language/en.json

@@ -28,13 +28,13 @@
     "allDevices": "All devices",
     "commodityType": "Commodity type",
     "machineType": "Machine type",
-    "whole": "whole",
+    "whole": "All",
     "noPaymentRequired": "No payment required",
     "coin": "Coin",
-    "notes": "Notes",
-    "coinsNotes": "Coins+notes",
+    "notes": "Cash",
+    "coinsNotes": "Coins + Cash",
     "creditCard": "Credit Card",
-    "electronicPayment": "electronic payment",
+    "electronicPayment": "Electronic payment",
     "mainSweepOfAlipay": "Main sweep of Alipay",
     "weChatScanning": "WeChat scanning",
     "antiScanningOfAlipay": "Anti scanning of Alipay",

src/components/dateOrderList/index.vue

@@ -15,7 +15,7 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="31"
+        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="31" :show-confirm="false"
           :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">

src/components/dateSelectList/index.vue

@@ -15,7 +15,7 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="186" switch-mode="year-month"
+        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="186" :show-confirm="false"
           :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">

src/service/device/index.js

@@ -19,7 +19,7 @@ export function getGoodsNumber(params) {
 
 // 修改设备详情
 export function updateDevice(params) {
-    return axios.post(`/SZWL-SERVER/tEquipment/update?${stringToUrl(params)}`, params);
+    return axios.post(`/SZWL-SERVER/tEquipment/update`, params);
 }
 
 // 消除报警

src/views/device/alarmClockSet/index.vue

@@ -66,7 +66,7 @@
             <van-cell v-for="(item, index) in equipmentList" clickable :key="index" :title="item.label"
               @click="equipementCheckItem(item.value)">
               <template #right-icon>
-                <van-checkbox :name="item.value" />
+                <van-checkbox :name="item.value" @click.stop/>
               </template>
             </van-cell>
           </van-cell-group>
@@ -96,13 +96,11 @@ export default {
   setup() {
     const { t } = useI18n();
     const onConfirm = ({ selectedValues }) => {
-      console.log(selectedValues);
+      // console.log(selectedValues);
       currentTime.value = selectedValues;
       currentTimeShow.value = false;
       hour.value = selectedValues.join(':');
-      console.log(hour.value);
     };
-    console.log(t("alarmClockSet.sunday"));
     // 周
     const weekDayList = ref([
       {
@@ -200,6 +198,7 @@ export default {
         // 选中的周
         selectList.value = data.data.week.split(',');
         equipmentIds.value = data.data.equipmentIds.split(",");
+        equipmentIds.value = equipmentIds.value.filter((item) => item !== "");
         isEquipemntIdsText();
         // 回显闹钟类型
         const statusTxt = alarmClockTypeOptions.value.filter(
@@ -234,6 +233,7 @@ export default {
       } else {
         equipmentIds.value.push(index);
       }
+
       isAllEquipement();
     };
     const equipemntIdsChange = (event) => {
@@ -328,7 +328,7 @@ export default {
       const { data } = route.query.deviceId
         ? await addAlaramClock(params)
         : await alaramClockUpdate(params);
-      console.log("data", data);
+      // console.log("data", data);
       if (data.code) {
         showSuccessToast(t("device.successfullyAddedAlarmClock"));
         router.back();

src/views/device/deviceOper.vue

@@ -111,7 +111,7 @@
         <div class="operText">{{ $t("device.timeSwitch") }}</div>
       </div>
       <!-- 音量调节 -->
-      <div class="operItem" @click="modulation()" v-if="device.equimentType != 'SI320' || user.id == 31">
+      <div class="operItem" @click="modulation()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/modulation.png" />
         </div>