fix:“优化订单导出功能”

src/assets/language/en.json

@@ -50,6 +50,7 @@
     "sc": "Sevencloud",
     "MG": "Marshmallow",
     "POP": "Popcorn",
+    "ICE": "Ice cream",
     "ifForeignes": "Account type",
     "mainland": "Chinese mainland",
     "overseas": "Hong Kong, Macao, Taiwan and overseas"
@@ -917,7 +918,11 @@
     "productNum": "Sales volume",
     "numberOfOrders": "Order quantity",
     "orderDetails": "order details",
+    "total": "Total ",
+    "records": " records",
     "exportToExcel": "Export to Excel",
+    "exportTips": "There are more than 30,000 order records. Please export them in batches",
+    "exportSuccess": "Export successfully",
     "equipmentNo": "Machine No",
     "equipmentName": "Machine",
     "tradeName": "Trade name",

src/assets/language/ja.json

@@ -50,6 +50,7 @@
         "sc": "QIYUN",
         "MG": "わたあめ",
         "POP": "ポップコーン",
+        "ICE": "アイスクリーム",
         "ifForeignes": "アカウントの種類",
         "mainland": "中国本土",
         "overseas": "海外"
@@ -918,7 +919,11 @@
         "productNum": "販売数",
         "numberOfOrders": "注文数",
         "orderDetails": "注文の詳細",
+        "total": "合計",
+        "records": "レコード",
         "exportToExcel": "Excelにエクスポートする",
+        "exportTips": "註文数は30000件を超えました,順次導出してください",
+        "exportSuccess": "導出成功です",
         "equipmentNo": "機器番号",
         "equipmentName": "機器名",
         "tradeName": "商品名",

src/assets/language/zh.json

@@ -50,6 +50,7 @@
     "sc": "七云",
     "MG": "棉花糖",
     "POP": "爆米花",
+    "ICE": "冰淇淋",
     "ifForeignes": "账号类型",
     "mainland": "大陆",
     "overseas": "港澳台及海外"
@@ -918,7 +919,11 @@
     "productNum": "销售量",
     "numberOfOrders": "订单数",
     "orderDetails": "订单明细",
+    "total": "共 ",
+    "records": "条记录",
     "exportToExcel": "导出 excel",
+    "exportTips": "订单数量已超过30000条，请分批导出",
+    "exportSuccess": "导出成功",
     "equipmentNo": "设备编号",
     "equipmentName": "设备名称",
     "tradeName": "商品名称",

src/service/order/index.js

@@ -30,6 +30,11 @@ export function Api_getOnlineExport(params) {
   return axios.get(`/ORDER-SERVER/tOrder/orderExport?${stringToUrl(params)}`,{responseType:'blob'});
 }
 
+// 订单数据导出
+export function exportOrder(params) {
+  return axios.post(`/ORDER-SERVER/tOrder/newOrderExport`, params ,{responseType:'blob'});
+}
+
 // 是否开发票
 export function updateIsInvoice(params) {
   return axios.get(`/ORDER-SERVER/tOrder/updateIsInvoice?${stringToUrl(params)}`);

src/styles/orderCenter/index.less

@@ -555,7 +555,8 @@
     .van-card {
       background-color: #ffff;
       width: 95%;
-      margin: 0 5px;
+      // margin: 0 5px;
+      padding: 0 5px;
     }
 
     .van-card__thumb {
@@ -574,8 +575,8 @@
 
     .van-card__footer {
       position: absolute;
-      top: 35px;
-      right: 15px;
+      top: 25px;
+      right: 10px;
       // width: 20px;
       overflow-wrap: break-word;
       // color: rgba(64, 77, 116, 1);

src/views/orderCenter/index.vue

@@ -31,30 +31,30 @@
         <div v-if="!noData(salesVolume, salesNumber, orderNumber)" class="o-plr-8 o-pt-15">
           <div class="salesData flex-col">
             <!-- <div class="block5 flex-col"> -->
-              <div class="salesDataBox flex-row">
-                <div class="dataGroup flex-col">
-                  <div class="dataGroupBox flex-row justify-center">
-                    <!-- 订单中心 - 收入总额￥ -->
-                    <!-- <span class="word8">&yen;</span> -->
-                    <span class="currencySymbol">{{ currencySymbol }}</span>
-                    <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
-                  </div>
-                  <span class="dataText">{{ $t("home.totalIncome") }}</span>
+            <div class="salesDataBox flex-row">
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-row justify-center">
+                  <!-- 订单中心 - 收入总额￥ -->
+                  <!-- <span class="word8">&yen;</span> -->
+                  <span class="currencySymbol">{{ currencySymbol }}</span>
+                  <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
                 </div>
-                <div class="dataGroup flex-col">
-                  <div class="dataGroupBox flex-col justify-between">
-                    <span class="dataNum">{{ salesNumber }}</span>
-                    <span class="dataText">{{ $t("home.productNum") }}</span>
-                  </div>
+                <span class="dataText">{{ $t("home.totalIncome") }}</span>
+              </div>
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-col justify-between">
+                  <span class="dataNum">{{ salesNumber }}</span>
+                  <span class="dataText">{{ $t("home.productNum") }}</span>
                 </div>
-                <div class="dataGroup flex-col">
-                  <div class="dataGroupBox flex-col justify-between">
-                    <span class="dataNum">{{ orderNumber }}</span>
-                    <span class="dataText">{{ $t("home.numberOfOrders") }}</span>
-                  </div>
+              </div>
+              <div class="dataGroup flex-col">
+                <div class="dataGroupBox flex-col justify-between">
+                  <span class="dataNum">{{ orderNumber }}</span>
+                  <span class="dataText">{{ $t("home.numberOfOrders") }}</span>
                 </div>
               </div>
             </div>
+          </div>
           <!-- </div> -->
         </div>
         <kNoData v-else></kNoData>
@@ -71,7 +71,12 @@
                 <div class="mod5 flex-row justify-between">
                   <div class="block3 flex-col"></div>
                   <div class="TextGroup7 flexOrderExcelIcon-col">
-                    <span class="info3">{{ $t('orderCenter.orderDetails') }}</span>
+                    <!-- <span class="info3">{{ $t('orderCenter.orderDetails') }}</span> -->
+                    <span class="info3">
+                      {{ $t('orderCenter.total') }}
+                      <span style="color: #df5e4c; font-size: 18px;">{{ total }}</span>
+                      {{ $t('orderCenter.records')}}
+                    </span>
                   </div>
                 </div>
               </div>
@@ -87,54 +92,55 @@
         </div>
         <div class="orderList flex-col">
           <!-- <div class="group8 flex-col"> -->
-            <!-- <div class="section4 flex-col"> -->
-              <div v-for="(item, index) in orderList" :key="index">
-                <div class="section5 flex-col" @click="orderClick(item)">
-                  <van-card :thumb="showSugerPhoto(item)">
-                    <template #title>
-                      <span class="tradeName">{{ $t('orderCenter.tradeName') }}：{{ item.productName }}</span>
-                    </template>
-                    <template #desc>
-                      <span class="equipmentName">{{ $t('orderCenter.equipmentName') }}：{{ item.es }}</span>
-                    </template>
-                    <template #price>
-                      <div class="pricBox flex-row" :class="{ orderError: item.status === 0 }">
-                        <span class="payType">{{ item.statusText }}：
-                        </span>
-                        <!-- 订单明细 - 线下支付 ￥ -->
-                        <span class="currencySymbol">{{ currencySymbol }}</span>
-                        <span class="orderPrice" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
-                        <span class="orderPrice" v-else>
-                          {{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -item.refundAmount).toFixed(2) }}</span>
-                      </div>
-                      <span v-if="user.ifForeign === '0'" class="giveAway">
-                        {{ $t('orderCenter.dividingDomesticService') }} ：{{ currencySymbol }}{{ showSubcom(item) }}
-                      </span>
-                    </template>
-                    <template #price-top>
-                      <span class="orderTime"
-                        :style="user.ifForeign == '0' ? '' : 'margin-top: 6vw;'">
-                        {{ $t('orderCenter.paymentTime') }}：{{ showOrderTime(item, 1) }}</span>
-                    </template>
-                    <template #footer>
-                      <span v-if="item.status === 3">x{{ item.refundQuantity }}</span>
-                      <span v-else>x{{ item.refundQuantity == null ? item.productNumber : (item.productNumber - item.refundQuantity) }}</span>
-                    </template>
-                  </van-card>
-                  <div v-if="typeof item.status === 'undefined'" class="payPic flex-col orderSuccess"></div>
-                  <div v-else class="payPic flex-col" 
-                    :class="{ orderSuccess: item.status === 1 && (user.ifForeign == '0' || user.ifForeign == null),
-                            coinOrderSuccess: item.status === 1 && user.ifForeign == '1',
-                            orderError: item.status === 0,
-                            refunding: item.status === 2,
-                            refunded: item.status === 3,
-                          }">
+          <!-- <div class="section4 flex-col"> -->
+          <div v-for="(item, index) in orderList" :key="index">
+            <div class="section5 flex-col" @click="orderClick(item)">
+              <van-card :thumb="showSugerPhoto(item)">
+                <template #title>
+                  <span class="tradeName">{{ $t('orderCenter.tradeName') }}：{{ item.productName }}</span>
+                </template>
+                <template #desc>
+                  <span class="equipmentName">{{ $t('orderCenter.equipmentName') }}：{{ item.es }}</span>
+                </template>
+                <template #price>
+                  <div class="pricBox flex-row" :class="{ orderError: item.status === 0 }">
+                    <span class="payType">{{ item.statusText }}：
+                    </span>
+                    <!-- 订单明细 - 线下支付 ￥ -->
+                    <span class="currencySymbol">{{ currencySymbol }}</span>
+                    <span class="orderPrice" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
+                    <span class="orderPrice" v-else>
+                      {{ item.refundAmount == null ? item.price.toFixed(2) : (item.price - item.refundAmount).toFixed(2)
+                      }}</span>
                   </div>
-                </div>
-                <!-- <div class="section6 flex-col"></div> -->
+                  <span v-if="user.ifForeign === '0'" class="giveAway">
+                    {{ $t('orderCenter.dividingDomesticService') }} ：{{ currencySymbol }}{{ showSubcom(item) }}
+                  </span>
+                </template>
+                <template #price-top>
+                  <span class="orderTime" :style="user.ifForeign == '0' ? '' : 'margin-top: 6vw;'">
+                    {{ $t('orderCenter.paymentTime') }}：{{ showOrderTime(item, 1) }}</span>
+                </template>
+                <template #footer>
+                  <span v-if="item.status === 3">x{{ item.refundQuantity }}</span>
+                  <span v-else>x{{ item.refundQuantity == null ? item.productNumber : (item.productNumber -
+      item.refundQuantity) }}</span>
+                </template>
+              </van-card>
+              <div v-if="typeof item.status === 'undefined'" class="payPic flex-col orderSuccess"></div>
+              <div v-else class="payPic flex-col" :class="{
+      orderSuccess: item.status === 1 && (user.ifForeign == '0' || user.ifForeign == null),
+      coinOrderSuccess: item.status === 1 && user.ifForeign == '1',
+      orderError: item.status === 0,
+      refunding: item.status === 2,
+      refunded: item.status === 3,
+    }">
               </div>
-              <van-back-top />
-            <!-- </div> -->
+            </div>
+            <!-- <div class="section6 flex-col"></div> -->
+          </div>
+          <van-back-top />
+          <!-- </div> -->
           <!-- </div> -->
         </div>
       </van-list>
@@ -145,93 +151,94 @@
     <van-popup v-model:show="refundType" position="bottom" round closeable>
       <div class="orderPopBox flex-col">
         <!-- <div class="section1 flex-col"> -->
-          <!-- <div class="group3 flex-col"> -->
-            <div class="popTopBox l-flex-center">
-              <div class="popTopTxtBox flex-col">
-                <!-- <span class="txt4">这里是设备名称</span> -->
-                <span class="business">{{ $t('orderCenter.business') }}</span>
-                <span class="incomePrice">+ {{ refundObject.refundAmount == null ? refundObject.price.toFixed(2) :
+        <!-- <div class="group3 flex-col"> -->
+        <div class="popTopBox l-flex-center">
+          <div class="popTopTxtBox flex-col">
+            <!-- <span class="txt4">这里是设备名称</span> -->
+            <span class="business">{{ $t('orderCenter.business') }}</span>
+            <span class="incomePrice">+ {{ refundObject.refundAmount == null ? refundObject.price.toFixed(2) :
       (refundObject.price - refundObject.refundAmount).toFixed(2) }}</span>
-              </div>
-            </div>
-            <div class="line flex-col"></div>
-            <!-- <div class="layer2 flex-row justify-between">
+          </div>
+        </div>
+        <div class="line flex-col"></div>
+        <!-- <div class="layer2 flex-row justify-between">
               <span class="info2">{{ $t('orderCenter.accountBalance') }}</span>
               <span class="txt6">{{ accountDetail.altAvilBalance }}</span>
             </div> -->
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.orderNo') }}</span>
-              <span class="content">{{ refundObject.sn }}</span>
-            </div>
-            <div v-if="refundObject.status != 0 && user.ifForeign === '0'" class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.orderSerialNumberLabel') }}</span>
-              <span class="content">{{ refundObject.trxNo }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.commodity') }}</span>
-              <span class="content">{{ refundObject.productName }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.distribution') }}</span>
-              <span class="content">{{ showSubcom(refundObject) }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.equipmentNo') }}</span>
-              <span class="content">{{ refundObject.clientId }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.state') }}</span>
-              <span class="content">{{ showStatus(refundObject) }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.paymentMethod') }}</span>
-              <span class="content">{{ showPayType(refundObject) }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between">
-              <span class="title">
-                {{ refundObject.status === 1 ? $t('orderCenter.paymentTime') : refundObject.status ===3 ? $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}
-              </span>
-              <span class="content">{{ showOrderTime(refundObject, 1) }}</span>
-            </div>
-            <div v-if="refundObject.status === 3" class="orderDetailBox flex-row justify-between">
-              <span class="title">{{ $t('orderCenter.refunded') }}</span>
-              <span class="content">{{ refundObject.refundAmount }}</span>
-            </div>
-            <div v-if="refundObject.status === 3 && orderType == '3'" class="orderDetailBox flex-row justify-between">
-              <span class="title">退款原因</span>
-              <span class="content">{{ refundObject.refundReason }}</span>
-            </div>
-            <div class="orderDetailBox flex-row justify-between l-flex-center"
-              v-if="(refundObject.status != 0 && refundObject.status != 2) && orderType == '3'">
-              <span class="title">是否开发票</span>
-              <van-radio-group v-model="isInvoice" direction="horizontal">
-                <van-radio :name="1">是</van-radio>
-                <van-radio :name="0">否</van-radio>
-              </van-radio-group>
-              <van-button color="#4d6add" type="primary" size="small" class="o-p-20"
-                @click="updateInvoice(refundObject.id)" style="padding: 10px; margin-left: 20px;">更新</van-button>
-            </div>
-            <van-field v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2 && orderType != '3'"
-              v-model="customerPhone" center label="联系方式" placeholder="消费者联系方式，没有则不填">
-            </van-field>
-            <!-- 发起退款 -->
-            <!-- 非已付款订单，线下订单要隐藏按钮 -->
-            <div style="display: flex; justify-content: center; padding-bottom: 20px;">
-              <van-button size="small"
-                v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2 && orderType != '3'"
-                @click="sentRefundMessage(refundObject)" round type="primary"
-                style="padding: 15px 15px; margin-top: 20px;" color="#4dc193">
-                退款提醒
-              </van-button>
-              <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 20px;">
-              </div>
-              <van-button size="small"
-                v-if="(refundObject.status === 1 && user.ifForeign === '0') || (refundObject.status === 1 && user.ifForeign === '1' && refundObject.isAir === '1')"
-                @click="noticeClk(refundObject)" round type="primary" style="padding: 15px 15px; margin-top: 20px;">
-                {{ $t('orderCenter.initiateRefund') }}
-              </van-button>
-            </div>
-          <!-- </div> -->
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.orderNo') }}</span>
+          <span class="content">{{ refundObject.sn }}</span>
+        </div>
+        <div v-if="refundObject.status != 0 && user.ifForeign === '0'" class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.orderSerialNumberLabel') }}</span>
+          <span class="content">{{ refundObject.trxNo }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.commodity') }}</span>
+          <span class="content">{{ refundObject.productName }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.distribution') }}</span>
+          <span class="content">{{ showSubcom(refundObject) }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.equipmentNo') }}</span>
+          <span class="content">{{ refundObject.clientId }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.state') }}</span>
+          <span class="content">{{ showStatus(refundObject) }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.paymentMethod') }}</span>
+          <span class="content">{{ showPayType(refundObject) }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between">
+          <span class="title">
+            {{ refundObject.status === 1 ? $t('orderCenter.paymentTime') : refundObject.status === 3 ?
+      $t('orderCenter.refundTime') : $t('orderCenter.creationTime') }}
+          </span>
+          <span class="content">{{ showOrderTime(refundObject, 1) }}</span>
+        </div>
+        <div v-if="refundObject.status === 3" class="orderDetailBox flex-row justify-between">
+          <span class="title">{{ $t('orderCenter.refunded') }}</span>
+          <span class="content">{{ refundObject.refundAmount }}</span>
+        </div>
+        <div v-if="refundObject.status === 3 && orderType == '3'" class="orderDetailBox flex-row justify-between">
+          <span class="title">退款原因</span>
+          <span class="content">{{ refundObject.refundReason }}</span>
+        </div>
+        <div class="orderDetailBox flex-row justify-between l-flex-center"
+          v-if="(refundObject.status != 0 && refundObject.status != 2) && orderType == '3'">
+          <span class="title">是否开发票</span>
+          <van-radio-group v-model="isInvoice" direction="horizontal">
+            <van-radio :name="1">是</van-radio>
+            <van-radio :name="0">否</van-radio>
+          </van-radio-group>
+          <van-button color="#4d6add" type="primary" size="small" class="o-p-20" @click="updateInvoice(refundObject.id)"
+            style="padding: 10px; margin-left: 20px;">更新</van-button>
+        </div>
+        <van-field v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2 && orderType != '3'"
+          v-model="customerPhone" center label="联系方式" placeholder="消费者联系方式，没有则不填">
+        </van-field>
+        <!-- 发起退款 -->
+        <!-- 非已付款订单，线下订单要隐藏按钮 -->
+        <div style="display: flex; justify-content: center; padding-bottom: 20px;">
+          <van-button size="small"
+            v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2 && orderType != '3'"
+            @click="sentRefundMessage(refundObject)" round type="primary" style="padding: 15px 15px; margin-top: 20px;"
+            color="#4dc193">
+            退款提醒
+          </van-button>
+          <div v-if="refundObject.status === 1 && user.ifForeign === '0' && user.type < 2" style="width: 20px;">
+          </div>
+          <van-button size="small"
+            v-if="(refundObject.status === 1 && user.ifForeign === '0') || (refundObject.status === 1 && user.ifForeign === '1' && refundObject.isAir === '1')"
+            @click="noticeClk(refundObject)" round type="primary" style="padding: 15px 15px; margin-top: 20px;">
+            {{ $t('orderCenter.initiateRefund') }}
+          </van-button>
+        </div>
+        <!-- </div> -->
         <!-- </div> -->
       </div>
     </van-popup>
@@ -266,7 +273,8 @@
   </div>
 </template>
 <script>
-import { Api_getOnlineExport } from "../../service/order";
+// import { Api_getOnlineExport } from "../../service/order";
+
 // 导入接口
 import { getAdminMch } from "../../service/merchantManage";
 // 导入弹窗
@@ -277,7 +285,7 @@ import kNoData from "../../components/commom/kNoData/index.vue";
 import { onMounted, reactive, ref } from "vue";
 import sHeader from "../../components/SimpleHeader";
 import orderSearch from "./orderSearch.vue";
-import { getOrderList, refundOrder, refundWechatOrder, updateIsInvoice, sentMessage } from "../../service/order/index";
+import { getOrderList, refundOrder, refundWechatOrder, updateIsInvoice, sentMessage, exportOrder } from "../../service/order/index";
 import { showFailToast, showToast, showLoadingToast } from "vant";
 import { getLoginUser, $M_IsDate, Format_time, $M_ExportFile, styleUrl } from "../../common/js/utils";
 import { getHuifuId } from "../../service/huifuMch/index";
@@ -294,6 +302,8 @@ export default {
     const kDialogRef = ref(null);
     // 订单明细
     const orderDetails = ref([]);
+    // 订单总数
+    const total = ref(0);
     // 退款商品选择状态
     const isChecked = ref([]);
     // 全选状态
@@ -617,6 +627,8 @@ export default {
         if (data.data.total === 0) {
           finished.value = true;
         } else {
+          total.value = data.data.total;
+          console.log("订单总数", total.value);
           // orderTotal.value = data.data.total;
           if (params.current === 1) {
             orderList.value = [];
@@ -726,6 +738,10 @@ export default {
 
     // 跳转订单导出
     const gotoOrderExcel = async () => {
+      if (total.value > 30000) {
+        showToast(t('orderCenter.exportTips'));
+        return;
+      }
       if (searchParams.type == null || searchParams.type == '') {
         searchParams.type = user.ifForeign;
       }
@@ -738,15 +754,26 @@ export default {
         duration: 0,
       });
       try {
-        const { headers, data } = await Api_getOnlineExport(searchParams);
+        // const { headers, data } = await Api_getOnlineExport(searchParams);
+        const { headers, data, status } = await exportOrder(searchParams)
+        console.log("data", data)
         // 请求完成后隐藏加载框
         $M_ExportFile(data, headers);
+        if (status == 200) {
+          downloadOrder.close();
+          showSuccessToast({
+            message: t('orderCenter.exportSuccess'),
+            forbidClick: true,
+            duration: 2000,
+          });
+        } else {
+          downloadOrder.close();
+        }
         // 处理返回的数据
       } catch (error) {
         // 请求发生错误时隐藏加载框
         // 处理错误情况
         console.error(error);
-      } finally {
         downloadOrder.close();
       }
     };
@@ -945,6 +972,7 @@ export default {
       orderType,
       isInvoice,
       updateInvoice,
+      total
     };
   },
 };