ts-glitter 20.4.9 → 20.5.0

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

@@ -95,7 +95,6 @@ class OrderDetail {
   }
 }
 
-
 export class ShoppingOrderManager {
   static vm = {
     page: 1,
@@ -380,8 +379,9 @@ export class ShoppingOrderManager {
                 vm.apiJSON.is_pos = vm.filter_type === 'pos';
               }
 
-              ApiShop.getOrder(vm.apiJSON).then(data => {
-                function getDatalist() {
+              ApiShop.getOrder(vm.apiJSON).then(async data => {
+                async function getDatalist() {
+                  const payment_support = await PaymentConfig.getSupportPayment();
                   return data.response.data.map((dd: any) => {
                     dd.orderData.total = dd.orderData.total || 0;
                     dd.orderData.customer_info = dd.orderData.customer_info ?? {};
@@ -461,6 +461,8 @@ export class ShoppingOrderManager {
                                     return '';
                                   }
                                   return BgWidget.primaryInsignia('POS', { type: 'border' });
+                                case 'split':
+                                  return BgWidget.warningInsignia('拆分', { type: 'border' });
                                 default:
                                   return '';
                               }
@@ -469,7 +471,7 @@ export class ShoppingOrderManager {
                         },
                         {
                           key: '訂單日期',
-                          value: html`<div style="width: 120px;">
+                          value: html` <div style="width: 120px;">
                             ${glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd')}
                           </div>`,
                         },
@@ -542,17 +544,17 @@ export class ShoppingOrderManager {
                         },
                         {
                           key: '運送方式',
-                          value: html`<div style="width: 120px;">
+                          value: html` <div style="width: 120px;">
                             ${OrderInfo.shipmetSelector(dd, OrderModule.supportShipmentMethod())}
                           </div>`,
                         },
                         {
                           key: '付款方式',
-                          value: OrderInfo.paymentSelector(gvc, dd),
+                          value: OrderInfo.paymentSelector(gvc, dd, payment_support),
                         },
                         {
                           key: '付款時間',
-                          value: html`<div style="width: 160px;">
+                          value: html` <div style="width: 160px;">
                             ${(() => {
                               if (!dd.orderData.editRecord) {
                                 return '-';
@@ -587,7 +589,7 @@ export class ShoppingOrderManager {
                 vm.dataList = data.response.data;
                 vmi.pageSize = Math.ceil(data.response.total / limit);
                 vmi.originalData = vm.dataList;
-                vmi.tableData = getDatalist();
+                vmi.tableData = await getDatalist();
                 vmi.loading = false;
                 if (vmi.pageSize != 0 && vmi.page > vmi.pageSize) {
                   ShoppingOrderManager.vm.page = 1;
@@ -1128,10 +1130,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 = orderData.orderData.progress ?? 'wait';
@@ -1198,6 +1201,28 @@ 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 as any);
           return html` <div style="display: flex; gap: 10px; justify-content: flex-end;">
@@ -1428,7 +1453,7 @@ export class ShoppingOrderManager {
                                         BgWidget.editeInput({
                                           gvc: gvc,
                                           title: '出貨單號碼',
-                                          default:   `${shipnumber ?? ''}`,
+                                          default: `${shipnumber ?? ''}`,
                                           callback: text => {
                                             shipnumber = text;
                                           },
@@ -1830,7 +1855,7 @@ export class ShoppingOrderManager {
                           let map = [];
 
                           if ((orderData.orderData.user_info as any).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 as any).invoice_method) {
@@ -1873,13 +1898,13 @@ export class ShoppingOrderManager {
                                       `發票寄送信箱: ${(orderData.orderData.user_info as any).email || '未填寫'}`,
                                     ]
                                       .map(dd => {
-                                        return html`<div>${dd}</div>`;
+                                        return html` <div>${dd}</div>`;
                                       })
                                       .join(BgWidget.mbContainer(8));
                                   default:
                                     return [`發票寄送信箱: ${(orderData.orderData.user_info as any).email || '未填寫'}`]
                                       .map(dd => {
-                                        return html`<div>${dd}</div>`;
+                                        return html` <div>${dd}</div>`;
                                       })
                                       .join(BgWidget.mbContainer(8));
                                 }
@@ -1889,7 +1914,7 @@ export class ShoppingOrderManager {
 
                           return map
                             .map(dd => {
-                              return html`<div>${dd}</div>`;
+                              return html` <div>${dd}</div>`;
                             })
                             .join(BgWidget.mbContainer(8));
                         })(),
@@ -1938,6 +1963,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: [
@@ -2023,15 +2049,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(
@@ -2183,7 +2209,7 @@ export class ShoppingOrderManager {
                               })
                               .join(BgWidget.mbContainer(18))}
                             ${`${orderData.orderData.orderStatus ?? 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(() => {
@@ -2373,7 +2399,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) ||
                                                 '已付款'}
@@ -2599,7 +2625,7 @@ export class ShoppingOrderManager {
                               </div>
                               ${invoiceDataList
                                 .map((invoiceData: any) => {
-                                  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>
@@ -2673,7 +2699,7 @@ export class ShoppingOrderManager {
                         (() => {
                           const renderReconciliationInfo = (orderData: any) => {
                             if (!orderData.reconciliation_date) {
-                              return html`<div>尚未入帳</div>`;
+                              return html` <div>尚未入帳</div>`;
                             }
 
                             return html`
@@ -2738,8 +2764,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>
@@ -2765,6 +2791,7 @@ export class ShoppingOrderManager {
                                 const source: Record<string, string> = {
                                   pos: 'POS',
                                   combine: '合併訂單',
+                                  split: '拆分',
                                 };
                                 return source[orderData.orderData.orderSource] ?? '線上';
                               })()}
@@ -2831,7 +2858,7 @@ export class ShoppingOrderManager {
                                       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(() => {
@@ -2949,7 +2976,7 @@ export class ShoppingOrderManager {
                                                 mapView.push(
                                                   formData.form
                                                     .map((dd: any) => {
-                                                      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
                                                         >
@@ -3610,11 +3637,12 @@ export class ShoppingOrderManager {
               title: '',
               id: data.id,
               spec: variant.spec,
-              count: variant.qty ?? "1",
+              count: variant.qty ?? '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) {
@@ -4051,7 +4079,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;"
                                                       >
@@ -4710,7 +4738,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>
@@ -4796,7 +4824,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="${ShipmentConfig.list.find(dd => {
@@ -4813,10 +4841,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`
@@ -4887,7 +4915,6 @@ export class ShoppingOrderManager {
             passData.orderStatus = 1;
             delete passData.tag;
             passData.line_items = passData.lineItems;
-          
             dialog.dataLoading({ visible: true });
             if (checkOrderEmpty(passData)) {
               ApiShop.toManualCheckout(passData).then(() => {

package/lowcode/cms-plugin/stock-history.js

@@ -1038,15 +1038,14 @@ export class StockHistory {
                                       class="w-100 d-flex align-items-center justify-content-center cursor_pointer"
                                       style="color: #36B; font-size: 16px; font-weight: 400;"
                                       onclick="${gvc.event(() => {
-                                                        BgWidget.variantDialog({
-                                                            gvc,
-                                                            title: '搜尋商品',
+                                                        BgProduct.productsDialog({
+                                                            gvc: gvc,
                                                             default: dvm.variantIds,
-                                                            callback: resultData => {
-                                                                alert(JSON.stringify(resultData));
-                                                                dvm.variantIds = resultData;
+                                                            with_variants: true,
+                                                            callback: (value) => __awaiter(this, void 0, void 0, function* () {
+                                                                dvm.variantIds = value;
                                                                 gvc.notifyDataChange(dvm.tableId);
-                                                            },
+                                                            }),
                                                         });
                                                     })}"
                                     >

package/lowcode/cms-plugin/stock-history.ts

@@ -1126,24 +1126,25 @@ export class StockHistory {
                                       class="w-100 d-flex align-items-center justify-content-center cursor_pointer"
                                       style="color: #36B; font-size: 16px; font-weight: 400;"
                                       onclick="${gvc.event(() => {
-                                        // BgProduct.productsDialog({
-                                        //   gvc: gvc,
-                                        //   default:  [],
-                                        //   with_variants:true,
-                                        //   callback: async value => {
-                                        //   alert(JSON.stringify(value))
-                                        //   },
-                                        // })
-                                        BgWidget.variantDialog({
-                                          gvc,
-                                          title: '搜尋商品',
-                                          default: dvm.variantIds,
-                                          callback: resultData => {
-                                            alert(JSON.stringify(resultData));
-                                            dvm.variantIds = resultData;
+                                        BgProduct.productsDialog({
+                                          gvc: gvc,
+                                          default:  dvm.variantIds,
+                                          with_variants:true,
+                                          callback: async value => {
+                                            dvm.variantIds=value
                                             gvc.notifyDataChange(dvm.tableId);
+                                          // alert(JSON.stringify(value))
                                           },
-                                        });
+                                        })
+                                        // BgWidget.variantDialog({
+                                        //   gvc,
+                                        //   title: '搜尋商品',
+                                        //   default: dvm.variantIds,
+                                        //   callback: resultData => {
+                                        //     dvm.variantIds = resultData;
+                                        //     gvc.notifyDataChange(dvm.tableId);
+                                        //   },
+                                        // });
                                       })}"
                                     >
                                       <div>新增${typeData.name}商品</div>

package/lowcode/glitter-base/route/shopping.ts

@@ -1137,7 +1137,7 @@ export class ApiShop {
     line_items: {
       id: number;
       spec: string[];
-      count: string;
+      count: number;
     }[];
     user_info: {
       shipment: string;

package/lowcode/public-components/checkout/index.js

@@ -3303,12 +3303,18 @@ export class CheckoutIndex {
                 });
                 return false;
             }
-            else if (!subData['area'] || subData['area'] === '') {
+            else if ((!subData['area'] || subData['area'] === '') && (subData['shipment'] !== 'global_express')) {
                 dialog.errorMessage({
                     text: `${Language.text('please_enter')}「${Language.text('area')}」`,
                 });
                 return false;
             }
+            else if ((!subData['state'] || subData['state'] === '') && (subData['shipment'] === 'global_express')) {
+                dialog.errorMessage({
+                    text: `${Language.text('please_enter')}「${Language.text('state')}」`,
+                });
+                return false;
+            }
         }
         else {
             delete subData['city'];

package/lowcode/public-components/checkout/index.ts

@@ -3594,11 +3594,16 @@ export class CheckoutIndex {
           text: `${Language.text('please_enter')}「${Language.text('city')}」`,
         });
         return false;
-      } else if (!subData['area'] || subData['area'] === '') {
+      } else if ((!subData['area'] || subData['area'] === '') && (subData['shipment']!=='global_express')) {
         dialog.errorMessage({
           text: `${Language.text('please_enter')}「${Language.text('area')}」`,
         });
         return false;
+      }else if ((!subData['state'] || subData['state'] === '') && (subData['shipment']==='global_express')) {
+        dialog.errorMessage({
+          text: `${Language.text('please_enter')}「${Language.text('state')}」`,
+        });
+        return false;
       }
     } else {
       delete subData['city'];

package/lowcode/public-components/user-manager/um-class.js

@@ -382,6 +382,7 @@ export class UmClass {
         const solidButtonBgr = (_e = globalValue['theme_color.0.solid-button-bg']) !== null && _e !== void 0 ? _e : '#292218';
         const solidButtonText = (_f = globalValue['theme_color.0.solid-button-text']) !== null && _f !== void 0 ? _f : '#000000';
         gvc.addStyle(`
+            
             .um-nav-title {
                 font-weight: 700;
                 font-size: 36px;

package/lowcode/public-components/user-manager/um-class.ts

@@ -401,6 +401,7 @@ export class UmClass {
         const solidButtonText = globalValue['theme_color.0.solid-button-text'] ?? '#000000';
 
         gvc.addStyle(`
+            
             .um-nav-title {
                 font-weight: 700;
                 font-size: 36px;

package/lowcode/public-components/user-manager/um-order.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { UmClass } from './um-class.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
 import { ApiShop } from '../../glitter-base/route/shopping.js';
-import { ApiCart } from '../../glitter-base/route/api-cart.js';
 import { Ad } from '../public/ad.js';
 import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
 import { FormWidget } from '../../official_view_component/official/form.js';
@@ -172,12 +171,33 @@ export class UMOrder {
         cursor: pointer;
       }
       .customer-btn-text {
+        line-height:normal;
         text-align: center;
         color: white;
         font-size: 14px;
         font-weight: 400;
         letter-spacing: 0.56px;
       }
+      
+      .payment-section {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 20px;
+      }
+      #repay-button {
+        height:32px;
+        
+        background-color: #4caf50;
+        color: white;
+        border-radius:10px;
+        padding: 6px 14px;
+        border: none;
+        cursor: pointer;
+      }
+      
+      #repay-button:hover {
+        background-color: #45a049;
+      }
     `);
     }
     static repay(gvc, id) {
@@ -191,7 +211,6 @@ export class UMOrder {
                 const id = gvc.glitter.getUUID();
                 $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
                 document.querySelector(`#${id} #submit`).click();
-                new ApiCart().clearCart();
             });
         });
     }
@@ -229,6 +248,7 @@ export class UMOrder {
             type: '',
             formList: [],
         };
+        const repayArray = ['ecPay', 'newWebPay', 'paypal', 'jkopay', 'paynow', 'line_pay'];
         return html ` <div class="container py-4">
       ${gvc.bindView({
             bind: ids.view,
@@ -724,11 +744,24 @@ export class UMOrder {
                             {
                                 title: Language.text('payment_status'),
                                 value: (() => {
+                                    var _a, _b;
                                     if (orderData.customer_info.payment_select === 'cash_on_delivery') {
                                         return Language.text('cash_on_delivery');
                                     }
                                     switch (vm.data.status) {
                                         case 0:
+                                            if (repayArray.includes((_b = (_a = vm.data) === null || _a === void 0 ? void 0 : _a.payment_method) !== null && _b !== void 0 ? _b : '')) {
+                                                const repayBtn = () => {
+                                                    return html ` 
+                                  <span class="payment-actions">
+                                    <button class="d-none customer-btn-text ms-3" id="repay-button" onclick="${gvc.event(() => {
+                                                        UMOrder.repay(gvc, vm.data.cart_token).then(r => {
+                                                        });
+                                                    })}">重新付款</button>
+                                  </span>`;
+                                                };
+                                                return Language.text('awaiting_verification') + repayBtn();
+                                            }
                                             return orderData.proof_purchase
                                                 ? Language.text('awaiting_verification')
                                                 : `${Language.text('unpaid')}${gotoCheckout()}`;

package/lowcode/public-components/user-manager/um-order.ts

@@ -14,6 +14,7 @@ const html = String.raw;
 const css = String.raw;
 
 interface Order {
+  payment_method?: string;
   id: number;
   cart_token: string;
   status: number;
@@ -23,6 +24,7 @@ interface Order {
 }
 
 interface OrderData {
+  payment_method: string;
   email: string;
   total: number;
   method: string;
@@ -408,12 +410,33 @@ export class UMOrder {
         cursor: pointer;
       }
       .customer-btn-text {
+        line-height:normal;
         text-align: center;
         color: white;
         font-size: 14px;
         font-weight: 400;
         letter-spacing: 0.56px;
       }
+      
+      .payment-section {
+        border: 1px solid #ccc;
+        padding: 10px;
+        margin-bottom: 20px;
+      }
+      #repay-button {
+        height:32px;
+        
+        background-color: #4caf50;
+        color: white;
+        border-radius:10px;
+        padding: 6px 14px;
+        border: none;
+        cursor: pointer;
+      }
+      
+      #repay-button:hover {
+        background-color: #45a049;
+      }
     `);
   }
 
@@ -430,7 +453,6 @@ export class UMOrder {
         const id = gvc.glitter.getUUID();
         $('body').append(`<div id="${id}" style="display: none;">${res.response.form}</div>`);
         (document.querySelector(`#${id} #submit`) as any).click();
-        new ApiCart().clearCart();
       });
     });
   }
@@ -682,6 +704,8 @@ export class UMOrder {
       type: '',
       formList: [] as any,
     };
+    //判定可以重新付款的付款方式
+    const repayArray = ['ecPay', 'newWebPay', 'paypal', 'jkopay', 'paynow', 'line_pay'];
 
     return html` <div class="container py-4">
       ${gvc.bindView({
@@ -955,7 +979,6 @@ export class UMOrder {
                 </section>
               `;
             }
-
             return html`
               <section class="o-h1">${Language.text('order_number')}<br />#${vm.data.cart_token}</section>
               <section class="o-card">
@@ -1224,6 +1247,19 @@ export class UMOrder {
                           }
                           switch (vm.data.status) {
                             case 0:
+                              if (repayArray.includes(vm.data?.payment_method ?? '')) {
+                                const repayBtn = () => {
+                                  return html` 
+                                  <span class="payment-actions">
+                                    <button class="d-none customer-btn-text ms-3" id="repay-button" onclick="${gvc.event(()=>{
+                                      UMOrder.repay(gvc, vm.data.cart_token).then(r => {
+                                       
+                                      });
+                                    })}">重新付款</button>
+                                  </span>`;
+                                };
+                                return Language.text('awaiting_verification') + repayBtn();
+                              }
                               return orderData.proof_purchase
                                 ? Language.text('awaiting_verification')
                                 : `${Language.text('unpaid')}${gotoCheckout()}`;
@@ -1407,9 +1443,9 @@ export class UMOrder {
                           case 'finish':
                             return Language.text('picked_up');
                           case 'arrived':
-                            if(ShipmentConfig.supermarketList.includes(orderData.user_info.shipment)){
+                            if (ShipmentConfig.supermarketList.includes(orderData.user_info.shipment)) {
                               return Language.text('delivered_stored');
-                            }else{
+                            } else {
                               return Language.text('delivered');
                             }
                           case 'returns':