:art: 机器销额保留2种支付方式+Total

src/assets/language/en.json

@@ -713,6 +713,7 @@
     "coinsBills": "Cash",
     "creditCard": "CreditCard",
     "electronicPayment": "PayOnline",
+    "allPayTypeTotal": "Total",
     "migrationInstructions": "Common Tools have been moved to the Personal Center",
     "machineSales": "Machine sales",
     "deviceManagement": "Machine management",

src/assets/language/ja.json

@@ -714,6 +714,7 @@
         "coinsBills": "現金",
         "creditCard": "クレジットカード",
         "electronicPayment": "オンライン支払い",
+        "allPayTypeTotal": "合計",
         "migrationInstructions": "【常用ツール】は【個人センター】に移動しました。",
         "machineSales": "機械販売",
         "deviceManagement": "装置管理",

src/assets/language/zh.json

@@ -727,6 +727,7 @@
     "coinsBills": "现金",
     "creditCard": "信用卡",
     "electronicPayment": "电子支付",
+    "allPayTypeTotal": "总计",
     "migrationInstructions": "【常用工具】已迁移至【个人中心】",
     "machineSales": "机器销售额",
     "deviceManagement": "设备管理",

src/views/device/index.vue

@@ -81,18 +81,18 @@
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
                   {{ $t("device.furnaceHeadTemperature") + '：' +
-        item.furnaceTm
-        + $t("device.degree") }}
+                    item.furnaceTm
+                    + $t("device.degree") }}
                 </span>
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
                   {{ $t("device.temperatureInCabinet") + '：' + item.cabinetTm
-        + $t("device.degree") }}
+                    + $t("device.degree") }}
                 </span>
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
                   {{ $t("device.humidityInCabinet") + '：' + item.cabinetHd
-        + $t("device.humidity") }}
+                    + $t("device.humidity") }}
                 </span>
                 <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
                   {{ $t("device.cornGeneratorTemperature") + '：' + item.cabinetTm + $t("device.degree") }}
@@ -109,12 +109,12 @@
                   <!-- 所属商家 -->
                   <!-- <span class="txt1 o-mt-10">{{ $t("device.affiliatedMerchants") }}：{{ item.adminUserName }}</span> -->
                   <div v-if="user.type < 2" class="contentWord kBordBott">{{ $t("device.affiliatedMerchants") }}：{{
-        item.adminUserName }}
+                    item.adminUserName }}
                   </div>
                   <!-- 睡眠状态 -->
                   <div class="contentWord kBordBott">
                     <span class="word o-mr-10">{{ $t("device.sleepState") }}：{{ item.isSleep ? $t("device.sleeping") :
-        $t("device.notSleeping") }}</span>
+                      $t("device.notSleeping") }}</span>
                     <van-switch :model-value="item.isSleep" size="18px" @click="changeSleep(item)" />
                   </div>
                   <!-- 睡眠描述 -->
@@ -131,7 +131,7 @@
                     </van-field>
                     <div class="l-flex-RC" v-else>
                       <span class="word o-mr-10">{{ item.sleepDesc == null ? $t("device.SuspendBusiness") :
-        item.sleepDesc
+                        item.sleepDesc
                         }}</span>
                       <van-button type="primary" @click="editSleepDesc()">{{ $t("device.modify") }}</van-button>
                     </div>
@@ -145,7 +145,7 @@
                   <div class="contentWord kBordBott" v-if="item.machineType == null || item.machineType == '0'">
                     <span class="word">
                       {{ (item.machineType == '0' || item.machineType == null) ? $t("device.furnHeadStatus") :
-        $t("device.deviceStatus") }}：
+                        $t("device.deviceStatus") }}：
                       {{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }}
                     </span>
                     <div class="o-ml-10">
@@ -205,8 +205,8 @@
                     </van-row>
                     <div class="sugarTxt kBordBott">
                       <span>{{ $t("device.stick") }}：{{
-        Format_calcuDecial(item.stick)
-      }}%</span>
+                        Format_calcuDecial(item.stick)
+                      }}%</span>
                     </div>
                     <van-row gutter="20" class="sugarTxt kBordBott">
                       <van-col>
@@ -220,31 +220,19 @@
                     <span class="contentWord kBordBott">
                       <span class="l-flex-RC">{{ $t("device.oneKeyFeed") }}：
                         <van-button class="replenishment" @click="replenishmentClk(item)" type="primary">{{
-        $t("device.replenishment") }}
+                          $t("device.replenishment") }}
                         </van-button>
                       </span>
                     </span>
                   </template>
                   <!-- 最近刷新时间 -->
                   <span class="contentWord kBordBott">{{ $t("device.lastRefreshTime") }}：{{
-        showDateTime(item.lastUpdateTime)
-      }}</span>
+                    showDateTime(item.lastUpdateTime)
+                  }}</span>
                   <!-- 音量 -->
                   <span v-if="item.machineType != '2'" class="contentWord kBordBott">{{ $t("device.volume") }}：{{
-        item.volume }}</span>
+                    item.volume }}</span>
                   <!-- 报警内容 -->
-                  <!-- <div class="contentWord kBordBott l-flex-LC justify-space-between">
-                    <span>{{ $t("device.alarmContent") }}：</span>
-                    <span class="word3">{{
-        item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent
-          ? showDateTime(item.alarmList[0].occurrenceTime) + " " + item.alarmList[0].alarmContent
-          : $t("device.alarmContentNoData")
-      }}
-                    </span>
-                    <van-button v-if="item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent"
-                      style="flex-shrink: 0; margin: 0;" type="primary" color="#07c160"
-                      :text="$t('device.eliminateAlarm')" @click="clearAlarm(item.alarmList[0], item)"></van-button>
-                  </div> -->
                   <div class="alert-item kBordBott" v-for="itemAlarm in item.alarmList" :key="itemAlarm">
                     <div class="alert-info o-pr-5">
                       <span style="display: block;">{{ $t("device.time") }} : {{ showDateTime(itemAlarm.occurrenceTime)
@@ -263,16 +251,16 @@
                     <!-- 详细信息 -->
                     <div class="l-flex-RC" @click="deviceSet(item)">
                       <span class="c-text-14">{{
-        $t("device.editDevice")
-      }}</span>
+                        $t("device.editDevice")
+                      }}</span>
                       <div class="box2 flex-col"></div>
                     </div>
 
                     <!-- 远程操作 -->
                     <div class="l-flex-RC" @click="deviceOprShow(item)">
                       <span class="c-text-14">{{
-        $t("device.commonOperations")
-                        }}</span>
+                        $t("device.commonOperations")
+                      }}</span>
                       <div class="box2 flex-col"></div>
                     </div>
                   </div>
@@ -282,7 +270,7 @@
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-5">{{
                       item.checkType ? $t("device.stow") : $t("device.seeMore")
-                      }}</span>
+                    }}</span>
                     <div class="group2 flex-col" :class="{ checkType: item.checkType }"></div>
                   </div>
                 </div>

src/views/home/index.vue

@@ -137,15 +137,17 @@
           </van-row> -->
                 <van-row class="layer5" justify="space-between">
                   <!-- 硬币 -->
-                  <van-col span="8">{{ $t("home.coins") }}: {{ item.coins }}</van-col>
+                  <!-- <van-col span="8">{{ $t("home.coins") }}: {{ item.coins }}</van-col> -->
                   <!-- 纸币 -->
-                  <van-col span="8">{{ $t("home.bills") }}: {{ item.bills }}</van-col>
+                  <!-- <van-col span="8">{{ $t("home.bills") }}: {{ item.bills }}</van-col> -->
                   <!-- 硬币+纸币 -->
-                  <van-col span="8">{{ $t("home.coinsBills") }}: {{ item.coinsBills }}</van-col>
+                  <van-col span="12">{{ $t("home.coinsBills") }}: {{ item.coinsBills !== undefined ? item.coinsBills : '0' }}</van-col>
                   <!-- 信用卡 -->
-                  <van-col span="8">{{ $t("home.creditCard") }}: {{ item.creditCard }}</van-col>
+                  <van-col span="12">{{ $t("home.creditCard") }}: {{ item.creditCard !== undefined ? item.creditCard : '0' }}</van-col>
                   <!-- 电子支付 -->
-                  <van-col span="8">{{ $t("home.electronicPayment") }}: {{ item.electronicPayment }}</van-col>
+                  <!-- <van-col span="8">{{ $t("home.electronicPayment") }}: {{ item.electronicPayment }}</van-col> -->
+                  <!-- 所有支付方式合计 -->
+                  <van-col span="12">{{ $t("home.allPayTypeTotal") }}: {{ calculateTotal(item) }}</van-col>
                 </van-row>
               </van-cell-group>
             </div>
@@ -157,8 +159,6 @@
         {{ $t("home.migrationInstructions") }}
       </div>
 
-
-
     </div>
     <!-- 通知弹窗 -->
     <kDialog :dialogTitle="$t('home.notificationPop.notification')" :cancelBtnTxt="$t('home.notificationPop.nextTime')"
@@ -539,7 +539,22 @@ export default {
 
     // 设备销售数据 
     const combinedList = ref([]); // 设备销额集合
+    const calculateTotal = (item) => {
+      let total = 0;
+      // total += item.coins;
+      // total += item.bills;
+      // total += item.coinsBills;
+      // total += item.creditCard;
+      if (typeof item.coinsBills === 'number' && !isNaN(item.coinsBills)) {
+        total += item.coinsBills;
+      }
 
+      if (typeof item.creditCard === 'number' && !isNaN(item.creditCard)) {
+        total += item.creditCard;
+      }
+      // total += item.electronicPayment;
+      return total;
+    }
 
     const getMachineNameListFunc = async () => {
 
@@ -852,7 +867,8 @@ export default {
       // creditCard,
       // electronicPayment,
       combinedList,
-      isOrderData
+      isOrderData,
+      calculateTotal
     };
   },