ts-glitter 20.4.8 → 20.5.0

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -312,225 +312,230 @@ export class ShoppingOrderManager {
                     if (vm.filter_type !== 'all') {
                         vm.apiJSON.is_pos = vm.filter_type === 'pos';
                     }
-                    ApiShop.getOrder(vm.apiJSON).then(data => {
+                    ApiShop.getOrder(vm.apiJSON).then((data) => __awaiter(this, void 0, void 0, function* () {
                         function getDatalist() {
-                            return data.response.data.map((dd) => {
-                                var _a;
-                                dd.orderData.total = dd.orderData.total || 0;
-                                dd.orderData.customer_info = (_a = dd.orderData.customer_info) !== null && _a !== void 0 ? _a : {};
-                                if (query.isShipment) {
-                                    return [
-                                        {
-                                            key: '訂單編號',
-                                            value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
+                            return __awaiter(this, void 0, void 0, function* () {
+                                const payment_support = yield PaymentConfig.getSupportPayment();
+                                return data.response.data.map((dd) => {
+                                    var _a;
+                                    dd.orderData.total = dd.orderData.total || 0;
+                                    dd.orderData.customer_info = (_a = dd.orderData.customer_info) !== null && _a !== void 0 ? _a : {};
+                                    if (query.isShipment) {
+                                        return [
+                                            {
+                                                key: '訂單編號',
+                                                value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
                             ${dd.cart_token}${(() => {
-                                                switch (dd.order_source) {
-                                                    case 'manual':
-                                                        return BgWidget.primaryInsignia('手動', { type: 'border' });
-                                                    case 'combine':
-                                                        return BgWidget.warningInsignia('合併', { type: 'border' });
-                                                    case 'POS':
-                                                        return BgWidget.primaryInsignia('POS', { type: 'border' });
-                                                    default:
-                                                        return '';
-                                                }
-                                            })()}
+                                                    switch (dd.order_source) {
+                                                        case 'manual':
+                                                            return BgWidget.primaryInsignia('手動', { type: 'border' });
+                                                        case 'combine':
+                                                            return BgWidget.warningInsignia('合併', { type: 'border' });
+                                                        case 'POS':
+                                                            return BgWidget.primaryInsignia('POS', { type: 'border' });
+                                                        default:
+                                                            return '';
+                                                    }
+                                                })()}
                           </div>`,
-                                        },
-                                        {
-                                            key: '出貨日期',
-                                            value: dd.orderData.user_info.shipment_date
-                                                ? glitter.ut.dateFormat(new Date(dd.orderData.user_info.shipment_date), 'yyyy-MM-dd hh:mm')
-                                                : '尚未設定',
-                                        },
-                                        {
-                                            key: '訂購人',
-                                            value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
-                                        },
-                                        {
-                                            key: '出貨狀態',
-                                            value: (() => {
-                                                var _a;
-                                                switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
-                                                    case 'pre_order':
-                                                        return BgWidget.notifyInsignia('待預購');
-                                                    case 'wait':
-                                                        if (dd.orderData.user_info.shipment_number) {
-                                                            return BgWidget.secondaryInsignia('備貨中');
-                                                        }
-                                                        else {
-                                                            return BgWidget.notifyInsignia('未出貨');
-                                                        }
-                                                    case 'shipping':
-                                                        return BgWidget.warningInsignia('已出貨');
-                                                    case 'finish':
-                                                        return BgWidget.infoInsignia('已取貨');
-                                                    case 'arrived':
-                                                        return BgWidget.warningInsignia('已送達');
-                                                    case 'returns':
-                                                        return BgWidget.dangerInsignia('已退貨');
-                                                }
-                                            })(),
-                                        },
-                                        {
-                                            key: '出貨單號碼',
-                                            value: dd.orderData.user_info.shipment_number,
-                                        },
-                                    ].map((dd) => {
-                                        dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
-                                        return dd;
-                                    });
-                                }
-                                else {
-                                    return [
-                                        {
-                                            key: '訂單編號',
-                                            value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
+                                            },
+                                            {
+                                                key: '出貨日期',
+                                                value: dd.orderData.user_info.shipment_date
+                                                    ? glitter.ut.dateFormat(new Date(dd.orderData.user_info.shipment_date), 'yyyy-MM-dd hh:mm')
+                                                    : '尚未設定',
+                                            },
+                                            {
+                                                key: '訂購人',
+                                                value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
+                                            },
+                                            {
+                                                key: '出貨狀態',
+                                                value: (() => {
+                                                    var _a;
+                                                    switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
+                                                        case 'pre_order':
+                                                            return BgWidget.notifyInsignia('待預購');
+                                                        case 'wait':
+                                                            if (dd.orderData.user_info.shipment_number) {
+                                                                return BgWidget.secondaryInsignia('備貨中');
+                                                            }
+                                                            else {
+                                                                return BgWidget.notifyInsignia('未出貨');
+                                                            }
+                                                        case 'shipping':
+                                                            return BgWidget.warningInsignia('已出貨');
+                                                        case 'finish':
+                                                            return BgWidget.infoInsignia('已取貨');
+                                                        case 'arrived':
+                                                            return BgWidget.warningInsignia('已送達');
+                                                        case 'returns':
+                                                            return BgWidget.dangerInsignia('已退貨');
+                                                    }
+                                                })(),
+                                            },
+                                            {
+                                                key: '出貨單號碼',
+                                                value: dd.orderData.user_info.shipment_number,
+                                            },
+                                        ].map((dd) => {
+                                            dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
+                                            return dd;
+                                        });
+                                    }
+                                    else {
+                                        return [
+                                            {
+                                                key: '訂單編號',
+                                                value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
                             ${dd.cart_token}${(() => {
-                                                switch (dd.orderData.orderSource) {
-                                                    case 'manual':
-                                                        return BgWidget.primaryInsignia('手動', { type: 'border' });
-                                                    case 'combine':
-                                                        return BgWidget.warningInsignia('合併', { type: 'border' });
-                                                    case 'POS':
-                                                        if (vm.filter_type === 'pos') {
+                                                    switch (dd.orderData.orderSource) {
+                                                        case 'manual':
+                                                            return BgWidget.primaryInsignia('手動', { type: 'border' });
+                                                        case 'combine':
+                                                            return BgWidget.warningInsignia('合併', { type: 'border' });
+                                                        case 'POS':
+                                                            if (vm.filter_type === 'pos') {
+                                                                return '';
+                                                            }
+                                                            return BgWidget.primaryInsignia('POS', { type: 'border' });
+                                                        case 'split':
+                                                            return BgWidget.warningInsignia('拆分', { type: 'border' });
+                                                        default:
                                                             return '';
-                                                        }
-                                                        return BgWidget.primaryInsignia('POS', { type: 'border' });
-                                                    default:
-                                                        return '';
-                                                }
-                                            })()}
+                                                    }
+                                                })()}
                           </div>`,
-                                        },
-                                        {
-                                            key: '訂單日期',
-                                            value: html `<div style="width: 120px;">
+                                            },
+                                            {
+                                                key: '訂單日期',
+                                                value: html ` <div style="width: 120px;">
                             ${glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd')}
                           </div>`,
-                                        },
-                                        {
-                                            key: '訂購人',
-                                            value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
-                                        },
-                                        {
-                                            key: '訂單金額',
-                                            value: `$ ${dd.orderData.total.toLocaleString()}`,
-                                        },
-                                        {
-                                            key: '付款狀態',
-                                            value: (() => {
-                                                switch (dd.status) {
-                                                    case 0:
-                                                        if (dd.orderData.proof_purchase) {
-                                                            return BgWidget.warningInsignia('待核款');
-                                                        }
-                                                        if (dd.orderData.customer_info.payment_select == 'cash_on_delivery') {
-                                                            return BgWidget.warningInsignia('貨到付款');
-                                                        }
-                                                        return BgWidget.notifyInsignia('未付款');
-                                                    case 3:
-                                                        return BgWidget.warningInsignia('部分付款');
-                                                    case 1:
-                                                        return BgWidget.infoInsignia('已付款');
-                                                    case -1:
-                                                        return BgWidget.notifyInsignia('付款失敗');
-                                                    case -2:
-                                                        return BgWidget.notifyInsignia('已退款');
-                                                }
-                                            })(),
-                                        },
-                                        {
-                                            key: '出貨狀態',
-                                            value: (() => {
-                                                var _a;
-                                                switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
-                                                    case 'pre_order':
-                                                        return BgWidget.notifyInsignia('待預購');
-                                                    case 'wait':
-                                                        if (dd.orderData.user_info.shipment_number) {
-                                                            return BgWidget.secondaryInsignia('備貨中');
-                                                        }
-                                                        else {
-                                                            return BgWidget.notifyInsignia('未出貨');
-                                                        }
-                                                    case 'shipping':
-                                                        return BgWidget.warningInsignia('已出貨');
-                                                    case 'finish':
-                                                        return BgWidget.infoInsignia('已取貨');
-                                                    case 'arrived':
-                                                        return BgWidget.warningInsignia('已送達');
-                                                    case 'returns':
-                                                        return BgWidget.dangerInsignia('已退貨');
-                                                }
-                                            })(),
-                                        },
-                                        {
-                                            key: '訂單狀態',
-                                            value: (() => {
-                                                var _a;
-                                                switch ((_a = dd.orderData.orderStatus) !== null && _a !== void 0 ? _a : '0') {
-                                                    case '-1':
-                                                        return BgWidget.notifyInsignia('已取消');
-                                                    case '0':
-                                                        return BgWidget.warningInsignia('處理中');
-                                                    case '1':
-                                                        return BgWidget.infoInsignia('已完成');
-                                                }
-                                            })(),
-                                        },
-                                        {
-                                            key: '運送方式',
-                                            value: html `<div style="width: 120px;">
+                                            },
+                                            {
+                                                key: '訂購人',
+                                                value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
+                                            },
+                                            {
+                                                key: '訂單金額',
+                                                value: `$ ${dd.orderData.total.toLocaleString()}`,
+                                            },
+                                            {
+                                                key: '付款狀態',
+                                                value: (() => {
+                                                    switch (dd.status) {
+                                                        case 0:
+                                                            if (dd.orderData.proof_purchase) {
+                                                                return BgWidget.warningInsignia('待核款');
+                                                            }
+                                                            if (dd.orderData.customer_info.payment_select == 'cash_on_delivery') {
+                                                                return BgWidget.warningInsignia('貨到付款');
+                                                            }
+                                                            return BgWidget.notifyInsignia('未付款');
+                                                        case 3:
+                                                            return BgWidget.warningInsignia('部分付款');
+                                                        case 1:
+                                                            return BgWidget.infoInsignia('已付款');
+                                                        case -1:
+                                                            return BgWidget.notifyInsignia('付款失敗');
+                                                        case -2:
+                                                            return BgWidget.notifyInsignia('已退款');
+                                                    }
+                                                })(),
+                                            },
+                                            {
+                                                key: '出貨狀態',
+                                                value: (() => {
+                                                    var _a;
+                                                    switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
+                                                        case 'pre_order':
+                                                            return BgWidget.notifyInsignia('待預購');
+                                                        case 'wait':
+                                                            if (dd.orderData.user_info.shipment_number) {
+                                                                return BgWidget.secondaryInsignia('備貨中');
+                                                            }
+                                                            else {
+                                                                return BgWidget.notifyInsignia('未出貨');
+                                                            }
+                                                        case 'shipping':
+                                                            return BgWidget.warningInsignia('已出貨');
+                                                        case 'finish':
+                                                            return BgWidget.infoInsignia('已取貨');
+                                                        case 'arrived':
+                                                            return BgWidget.warningInsignia('已送達');
+                                                        case 'returns':
+                                                            return BgWidget.dangerInsignia('已退貨');
+                                                    }
+                                                })(),
+                                            },
+                                            {
+                                                key: '訂單狀態',
+                                                value: (() => {
+                                                    var _a;
+                                                    switch ((_a = dd.orderData.orderStatus) !== null && _a !== void 0 ? _a : '0') {
+                                                        case '-1':
+                                                            return BgWidget.notifyInsignia('已取消');
+                                                        case '0':
+                                                            return BgWidget.warningInsignia('處理中');
+                                                        case '1':
+                                                            return BgWidget.infoInsignia('已完成');
+                                                    }
+                                                })(),
+                                            },
+                                            {
+                                                key: '運送方式',
+                                                value: html ` <div style="width: 120px;">
                             ${OrderInfo.shipmetSelector(dd, OrderModule.supportShipmentMethod())}
                           </div>`,
-                                        },
-                                        {
-                                            key: '付款方式',
-                                            value: OrderInfo.paymentSelector(gvc, dd),
-                                        },
-                                        {
-                                            key: '付款時間',
-                                            value: html `<div style="width: 160px;">
+                                            },
+                                            {
+                                                key: '付款方式',
+                                                value: OrderInfo.paymentSelector(gvc, dd, payment_support),
+                                            },
+                                            {
+                                                key: '付款時間',
+                                                value: html ` <div style="width: 160px;">
                             ${(() => {
-                                                if (!dd.orderData.editRecord) {
-                                                    return '-';
-                                                }
-                                                const record = dd.orderData.editRecord.find((item) => item.record === '付款成功');
-                                                return record ? Tool.formatDateTime(record.time) : '-';
-                                            })()}
+                                                    if (!dd.orderData.editRecord) {
+                                                        return '-';
+                                                    }
+                                                    const record = dd.orderData.editRecord.find((item) => item.record === '付款成功');
+                                                    return record ? Tool.formatDateTime(record.time) : '-';
+                                                })()}
                           </div>`,
-                                        },
-                                        {
-                                            key: '對帳狀態',
-                                            value: OrderInfo.reconciliationStatus(dd),
-                                        },
-                                        {
-                                            key: '發票號碼',
-                                            value: dd.invoice_no || '-',
-                                        },
-                                    ]
-                                        .filter(item => {
-                                        return vm.headerConfig.includes(item.key);
-                                    })
-                                        .map((dd) => {
-                                        dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
-                                        return dd;
-                                    });
-                                }
+                                            },
+                                            {
+                                                key: '對帳狀態',
+                                                value: OrderInfo.reconciliationStatus(dd),
+                                            },
+                                            {
+                                                key: '發票號碼',
+                                                value: dd.invoice_no || '-',
+                                            },
+                                        ]
+                                            .filter(item => {
+                                            return vm.headerConfig.includes(item.key);
+                                        })
+                                            .map((dd) => {
+                                            dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
+                                            return dd;
+                                        });
+                                    }
+                                });
                             });
                         }
                         vm.dataList = data.response.data;
                         vmi.pageSize = Math.ceil(data.response.total / limit);
                         vmi.originalData = vm.dataList;
-                        vmi.tableData = getDatalist();
+                        vmi.tableData = yield getDatalist();
                         vmi.loading = false;
                         if (vmi.pageSize != 0 && vmi.page > vmi.pageSize) {
                             ShoppingOrderManager.vm.page = 1;
                             gvc.notifyDataChange(vm.id);
                         }
                         vmi.callback();
-                    });
+                    }));
                 },
                 rowClick: (_, index) => {
                     vm.data = vm.dataList[index];
@@ -1015,10 +1020,11 @@ export class ShoppingOrderManager {
                             limit: 1,
                             search: cart_token,
                             data_from: 'manager',
-                            searchType: 'cart_token',
+                            searchType: 'cart_token_exact',
                         });
                         orderData = structuredClone(orderDataNew.response.data[0]);
                         originData = structuredClone(orderData);
+                        console.log('orderDataNew.response.data -- ', orderDataNew.response.data);
                     }
                     orderData.orderData.progress = (_b = orderData.orderData.progress) !== null && _b !== void 0 ? _b : 'wait';
                     if (orderData.orderData.shipment_selector &&
@@ -1079,6 +1085,26 @@ export class ShoppingOrderManager {
                             }
                         });
                     }
+                    const funBTN = () => {
+                        gvc.addStyle(html `
+            .funInsignia{ border-radius: 10px; background: #EAEAEA; display: flex; padding: 6px 18px; justify-content:
+            center; align-items: center; gap: 8px; font-size: 16px; font-weight: 700; cursor: pointer; }
+          `);
+                        return {
+                            splitOrder: () => {
+                                return html ` <div
+                class="funInsignia"
+                style=""
+                onclick="${gvc.event(() => {
+                                    console.log('orderData -- ', orderData);
+                                    OrderSetting.splitOrder(gvc, orderData.orderData, () => gvc.notifyDataChange(vm.id));
+                                })}"
+              >
+                拆分訂單
+              </div>`;
+                            },
+                        };
+                    };
                     function getBadgeList() {
                         const vt = OrderSetting.getAllStatusBadge(orderData);
                         return html ` <div style="display: flex; gap: 10px; justify-content: flex-end;">
@@ -1649,7 +1675,7 @@ export class ShoppingOrderManager {
                                                 (() => {
                                                     let map = [];
                                                     if (orderData.orderData.user_info.invoice_method) {
-                                                        map.push(html `<div class="tx_700">發票開立資訊</div>`);
+                                                        map.push(html ` <div class="tx_700">發票開立資訊</div>`);
                                                         map.push(`開立時機: ${(() => {
                                                             switch (orderData.orderData.user_info.invoice_method) {
                                                                 case 'nouse':
@@ -1684,13 +1710,13 @@ export class ShoppingOrderManager {
                                                                         `發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`,
                                                                     ]
                                                                         .map(dd => {
-                                                                        return html `<div>${dd}</div>`;
+                                                                        return html ` <div>${dd}</div>`;
                                                                     })
                                                                         .join(BgWidget.mbContainer(8));
                                                                 default:
                                                                     return [`發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`]
                                                                         .map(dd => {
-                                                                        return html `<div>${dd}</div>`;
+                                                                        return html ` <div>${dd}</div>`;
                                                                     })
                                                                         .join(BgWidget.mbContainer(8));
                                                             }
@@ -1698,7 +1724,7 @@ export class ShoppingOrderManager {
                                                     }
                                                     return map
                                                         .map(dd => {
-                                                        return html `<div>${dd}</div>`;
+                                                        return html ` <div>${dd}</div>`;
                                                     })
                                                         .join(BgWidget.mbContainer(8));
                                                 })(),
@@ -1743,6 +1769,7 @@ export class ShoppingOrderManager {
                     ${document.body.clientWidth > 768 ? getBadgeList() : ''}
                   </div>
                   ${document.body.clientWidth > 768 ? '' : html ` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
+                  <div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
                   ${BgWidget.container1x2({
                                     html: [
                                         !is_shipment ? '' : shipment_card,
@@ -1827,15 +1854,15 @@ export class ShoppingOrderManager {
                                       </div>
                                       <div class="d-flex flex-column">
                                         ${dd.is_hidden
-                                                        ? html `<div style="width:auto;">
+                                                        ? html ` <div style="width:auto;">
                                               ${BgWidget.secondaryInsignia('隱形商品')}
                                             </div>`
                                                         : ''}
                                         <div class="tx_700 d-flex align-items-center" style="gap:4px;">
                                           <div>${dd.title}</div>
-                                          ${dd.is_gift ? html `<div>${showTag('#FFE9B2', '贈品')}</div>` : ''}
-                                          ${dd.is_add_on_items ? html `<div>${showTag('#D8E7EC', '加購品')}</div>` : ''}
-                                          ${dd.pre_order ? html `<div>${showTag('#D8E7EC', '預購')}</div>` : ''}
+                                          ${dd.is_gift ? html ` <div>${showTag('#FFE9B2', '贈品')}</div>` : ''}
+                                          ${dd.is_add_on_items ? html ` <div>${showTag('#D8E7EC', '加購品')}</div>` : ''}
+                                          ${dd.pre_order ? html ` <div>${showTag('#D8E7EC', '預購')}</div>` : ''}
                                         </div>
                                         ${dd.spec.length > 0 ? BgWidget.grayNote(dd.spec.join(', ')) : ''}
                                         ${BgWidget.grayNote(`存貨單位 (SKU)：${dd.sku && dd.sku.length > 0 ? dd.sku : '無'}`)}
@@ -1979,7 +2006,7 @@ export class ShoppingOrderManager {
                                         })
                                             .join(BgWidget.mbContainer(18))}
                             ${`${(_c = orderData.orderData.orderStatus) !== null && _c !== void 0 ? _c : 0}` === '0'
-                                            ? html `<div class="d-flex justify-content-end mt-3">
+                                            ? html ` <div class="d-flex justify-content-end mt-3">
                                   ${BgWidget.blueNote('手動調整訂單價格', gvc.event(() => {
                                                 const cloneData = orderData.orderData;
                                                 PosFunction.manualDiscount({
@@ -2171,7 +2198,7 @@ export class ShoppingOrderManager {
                                       <div>
                                         ${(cash_flow.TradeStatus === '1'
                                                             ? [
-                                                                html `<div class="d-flex align-items-center">
+                                                                html ` <div class="d-flex align-items-center">
                                                 金流交易結果:
                                                 ${(cash_flow.credit_receipt && cash_flow.credit_receipt.status) ||
                                                                     '已付款'}
@@ -2388,7 +2415,7 @@ export class ShoppingOrderManager {
                               ${invoiceDataList
                                                     .map((invoiceData) => {
                                                     var _a;
-                                                    return html `<div class="d-flex" style="height:55px;">
+                                                    return html ` <div class="d-flex" style="height:55px;">
                                     <div class="col-3 d-flex align-items-center ">
                                       ${invoiceData.create_date.split('T')[0]}
                                     </div>
@@ -2451,7 +2478,7 @@ export class ShoppingOrderManager {
                                             var _a;
                                             const renderReconciliationInfo = (orderData) => {
                                                 if (!orderData.reconciliation_date) {
-                                                    return html `<div>尚未入帳</div>`;
+                                                    return html ` <div>尚未入帳</div>`;
                                                 }
                                                 return html `
                               <div class="rounded-3 w-100 border p-2" style="background: whitesmoke;">
@@ -2510,8 +2537,8 @@ export class ShoppingOrderManager {
                                                 .slice()
                                                 .reverse()
                                                 .map(renderOffsetRecord)
-                                                .map(dd => html `<div class="w-100">${dd}</div>`)
-                                                .join(html `<div class="w-100 border-top my-2"></div>`);
+                                                .map(dd => html ` <div class="w-100">${dd}</div>`)
+                                                .join(html ` <div class="w-100 border-top my-2"></div>`);
                                             BgWidget.mainCard(html `
                             <div class="tx_700">對帳記錄</div>
                             ${BgWidget.mbContainer(18)}
@@ -2536,6 +2563,7 @@ export class ShoppingOrderManager {
                                             const source = {
                                                 pos: 'POS',
                                                 combine: '合併訂單',
+                                                split: '拆分',
                                             };
                                             return (_a = source[orderData.orderData.orderSource]) !== null && _a !== void 0 ? _a : '線上';
                                         })()}
@@ -2601,7 +2629,7 @@ export class ShoppingOrderManager {
                                                     let view = [];
                                                     if (orderData.orderData.user_info.shipment !== 'now') {
                                                         view.push([
-                                                            html `<div style="font-size: 16px;font-weight: 700;color:#393939">
+                                                            html ` <div style="font-size: 16px;font-weight: 700;color:#393939">
                                               收件人資料
                                             </div>`,
                                                             gvc.bindView(() => {
@@ -2702,7 +2730,7 @@ export class ShoppingOrderManager {
                                                                 if (formData.form) {
                                                                     mapView.push(formData.form
                                                                         .map((dd) => {
-                                                                        return html `<div class="d-flex flex-wrap w-100">
+                                                                        return html ` <div class="d-flex flex-wrap w-100">
                                                         <span class="me-2 fw-normal fs-6"
                                                           >${Language.getLanguageCustomText(dd.title)}:</span
                                                         >
@@ -3300,11 +3328,12 @@ export class ShoppingOrderManager {
                             title: '',
                             id: data.id,
                             spec: variant.spec,
-                            count: (_b = variant.qty) !== null && _b !== void 0 ? _b : "1",
+                            count: (_b = variant.qty) !== null && _b !== void 0 ? _b : '1',
                             sale_price: variant.sale_price,
-                            sku: variant.sku
+                            sku: variant.sku,
                         });
-                        orderDetail.subtotal += Number(orderDetail.lineItems[index].count) * orderDetail.lineItems[index].sale_price;
+                        orderDetail.subtotal +=
+                            Number(orderDetail.lineItems[index].count) * orderDetail.lineItems[index].sale_price;
                     });
                     if (orderDetailRefresh) {
                         dialog.dataLoading({ text: '計算中', visible: true });
@@ -3731,7 +3760,7 @@ export class ShoppingOrderManager {
                                                             .join('')}
                                                         </select>
                                                       `
-                                                        : html `<div
+                                                        : html ` <div
                                                         class="d-flex align-items-center"
                                                         style="height: 34px;color: #8D8D8D;font-size: 14px;font-weight: 400;"
                                                       >
@@ -4364,7 +4393,7 @@ export class ShoppingOrderManager {
                     }),
                 ]
                     .map(dd => {
-                    return html `<div class="col-12 col-lg-6">${dd}</div>`;
+                    return html ` <div class="col-12 col-lg-6">${dd}</div>`;
                 })
                     .join('')}
                   </div>
@@ -4451,7 +4480,7 @@ export class ShoppingOrderManager {
                                 returnHTML = html `
                             <div class="d-flex flex-column">
                               ${[
-                                    html `<div class="d-flex align-items-center pt-2">
+                                    html ` <div class="d-flex align-items-center pt-2">
                                   <img
                                     style="width: 23px;height: 23px;margin-right: 8px;"
                                     src="${(_b = ShipmentConfig.list.find(dd => {
@@ -4468,10 +4497,10 @@ export class ShoppingOrderManager {
                                     點擊更換門市
                                   </div>
                                 </div>`,
-                                    html `<div class="d-flex">門市名稱: ${orderDetail.user_info.CVSStoreName}</div>`,
-                                    html `<div class="d-flex">門市店號: ${orderDetail.user_info.CVSStoreID}</div>`,
-                                    html `<div class="d-flex">門市地址: ${orderDetail.user_info.CVSAddress}</div>`,
-                                ].join(html `<div class="my-2 w-100 border-top"></div>`)}
+                                    html ` <div class="d-flex">門市名稱: ${orderDetail.user_info.CVSStoreName}</div>`,
+                                    html ` <div class="d-flex">門市店號: ${orderDetail.user_info.CVSStoreID}</div>`,
+                                    html ` <div class="d-flex">門市地址: ${orderDetail.user_info.CVSAddress}</div>`,
+                                ].join(html ` <div class="my-2 w-100 border-top"></div>`)}
                             </div>
                           `;
                                 return html `
@@ -4540,8 +4569,6 @@ export class ShoppingOrderManager {
             passData.orderStatus = 1;
             delete passData.tag;
             passData.line_items = passData.lineItems;
-            console.log("passData -- ", passData);
-            return;
             dialog.dataLoading({ visible: true });
             if (checkOrderEmpty(passData)) {
                 ApiShop.toManualCheckout(passData).then(() => {