ts-glitter 20.8.7 → 20.8.9

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

@@ -672,8 +672,8 @@ export class CheckoutIndex {
                     <div>${Language.text('total_products')}</div>
                     <div>
                       ${Currency.convertCurrencyText(
-                        vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.discount + vm.cartData.use_rebate
-                      )}
+                  vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.discount + vm.cartData.use_rebate
+                )}
                     </div>
                   </div>
                   <div class="${gClass(['price-row', 'text-2'])}">
@@ -689,71 +689,71 @@ export class CheckoutIndex {
                     <div
                       style="cursor: pointer; color: #3564c0;"
                       onclick="${gvc.event(() => {
-                        this.viewDialog({
-                          gvc: gvc,
-                          title: Language.text('available_coupons'),
-                          tag: '',
-                          innerHTML: (gvc: GVC) => {
-                            return gvc.bindView(
-                              (() => {
-                                const id = glitter.getUUID();
-                                const vmi = {
-                                  dataList: [] as Voucher[],
-                                };
-                                const isWebsite = document.body.clientWidth > 768;
-                                let loading = true;
-                                return {
-                                  bind: id,
-                                  view: () => {
-                                    try {
-                                      if (loading) {
-                                        return html` <div style="height: 400px">${spinner()}</div>`;
-                                      } else {
-                                        const header = [
-                                          {
-                                            title: Language.text('coupon_name'),
-                                          },
-                                          {
-                                            title: Language.text('coupon_code'),
-                                          },
-                                          {
-                                            title: Language.text('expiration_date'),
-                                          },
-                                          {
-                                            title: '',
-                                          },
-                                        ];
-
-                                        function formatText(item: UserVoucher) {
-                                          return [
-                                            item.title,
-                                            item.code,
-                                            (() => {
-                                              const endText = item.end_ISO_Date
-                                                ? glitter.ut.dateFormat(new Date(item.end_ISO_Date), 'yyyy/MM/dd')
-                                                : Language.text('no_expiration');
-                                              return `${glitter.ut.dateFormat(
-                                                new Date(item.start_ISO_Date),
-                                                'yyyy/MM/dd'
-                                              )} ~ ${endText}`;
-                                            })(),
-                                            item.usePass
-                                              ? html` <button
+                  this.viewDialog({
+                    gvc: gvc,
+                    title: Language.text('available_coupons'),
+                    tag: '',
+                    innerHTML: (gvc: GVC) => {
+                      return gvc.bindView(
+                        (() => {
+                          const id = glitter.getUUID();
+                          const vmi = {
+                            dataList: [] as Voucher[],
+                          };
+                          const isWebsite = document.body.clientWidth > 768;
+                          let loading = true;
+                          return {
+                            bind: id,
+                            view: () => {
+                              try {
+                                if (loading) {
+                                  return html` <div style="height: 400px">${spinner()}</div>`;
+                                } else {
+                                  const header = [
+                                    {
+                                      title: Language.text('coupon_name'),
+                                    },
+                                    {
+                                      title: Language.text('coupon_code'),
+                                    },
+                                    {
+                                      title: Language.text('expiration_date'),
+                                    },
+                                    {
+                                      title: '',
+                                    },
+                                  ];
+
+                                  function formatText(item: UserVoucher) {
+                                    return [
+                                      item.title,
+                                      item.code,
+                                      (() => {
+                                        const endText = item.end_ISO_Date
+                                          ? glitter.ut.dateFormat(new Date(item.end_ISO_Date), 'yyyy/MM/dd')
+                                          : Language.text('no_expiration');
+                                        return `${glitter.ut.dateFormat(
+                                          new Date(item.start_ISO_Date),
+                                          'yyyy/MM/dd'
+                                        )} ~ ${endText}`;
+                                      })(),
+                                      item.usePass
+                                        ? html` <button
                                                   class="${gClass('button-bgr')} my-2"
                                                   style="max-width: 150px;"
                                                   onclick="${gvc.event(() => {
-                                                    apiCart.setCart(cartItem => {
-                                                      cartItem.code = item.code;
-                                                      refreshCartData();
-                                                      gvc.closeDialog();
-                                                    });
-                                                  })}"
+                                          apiCart.setCart(cartItem => {
+                                            cartItem.code = item.code;
+                                            refreshCartData();
+                                            gvc.closeDialog();
+                                          });
+                                        })}"
                                                 >
                                                   <span class="${gClass('button-text')}"
                                                     >${Language.text('select_to_use')}</span
                                                   >
                                                 </button>`
-                                              : html` <button
+                                        : html` <button
                                                   class="${gClass('button-bgr-disable')} my-2"
                                                   style="max-width: 150px; cursor: not-allowed"
                                                 >
@@ -761,41 +761,41 @@ export class CheckoutIndex {
                                                     >${Language.text('not_meet_usage_criteria')}</span
                                                   >
                                                 </button>`,
-                                          ];
-                                        }
+                                    ];
+                                  }
 
-                                        const dialog = new ShareDialog(gvc.glitter);
-                                        const cloneCart = JSON.parse(JSON.stringify(vm.cartData));
-
-                                        function checkCodeValue(code: string) {
-                                          cloneCart.code = code;
-                                          cloneCart.line_items = cloneCart.lineItems;
-                                          dialog.dataLoading({ visible: true });
-                                          ApiShop.getCheckout(cloneCart).then(r => {
-                                            dialog.dataLoading({ visible: false });
-                                            if (
-                                              r.result &&
-                                              r.response.data &&
-                                              r.response.data.voucherList.some((dd: any) => {
-                                                return dd.code === code;
-                                              })
-                                            ) {
-                                              apiCart.setCart(cartItem => {
-                                                cartItem.code = code;
-                                                refreshCartData();
-                                                gvc.closeDialog();
-                                              });
-                                            } else {
-                                              dialog.errorMessage({
-                                                text: Language.text('code_unusable'),
-                                              });
-                                            }
-                                          });
-                                        }
+                                  const dialog = new ShareDialog(gvc.glitter);
+                                  const cloneCart = JSON.parse(JSON.stringify(vm.cartData));
+
+                                  function checkCodeValue(code: string) {
+                                    cloneCart.code = code;
+                                    cloneCart.line_items = cloneCart.lineItems;
+                                    dialog.dataLoading({ visible: true });
+                                    ApiShop.getCheckout(cloneCart).then(r => {
+                                      dialog.dataLoading({ visible: false });
+                                      if (
+                                        r.result &&
+                                        r.response.data &&
+                                        r.response.data.voucherList.some((dd: any) => {
+                                          return dd.code === code;
+                                        })
+                                      ) {
+                                        apiCart.setCart(cartItem => {
+                                          cartItem.code = code;
+                                          refreshCartData();
+                                          gvc.closeDialog();
+                                        });
+                                      } else {
+                                        dialog.errorMessage({
+                                          text: Language.text('code_unusable'),
+                                        });
+                                      }
+                                    });
+                                  }
 
-                                        if (isWebsite) {
-                                          const flexList = [1.2, 1, 1.5, 1.5];
-                                          return html`
+                                  if (isWebsite) {
+                                    const flexList = [1.2, 1, 1.5, 1.5];
+                                    return html`
                                             <div>
                                               <div class="d-flex align-items-center mb-2">
                                                 <label class="${gClass('label')} mb-0 me-2" style="min-width: 80px;"
@@ -805,41 +805,41 @@ export class CheckoutIndex {
                                                   class="${gClass('input')}"
                                                   type="text"
                                                   onchange="${gvc.event(e => {
-                                                    checkCodeValue(e.value);
-                                                  })}"
+                                      checkCodeValue(e.value);
+                                    })}"
                                                 />
                                               </div>
                                             </div>
                                             <div class="w-100 d-sm-flex py-4 um-th-bar">
                                               ${header
-                                                .map((item, index) => {
-                                                  return html` <div class="um-th" style="flex: ${flexList[index]};">
+                                      .map((item, index) => {
+                                        return html` <div class="um-th" style="flex: ${flexList[index]};">
                                                     ${item.title}
                                                   </div>`;
-                                                })
-                                                .join('')}
+                                      })
+                                      .join('')}
                                             </div>
                                             ${vmi.dataList
-                                              .map((item, t1) => {
-                                                const fText = formatText(item.content);
-                                                return html` <div class="w-100 d-sm-flex py-1 align-items-center">
+                                      .map((item, t1) => {
+                                        const fText = formatText(item.content);
+                                        return html` <div class="w-100 d-sm-flex py-1 align-items-center">
                                                   ${fText
-                                                    .map((dd, t2) => {
-                                                      return html` <div
+                                          .map((dd, t2) => {
+                                            return html` <div
                                                         class="um-td ${t2 === fText.length - 1 ? 'text-center' : ''}"
                                                         style="flex: ${flexList[t2]}"
                                                       >
                                                         ${dd}
                                                       </div>`;
-                                                    })
-                                                    .join('')}
+                                          })
+                                          .join('')}
                                                 </div>`;
-                                              })
-                                              .join('')}
+                                      })
+                                      .join('')}
                                           `;
-                                        }
+                                  }
 
-                                        return html` <div>
+                                  return html` <div>
                                           <div class="d-flex flex-column flex-sm-row align-items-center ">
                                             <div class="d-flex align-items-center">
                                               <input
@@ -852,8 +852,8 @@ export class CheckoutIndex {
                                                 class="${gClass('button-bgr')}"
                                                 style="width:100px;border-top-left-radius: 0;border-bottom-left-radius: 0px;"
                                                 onclick="${gvc.event(e => {
-                                                  checkCodeValue(e.value);
-                                                })}"
+                                    checkCodeValue(e.value);
+                                  })}"
                                               >
                                                 <span class="${gClass('button-text')}"
                                                   >${Language.text('confirm')}</span
@@ -863,151 +863,151 @@ export class CheckoutIndex {
                                           </div>
                                           <div class="w-100 d-sm-none mb-3 s162413">
                                             ${vmi.dataList
-                                              .map(item => {
-                                                return html` <div class="um-mobile-area">
+                                    .map(item => {
+                                      return html` <div class="um-mobile-area">
                                                   ${formatText(item.content)
-                                                    .map((dd, index) => {
-                                                      if (header[index].title === '') {
-                                                        return dd;
-                                                      }
-                                                      return html` <div class="um-mobile-text">
+                                        .map((dd, index) => {
+                                          if (header[index].title === '') {
+                                            return dd;
+                                          }
+                                          return html` <div class="um-mobile-text">
                                                         ${header[index].title} : ${dd}
                                                       </div>`;
-                                                    })
-                                                    .join('')}
+                                        })
+                                        .join('')}
                                                 </div>`;
-                                              })
-                                              .join('')}
+                                    })
+                                    .join('')}
                                           </div>
                                         </div>`;
-                                      }
-                                    } catch (e) {
-                                      return ``;
-                                    }
-                                  },
-                                  divCreate: {},
-                                  onCreate: () => {
-                                    if (loading) {
-                                      function isNowBetweenDates(startIso: string, endIso: string): boolean {
-                                        const now = new Date();
-                                        const startDate = new Date(startIso);
-                                        const endDate = new Date(endIso);
-
-                                        // 確保 `startIso` 和 `endIso` 是有效的日期
-                                        if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
-                                          return true;
-                                        }
+                                }
+                              } catch (e) {
+                                return ``;
+                              }
+                            },
+                            divCreate: {},
+                            onCreate: () => {
+                              if (loading) {
+                                function isNowBetweenDates(startIso: string, endIso: string): boolean {
+                                  const now = new Date();
+                                  const startDate = new Date(startIso);
+                                  const endDate = new Date(endIso);
+
+                                  // 確保 `startIso` 和 `endIso` 是有效的日期
+                                  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+                                    return true;
+                                  }
 
-                                        // 判斷現在時間是否在範圍內
-                                        return now >= startDate && now <= endDate;
-                                      }
+                                  // 判斷現在時間是否在範圍內
+                                  return now >= startDate && now <= endDate;
+                                }
 
-                                      gvc.addMtScript(
-                                        [
-                                          {
-                                            src: `${gvc.glitter.root_path}/jslib/lottie-player.js`,
-                                          },
-                                        ],
-                                        () => {
-                                          ApiShop.getVoucher({
-                                            page: 0,
-                                            limit: 10000,
-                                            data_from: 'user',
-                                          }).then(async res => {
-                                            if (res.result && res.response.data) {
-                                              vmi.dataList = res.response.data.filter((item: Voucher) => {
-                                                return (
-                                                  item.content.trigger === 'code' &&
-                                                  isNowBetweenDates(
-                                                    item.content.start_ISO_Date,
-                                                    item.content.end_ISO_Date
-                                                  )
-                                                );
+                                gvc.addMtScript(
+                                  [
+                                    {
+                                      src: `${gvc.glitter.root_path}/jslib/lottie-player.js`,
+                                    },
+                                  ],
+                                  () => {
+                                    ApiShop.getVoucher({
+                                      page: 0,
+                                      limit: 10000,
+                                      data_from: 'user',
+                                    }).then(async res => {
+                                      if (res.result && res.response.data) {
+                                        vmi.dataList = res.response.data.filter((item: Voucher) => {
+                                          return (
+                                            item.content.trigger === 'code' &&
+                                            isNowBetweenDates(
+                                              item.content.start_ISO_Date,
+                                              item.content.end_ISO_Date
+                                            )
+                                          );
+                                        });
+                                      } else {
+                                        vmi.dataList = [];
+                                      }
+                                      const cloneCart = JSON.parse(JSON.stringify(vm.cartData));
+                                      Promise.all(
+                                        vmi.dataList.map((voucher, index) => {
+                                          return new Promise<{
+                                            code: string;
+                                            response: any;
+                                          }>(resolve => {
+                                            const code = voucher.content.code;
+                                            cloneCart.code = code;
+                                            cloneCart.line_items = cloneCart.lineItems;
+                                            ApiShop.getCheckout(cloneCart).then(response => {
+                                              resolve({
+                                                code,
+                                                response,
                                               });
-                                            } else {
-                                              vmi.dataList = [];
-                                            }
-                                            const cloneCart = JSON.parse(JSON.stringify(vm.cartData));
-                                            Promise.all(
-                                              vmi.dataList.map((voucher, index) => {
-                                                return new Promise<{
-                                                  code: string;
-                                                  response: any;
-                                                }>(resolve => {
-                                                  const code = voucher.content.code;
-                                                  cloneCart.code = code;
-                                                  cloneCart.line_items = cloneCart.lineItems;
-                                                  ApiShop.getCheckout(cloneCart).then(response => {
-                                                    resolve({
-                                                      code,
-                                                      response,
-                                                    });
-                                                  });
-                                                });
-                                              })
-                                            ).then(
-                                              (
-                                                resolveArray: {
-                                                  code: string;
-                                                  response: any;
-                                                }[]
-                                              ) => {
-                                                vmi.dataList = vmi.dataList.map(item => {
-                                                  const f = resolveArray.find(res => {
-                                                    return item.content.code === res.code;
-                                                  });
-                                                  if (f) {
-                                                    const r = f.response;
-                                                    if (r.result && r.response.data) {
-                                                      item.content.usePass = r.response.data.voucherList.some(
-                                                        (dd: any) => {
-                                                          return dd.code === f.code;
-                                                        }
-                                                      );
-                                                    }
+                                            });
+                                          });
+                                        })
+                                      ).then(
+                                        (
+                                          resolveArray: {
+                                            code: string;
+                                            response: any;
+                                          }[]
+                                        ) => {
+                                          vmi.dataList = vmi.dataList.map(item => {
+                                            const f = resolveArray.find(res => {
+                                              return item.content.code === res.code;
+                                            });
+                                            if (f) {
+                                              const r = f.response;
+                                              if (r.result && r.response.data) {
+                                                item.content.usePass = r.response.data.voucherList.some(
+                                                  (dd: any) => {
+                                                    return dd.code === f.code;
                                                   }
-                                                  return item;
-                                                });
-                                                loading = false;
-                                                gvc.notifyDataChange(id);
+                                                );
                                               }
-                                            );
+                                            }
+                                            return item;
                                           });
-                                        },
-                                        () => {}
+                                          loading = false;
+                                          gvc.notifyDataChange(id);
+                                        }
                                       );
-                                    }
+                                    });
                                   },
-                                };
-                              })()
-                            );
-                          },
-                        });
-                      })}"
+                                  () => {}
+                                );
+                              }
+                            },
+                          };
+                        })()
+                      );
+                    },
+                  });
+                })}"
                     >
                       ${vm.cartData.code
-                        ? html`${vm.cartData.code}<i
+                  ? html`${vm.cartData.code}<i
                               class="fa-solid fa-xmark-large ms-2"
                               style="cursor: pointer;"
                               onclick="${gvc.event((e, event) => {
-                                event.stopPropagation();
-                                apiCart.setCart(cartItem => {
-                                  cartItem.code = '';
-                                  refreshCartData();
-                                });
-                              })}"
+                    event.stopPropagation();
+                    apiCart.setCart(cartItem => {
+                      cartItem.code = '';
+                      refreshCartData();
+                    });
+                  })}"
                             ></i>`
-                        : Language.text('add')}
+                  : Language.text('add')}
                     </div>
                   </div>
                   ${(() => {
-                    if (!GlobalUser.token || !vm.cartData.useRebateInfo.status) {
-                      return ``;
-                    } else {
-                      return html` ${(() => {
-                          let tempRebate: number = 0;
-                          const dialog = new ShareDialog(gvc.glitter);
-                          return html` <div class="${gClass(['price-row', 'text-2'])}">
+                  if (!GlobalUser.token || !vm.cartData.useRebateInfo.status) {
+                    return ``;
+                  } else {
+                    return html` ${(() => {
+                      let tempRebate: number = 0;
+                      const dialog = new ShareDialog(gvc.glitter);
+                      return html` <div class="${gClass(['price-row', 'text-2'])}">
                               <div>${vm.rebateConfig.title}${Language.text('discount')}</div>
                               <div>- ${Currency.convertCurrencyText(vm.cartData.use_rebate)}</div>
                             </div>
@@ -1019,110 +1019,110 @@ export class CheckoutIndex {
                             <div class="${gClass(['price-row', 'text-2'])}">
                               <div
                                 style="  justify-content: flex-start; align-items: center; display: inline-flex;border:1px solid #EAEAEA;border-radius: 10px;overflow: hidden; ${document
-                                  .body.clientWidth > 768
-                                  ? 'gap: 18px;'
-                                  : 'gap: 0px;'}"
+                        .body.clientWidth > 768
+                        ? 'gap: 18px;'
+                        : 'gap: 0px;'}"
                                 class="w-100"
                               >
                                 <input
                                   class="flex-fill ${gClass('group-input')}"
                                   placeholder="${Language.text('please_enter')}${vm.rebateConfig.title}"
                                   style="${document.body.clientWidth < 800
-                                    ? `width:calc(100% - 150px) !important;`
-                                    : ``}"
+                        ? `width:calc(100% - 150px) !important;`
+                        : ``}"
                                   value="${vm.cartData.use_rebate || ''}"
                                   onchange="${gvc.event((e, event) => {
-                                    if (CheckInput.isNumberString(e.value)) {
-                                      tempRebate = parseInt(e.value, 10);
-                                    } else {
-                                      dialog.errorMessage({ text: Language.text('enter_value') });
-                                      gvc.notifyDataChange(ids.page);
-                                    }
-                                  })}"
+                        if (CheckInput.isNumberString(e.value)) {
+                          tempRebate = parseInt(e.value, 10);
+                        } else {
+                          dialog.errorMessage({ text: Language.text('enter_value') });
+                          gvc.notifyDataChange(ids.page);
+                        }
+                      })}"
                                 />
                                 <div class="${gClass('group-button')}">
                                   <div
                                     class="${gClass('button-text')}"
                                     onclick="${gvc.event(async () => {
-                                      const sum: number = await new Promise((resolve, reject) => {
-                                        ApiShop.getRebate({}).then(async res => {
-                                          if (res.result && res.response.sum) {
-                                            resolve(res.response.sum);
-                                          } else {
-                                            resolve(0);
-                                          }
-                                        });
-                                      });
-                                      const limit =
-                                        vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.use_rebate;
-                                      if (sum === 0) {
-                                        dialog.errorMessage({
-                                          text: `您的 ${vm.rebateConfig.title} 為 0 點，無法折抵`,
-                                        });
-                                        return;
-                                      }
-                                      if (tempRebate > Math.min(sum, limit)) {
-                                        dialog.errorMessage({
-                                          text: `${Language.text('please_enter')} 0 到 ${Math.min(sum, limit)} 的數值`,
-                                        });
-                                        return;
-                                      }
-
-                                      apiCart.setCart(cartItem => {
-                                        cartItem.use_rebate = tempRebate;
-                                        refreshCartData();
-                                      });
-                                    })}"
+                        const sum: number = await new Promise((resolve, reject) => {
+                          ApiShop.getRebate({}).then(async res => {
+                            if (res.result && res.response.sum) {
+                              resolve(res.response.sum);
+                            } else {
+                              resolve(0);
+                            }
+                          });
+                        });
+                        const limit =
+                          vm.cartData.total - vm.cartData.shipment_fee + vm.cartData.use_rebate;
+                        if (sum === 0) {
+                          dialog.errorMessage({
+                            text: `您的 ${vm.rebateConfig.title} 為 0 點，無法折抵`,
+                          });
+                          return;
+                        }
+                        if (tempRebate > Math.min(sum, limit)) {
+                          dialog.errorMessage({
+                            text: `${Language.text('please_enter')} 0 到 ${Math.min(sum, limit)} 的數值`,
+                          });
+                          return;
+                        }
+
+                        apiCart.setCart(cartItem => {
+                          cartItem.use_rebate = tempRebate;
+                          refreshCartData();
+                        });
+                      })}"
                                   >
                                     ${Language.text('apply')}
                                   </div>
                                 </div>
                               </div>
                             </div>`;
-                        })()}
+                    })()}
                         <div class="${gClass(['price-row', 'text-2'])}">
                           ${(() => {
-                            return gvc.bindView(() => {
-                              return {
-                                bind: gvc.glitter.getUUID(),
-                                view: async () => {
-                                  const sum = await new Promise((resolve, reject) => {
-                                    ApiShop.getRebate({}).then(async res => {
-                                      if (res.result && res.response.sum) {
-                                        resolve(res.response.sum);
-                                      } else {
-                                        resolve(0);
-                                      }
-                                    });
-                                  });
-                                  if (!vm.cartData.useRebateInfo) {
-                                    return '';
-                                  }
+                      return gvc.bindView(() => {
+                        return {
+                          bind: gvc.glitter.getUUID(),
+                          view: async () => {
+                            const sum = await new Promise((resolve, reject) => {
+                              ApiShop.getRebate({}).then(async res => {
+                                if (res.result && res.response.sum) {
+                                  resolve(res.response.sum);
+                                } else {
+                                  resolve(0);
+                                }
+                              });
+                            });
+                            if (!vm.cartData.useRebateInfo) {
+                              return '';
+                            }
 
-                                  const info = vm.cartData.useRebateInfo;
-                                  if (info.condition) {
-                                    return html`${Language.text('distance_from_target_amount')}$
+                            const info = vm.cartData.useRebateInfo;
+                            if (info.condition) {
+                              return html`${Language.text('distance_from_target_amount')}$
                                     ${info.condition.toLocaleString()} ${Language.text('can_use_now')}
                                     ${vm.rebateConfig.title} ${Language.text('discount')}`;
-                                  }
-                                  if (info.limit) {
-                                    return html`${Language.text('remaining_balance')} ${sum || 0}
+                            }
+                            if (info.limit) {
+                              return html`${Language.text('remaining_balance')} ${sum || 0}
                                       ${Language.text('point')} ${vm.rebateConfig.title} <br />${Language.text(
-                                        'max_discount_order'
-                                      )}
+                                'max_discount_order'
+                              )}
                                       ${info.limit.toLocaleString()} ${Language.text('point')} ${vm.rebateConfig.title}`;
-                                  } else {
-                                    return `${Language.text('remaining_balance')} ${sum || 0} ${Language.text('point')} ${
-                                      vm.rebateConfig.title
-                                    }`;
-                                  }
-                                },
-                              };
-                            });
-                          })()}
+                            } else {
+                              return `${Language.text('remaining_balance')} ${sum || 0} ${Language.text('point')} ${
+                                vm.rebateConfig.title
+                              }`;
+                            }
+                          },
+                        };
+                      });
+                    })()}
                         </div>`;
-                    }
-                  })()}
+                  }
+                })()}
                 </div>`;
                 if (!widget.share.receipt_form) {
                   const res = await ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager');
@@ -1163,108 +1163,108 @@ export class CheckoutIndex {
 
                 return html` <div class="w-100" style="margin-top:0 !important;">
                   ${gvc.bindView(
-                    (() => {
-                      return {
-                        bind: ids.cart,
-                        view: () => {
-                          let padding = (document.body.clientWidth - 1200) / 2;
-                          if (gvc.glitter.getUrlParameter('page') !== 'checkout') {
-                            padding = 0;
-                          }
-                          const shipmentSupportSet = new Set(vm.cartData.shipment_support);
-
-                          console.log(`shipmentSupportSet==>`,shipmentSupportSet)
-                          const shipmentList = this.getShipmentMethod(vm.cartData).filter((dd: { value: string }) =>
-                            shipmentSupportSet.has(dd.value)
-                          );
-                          console.log(`cartData.shipment_selector=>`, vm.cartData.shipment_selector);
-                          console.log(`shipmentSupportSet=>`, shipmentSupportSet);
-                          console.log(`shipmentList==>`, shipmentList);
-                          const localShip = shipmentSupportSet.has(localStorage.getItem('shipment-select'));
-                          if (shipmentList.length === 0) {
-                            vm.cartData.user_info.shipment = 'none';
-                            localStorage.setItem('shipment-select', 'none');
-                          } else if (localShip) {
-                            vm.cartData.user_info.shipment = localStorage.getItem('shipment-select');
-                          } else {
-                            vm.cartData.user_info.shipment = shipmentList[0].value;
-                            localStorage.setItem('shipment-select', shipmentList[0].value);
-                          }
-
-                          return html`
+                  (() => {
+                    return {
+                      bind: ids.cart,
+                      view: () => {
+                        let padding = (document.body.clientWidth - 1200) / 2;
+                        if (gvc.glitter.getUrlParameter('page') !== 'checkout') {
+                          padding = 0;
+                        }
+                        const shipmentSupportSet = new Set(vm.cartData.shipment_support);
+
+                        console.log(`shipmentSupportSet==>`,shipmentSupportSet)
+                        const shipmentList = this.getShipmentMethod(vm.cartData).filter((dd: { value: string }) =>
+                          shipmentSupportSet.has(dd.value)
+                        );
+                        console.log(`cartData.shipment_selector=>`, vm.cartData.shipment_selector);
+                        console.log(`shipmentSupportSet=>`, shipmentSupportSet);
+                        console.log(`shipmentList==>`, shipmentList);
+                        const localShip = shipmentSupportSet.has(localStorage.getItem('shipment-select'));
+                        if (shipmentList.length === 0) {
+                          vm.cartData.user_info.shipment = 'none';
+                          localStorage.setItem('shipment-select', 'none');
+                        } else if (localShip) {
+                          vm.cartData.user_info.shipment = localStorage.getItem('shipment-select');
+                        } else {
+                          vm.cartData.user_info.shipment = shipmentList[0].value;
+                          localStorage.setItem('shipment-select', shipmentList[0].value);
+                        }
+
+                        return html`
                             <div
                               class="d-flex flex-column flex-md-row justify-content-between w-100"
                               style="${document.body.clientWidth > 800 &&
-                              gvc.glitter.getUrlParameter('page') === 'checkout'
-                                ? `height:calc(100vh - 150px);overflow-y:auto;`
-                                : `gap:20px;`} padding-left:${padding > 0 ? padding : 10}px;padding-right:${padding > 0
-                                ? padding
-                                : 10}px;"
+                        gvc.glitter.getUrlParameter('page') === 'checkout'
+                          ? `height:calc(100vh - 150px);overflow-y:auto;`
+                          : `gap:20px;`} padding-left:${padding > 0 ? padding : 10}px;padding-right:${padding > 0
+                          ? padding
+                          : 10}px;"
                             >
                               <div
                                 style="${document.body.clientWidth > 800
-                                  ? `width:calc(66% - 10px);`
-                                  : `width:calc(100%);`}"
+                          ? `width:calc(66% - 10px);`
+                          : `width:calc(100%);`}"
                               >
                                 <div
                                   style="padding-top:20px;"
                                   class="${gClass('banner-text')} fs-4 mb-3 pt-3 ${gvc.glitter.getUrlParameter(
-                                    'page'
-                                  ) === 'checkout'
-                                    ? ``
-                                    : `d-none`}"
+                          'page'
+                        ) === 'checkout'
+                          ? ``
+                          : `d-none`}"
                                 >
                                   ${Language.text(
-                                    ApiCart.checkoutCart === ApiCart.buyItNow ? 'buy_it_now' : 'your_shopping_cart'
-                                  )}
+                          ApiCart.checkoutCart === ApiCart.buyItNow ? 'buy_it_now' : 'your_shopping_cart'
+                        )}
                                 </div>
                                 <div style="" class="rounded-3 bg-white w-100 ">
                                   ${gvc.bindView({
-                                    bind: glitter.getUUID(),
-                                    view: () => {
-                                      try {
-                                        return vm.cartData.lineItems
-                                          .map((item: any, index: number) => {
-                                            // min_qty
-                                            function getBadgeClass() {
-                                              if (item.is_add_on_items) {
-                                                return addItemBadge();
-                                              } else if (item.is_gift) {
-                                                return giftBadge();
-                                              } else if (item.is_hidden) {
-                                                return hiddenBadge();
-                                              } else {
-                                                return ``;
-                                              }
-                                            }
+                          bind: glitter.getUUID(),
+                          view: () => {
+                            try {
+                              return vm.cartData.lineItems
+                                .map((item: any, index: number) => {
+                                  // min_qty
+                                  function getBadgeClass() {
+                                    if (item.is_add_on_items) {
+                                      return addItemBadge();
+                                    } else if (item.is_gift) {
+                                      return giftBadge();
+                                    } else if (item.is_hidden) {
+                                      return hiddenBadge();
+                                    } else {
+                                      return ``;
+                                    }
+                                  }
 
-                                            const title =
-                                              (item.language_data &&
-                                                item.language_data[Language.getLanguage()].title) ||
-                                              item.title;
-                                            const spec = (() => {
-                                              if (item.spec) {
-                                                return item.spec.map((dd: string, index: number) => {
-                                                  try {
-                                                    return (
-                                                      item.specs[index].option.find((d1: any) => {
-                                                        return d1.title === dd;
-                                                      }).language_title[Language.getLanguage()] || dd
-                                                    );
-                                                  } catch (e) {
-                                                    return dd;
-                                                  }
-                                                });
-                                              } else {
-                                                return ``;
-                                              }
-                                            })();
+                                  const title =
+                                    (item.language_data &&
+                                      item.language_data[Language.getLanguage()].title) ||
+                                    item.title;
+                                  const spec = (() => {
+                                    if (item.spec) {
+                                      return item.spec.map((dd: string, index: number) => {
+                                        try {
+                                          return (
+                                            item.specs[index].option.find((d1: any) => {
+                                              return d1.title === dd;
+                                            }).language_title[Language.getLanguage()] || dd
+                                          );
+                                        } catch (e) {
+                                          return dd;
+                                        }
+                                      });
+                                    } else {
+                                      return ``;
+                                    }
+                                  })();
 
-                                            if (vm.cartData.lineItems.length === index + 1) {
-                                              gvc.notifyDataChange(ids.shipping);
-                                            }
+                                  if (vm.cartData.lineItems.length === index + 1) {
+                                    gvc.notifyDataChange(ids.shipping);
+                                  }
 
-                                            return html`
+                                  return html`
                                               <div class="d-flex flex-column p-lg-3 px-2 py-3 gap-2">
                                                 <div class="d-flex w-100 position-relative" style="gap:20px;">
                                                   <div class=" justify-content-start  ">
@@ -1279,8 +1279,8 @@ export class CheckoutIndex {
                                                     <span
                                                       class="fw-bold pe-4"
                                                       style="gap:5px;font-size:${document.body.clientWidth > 800
-                                                        ? `16`
-                                                        : `14`}px;max-width:calc(100% - 10px); display: -webkit-box; -webkit-line-clamp: 2;  -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; "
+                                    ? `16`
+                                    : `14`}px;max-width:calc(100% - 10px); display: -webkit-box; -webkit-line-clamp: 2;  -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; "
                                                       >${title}</span
                                                     >
                                                     <div class="${gClass(['66text'])} fs-sm">
@@ -1290,24 +1290,24 @@ export class CheckoutIndex {
                                                     <div class="d-flex flex-column align-items-start " style="gap:2px;">
                                                       <div class="fw-bold fs-6 ${gClass('price-text')}">
                                                         ${(() => {
-                                                          if (item.is_gift) {
-                                                            return Currency.convertCurrencyText(0);
-                                                          }
-                                                          return Currency.convertCurrencyText(
-                                                            parseFloat(item.sale_price)
-                                                          );
-                                                        })()}
+                                    if (item.is_gift) {
+                                      return Currency.convertCurrencyText(0);
+                                    }
+                                    return Currency.convertCurrencyText(
+                                      parseFloat(item.sale_price)
+                                    );
+                                  })()}
                                                       </div>
                                                       ${(() => {
-                                                        if (item.is_gift || item.sale_price >= item.origin_price) {
-                                                          return '';
-                                                        }
-                                                        return html` <div
+                                    if (item.is_gift || item.sale_price >= item.origin_price) {
+                                      return '';
+                                    }
+                                    return html` <div
                                                           style="text-decoration: line-through; font-size: 12px;"
                                                         >
                                                           ${Currency.convertCurrencyText(parseFloat(item.origin_price))}
                                                         </div>`;
-                                                      })()}
+                                  })()}
                                                     </div>
                                                     <div class="w-100 d-flex">
                                                       <div class="flex-fill"></div>
@@ -1317,23 +1317,23 @@ export class CheckoutIndex {
                                                       >
                                                         <div
                                                           class="${item.is_gift
-                                                            ? `d-none`
-                                                            : `d-flex`} align-items-center justify-content-center"
+                                    ? `d-none`
+                                    : `d-flex`} align-items-center justify-content-center"
                                                           style="width:38px;height: 38px;cursor: pointer;"
                                                           onclick="${gvc.event(() => {
-                                                            apiCart.setCart(cartItem => {
-                                                              const find = cartItem.line_items.find(dd => {
-                                                                return (
-                                                                  dd.id === item.id &&
-                                                                  item.spec.join('') === dd.spec.join('')
-                                                                );
-                                                              })!;
-                                                              if (find.count - 1 > 0) {
-                                                                find.count = find.count - 1;
-                                                                refreshCartData();
-                                                              }
-                                                            });
-                                                          })}"
+                                    apiCart.setCart(cartItem => {
+                                      const find = cartItem.line_items.find(dd => {
+                                        return (
+                                          dd.id === item.id &&
+                                          item.spec.join('') === dd.spec.join('')
+                                        );
+                                      })!;
+                                      if (find.count - 1 > 0) {
+                                        find.count = find.count - 1;
+                                        refreshCartData();
+                                      }
+                                    });
+                                  })}"
                                                         >
                                                           <i class="fa-solid fa-minus" style="color:black;"></i>
                                                         </div>
@@ -1342,69 +1342,69 @@ export class CheckoutIndex {
                                                           style="
                                                             
                                                             ${item.is_gift
-                                                            ? `border:none;`
-                                                            : `border-top:none;border-bottom: none;`}
+                                    ? `border:none;`
+                                    : `border-top:none;border-bottom: none;`}
                                                             border-radius: 0px; color: #575757; width: 50px;height:38px;background-image:none;${parseInt(
-                                                            vm.quantity,
-                                                            10
-                                                          ) < 10
-                                                            ? `text-indent: 43%;`
-                                                            : `text-indent: 40%;`}"
+                                    vm.quantity,
+                                    10
+                                  ) < 10
+                                    ? `text-indent: 43%;`
+                                    : `text-indent: 40%;`}"
                                                           onchange="${gvc.event(e => {
-                                                            apiCart.setCart(cartItem => {
-                                                              cartItem.line_items.find(dd => {
-                                                                return (
-                                                                  dd.id === item.id &&
-                                                                  item.spec.join('') === dd.spec.join('')
-                                                                );
-                                                              })!.count = parseInt(e.value, 10);
-                                                              refreshCartData();
-                                                            });
-                                                          })}"
+                                    apiCart.setCart(cartItem => {
+                                      cartItem.line_items.find(dd => {
+                                        return (
+                                          dd.id === item.id &&
+                                          item.spec.join('') === dd.spec.join('')
+                                        );
+                                      })!.count = parseInt(e.value, 10);
+                                      refreshCartData();
+                                    });
+                                  })}"
                                                           ${item.is_gift ? `disabled` : ``}
                                                         >
                                                           ${[
-                                                            ...new Array(
-                                                              (() => {
-                                                                if (item.show_understocking === 'false') {
-                                                                  return 50;
-                                                                }
-                                                                return item.stock < 50 ? item.stock : 50;
-                                                              })()
-                                                            ),
-                                                          ]
-                                                            .map((_, index) => {
-                                                              return html` <option
+                                    ...new Array(
+                                      (() => {
+                                        if (item.show_understocking === 'false') {
+                                          return 50;
+                                        }
+                                        return item.stock < 50 ? item.stock : 50;
+                                      })()
+                                    ),
+                                  ]
+                                    .map((_, index) => {
+                                      return html` <option
                                                                 value="${index + 1}"
                                                                 ${index + 1 === item.count ? `selected` : ``}
                                                               >
                                                                 ${index + 1}
                                                               </option>`;
-                                                            })
-                                                            .join('')}
+                                    })
+                                    .join('')}
                                                         </select>
                                                         <div
                                                           class=" align-items-center justify-content-center ${item.is_gift
-                                                            ? `d-none`
-                                                            : `d-flex`}"
+                                    ? `d-none`
+                                    : `d-flex`}"
                                                           style="width:38px;height: 38px;cursor: pointer;"
                                                           onclick="${gvc.event(() => {
-                                                            apiCart.setCart(cartItem => {
-                                                              const find = cartItem.line_items.find(dd => {
-                                                                return (
-                                                                  dd.id === item.id &&
-                                                                  item.spec.join('') === dd.spec.join('')
-                                                                );
-                                                              })!;
-                                                              if (
-                                                                item.show_understocking === 'false' ||
-                                                                find.count + 1 < item.stock
-                                                              ) {
-                                                                find.count = find.count + 1;
-                                                                refreshCartData();
-                                                              }
-                                                            });
-                                                          })}"
+                                    apiCart.setCart(cartItem => {
+                                      const find = cartItem.line_items.find(dd => {
+                                        return (
+                                          dd.id === item.id &&
+                                          item.spec.join('') === dd.spec.join('')
+                                        );
+                                      })!;
+                                      if (
+                                        item.show_understocking === 'false' ||
+                                        find.count + 1 < item.stock
+                                      ) {
+                                        find.count = find.count + 1;
+                                        refreshCartData();
+                                      }
+                                    });
+                                  })}"
                                                         >
                                                           <i class="fa-solid fa-plus" style="color:black;"></i>
                                                         </div>
@@ -1418,101 +1418,101 @@ export class CheckoutIndex {
                                                         class="fa-solid fa-xmark-large"
                                                         style="cursor: pointer;color:gray;"
                                                         onclick="${gvc.event(() => {
-                                                          apiCart.setCart(cartItem => {
-                                                            cartItem.line_items = cartItem.line_items.filter(dd => {
-                                                              return !(
-                                                                dd.id === item.id &&
-                                                                item.spec.join('') === dd.spec.join('')
-                                                              );
-                                                            });
-                                                            refreshCartData();
-                                                          });
-                                                        })}"
+                                    apiCart.setCart(cartItem => {
+                                      cartItem.line_items = cartItem.line_items.filter(dd => {
+                                        return !(
+                                          dd.id === item.id &&
+                                          item.spec.join('') === dd.spec.join('')
+                                        );
+                                      });
+                                      refreshCartData();
+                                    });
+                                  })}"
                                                       ></i>
                                                     </div>
                                                   </div>
                                                 </div>
                                                 <div>
                                                   ${vm.cartData.voucherList
-                                                    .filter((dd: any) => {
-                                                      return (
-                                                        dd.bind.find((d2: any) => {
-                                                          return d2.id === item.id;
-                                                        }) &&
-                                                        dd.reBackType !== 'giveaway' &&
-                                                        dd.reBackType !== 'add_on_items'
-                                                      );
-                                                    })
-                                                    .map((dd: any) => {
-                                                      return `<div class=" w-100 " style="${document.body.clientWidth < 800 ? `font-size:12px;` : `font-size:14px;`}"><i class="fa-solid fa-tickets-perforated  me-2"></i>${dd.title}</div>`;
-                                                    })
-                                                    .join('<div class="my-1"></div>')}
+                                    .filter((dd: any) => {
+                                      return (
+                                        dd.bind.find((d2: any) => {
+                                          return d2.id === item.id;
+                                        }) &&
+                                        dd.reBackType !== 'giveaway' &&
+                                        dd.reBackType !== 'add_on_items'
+                                      );
+                                    })
+                                    .map((dd: any) => {
+                                      return `<div class=" w-100 " style="${document.body.clientWidth < 800 ? `font-size:12px;` : `font-size:14px;`}"><i class="fa-solid fa-tickets-perforated  me-2"></i>${dd.title}</div>`;
+                                    })
+                                    .join('<div class="my-1"></div>')}
                                                   ${(() => {
-                                                    let min = (item.min_qty && parseInt(item.min_qty, 10)) || 1;
-                                                    let count = 0;
-                                                    for (const b of vm.cartData.lineItems) {
-                                                      if (b.id === item.id) {
-                                                        count += b.count;
-                                                      }
-                                                    }
-                                                    if (count < min) {
-                                                      return `<div class="text-danger">${Language.text('min_p_count').replace('_c_', min)}</div>`;
-                                                    } else {
-                                                      return ``;
-                                                    }
-                                                  })()}
+                                    let min = (item.min_qty && parseInt(item.min_qty, 10)) || 1;
+                                    let count = 0;
+                                    for (const b of vm.cartData.lineItems) {
+                                      if (b.id === item.id) {
+                                        count += b.count;
+                                      }
+                                    }
+                                    if (count < min) {
+                                      return `<div class="text-danger">${Language.text('min_p_count').replace('_c_', min)}</div>`;
+                                    } else {
+                                      return ``;
+                                    }
+                                  })()}
                                                   ${(() => {
-                                                    let max_qty =
-                                                      (item.max_qty && parseInt(item.max_qty, 10)) || Infinity;
-                                                    let count = 0;
-                                                    for (const b of vm.cartData.lineItems) {
-                                                      if (b.id === item.id) {
-                                                        count += b.count;
-                                                      }
-                                                    }
+                                    let max_qty =
+                                      (item.max_qty && parseInt(item.max_qty, 10)) || Infinity;
+                                    let count = 0;
+                                    for (const b of vm.cartData.lineItems) {
+                                      if (b.id === item.id) {
+                                        count += b.count;
+                                      }
+                                    }
 
-                                                    if (count > max_qty) {
-                                                      return `<div class="text-danger">${Language.text('max_p_count').replace('_c_', max_qty)}</div>`;
-                                                    } else {
-                                                      return ``;
-                                                    }
-                                                  })()}
+                                    if (count > max_qty) {
+                                      return `<div class="text-danger">${Language.text('max_p_count').replace('_c_', max_qty)}</div>`;
+                                    } else {
+                                      return ``;
+                                    }
+                                  })()}
                                                 </div>
                                               </div>
                                             `;
-                                          })
-                                          .join(`<div class="border-bottom w-100"></div>`);
-                                      } catch (e) {
-                                        console.error(`error 1 =>`, e);
-                                        return '';
-                                      }
-                                    },
-                                  })}
+                                })
+                                .join(`<div class="border-bottom w-100"></div>`);
+                            } catch (e) {
+                              console.error(`error 1 =>`, e);
+                              return '';
+                            }
+                          },
+                        })}
                                 </div>
                                 <!--加購品-->
                                 ${(() => {
-                                  let add_on: any[] = [];
-                                  vm.cartData.voucherList.filter((dd: any) => {
-                                    if (dd.reBackType === 'add_on_items') {
-                                      add_on = add_on.concat(dd.add_on_products);
-                                    }
+                          let add_on: any[] = [];
+                          vm.cartData.voucherList.filter((dd: any) => {
+                            if (dd.reBackType === 'add_on_items') {
+                              add_on = add_on.concat(dd.add_on_products);
+                            }
+                          });
+                          if (add_on.length) {
+                            return gvc.bindView(() => {
+                              const id = gvc.glitter.getUUID();
+                              return {
+                                bind: id,
+                                view: async () => {
+                                  const add_products = await ApiShop.getProduct({
+                                    page: 0,
+                                    limit: 100,
+                                    productType: 'addProduct',
+                                    id_list: add_on.join(','),
                                   });
-                                  if (add_on.length) {
-                                    return gvc.bindView(() => {
-                                      const id = gvc.glitter.getUUID();
-                                      return {
-                                        bind: id,
-                                        view: async () => {
-                                          const add_products = await ApiShop.getProduct({
-                                            page: 0,
-                                            limit: 100,
-                                            productType: 'addProduct',
-                                            id_list: add_on.join(','),
-                                          });
-                                          if (!add_products.response.data.length) {
-                                            return ``;
-                                          }
-                                          return html`
+                                  if (!add_products.response.data.length) {
+                                    return ``;
+                                  }
+                                  return html`
                                             <div class="rounded-3 mt-3 p-3 bg-white">
                                               <span class="${gClass('banner-text')}"
                                                 >${Language.text('additional_purchase_items')}</span
@@ -1522,8 +1522,8 @@ export class CheckoutIndex {
                                                 style="overflow-x:auto;gap:10px;"
                                               >
                                                 ${add_products.response.data
-                                                  .map((dd: any) => {
-                                                    return html` <div
+                                    .map((dd: any) => {
+                                      return html` <div
                                                       class="d-flex py-3 align-items-center"
                                                       style="gap:10px;"
                                                     >
@@ -1541,29 +1541,29 @@ export class CheckoutIndex {
                                                         <button
                                                           class="${gClass('button-bgr')} mb-0 mt-2"
                                                           onclick="${gvc.event(() => {
-                                                            const titleFontColor =
-                                                              glitter.share.globalValue['theme_color.0.title'] ??
-                                                              '#333333';
-                                                            gvc.glitter.innerDialog(
-                                                              (gvc: GVC) => {
-                                                                return html` <div
+                                        const titleFontColor =
+                                          glitter.share.globalValue['theme_color.0.title'] ??
+                                          '#333333';
+                                        gvc.glitter.innerDialog(
+                                          (gvc: GVC) => {
+                                            return html` <div
                                                                   class=" bg-white shadow  ${document.body.clientWidth >
-                                                                  768
-                                                                    ? `rounded-3`
-                                                                    : ` position-absolute bottom-0`}"
+                                            768
+                                              ? `rounded-3`
+                                              : ` position-absolute bottom-0`}"
                                                                   style=" ${document.body.clientWidth > 768
-                                                                    ? `min-width: 400px; width: 1000px;max-height:calc(100% - 150px);overflow-y: auto;`
-                                                                    : 'width:calc(100vw);height:100%;'}"
+                                              ? `min-width: 400px; width: 1000px;max-height:calc(100% - 150px);overflow-y: auto;`
+                                              : 'width:calc(100vw);height:100%;'}"
                                                                 >
                                                                   <div
                                                                     class="bg-white shadow  ${document.body
-                                                                      .clientWidth > 768
-                                                                      ? `rounded-3`
-                                                                      : `h-100`}"
+                                              .clientWidth > 768
+                                              ? `rounded-3`
+                                              : `h-100`}"
                                                                     style="width: 100%;  position: relative;${document
-                                                                      .body.clientWidth > 768
-                                                                      ? ``
-                                                                      : `overflow-y: auto;`}"
+                                              .body.clientWidth > 768
+                                              ? ``
+                                              : `overflow-y: auto;`}"
                                                                   >
                                                                     <div
                                                                       class="w-100 d-flex align-items-center p-3 border-bottom"
@@ -1580,77 +1580,77 @@ export class CheckoutIndex {
                                                                         class="fa-regular fa-circle-xmark fs-5 text-dark"
                                                                         style="cursor: pointer"
                                                                         onclick="${gvc.event(() => {
-                                                                          gvc.closeDialog();
-                                                                        })}"
+                                              gvc.closeDialog();
+                                            })}"
                                                                       ></i>
                                                                     </div>
                                                                     <div
                                                                       class="c_dialog_main"
                                                                       style="gap: 24px;  max-height: calc(100% - 100px); ${document
-                                                                        .body.clientWidth < 800
-                                                                        ? `padding: 12px 20px;`
-                                                                        : `padding: 30px;`}"
+                                              .body.clientWidth < 800
+                                              ? `padding: 12px 20px;`
+                                              : `padding: 30px;`}"
                                                                     >
                                                                       ${PdClass.selectSpec({
-                                                                        gvc,
-                                                                        titleFontColor:
-                                                                          glitter.share.globalValue[
-                                                                            'theme_color.0.title'
-                                                                          ] ?? '#333333',
-                                                                        prod: dd.content,
-                                                                        vm: {
-                                                                          specs: dd.content.specs.map(
-                                                                            (spec: {
-                                                                              option: {
-                                                                                title: string;
-                                                                              }[];
-                                                                            }) => {
-                                                                              return spec.option[0].title;
-                                                                            }
-                                                                          ),
-                                                                          quantity: '1',
-                                                                          wishStatus: (
-                                                                            glitter.share.wishList ?? []
-                                                                          ).some((item: { id: number }) => {
-                                                                            return item.id === dd.id;
-                                                                          }),
-                                                                        },
-                                                                        preview: true,
-                                                                        with_qty: false,
-                                                                        is_gift: true,
-                                                                        callback: () => {
-                                                                          gvc.closeDialog();
-                                                                          console.log(`vm.cartData=>`, vm.cartData);
-                                                                          let find = vm.cartData.lineItems.find(
-                                                                            (d1: any) => {
-                                                                              return dd.add_on_products.find(
-                                                                                (d2: any) => {
-                                                                                  return d2.id === d1.id;
-                                                                                }
-                                                                              );
-                                                                            }
-                                                                          );
-                                                                          console.log(`find=>`, find);
-                                                                          if (find) {
-                                                                            apiCart.setCart(cartItem => {
-                                                                              cartItem.line_items.map(dd => {
-                                                                                if (dd.id === find.id) {
-                                                                                  dd.count--;
-                                                                                }
-                                                                              });
-                                                                              cartItem.line_items =
-                                                                                cartItem.line_items.filter(dd => {
-                                                                                  return dd.count > 0;
-                                                                                });
-                                                                              refreshCartData();
-                                                                              gvc.closeDialog();
-                                                                            });
-                                                                          } else {
-                                                                            refreshCartData();
-                                                                            gvc.closeDialog();
-                                                                          }
-                                                                        },
-                                                                      })}
+                                              gvc,
+                                              titleFontColor:
+                                                glitter.share.globalValue[
+                                                  'theme_color.0.title'
+                                                  ] ?? '#333333',
+                                              prod: dd.content,
+                                              vm: {
+                                                specs: dd.content.specs.map(
+                                                  (spec: {
+                                                    option: {
+                                                      title: string;
+                                                    }[];
+                                                  }) => {
+                                                    return spec.option[0].title;
+                                                  }
+                                                ),
+                                                quantity: '1',
+                                                wishStatus: (
+                                                  glitter.share.wishList ?? []
+                                                ).some((item: { id: number }) => {
+                                                  return item.id === dd.id;
+                                                }),
+                                              },
+                                              preview: true,
+                                              with_qty: false,
+                                              is_gift: true,
+                                              callback: () => {
+                                                gvc.closeDialog();
+                                                console.log(`vm.cartData=>`, vm.cartData);
+                                                let find = vm.cartData.lineItems.find(
+                                                  (d1: any) => {
+                                                    return dd.add_on_products.find(
+                                                      (d2: any) => {
+                                                        return d2.id === d1.id;
+                                                      }
+                                                    );
+                                                  }
+                                                );
+                                                console.log(`find=>`, find);
+                                                if (find) {
+                                                  apiCart.setCart(cartItem => {
+                                                    cartItem.line_items.map(dd => {
+                                                      if (dd.id === find.id) {
+                                                        dd.count--;
+                                                      }
+                                                    });
+                                                    cartItem.line_items =
+                                                      cartItem.line_items.filter(dd => {
+                                                        return dd.count > 0;
+                                                      });
+                                                    refreshCartData();
+                                                    gvc.closeDialog();
+                                                  });
+                                                } else {
+                                                  refreshCartData();
+                                                  gvc.closeDialog();
+                                                }
+                                              },
+                                            })}
                                                                       <div
                                                                         class="d-sm-none"
                                                                         style="height:100px;"
@@ -1658,16 +1658,16 @@ export class CheckoutIndex {
                                                                     </div>
                                                                   </div>
                                                                 </div>`;
-                                                              },
-                                                              Tool.randomString(7),
-                                                              {
-                                                                animation:
-                                                                  document.body.clientWidth < 768
-                                                                    ? Animation.popup
-                                                                    : Animation.fade,
-                                                              }
-                                                            );
-                                                          })}"
+                                          },
+                                          Tool.randomString(7),
+                                          {
+                                            animation:
+                                              document.body.clientWidth < 768
+                                                ? Animation.popup
+                                                : Animation.fade,
+                                          }
+                                        );
+                                      })}"
                                                         >
                                                           <span class="${gClass('button-text')}"
                                                             >${Language.text('add_to_cart')}</span
@@ -1675,46 +1675,46 @@ export class CheckoutIndex {
                                                         </button>
                                                       </div>
                                                     </div>`;
-                                                  })
-                                                  .join('')}
+                                    })
+                                    .join('')}
                                               </div>
                                             </div>
                                           `;
-                                        },
-                                        divCreate: {
-                                          class: `w-100`,
-                                        },
-                                      };
-                                    });
-                                  } else {
-                                    return '';
-                                  }
-                                })()}
+                                },
+                                divCreate: {
+                                  class: `w-100`,
+                                },
+                              };
+                            });
+                          } else {
+                            return '';
+                          }
+                        })()}
                                 <!--贈品-->
                                 ${(() => {
-                                  let already_add: any[] = vm.cartData.lineItems.filter((dd: any) => {
-                                    return dd.is_gift;
-                                  });
-                                  const giftHtml = vm.cartData.voucherList
-                                    .filter((d1: any) => {
-                                      return d1.reBackType === 'giveaway';
-                                    })
-                                    .map((dd: any) => {
-                                      let isSelected = already_add.find(d2 => {
-                                        return dd.add_on_products.find((d1: any) => {
-                                          return d1.id === d2.id;
-                                        });
-                                      });
-                                      already_add = already_add.filter(dd => {
-                                        return !dd === isSelected;
-                                      });
-                                      return html`
+                          let already_add: any[] = vm.cartData.lineItems.filter((dd: any) => {
+                            return dd.is_gift;
+                          });
+                          const giftHtml = vm.cartData.voucherList
+                            .filter((d1: any) => {
+                              return d1.reBackType === 'giveaway';
+                            })
+                            .map((dd: any) => {
+                              let isSelected = already_add.find(d2 => {
+                                return dd.add_on_products.find((d1: any) => {
+                                  return d1.id === d2.id;
+                                });
+                              });
+                              already_add = already_add.filter(dd => {
+                                return !dd === isSelected;
+                              });
+                              return html`
                                         <span class="${gClass('banner-text')}">${dd.title}</span>
                                         <div class="d-flex align-items-center w-100" style="overflow-x:auto;gap:10px;">
                                           ${dd.add_on_products
-                                            .map((pd: any) => {
-                                              try {
-                                                return html` <div
+                                .map((pd: any) => {
+                                  try {
+                                    return html` <div
                                                   class="d-flex py-3 align-items-center"
                                                   style="gap:10px;"
                                                 >
@@ -1732,35 +1732,35 @@ export class CheckoutIndex {
                                                     <button
                                                       class="${gClass('button-bgr')} mb-0 mt-2"
                                                       style="${isSelected
-                                                        ? isSelected.id === pd.id
-                                                          ? `background: gray !important;`
-                                                          : ``
-                                                        : ``}"
+                                      ? isSelected.id === pd.id
+                                        ? `background: gray !important;`
+                                        : ``
+                                      : ``}"
                                                       onclick="${gvc.event(() => {
-                                                        if (isSelected && isSelected.id === pd.id) {
-                                                          return;
-                                                        }
-                                                        const titleFontColor =
-                                                          glitter.share.globalValue['theme_color.0.title'] ?? '#333333';
-                                                        gvc.glitter.innerDialog(
-                                                          (gvc: GVC) => {
-                                                            return html` <div
+                                      if (isSelected && isSelected.id === pd.id) {
+                                        return;
+                                      }
+                                      const titleFontColor =
+                                        glitter.share.globalValue['theme_color.0.title'] ?? '#333333';
+                                      gvc.glitter.innerDialog(
+                                        (gvc: GVC) => {
+                                          return html` <div
                                                               class=" bg-white shadow  ${document.body.clientWidth > 768
-                                                                ? `rounded-3`
-                                                                : ` position-absolute bottom-0`}"
+                                            ? `rounded-3`
+                                            : ` position-absolute bottom-0`}"
                                                               style=" ${document.body.clientWidth > 768
-                                                                ? `min-width: 400px; width: 1000px;max-height:calc(100% - 150px);overflow-y: auto;`
-                                                                : 'width:calc(100vw);height:100%;'}"
+                                            ? `min-width: 400px; width: 1000px;max-height:calc(100% - 150px);overflow-y: auto;`
+                                            : 'width:calc(100vw);height:100%;'}"
                                                             >
                                                               <div
                                                                 class="bg-white shadow  ${document.body.clientWidth >
-                                                                768
-                                                                  ? `rounded-3`
-                                                                  : `h-100`}"
+                                          768
+                                            ? `rounded-3`
+                                            : `h-100`}"
                                                                 style="width: 100%;  position: relative;${document.body
-                                                                  .clientWidth > 768
-                                                                  ? ``
-                                                                  : `overflow-y: auto;`}"
+                                            .clientWidth > 768
+                                            ? ``
+                                            : `overflow-y: auto;`}"
                                                               >
                                                                 <div
                                                                   class="w-100 d-flex align-items-center p-3 border-bottom"
@@ -1777,110 +1777,110 @@ export class CheckoutIndex {
                                                                     class="fa-regular fa-circle-xmark fs-5 text-dark"
                                                                     style="cursor: pointer"
                                                                     onclick="${gvc.event(() => {
-                                                                      gvc.closeDialog();
-                                                                    })}"
+                                            gvc.closeDialog();
+                                          })}"
                                                                   ></i>
                                                                 </div>
                                                                 <div
                                                                   class="c_dialog_main"
                                                                   style="gap: 24px;  max-height: calc(100% - 100px); ${document
-                                                                    .body.clientWidth < 800
-                                                                    ? `padding: 12px 20px;`
-                                                                    : `padding: 30px;`}"
+                                            .body.clientWidth < 800
+                                            ? `padding: 12px 20px;`
+                                            : `padding: 30px;`}"
                                                                 >
                                                                   ${PdClass.selectSpec({
-                                                                    gvc,
-                                                                    titleFontColor:
-                                                                      glitter.share.globalValue[
-                                                                        'theme_color.0.title'
-                                                                      ] ?? '#333333',
-                                                                    prod: pd,
-                                                                    vm: {
-                                                                      specs: pd.specs.map(
-                                                                        (spec: {
-                                                                          option: {
-                                                                            title: string;
-                                                                          }[];
-                                                                        }) => {
-                                                                          return spec.option[0].title;
-                                                                        }
-                                                                      ),
-                                                                      quantity: '1',
-                                                                      wishStatus: (glitter.share.wishList ?? []).some(
-                                                                        (item: { id: number }) => {
-                                                                          return item.id === dd.id;
-                                                                        }
-                                                                      ),
-                                                                    },
-                                                                    preview: true,
-                                                                    with_qty: false,
-                                                                    is_gift: true,
-                                                                    callback: () => {
-                                                                      console.log(`vm.cartData=>`, vm.cartData);
-                                                                      let find = vm.cartData.lineItems.find(
-                                                                        (d1: any) => {
-                                                                          return dd.add_on_products.find((d2: any) => {
-                                                                            return d2.id === d1.id;
-                                                                          });
-                                                                        }
-                                                                      );
-                                                                      console.log(`find=>`, find);
-                                                                      if (find) {
-                                                                        apiCart.setCart(cartItem => {
-                                                                          cartItem.line_items.map(dd => {
-                                                                            if (dd.id === find.id) {
-                                                                              dd.count--;
-                                                                            }
-                                                                          });
-                                                                          cartItem.line_items =
-                                                                            cartItem.line_items.filter(dd => {
-                                                                              return dd.count > 0;
-                                                                            });
-                                                                          refreshCartData();
-                                                                          gvc.closeDialog();
-                                                                        });
-                                                                      } else {
-                                                                        refreshCartData();
-                                                                        gvc.closeDialog();
-                                                                      }
-                                                                    },
-                                                                  })}
+                                            gvc,
+                                            titleFontColor:
+                                              glitter.share.globalValue[
+                                                'theme_color.0.title'
+                                                ] ?? '#333333',
+                                            prod: pd,
+                                            vm: {
+                                              specs: pd.specs.map(
+                                                (spec: {
+                                                  option: {
+                                                    title: string;
+                                                  }[];
+                                                }) => {
+                                                  return spec.option[0].title;
+                                                }
+                                              ),
+                                              quantity: '1',
+                                              wishStatus: (glitter.share.wishList ?? []).some(
+                                                (item: { id: number }) => {
+                                                  return item.id === dd.id;
+                                                }
+                                              ),
+                                            },
+                                            preview: true,
+                                            with_qty: false,
+                                            is_gift: true,
+                                            callback: () => {
+                                              console.log(`vm.cartData=>`, vm.cartData);
+                                              let find = vm.cartData.lineItems.find(
+                                                (d1: any) => {
+                                                  return dd.add_on_products.find((d2: any) => {
+                                                    return d2.id === d1.id;
+                                                  });
+                                                }
+                                              );
+                                              console.log(`find=>`, find);
+                                              if (find) {
+                                                apiCart.setCart(cartItem => {
+                                                  cartItem.line_items.map(dd => {
+                                                    if (dd.id === find.id) {
+                                                      dd.count--;
+                                                    }
+                                                  });
+                                                  cartItem.line_items =
+                                                    cartItem.line_items.filter(dd => {
+                                                      return dd.count > 0;
+                                                    });
+                                                  refreshCartData();
+                                                  gvc.closeDialog();
+                                                });
+                                              } else {
+                                                refreshCartData();
+                                                gvc.closeDialog();
+                                              }
+                                            },
+                                          })}
                                                                   <div class="d-sm-none" style="height:100px;"></div>
                                                                 </div>
                                                               </div>
                                                             </div>`;
-                                                          },
-                                                          Tool.randomString(7),
-                                                          {
-                                                            animation:
-                                                              document.body.clientWidth < 768
-                                                                ? Animation.popup
-                                                                : Animation.fade,
-                                                          }
-                                                        );
-                                                      })}"
+                                        },
+                                        Tool.randomString(7),
+                                        {
+                                          animation:
+                                            document.body.clientWidth < 768
+                                              ? Animation.popup
+                                              : Animation.fade,
+                                        }
+                                      );
+                                    })}"
                                                     >
                                                       <span class="${gClass('button-text')}"
                                                         >${isSelected
-                                                          ? isSelected.id === pd.id
-                                                            ? Language.text('selected')
-                                                            : Language.text('change_gift')
-                                                          : Language.text('select_gift')}</span
+                                      ? isSelected.id === pd.id
+                                        ? Language.text('selected')
+                                        : Language.text('change_gift')
+                                      : Language.text('select_gift')}</span
                                                       >
                                                     </button>
                                                   </div>
                                                 </div>`;
-                                              } catch (e) {
-                                                console.error(`error 2 =>`, e);
-                                              }
-                                            })
-                                            .join('')}
+                                  } catch (e) {
+                                    console.error(`error 2 =>`, e);
+                                  }
+                                })
+                                .join('')}
                                         </div>
                                       `;
-                                    })
-                                    .join('');
-                                  return giftHtml && `<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
-                                })()}
+                            })
+                            .join('');
+                          return giftHtml && `<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
+                        })()}
                                 <!--配送資訊-->
                                 <div class="rounded-3 bg-white w-100 p-1 mt-3">
                                   ${html` <section>
@@ -1888,8 +1888,8 @@ export class CheckoutIndex {
                                       ${Language.text('payment_and_shipping_methods')}
                                     </div>
                                     ${vm.cartData.shipment_info
-                                      ? html` <div class="pt-2 mx-2 mx-sm-3">${vm.cartData.shipment_info}</div>`
-                                      : ''}
+                          ? html` <div class="pt-2 mx-2 mx-sm-3">${vm.cartData.shipment_info}</div>`
+                          : ''}
                                     <div class="row mt-3 mx-1 mx-sm-0 my-md-3">
                                       <div class="col-12 col-md-6 mb-2 mb-sm-0">
                                         <label class="${gClass('label')}">${Language.text('payment_method')}</label>
@@ -1897,118 +1897,118 @@ export class CheckoutIndex {
                                           <select
                                             class="w-100 ${gClass('select')}"
                                             onchange="${gvc.event(e => {
-                                              vm.cartData.customer_info.payment_select = e.value;
-                                              this.storeLocalData(vm.cartData);
-                                              refreshCartData();
-                                            })}"
+                          vm.cartData.customer_info.payment_select = e.value;
+                          this.storeLocalData(vm.cartData);
+                          refreshCartData();
+                        })}"
                                           >
                                             ${(() => {
-                                              return this.getPaymentMethod(vm.cartData)
-                                                .map((dd: { name: string; value: string }) => {
-                                                  return html` <option
+                          return this.getPaymentMethod(vm.cartData)
+                            .map((dd: { name: string; value: string }) => {
+                              return html` <option
                                                     value="${dd.value}"
                                                     ${localStorage.getItem('checkout-payment') === dd.value
-                                                      ? `selected`
-                                                      : ``}
+                                ? `selected`
+                                : ``}
                                                   >
                                                     ${Language.getLanguageCustomText(dd.name) ||
-                                                    Language.text(dd.value)}
+                              Language.text(dd.value)}
                                                   </option>`;
-                                                })
-                                                .join('');
-                                            })()}
+                            })
+                            .join('');
+                        })()}
                                           </select>
                                         </div>
                                       </div>
                                       <div class="col-12 col-md-6 mb-2">
                                         <label class="${gClass('label')}">${Language.text('shipping_method')}</label>
                                         ${gvc.bindView({
-                                          bind: ids.shipping,
-                                          view: () => {
-                                            return html` <div>
+                          bind: ids.shipping,
+                          view: () => {
+                            return html` <div>
                                               <select
                                                 class="w-100 ${gClass('select')}"
                                                 onchange="${gvc.event(e => {
-                                                  [
-                                                    'CVSStoreName',
-                                                    'MerchantTradeNo',
-                                                    'LogisticsSubType',
-                                                    'CVSStoreID',
-                                                    'CVSTelephone',
-                                                    'CVSOutSide',
-                                                    'ExtraData',
-                                                    'CVSAddress',
-                                                  ].map(dd => {
-                                                    gvc.glitter.setUrlParameter(dd);
-                                                  });
-                                                  vm.cartData.user_info.shipment = e.value;
-                                                  this.storeLocalData(vm.cartData);
-                                                  refreshCartData();
-                                                })}"
+                              [
+                                'CVSStoreName',
+                                'MerchantTradeNo',
+                                'LogisticsSubType',
+                                'CVSStoreID',
+                                'CVSTelephone',
+                                'CVSOutSide',
+                                'ExtraData',
+                                'CVSAddress',
+                              ].map(dd => {
+                                gvc.glitter.setUrlParameter(dd);
+                              });
+                              vm.cartData.user_info.shipment = e.value;
+                              this.storeLocalData(vm.cartData);
+                              refreshCartData();
+                            })}"
                                               >
                                                 ${shipmentList.length > 0
-                                                  ? shipmentList
-                                                      .map((dd: { name: string; value: string }) => {
-                                                        return html` <option
+                              ? shipmentList
+                                .map((dd: { name: string; value: string }) => {
+                                  return html` <option
                                                           value="${dd.value}"
                                                           ${vm.cartData.user_info.shipment === dd.value
-                                                            ? `selected`
-                                                            : ``}
+                                    ? `selected`
+                                    : ``}
                                                         >
                                                           ${Language.text(`ship_${dd.value}`) ||
-                                                          Language.getLanguageCustomText(dd.name)}
+                                  Language.getLanguageCustomText(dd.name)}
                                                         </option>`;
-                                                      })
-                                                      .join('')
-                                                  : html` <option selected>(${Language.text('disable_ship')})</option>`}
+                                })
+                                .join('')
+                              : html` <option selected>(${Language.text('disable_ship')})</option>`}
                                               </select>
                                             </div>`;
-                                          },
-                                        })}
+                          },
+                        })}
                                       </div>
                                       <div class="col-12">
                                         ${gvc.bindView(() => {
-                                          return {
-                                            bind: gvc.glitter.getUUID(),
-                                            view: async () => {
-                                              const log_config = (
-                                                await ApiUser.getPublicConfig(
-                                                  'shipment_config_' + vm.cartData.user_info.shipment,
-                                                  'manager'
-                                                )
-                                              ).response.value;
-                                              if (log_config.content) {
-                                                return html` <label class="${gClass('label')}"
+                          return {
+                            bind: gvc.glitter.getUUID(),
+                            view: async () => {
+                              const log_config = (
+                                await ApiUser.getPublicConfig(
+                                  'shipment_config_' + vm.cartData.user_info.shipment,
+                                  'manager'
+                                )
+                              ).response.value;
+                              if (log_config.content) {
+                                return html` <label class="${gClass('label')}"
                                                     >${Language.text('shipping_instructions')}</label
                                                   >
                                                   <div class="border rounded-3 p-2">${log_config.content}</div>`;
-                                              }
-                                              return ``;
-                                            },
-                                          };
-                                        })}
+                              }
+                              return ``;
+                            },
+                          };
+                        })}
                                       </div>
                                       <!-- 配送地址 -->
                                       ${(() => {
-                                        if (vm.cartData.user_info.shipment === 'none') {
-                                          return false;
-                                        }
-                                        const ship_method = this.getShipmentMethod(vm.cartData).find((dd: any) => {
-                                          return vm.cartData.user_info.shipment === dd.value;
-                                        });
-                                        if (ship_method && ship_method.system_form) {
-                                          return (ship_method.system_form ?? []).includes('tw-address-selector');
-                                        }
-                                        // ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
-                                        //   vm.cartData.user_info.shipment
-                                        // )
-                                        return ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
-                                          vm.cartData.user_info.shipment
-                                        );
-                                      })()
-                                        ? gvc.bindView(() => {
-                                            const id = gvc.glitter.getUUID();
-                                            gvc.addStyle(`
+                          if (vm.cartData.user_info.shipment === 'none') {
+                            return false;
+                          }
+                          const ship_method = this.getShipmentMethod(vm.cartData).find((dd: any) => {
+                            return vm.cartData.user_info.shipment === dd.value;
+                          });
+                          if (ship_method && ship_method.system_form) {
+                            return (ship_method.system_form ?? []).includes('tw-address-selector');
+                          }
+                          // ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
+                          //   vm.cartData.user_info.shipment
+                          // )
+                          return ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
+                            vm.cartData.user_info.shipment
+                          );
+                        })()
+                          ? gvc.bindView(() => {
+                            const id = gvc.glitter.getUUID();
+                            gvc.addStyle(`
                                               .city-selector select {
                                                 -webkit-appearance: none;
                                                 -moz-appearance: none;
@@ -2021,12 +2021,12 @@ export class CheckoutIndex {
                                                 flex: 1;
                                               }
                                             `);
-                                            let select_id = '';
-                                            return {
-                                              bind: id,
-                                              view: () => {
-                                                select_id = gvc.glitter.getUUID();
-                                                return html`<label
+                            let select_id = '';
+                            return {
+                              bind: id,
+                              view: () => {
+                                select_id = gvc.glitter.getUUID();
+                                return html`<label
                                                     class="${gClass('label')} w-100 d-flex align-items-center"
                                                     >${Language.text('shipping_address')}
                                                     <div class="flex-fill"></div>
@@ -2034,13 +2034,13 @@ export class CheckoutIndex {
                                                       class="fs-sm fw-500 ${!GlobalUser.token ? `d-none` : ``}"
                                                       style="cursor: pointer; color: #3366bb;"
                                                       onclick="${gvc.event(() => {
-                                                        ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                                          vm.cartData.user_info.address =
-                                                            res.response.userData.consignee_address;
-                                                          this.storeLocalData(vm.cartData);
-                                                          gvc.notifyDataChange(id);
-                                                        });
-                                                      })}"
+                                  ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
+                                    vm.cartData.user_info.address =
+                                      res.response.userData.consignee_address;
+                                    this.storeLocalData(vm.cartData);
+                                    gvc.notifyDataChange(id);
+                                  });
+                                })}"
                                                     >
                                                       ${Language.text('quick_input')}
                                                     </div>
@@ -2061,211 +2061,211 @@ export class CheckoutIndex {
                                                         placeholder="${Language.text('please_enter_street_location')}"
                                                         value="${vm.cartData.user_info.address || ''}"
                                                         onchange="${gvc.event(e => {
-                                                          vm.cartData.user_info.address = e.value;
-                                                          this.storeLocalData(vm.cartData);
-                                                        })}"
+                                  vm.cartData.user_info.address = e.value;
+                                  this.storeLocalData(vm.cartData);
+                                })}"
                                                       />
                                                     </div>
                                                   </div> `;
-                                              },
-                                              divCreate: {
-                                                class: `col-12  mb-2`,
-                                              },
-                                              onCreate: () => {
-                                                gvc.glitter.addMtScript(
-                                                  [
-                                                    {
-                                                      src: 'https://cdn.jsdelivr.net/npm/tw-city-selector@2.1.1/dist/tw-city-selector.min.js',
-                                                    },
-                                                  ],
-                                                  () => {
-                                                    //@ts-ignore
-                                                    const tw_selector = new TwCitySelector({
-                                                      el: `.d_${select_id}`,
-                                                    });
-                                                    const interVal = setInterval(() => {
-                                                      if (document.querySelector(`#select_id_${id} .county`) as any) {
-                                                        clearInterval(interVal);
-                                                        (
-                                                          document.querySelector(`#select_id_${id} .county`) as any
-                                                        ).addEventListener('change', (event: any) => {
-                                                          // 獲取當前選中的值
-                                                          const selectedValue = event.target.value;
-                                                          // 在控制台輸出當前選中的值
-                                                          console.log(`選中的值是: ${selectedValue}`);
-                                                          // 根據選中的值執行其他操作
-                                                          vm.cartData.user_info.city = selectedValue;
-                                                          vm.cartData.user_info.area = undefined;
-                                                          this.storeLocalData(vm.cartData);
-                                                        });
-                                                        (
-                                                          document.querySelector(`#select_id_${id} .district`) as any
-                                                        ).addEventListener('change', (event: any) => {
-                                                          // 獲取當前選中的值
-                                                          const selectedValue = event.target.value;
-
-                                                          // 在控制台輸出當前選中的值
-                                                          console.log(`選中的值是: ${selectedValue}`);
-
-                                                          // 根據選中的值執行其他操作
-                                                          vm.cartData.user_info.area = selectedValue;
-                                                          this.storeLocalData(vm.cartData);
-                                                        });
-
-                                                        if (vm.cartData.user_info.city && vm.cartData.user_info.area) {
-                                                          tw_selector.setValue(
-                                                            vm.cartData.user_info.city,
-                                                            vm.cartData.user_info.area
-                                                          );
-                                                        } else if (vm.cartData.user_info.city) {
-                                                          tw_selector.setValue(vm.cartData.user_info.city);
-                                                        }
-                                                      }
-                                                      glitter.share.tw_selector = tw_selector;
-                                                    }, 100);
-                                                  },
-                                                  () => {}
-                                                );
-                                              },
-                                            };
-                                          })
-                                        : ``}
+                              },
+                              divCreate: {
+                                class: `col-12  mb-2`,
+                              },
+                              onCreate: () => {
+                                gvc.glitter.addMtScript(
+                                  [
+                                    {
+                                      src: 'https://cdn.jsdelivr.net/npm/tw-city-selector@2.1.1/dist/tw-city-selector.min.js',
+                                    },
+                                  ],
+                                  () => {
+                                    //@ts-ignore
+                                    const tw_selector = new TwCitySelector({
+                                      el: `.d_${select_id}`,
+                                    });
+                                    const interVal = setInterval(() => {
+                                      if (document.querySelector(`#select_id_${id} .county`) as any) {
+                                        clearInterval(interVal);
+                                        (
+                                          document.querySelector(`#select_id_${id} .county`) as any
+                                        ).addEventListener('change', (event: any) => {
+                                          // 獲取當前選中的值
+                                          const selectedValue = event.target.value;
+                                          // 在控制台輸出當前選中的值
+                                          console.log(`選中的值是: ${selectedValue}`);
+                                          // 根據選中的值執行其他操作
+                                          vm.cartData.user_info.city = selectedValue;
+                                          vm.cartData.user_info.area = undefined;
+                                          this.storeLocalData(vm.cartData);
+                                        });
+                                        (
+                                          document.querySelector(`#select_id_${id} .district`) as any
+                                        ).addEventListener('change', (event: any) => {
+                                          // 獲取當前選中的值
+                                          const selectedValue = event.target.value;
+
+                                          // 在控制台輸出當前選中的值
+                                          console.log(`選中的值是: ${selectedValue}`);
+
+                                          // 根據選中的值執行其他操作
+                                          vm.cartData.user_info.area = selectedValue;
+                                          this.storeLocalData(vm.cartData);
+                                        });
+
+                                        if (vm.cartData.user_info.city && vm.cartData.user_info.area) {
+                                          tw_selector.setValue(
+                                            vm.cartData.user_info.city,
+                                            vm.cartData.user_info.area
+                                          );
+                                        } else if (vm.cartData.user_info.city) {
+                                          tw_selector.setValue(vm.cartData.user_info.city);
+                                        }
+                                      }
+                                      glitter.share.tw_selector = tw_selector;
+                                    }, 100);
+                                  },
+                                  () => {}
+                                );
+                              },
+                            };
+                          })
+                          : ``}
                                       <!-- 選取超商 -->
                                       ${ShipmentConfig.supermarketList.includes(vm.cartData.user_info.shipment)
-                                        ? html` <div class="col-12">
+                          ? html` <div class="col-12">
                                             <button
                                               class="${gClass('button-bgr')}"
                                               onclick="${gvc.event(() => {
-                                                ApiDelivery.storeMaps({
-                                                  returnURL: (()=>{
-                                                    if(ApplicationConfig.device_type==='ios'){
-                                                      const url=new URL(location.href);
-                                                      url.searchParams.set("select_map_finish","true");
-                                                      return url.href;
-                                                    }else{
-                                                      return location.href;
-                                                    }
-                                                  })(),
-                                                  logistics: vm.cartData.user_info.shipment,
-                                                }).then(async res => {
-                                                  if (ApplicationConfig.device_type === 'ios') {
-                                                    glitter.runJsInterFace(
-                                                      'post_form',
-                                                      {
-                                                        form: res.response.form,
-                                                      },
-                                                      () => {}
-                                                    );
-                                                  } else {
-                                                    const form_id = gvc.glitter.getUUID();
-                                                    $('body').append(`<div id="${form_id}">${res.response.form}</div>`);
-                                                    (document.querySelector(`#${form_id} #submit`) as any).click();
-                                                  }
-                                                });
-                                              })}"
+                            ApiDelivery.storeMaps({
+                              returnURL: (()=>{
+                                if(ApplicationConfig.device_type==='ios'){
+                                  const url=new URL(location.href);
+                                  url.searchParams.set("select_map_finish","true");
+                                  return url.href;
+                                }else{
+                                  return location.href;
+                                }
+                              })(),
+                              logistics: vm.cartData.user_info.shipment,
+                            }).then(async res => {
+                              if (ApplicationConfig.device_type === 'ios') {
+                                glitter.runJsInterFace(
+                                  'post_form',
+                                  {
+                                    form: res.response.form,
+                                  },
+                                  () => {}
+                                );
+                              } else {
+                                const form_id = gvc.glitter.getUUID();
+                                $('body').append(`<div id="${form_id}">${res.response.form}</div>`);
+                                (document.querySelector(`#${form_id} #submit`) as any).click();
+                              }
+                            });
+                          })}"
                                             >
                                               <span class="${gClass('button-text')}"
                                                 >${(() => {
-                                                  let cvs = glitter.getUrlParameter('CVSStoreName') || '';
-                                                  if (decodeURIComponent(cvs)) {
-                                                    return `${decodeURIComponent(cvs)} 『 ${Language.text('click_to_reselct_store')} 』`;
-                                                  } else {
-                                                    return Language.text('select_pickup_store');
-                                                  }
-                                                })()}</span
+                            let cvs = glitter.getUrlParameter('CVSStoreName') || '';
+                            if (decodeURIComponent(cvs)) {
+                              return `${decodeURIComponent(cvs)} 『 ${Language.text('click_to_reselct_store')} 』`;
+                            } else {
+                              return Language.text('select_pickup_store');
+                            }
+                          })()}</span
                                               >
                                             </button>
                                           </div>`
-                                        : ''}
+                          : ''}
                                       ${(() => {
-                                        if (vm.cartData.user_info.shipment === 'none') {
-                                          return false;
+                          if (vm.cartData.user_info.shipment === 'none') {
+                            return false;
+                          }
+                          const ship_method = this.getShipmentMethod(vm.cartData).find((dd: any) => {
+                            return vm.cartData.user_info.shipment === dd.value;
+                          });
+                          if (ship_method && ship_method.system_form) {
+                            return (ship_method.system_form ?? []).includes('global-address-selector');
+                          }
+                          // ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
+                          //   vm.cartData.user_info.shipment
+                          // )
+                          return ['global_express'].includes(vm.cartData.user_info.shipment);
+                        })()
+                          ? [
+                            html`<label class="${gClass('label')}">${Language.text('country')}</label>
+                                              ${gvc.bindView(() => {
+                              const id = gvc.glitter.getUUID();
+                              return {
+                                bind: id,
+                                view: async () => {
+                                  let country_select: any = [];
+                                  const support_country = (
+                                    await ApiUser.getPublicConfig('global_express_country', 'manager')
+                                  ).response.value.country;
+                                  await new Promise((resolve, reject) => {
+                                    glitter.getModule(
+                                      (() => {
+                                        switch (Language.getLanguage()) {
+                                          case 'en-US':
+                                            return `${gvc.glitter.root_path}/modules/country-language/country-en.js`;
+                                          case 'zh-CN':
+                                            return `${gvc.glitter.root_path}/modules/country-language/country-zh.js`;
+                                          default:
+                                            return `${gvc.glitter.root_path}/modules/country-language/country-tw.js`;
                                         }
-                                        const ship_method = this.getShipmentMethod(vm.cartData).find((dd: any) => {
-                                          return vm.cartData.user_info.shipment === dd.value;
+                                      })(),
+                                      response => {
+                                        country_select = response.filter((dd: any) => {
+                                          return support_country.includes(dd.countryCode);
                                         });
-                                        if (ship_method && ship_method.system_form) {
-                                          return (ship_method.system_form ?? []).includes('global-address-selector');
-                                        }
-                                        // ['normal', 'black_cat', 'black_cat_freezing', 'black_cat_ice'].includes(
-                                        //   vm.cartData.user_info.shipment
-                                        // )
-                                        return ['global_express'].includes(vm.cartData.user_info.shipment);
-                                      })()
-                                        ? [
-                                            html`<label class="${gClass('label')}">${Language.text('country')}</label>
-                                              ${gvc.bindView(() => {
-                                                const id = gvc.glitter.getUUID();
-                                                return {
-                                                  bind: id,
-                                                  view: async () => {
-                                                    let country_select: any = [];
-                                                    const support_country = (
-                                                      await ApiUser.getPublicConfig('global_express_country', 'manager')
-                                                    ).response.value.country;
-                                                    await new Promise((resolve, reject) => {
-                                                      glitter.getModule(
-                                                        (() => {
-                                                          switch (Language.getLanguage()) {
-                                                            case 'en-US':
-                                                              return `${gvc.glitter.root_path}/modules/country-language/country-en.js`;
-                                                            case 'zh-CN':
-                                                              return `${gvc.glitter.root_path}/modules/country-language/country-zh.js`;
-                                                            default:
-                                                              return `${gvc.glitter.root_path}/modules/country-language/country-tw.js`;
-                                                          }
-                                                        })(),
-                                                        response => {
-                                                          country_select = response.filter((dd: any) => {
-                                                            return support_country.includes(dd.countryCode);
-                                                          });
-                                                          resolve(true);
-                                                        }
-                                                      );
-                                                    });
-                                                    return html`<select
+                                        resolve(true);
+                                      }
+                                    );
+                                  });
+                                  return html`<select
                                                       class="w-100 ${gClass('select')}"
                                                       onchange="${gvc.event((e, event) => {
-                                                        vm.cartData.user_info.country = e.value;
-                                                        this.storeLocalData(vm.cartData);
-                                                        refreshCartData();
-                                                      })}"
+                                    vm.cartData.user_info.country = e.value;
+                                    this.storeLocalData(vm.cartData);
+                                    refreshCartData();
+                                  })}"
                                                     >
                                                       ${(() => {
-                                                        let map = country_select.map(
-                                                          (dd: { countryCode: string; countryName: string }) => {
-                                                            return html`
+                                    let map = country_select.map(
+                                      (dd: { countryCode: string; countryName: string }) => {
+                                        return html`
                                                               <option
                                                                 value="${dd.countryCode}"
                                                                 ${vm.cartData.user_info.country === dd.countryCode
-                                                                  ? `selected`
-                                                                  : ``}
+                                          ? `selected`
+                                          : ``}
                                                               >
                                                                 ${dd.countryName}
                                                               </option>
                                                             `;
-                                                          }
-                                                        );
-                                                        if (
-                                                          !country_select.find((dd: any) => {
-                                                            return dd.countryCode === vm.cartData.user_info.country;
-                                                          })
-                                                        ) {
-                                                          delete vm.cartData.user_info.country;
-                                                          map.push(
-                                                            html` <option class="d-none" selected>
+                                      }
+                                    );
+                                    if (
+                                      !country_select.find((dd: any) => {
+                                        return dd.countryCode === vm.cartData.user_info.country;
+                                      })
+                                    ) {
+                                      delete vm.cartData.user_info.country;
+                                      map.push(
+                                        html` <option class="d-none" selected>
                                                               ${Language.text('select_country')}
                                                             </option>`
-                                                          );
-                                                        }
-                                                        return map.join('');
-                                                      })()}
+                                      );
+                                    }
+                                    return map.join('');
+                                  })()}
                                                     </select>`;
-                                                  },
-                                                  divCreate: {},
-                                                };
-                                              })}`,
-                                            html` <label class="${gClass('label')}"
+                                },
+                                divCreate: {},
+                              };
+                            })}`,
+                            html` <label class="${gClass('label')}"
                                                 >${Language.text('shipping_address')}</label
                                               >
                                               <input
@@ -2274,22 +2274,22 @@ export class CheckoutIndex {
                                                 placeholder="${Language.text('please_enter_delivery_address')}"
                                                 value="${vm.cartData.user_info.address || ''}"
                                                 onchange="${gvc.event(e => {
-                                                  vm.cartData.user_info.address = e.value;
-                                                  this.storeLocalData(vm.cartData);
-                                                })}"
+                              vm.cartData.user_info.address = e.value;
+                              this.storeLocalData(vm.cartData);
+                            })}"
                                               />`,
-                                            html` <label class="${gClass('label')}">${Language.text('city')}</label>
+                            html` <label class="${gClass('label')}">${Language.text('city')}</label>
                                               <input
                                                 class="${gClass('input')}"
                                                 type="city"
                                                 placeholder="${Language.text('city')}"
                                                 value="${vm.cartData.user_info.city || ''}"
                                                 onchange="${gvc.event(e => {
-                                                  vm.cartData.user_info.city = e.value;
-                                                  this.storeLocalData(vm.cartData);
-                                                })}"
+                              vm.cartData.user_info.city = e.value;
+                              this.storeLocalData(vm.cartData);
+                            })}"
                                               />`,
-                                            html` <label class="${gClass('label')}">${Language.text('state')}</label>
+                            html` <label class="${gClass('label')}">${Language.text('state')}</label>
                                               <input
                                                 class="${gClass('input')}"
                                                 class="${gClass('input')}"
@@ -2297,11 +2297,11 @@ export class CheckoutIndex {
                                                 placeholder="${Language.text('state')}"
                                                 value="${vm.cartData.user_info.state || ''}"
                                                 onchange="${gvc.event(e => {
-                                                  vm.cartData.user_info.state = e.value;
-                                                  this.storeLocalData(vm.cartData);
-                                                })}"
+                              vm.cartData.user_info.state = e.value;
+                              this.storeLocalData(vm.cartData);
+                            })}"
                                               />`,
-                                            html` <label class="${gClass('label')}"
+                            html` <label class="${gClass('label')}"
                                                 >${Language.text('postal_code')}</label
                                               >
                                               <input
@@ -2310,46 +2310,46 @@ export class CheckoutIndex {
                                                 placeholder="${Language.text('postal_code')}"
                                                 value="${vm.cartData.user_info.postal_code || ''}"
                                                 onchange="${gvc.event(e => {
-                                                  vm.cartData.user_info.postal_code = e.value;
-                                                  this.storeLocalData(vm.cartData);
-                                                })}"
+                              vm.cartData.user_info.postal_code = e.value;
+                              this.storeLocalData(vm.cartData);
+                            })}"
                                               />`,
-                                          ]
-                                            .map(dd => {
-                                              return html` <div class="col-12 col-md-6 mb-2">${dd}</div>`;
-                                            })
-                                            .join('')
-                                        : ''}
+                          ]
+                            .map(dd => {
+                              return html` <div class="col-12 col-md-6 mb-2">${dd}</div>`;
+                            })
+                            .join('')
+                          : ''}
                                       ${(() => {
-                                        try {
-                                          vm.cartData.user_info.custom_form_delivery =
-                                            vm.cartData.user_info.custom_form_delivery ?? {};
-                                          const formData = this.getShipmentMethod(vm.cartData).find((dd: any) => {
-                                            return vm.cartData.user_info.shipment === dd.value;
-                                          }).form;
-
-                                          if (!formData) {
-                                            return '';
-                                          }
-                                          const form_array = JSON.parse(JSON.stringify(formData));
-                                          form_array.map((dd: any) => {
-                                            return formatterFormElement(dd);
-                                          });
-                                          return [
-                                            FormWidget.editorView({
-                                              gvc: gvc,
-                                              array: form_array,
-                                              refresh: () => {
-                                                this.storeLocalData(vm.cartData);
-                                              },
-                                              formData: vm.cartData.user_info.custom_form_delivery,
-                                            }),
-                                          ].join('');
-                                        } catch (e) {
-                                          console.error(`error 3 =>`, e);
-                                          return ``;
-                                        }
-                                      })()}
+                          try {
+                            vm.cartData.user_info.custom_form_delivery =
+                              vm.cartData.user_info.custom_form_delivery ?? {};
+                            const formData = this.getShipmentMethod(vm.cartData).find((dd: any) => {
+                              return vm.cartData.user_info.shipment === dd.value;
+                            }).form;
+
+                            if (!formData) {
+                              return '';
+                            }
+                            const form_array = JSON.parse(JSON.stringify(formData));
+                            form_array.map((dd: any) => {
+                              return formatterFormElement(dd);
+                            });
+                            return [
+                              FormWidget.editorView({
+                                gvc: gvc,
+                                array: form_array,
+                                refresh: () => {
+                                  this.storeLocalData(vm.cartData);
+                                },
+                                formData: vm.cartData.user_info.custom_form_delivery,
+                              }),
+                            ].join('');
+                          } catch (e) {
+                            console.error(`error 3 =>`, e);
+                            return ``;
+                          }
+                        })()}
                                     </div>
                                   </section>`}
                                 </div>
@@ -2362,614 +2362,85 @@ export class CheckoutIndex {
                                       class="fs-sm fw-500 ${!GlobalUser.token ? `d-none` : ``}"
                                       style="cursor: pointer; color: #3366bb;"
                                       onclick="${gvc.event(() => {
-                                        ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                          console.log(`res.response.userData=>`, res.response.userData);
-                                          ['name', 'phone', 'email'].map(dd => {
-                                            vm.cartData.customer_info[dd] =
-                                              res.response.userData[dd] || vm.cartData.customer_info[dd];
-                                          });
-                                          this.storeLocalData(vm.cartData);
-                                          gvc.notifyDataChange('customer-info');
-                                        });
-                                      })}"
-                                    >
-                                      ${Language.text('quick_input')}
-                                    </div>
-                                  </div>
-                                  ${gvc.bindView(() => {
-                                    const id = 'customer-info';
-                                    const vm_info: {
-                                      loading: boolean;
-                                      list: any[];
-                                    } = {
-                                      loading: true,
-                                      list: [],
-                                    };
-                                    vm_info.list = widget.share.custom_form_checkout;
-                                    return {
-                                      bind: id,
-                                      view: () => {
-                                        return new Promise(async (resolve, reject) => {
-                                          vm_info.list = widget.share.custom_form_checkout;
-                                          resolve(
-                                            [
-                                              html` <div class="row m-0 mt-3 mb-2">
-                                                ${[
-                                                  {
-                                                    name: Language.text('name'),
-                                                    key: 'name',
-                                                  },
-                                                  {
-                                                    name: Language.text('contact_number'),
-                                                    key: 'phone',
-                                                  },
-                                                  {
-                                                    name: Language.text('email'),
-                                                    key: 'email',
-                                                  },
-                                                ]
-                                                  .filter(dd => {
-                                                    return vm_info.list.find(d1 => {
-                                                      return d1.key === dd.key && `${d1.hidden}` !== 'true';
-                                                    });
-                                                  })
-                                                  .map(dd => {
-                                                    return html` <div class="col-12 col-md-4 mb-2">
-                                                      <label class="${gClass('label')}">${dd.name}</label>
-                                                      <input
-                                                        class="${gClass('input')}"
-                                                        type="${dd.key}"
-                                                        value="${vm.cartData.customer_info[dd.key] || ''}"
-                                                        onchange="${gvc.event((e, event) => {
-                                                          vm.cartData.customer_info[dd.key] = e.value;
-                                                          this.storeLocalData(vm.cartData);
-                                                        })}"
-                                                      />
-                                                    </div>`;
-                                                  })
-                                                  .join('')}
-                                              </div>`,
-                                              gvc.bindView(() => {
-                                                const id = gvc.glitter.getUUID();
-                                                return {
-                                                  bind: id,
-                                                  view: () => {
-                                                    const form_array = JSON.parse(JSON.stringify(vm_info.list));
-                                                    form_array.map((dd: any) => {
-                                                      dd.col = '4';
-                                                      dd.form_config.title_style = {
-                                                        list: [
-                                                          {
-                                                            class: gClass('label') + ' mb-2',
-                                                            style:
-                                                              'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
-                                                            stylist: [],
-                                                            dataType: 'code',
-                                                            style_from: 'code',
-                                                            classDataType: 'static',
-                                                          },
-                                                        ],
-                                                        class: 'form-label',
-                                                        style:
-                                                          'font-size: 20px;font-style: normal;font-weight: 400;line-height: 140%; color:#393939 !important;',
-                                                        stylist: [],
-                                                        version: 'v2',
-                                                        dataType: 'static',
-                                                        style_from: 'code',
-                                                        classDataType: 'static',
-                                                      };
-                                                      dd.form_config.input_style = {
-                                                        list: [
-                                                          {
-                                                            class: gClass('input'),
-                                                            style:
-                                                              'return `border-radius: ${widget.formData.radius}px !important;`',
-                                                            stylist: [],
-                                                            dataType: 'code',
-                                                            style_from: 'code',
-                                                            classDataType: 'static',
-                                                          },
-                                                        ],
-                                                        class: ' mb-3',
-                                                        style: 'background: #FFF;',
-                                                        stylist: [],
-                                                        version: 'v2',
-                                                        dataType: 'static',
-                                                        style_from: 'code',
-                                                        classDataType: 'static',
-                                                      };
-                                                    });
-                                                    return [
-                                                      FormWidget.editorView({
-                                                        gvc: gvc,
-                                                        array: form_array.filter((dd: any) => {
-                                                          return !['name', 'email', 'phone'].includes(dd.key);
-                                                        }),
-                                                        refresh: () => {
-                                                          this.storeLocalData(vm.cartData);
-                                                        },
-                                                        formData: vm.cartData.custom_form_data,
-                                                      }),
-                                                    ].join('');
-                                                  },
-                                                  divCreate: {
-                                                    class: `w-100 `,
-                                                  },
-                                                };
-                                              }),
-                                            ].join('')
-                                          );
-                                        });
-                                      },
-                                    };
-                                  })}
-                                </div>
-                                <!--收件人資料-->
-                                <div class="rounded-3 bg-white w-100 p-1 mt-3">
-                                  <div class="${gClass('banner-text')} px-3 pt-3 d-flex align-items-center">
-                                    ${Language.text('recipient_info')}
-                                    <div class="flex-fill"></div>
-                                    <div
-                                      class="fs-sm fw-500 ${!GlobalUser.token ? `d-none` : ``}"
-                                      style="cursor: pointer; color: #3366bb;"
-                                      onclick="${gvc.event(() => {
-                                        ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                          console.log(`res.response.userData=>`, res.response.userData);
-                                          ['name', 'phone', 'email'].map(dd => {
-                                            vm.cartData.user_info[dd] =
-                                              res.response.userData[dd] || vm.cartData.user_info[dd];
-                                          });
-
-                                          [
-                                            {
-                                              key: 'carrier_num',
-                                              refer: res.response.userData['carrier_number'],
-                                            },
-                                            {
-                                              key: 'gui_number',
-                                              refer: res.response.userData['gui_number'],
-                                            },
-                                            {
-                                              key: 'send_type',
-                                              refer:
-                                                res.response.userData['gui_number'] ||
-                                                !res.response.userData['carrier_number']
-                                                  ? 'email'
-                                                  : 'carrier_num',
-                                            },
-                                            {
-                                              key: 'invoice_type',
-                                              refer: res.response.userData['gui_number'] ? 'company' : 'me',
-                                            },
-                                            {
-                                              key: 'company',
-                                              refer: res.response.userData['company'],
-                                            },
-                                          ].map(dd => {
-                                            vm.cartData.user_info[dd.key] = dd.refer || vm.cartData.user_info[dd.key];
-                                          });
-
-                                          this.storeLocalData(vm.cartData);
-                                          gvc.notifyDataChange('invoice_place');
-                                        });
-                                      })}"
+                          ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
+                            console.log(`res.response.userData=>`, res.response.userData);
+                            ['name', 'phone', 'email'].map(dd => {
+                              vm.cartData.customer_info[dd] =
+                                res.response.userData[dd] || vm.cartData.customer_info[dd];
+                            });
+                            this.storeLocalData(vm.cartData);
+                            gvc.notifyDataChange('customer-info');
+                          });
+                        })}"
                                     >
                                       ${Language.text('quick_input')}
                                     </div>
                                   </div>
-                                  ${gvc.bindView(() => {
-                                    const id = 'invoice_place';
-                                    const vm_info: {
-                                      loading: boolean;
-                                      list: any[];
-                                    } = {
-                                      loading: true,
-                                      list: [],
-                                    };
-                                    //nouse
-                                    let method = widget.share.invoice_method || '';
-                                    if (widget.share.invoice_method) {
-                                      vm_info.loading = false;
-                                      gvc.notifyDataChange(id);
-                                    } else {
-                                      ApiShop.getInvoiceType().then((res: any) => {
-                                        method = res.response.method;
-                                        vm_info.loading = false;
-                                        widget.share.invoice_method = method;
-                                        gvc.notifyDataChange(id);
-                                      });
-                                    }
-                                    const checkbox = this.getCheckedClass(gvc, '#393939');
-                                    return {
-                                      bind: id,
-                                      view: async () => {
-                                        try {
-                                          if (vm_info.loading) {
-                                            return ``;
-                                          }
-                                          const receipt_form = JSON.parse(
-                                            JSON.stringify(widget.share.receipt_form)
-                                          ).map((dd: any) => {
-                                            switch (dd.key) {
-                                              case 'name':
-                                                dd.form_config.place_holder = Language.text('please_enter_name');
-                                                dd.title = Language.text('name');
-                                                break;
-                                              case 'phone':
-                                                dd.form_config.place_holder =
-                                                  Language.text('please_enter_contact_number');
-                                                dd.title = Language.text('contact_number');
-                                                break;
-                                              case 'email':
-                                                dd.form_config.place_holder = Language.text('please_enter_email');
-                                                dd.title = Language.text('email');
-                                                break;
-                                            }
-                                            dd.col = '4';
-                                            return dd;
-                                          });
-                                          vm_info.list = [
-                                            ...receipt_form,
-                                            ...(method === 'nouse'
-                                              ? []
-                                              : [
-                                                  {
-                                                    col: '6',
-                                                    key: 'invoice_type',
-                                                    page: 'form-select',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('invoice_recipient'),
-                                                    col_sm: '12',
-                                                    appName: 'cms_system',
-                                                    require: 'true',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '下拉選單',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      option: [
-                                                        {
-                                                          name: Language.text('personal'),
-                                                          index: 0,
-                                                          value: 'me',
-                                                        },
-                                                        {
-                                                          name: Language.text('company'),
-                                                          index: 1,
-                                                          value: 'company',
-                                                        },
-                                                        {
-                                                          name: Language.text('donate_invoice'),
-                                                          index: 2,
-                                                          value: 'donate',
-                                                        },
-                                                      ],
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: '',
-                                                    },
-                                                    hidden_code: "return (form_data['invoice_method']==='nouse')",
-                                                  },
-                                                  {
-                                                    col: '6',
-                                                    key: 'send_type',
-                                                    page: 'form-select',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('invoice_method'),
-                                                    col_sm: '12',
-                                                    appName: 'cms_system',
-                                                    require: 'true',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '下拉選單',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      option: [
-                                                        {
-                                                          name: Language.text('send_to_user_email'),
-                                                          index: 0,
-                                                          value: 'email',
-                                                        },
-                                                        {
-                                                          name: Language.text('mobile_barcode_device'),
-                                                          index: 1,
-                                                          value: 'carrier',
-                                                        },
-                                                      ],
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: '',
-                                                    },
-                                                    hidden_code:
-                                                      "    if(form_data['invoice_type']!=='me' || (form_data['invoice_method']==='nouse') || (form_data['invoice_method']==='off_line')){\n         form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
-                                                  },
-                                                  {
-                                                    key: 'carrier_num',
-                                                    page: 'input',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('carrier_number'),
-                                                    appName: 'cms_system',
-                                                    require: 'false',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '輸入框',
-                                                    col: '3',
-                                                    col_sm: '12',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: Language.text('please_enter_carrier_number'),
-                                                    },
-                                                    hidden_code:
-                                                      "    \n    if(form_data['invoice_type']!=='me' || form_data['send_type']!=='carrier'){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
-                                                  },
-                                                  {
-                                                    key: 'company',
-                                                    page: 'input',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('company_name'),
-                                                    appName: 'cms_system',
-                                                    require: 'false',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '輸入框',
-                                                    col: '3',
-                                                    col_sm: '12',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: Language.text('please_enter_company_name'),
-                                                    },
-                                                    hidden_code:
-                                                      "    if(form_data['invoice_type']!=='company' || (form_data['invoice_method']==='nouse')){\n         form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
-                                                  },
-                                                  {
-                                                    key: 'gui_number',
-                                                    page: 'input',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('company_tax_id'),
-                                                    col: '3',
-                                                    col_sm: '12',
-                                                    appName: 'cms_system',
-                                                    require: 'false',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '輸入框',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: Language.text('please_enter_company_tax_id'),
-                                                    },
-                                                    hidden_code:
-                                                      "    if(form_data['invoice_type']!=='company'){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
-                                                  },
-                                                  {
-                                                    col: '6',
-                                                    key: 'love_code',
-                                                    page: 'input',
-                                                    type: 'form_plugin_v2',
-                                                    group: '',
-                                                    title: Language.text('donation_code'),
-                                                    col_sm: '12',
-                                                    appName: 'cms_system',
-                                                    require: 'false',
-                                                    readonly: 'write',
-                                                    formFormat: '{}',
-                                                    moduleName: '輸入框',
-                                                    style_data: {
-                                                      input: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      label: {
-                                                        list: [],
-                                                        class: 'form-label fs-base ',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                      container: {
-                                                        list: [],
-                                                        class: '',
-                                                        style: '',
-                                                        version: 'v2',
-                                                      },
-                                                    },
-                                                    form_config: {
-                                                      type: 'name',
-                                                      title: '',
-                                                      input_style: { list: [], version: 'v2' },
-                                                      title_style: { list: [], version: 'v2' },
-                                                      place_holder: Language.text('please_enter_donation_code'),
-                                                    },
-                                                    hidden_code:
-                                                      "    if(form_data['invoice_type']!=='donate' || (form_data['invoice_method']==='nouse')){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
-                                                  },
-                                                ]),
-                                            {
-                                              col: '12',
-                                              key: 'note',
-                                              page: 'multiple_line_text',
-                                              type: 'form_plugin_v2',
-                                              group: '',
-                                              title: Language.text('delivery_notes'),
-                                              col_sm: '12',
-                                              appName: 'cms_system',
-                                              require: 'false',
-                                              readonly: 'write',
-                                              formFormat: '{}',
-                                              moduleName: '多行文字區塊',
-                                              style_data: {
-                                                input: {
-                                                  list: [],
-                                                  class: '',
-                                                  style: '',
-                                                  version: 'v2',
-                                                },
-                                                label: {
-                                                  list: [],
-                                                  class: 'form-label fs-base ',
-                                                  style: '',
-                                                  version: 'v2',
-                                                },
-                                                container: {
-                                                  list: [],
-                                                  class: '',
-                                                  style: '',
-                                                  version: 'v2',
-                                                },
-                                              },
-                                              form_config: {
-                                                type: 'text',
-                                                title: '',
-                                                title_style: { list: [], version: 'v2' },
-                                                place_holder: Language.text('enter_delivery_notes'),
-                                              },
-                                              hidden_code: 'return false',
-                                            },
-                                          ].filter(dd => {
-                                            return (
-                                              (dd.key !== 'name' && dd.key !== 'phone' && dd.key !== 'email') ||
-                                              !vm.cartData.user_info_same ||
-                                              !widget.share.custom_form_checkout.find((d1: any) => {
-                                                return d1.key === dd.key && d1.require;
-                                              })
-                                            );
-                                          });
-                                          vm.cartData.user_info.invoice_method = method;
-                                          vm.cartData.user_info.invoice_type =
-                                            vm.cartData.user_info.invoice_type || 'me';
-                                          vm.cartData.user_info.send_type = vm.cartData.user_info.send_type || 'email';
-
+                                  ${gvc.bindView(() => {
+                          const id = 'customer-info';
+                          const vm_info: {
+                            loading: boolean;
+                            list: any[];
+                          } = {
+                            loading: true,
+                            list: [],
+                          };
+                          vm_info.list = widget.share.custom_form_checkout;
+                          return {
+                            bind: id,
+                            view: () => {
+                              return new Promise(async (resolve, reject) => {
+                                vm_info.list = widget.share.custom_form_checkout;
+                                resolve(
+                                  [
+                                    html` <div class="row m-0 mt-3 mb-2">
+                                                ${[
+                                      {
+                                        name: Language.text('name'),
+                                        key: 'name',
+                                      },
+                                      {
+                                        name: Language.text('contact_number'),
+                                        key: 'phone',
+                                      },
+                                      {
+                                        name: Language.text('email'),
+                                        key: 'email',
+                                      },
+                                    ]
+                                      .filter(dd => {
+                                        return vm_info.list.find(d1 => {
+                                          return d1.key === dd.key && `${d1.hidden}` !== 'true';
+                                        });
+                                      })
+                                      .map(dd => {
+                                        return html` <div class="col-12 col-md-4 mb-2">
+                                                      <label class="${gClass('label')}">${dd.name}</label>
+                                                      <input
+                                                        class="${gClass('input')}"
+                                                        type="${dd.key}"
+                                                        value="${vm.cartData.customer_info[dd.key] || ''}"
+                                                        onchange="${gvc.event((e, event) => {
+                                          vm.cartData.customer_info[dd.key] = e.value;
+                                          this.storeLocalData(vm.cartData);
+                                        })}"
+                                                      />
+                                                    </div>`;
+                                      })
+                                      .join('')}
+                                              </div>`,
+                                    gvc.bindView(() => {
+                                      const id = gvc.glitter.getUUID();
+                                      return {
+                                        bind: id,
+                                        view: () => {
                                           const form_array = JSON.parse(JSON.stringify(vm_info.list));
-
                                           form_array.map((dd: any) => {
-                                            if (
-                                              dd.key === 'send_type' &&
-                                              vm.cartData.user_info.send_type === 'carrier'
-                                            ) {
-                                              dd.col = 3;
-                                            }
+                                            dd.col = '4';
                                             dd.form_config.title_style = {
                                               list: [
                                                 {
-                                                  class: ['company', 'gui_number', 'carrier_num'].includes(dd.key)
-                                                    ? gClass('label') + ' mt-2'
-                                                    : gClass('label') + ' mb-2',
+                                                  class: gClass('label') + ' mb-2',
                                                   style:
                                                     'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
                                                   stylist: [],
@@ -3007,21 +2478,550 @@ export class CheckoutIndex {
                                               style_from: 'code',
                                               classDataType: 'static',
                                             };
-                                            return dd;
                                           });
                                           return [
-                                            html` <div
+                                            FormWidget.editorView({
+                                              gvc: gvc,
+                                              array: form_array.filter((dd: any) => {
+                                                return !['name', 'email', 'phone'].includes(dd.key);
+                                              }),
+                                              refresh: () => {
+                                                this.storeLocalData(vm.cartData);
+                                              },
+                                              formData: vm.cartData.custom_form_data,
+                                            }),
+                                          ].join('');
+                                        },
+                                        divCreate: {
+                                          class: `w-100 `,
+                                        },
+                                      };
+                                    }),
+                                  ].join('')
+                                );
+                              });
+                            },
+                          };
+                        })}
+                                </div>
+                                <!--收件人資料-->
+                                <div class="rounded-3 bg-white w-100 p-1 mt-3">
+                                  <div class="${gClass('banner-text')} px-3 pt-3 d-flex align-items-center">
+                                    ${Language.text('recipient_info')}
+                                    <div class="flex-fill"></div>
+                                    <div
+                                      class="fs-sm fw-500 ${!GlobalUser.token ? `d-none` : ``}"
+                                      style="cursor: pointer; color: #3366bb;"
+                                      onclick="${gvc.event(() => {
+                          ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
+                            console.log(`res.response.userData=>`, res.response.userData);
+                            ['name', 'phone', 'email'].map(dd => {
+                              vm.cartData.user_info[dd] =
+                                res.response.userData[dd] || vm.cartData.user_info[dd];
+                            });
+
+                            [
+                              {
+                                key: 'carrier_num',
+                                refer: res.response.userData['carrier_number'],
+                              },
+                              {
+                                key: 'gui_number',
+                                refer: res.response.userData['gui_number'],
+                              },
+                              {
+                                key: 'send_type',
+                                refer:
+                                  res.response.userData['gui_number'] ||
+                                  !res.response.userData['carrier_number']
+                                    ? 'email'
+                                    : 'carrier_num',
+                              },
+                              {
+                                key: 'invoice_type',
+                                refer: res.response.userData['gui_number'] ? 'company' : 'me',
+                              },
+                              {
+                                key: 'company',
+                                refer: res.response.userData['company'],
+                              },
+                            ].map(dd => {
+                              vm.cartData.user_info[dd.key] = dd.refer || vm.cartData.user_info[dd.key];
+                            });
+
+                            this.storeLocalData(vm.cartData);
+                            gvc.notifyDataChange('invoice_place');
+                          });
+                        })}"
+                                    >
+                                      ${Language.text('quick_input')}
+                                    </div>
+                                  </div>
+                                  ${gvc.bindView(() => {
+                          const id = 'invoice_place';
+                          const vm_info: {
+                            loading: boolean;
+                            list: any[];
+                          } = {
+                            loading: true,
+                            list: [],
+                          };
+                          //nouse
+                          let method = widget.share.invoice_method || '';
+                          if (widget.share.invoice_method) {
+                            vm_info.loading = false;
+                            gvc.notifyDataChange(id);
+                          } else {
+                            ApiShop.getInvoiceType().then((res: any) => {
+                              method = res.response.method;
+                              vm_info.loading = false;
+                              widget.share.invoice_method = method;
+                              gvc.notifyDataChange(id);
+                            });
+                          }
+                          const checkbox = this.getCheckedClass(gvc, '#393939');
+                          return {
+                            bind: id,
+                            view: async () => {
+                              try {
+                                if (vm_info.loading) {
+                                  return ``;
+                                }
+                                const receipt_form = JSON.parse(
+                                  JSON.stringify(widget.share.receipt_form)
+                                ).map((dd: any) => {
+                                  switch (dd.key) {
+                                    case 'name':
+                                      dd.form_config.place_holder = Language.text('please_enter_name');
+                                      dd.title = Language.text('name');
+                                      break;
+                                    case 'phone':
+                                      dd.form_config.place_holder =
+                                        Language.text('please_enter_contact_number');
+                                      dd.title = Language.text('contact_number');
+                                      break;
+                                    case 'email':
+                                      dd.form_config.place_holder = Language.text('please_enter_email');
+                                      dd.title = Language.text('email');
+                                      break;
+                                  }
+                                  dd.col = '4';
+                                  return dd;
+                                });
+                                vm_info.list = [
+                                  ...receipt_form,
+                                  ...(method === 'nouse'
+                                    ? []
+                                    : [
+                                      {
+                                        col: '6',
+                                        key: 'invoice_type',
+                                        page: 'form-select',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('invoice_recipient'),
+                                        col_sm: '12',
+                                        appName: 'cms_system',
+                                        require: 'true',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '下拉選單',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          option: [
+                                            {
+                                              name: Language.text('personal'),
+                                              index: 0,
+                                              value: 'me',
+                                            },
+                                            {
+                                              name: Language.text('company'),
+                                              index: 1,
+                                              value: 'company',
+                                            },
+                                            {
+                                              name: Language.text('donate_invoice'),
+                                              index: 2,
+                                              value: 'donate',
+                                            },
+                                          ],
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: '',
+                                        },
+                                        hidden_code: "return (form_data['invoice_method']==='nouse')",
+                                      },
+                                      {
+                                        col: '6',
+                                        key: 'send_type',
+                                        page: 'form-select',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('invoice_method'),
+                                        col_sm: '12',
+                                        appName: 'cms_system',
+                                        require: 'true',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '下拉選單',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          option: [
+                                            {
+                                              name: Language.text('send_to_user_email'),
+                                              index: 0,
+                                              value: 'email',
+                                            },
+                                            {
+                                              name: Language.text('mobile_barcode_device'),
+                                              index: 1,
+                                              value: 'carrier',
+                                            },
+                                          ],
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: '',
+                                        },
+                                        hidden_code:
+                                          "    if(form_data['invoice_type']!=='me' || (form_data['invoice_method']==='nouse') || (form_data['invoice_method']==='off_line')){\n         form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
+                                      },
+                                      {
+                                        key: 'carrier_num',
+                                        page: 'input',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('carrier_number'),
+                                        appName: 'cms_system',
+                                        require: 'false',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '輸入框',
+                                        col: '3',
+                                        col_sm: '12',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: Language.text('please_enter_carrier_number'),
+                                        },
+                                        hidden_code:
+                                          "    \n    if(form_data['invoice_type']!=='me' || form_data['send_type']!=='carrier'){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
+                                      },
+                                      {
+                                        key: 'company',
+                                        page: 'input',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('company_name'),
+                                        appName: 'cms_system',
+                                        require: 'false',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '輸入框',
+                                        col: '3',
+                                        col_sm: '12',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: Language.text('please_enter_company_name'),
+                                        },
+                                        hidden_code:
+                                          "    if(form_data['invoice_type']!=='company' || (form_data['invoice_method']==='nouse')){\n         form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
+                                      },
+                                      {
+                                        key: 'gui_number',
+                                        page: 'input',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('company_tax_id'),
+                                        col: '3',
+                                        col_sm: '12',
+                                        appName: 'cms_system',
+                                        require: 'false',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '輸入框',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: Language.text('please_enter_company_tax_id'),
+                                        },
+                                        hidden_code:
+                                          "    if(form_data['invoice_type']!=='company'){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
+                                      },
+                                      {
+                                        col: '6',
+                                        key: 'love_code',
+                                        page: 'input',
+                                        type: 'form_plugin_v2',
+                                        group: '',
+                                        title: Language.text('donation_code'),
+                                        col_sm: '12',
+                                        appName: 'cms_system',
+                                        require: 'false',
+                                        readonly: 'write',
+                                        formFormat: '{}',
+                                        moduleName: '輸入框',
+                                        style_data: {
+                                          input: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          label: {
+                                            list: [],
+                                            class: 'form-label fs-base ',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                          container: {
+                                            list: [],
+                                            class: '',
+                                            style: '',
+                                            version: 'v2',
+                                          },
+                                        },
+                                        form_config: {
+                                          type: 'name',
+                                          title: '',
+                                          input_style: { list: [], version: 'v2' },
+                                          title_style: { list: [], version: 'v2' },
+                                          place_holder: Language.text('please_enter_donation_code'),
+                                        },
+                                        hidden_code:
+                                          "    if(form_data['invoice_type']!=='donate' || (form_data['invoice_method']==='nouse')){\n       form_data[form_key]=undefined\nreturn true\n    }else{\n return false\n    }",
+                                      },
+                                    ]),
+                                  {
+                                    col: '12',
+                                    key: 'note',
+                                    page: 'multiple_line_text',
+                                    type: 'form_plugin_v2',
+                                    group: '',
+                                    title: Language.text('delivery_notes'),
+                                    col_sm: '12',
+                                    appName: 'cms_system',
+                                    require: 'false',
+                                    readonly: 'write',
+                                    formFormat: '{}',
+                                    moduleName: '多行文字區塊',
+                                    style_data: {
+                                      input: {
+                                        list: [],
+                                        class: '',
+                                        style: '',
+                                        version: 'v2',
+                                      },
+                                      label: {
+                                        list: [],
+                                        class: 'form-label fs-base ',
+                                        style: '',
+                                        version: 'v2',
+                                      },
+                                      container: {
+                                        list: [],
+                                        class: '',
+                                        style: '',
+                                        version: 'v2',
+                                      },
+                                    },
+                                    form_config: {
+                                      type: 'text',
+                                      title: '',
+                                      title_style: { list: [], version: 'v2' },
+                                      place_holder: Language.text('enter_delivery_notes'),
+                                    },
+                                    hidden_code: 'return false',
+                                  },
+                                ].filter(dd => {
+                                  return (
+                                    (dd.key !== 'name' && dd.key !== 'phone' && dd.key !== 'email') ||
+                                    !vm.cartData.user_info_same ||
+                                    !widget.share.custom_form_checkout.find((d1: any) => {
+                                      return d1.key === dd.key && d1.require;
+                                    })
+                                  );
+                                });
+                                vm.cartData.user_info.invoice_method = method;
+                                vm.cartData.user_info.invoice_type =
+                                  vm.cartData.user_info.invoice_type || 'me';
+                                vm.cartData.user_info.send_type = vm.cartData.user_info.send_type || 'email';
+
+                                const form_array = JSON.parse(JSON.stringify(vm_info.list));
+
+                                form_array.map((dd: any) => {
+                                  if (
+                                    dd.key === 'send_type' &&
+                                    vm.cartData.user_info.send_type === 'carrier'
+                                  ) {
+                                    dd.col = 3;
+                                  }
+                                  dd.form_config.title_style = {
+                                    list: [
+                                      {
+                                        class: ['company', 'gui_number', 'carrier_num'].includes(dd.key)
+                                          ? gClass('label') + ' mt-2'
+                                          : gClass('label') + ' mb-2',
+                                        style:
+                                          'return `color:${glitter.share.globalValue[`theme_color.0.title`]} !important;font-size:16px !important;`',
+                                        stylist: [],
+                                        dataType: 'code',
+                                        style_from: 'code',
+                                        classDataType: 'static',
+                                      },
+                                    ],
+                                    class: 'form-label',
+                                    style:
+                                      'font-size: 20px;font-style: normal;font-weight: 400;line-height: 140%; color:#393939 !important;',
+                                    stylist: [],
+                                    version: 'v2',
+                                    dataType: 'static',
+                                    style_from: 'code',
+                                    classDataType: 'static',
+                                  };
+                                  dd.form_config.input_style = {
+                                    list: [
+                                      {
+                                        class: gClass('input'),
+                                        style:
+                                          'return `border-radius: ${widget.formData.radius}px !important;`',
+                                        stylist: [],
+                                        dataType: 'code',
+                                        style_from: 'code',
+                                        classDataType: 'static',
+                                      },
+                                    ],
+                                    class: ' mb-3',
+                                    style: 'background: #FFF;',
+                                    stylist: [],
+                                    version: 'v2',
+                                    dataType: 'static',
+                                    style_from: 'code',
+                                    classDataType: 'static',
+                                  };
+                                  return dd;
+                                });
+                                return [
+                                  html` <div
                                               class="d-flex ms-2 my-3"
                                               style="gap:10px;cursor:pointer;"
                                               onclick="${gvc.event(() => {
-                                                vm.cartData.user_info_same = !vm.cartData.user_info_same;
-                                                if (vm.cartData.user_info_same) {
-                                                  vm.cartData.user_info.name = vm.cartData.customer_info.name;
-                                                  vm.cartData.user_info.phone = vm.cartData.customer_info.phone;
-                                                  vm.cartData.user_info.email = vm.cartData.customer_info.email;
-                                                }
-                                                gvc.notifyDataChange(id);
-                                              })}"
+                                    vm.cartData.user_info_same = !vm.cartData.user_info_same;
+                                    if (vm.cartData.user_info_same) {
+                                      vm.cartData.user_info.name = vm.cartData.customer_info.name;
+                                      vm.cartData.user_info.phone = vm.cartData.customer_info.phone;
+                                      vm.cartData.user_info.email = vm.cartData.customer_info.email;
+                                    }
+                                    gvc.notifyDataChange(id);
+                                  })}"
                                             >
                                               <input
                                                 class="form-check-input form-checkbox  ${checkbox}"
@@ -3030,48 +3030,48 @@ export class CheckoutIndex {
                                               />
                                               ${Language.text('same_as_buyer_info')}
                                             </div>`,
-                                            FormWidget.editorView({
-                                              gvc: gvc,
-                                              array: form_array.map((dd: any, index: number) => {
-                                                dd.col = '6';
-                                                if (index === form_array.length - 1) {
-                                                  dd.col = '12';
-                                                }
-                                                return dd;
-                                              }),
-                                              refresh: () => {
-                                                this.storeLocalData(vm.cartData);
-                                                gvc.notifyDataChange(id);
-                                              },
-                                              formData: vm.cartData.user_info,
-                                            }),
-                                          ].join('<div class="my-2"></div>');
-                                        } catch (e) {
-                                          console.error(`error 4 =>`, e);
-                                          return '';
-                                        }
-                                      },
-                                      divCreate: {
-                                        class: `w-100 mt-2`,
-                                      },
-                                    };
-                                  })}
+                                  FormWidget.editorView({
+                                    gvc: gvc,
+                                    array: form_array.map((dd: any, index: number) => {
+                                      dd.col = '6';
+                                      if (index === form_array.length - 1) {
+                                        dd.col = '12';
+                                      }
+                                      return dd;
+                                    }),
+                                    refresh: () => {
+                                      this.storeLocalData(vm.cartData);
+                                      gvc.notifyDataChange(id);
+                                    },
+                                    formData: vm.cartData.user_info,
+                                  }),
+                                ].join('<div class="my-2"></div>');
+                              } catch (e) {
+                                console.error(`error 4 =>`, e);
+                                return '';
+                              }
+                            },
+                            divCreate: {
+                              class: `w-100 mt-2`,
+                            },
+                          };
+                        })}
                                   ${(() => {
-                                    const verify = [];
-                                    const shipment = vm.cartData.shipment_selector.find(
-                                      (item: any) => item.value === vm.cartData.user_info.shipment
-                                    );
-                                    if (shipment.isExcludedByTotal) {
-                                      verify.push(
-                                        '提示：若總金額超過20,000元，結帳系統無法提供四大超商配送，請調整購買項目'
-                                      );
-                                    }
-                                    if (shipment.isExcludedByWeight) {
-                                      verify.push(
-                                        '提示：若訂單總重超過20公斤，無法提供中華郵政/黑貓宅配服務，請調整購買項目'
-                                      );
-                                    }
-                                    return html`
+                          const verify = [];
+                          const shipment = vm.cartData.shipment_selector.find(
+                            (item: any) => item.value === vm.cartData.user_info.shipment
+                          );
+                          if (shipment.isExcludedByTotal) {
+                            verify.push(
+                              '提示：若總金額超過20,000元，結帳系統無法提供四大超商配送，請調整購買項目'
+                            );
+                          }
+                          if (shipment.isExcludedByWeight) {
+                            verify.push(
+                              '提示：若訂單總重超過20公斤，無法提供中華郵政/黑貓宅配服務，請調整購買項目'
+                            );
+                          }
+                          return html`
                                       <div style="height:100px;"></div>
 
                                       <div
@@ -3079,14 +3079,14 @@ export class CheckoutIndex {
                                         style="min-height:76px;z-index:10;"
                                       >
                                         ${(() => {
-                                          if (verify.length > 0) {
-                                            return verify
-                                              .map(dd => {
-                                                return `<div class="text-danger" style="font-size: 13px;">${dd}</div>`;
-                                              })
-                                              .join('');
-                                          } else {
-                                            return ` <div
+                            if (verify.length > 0) {
+                              return verify
+                                .map(dd => {
+                                  return `<div class="text-danger" style="font-size: 13px;">${dd}</div>`;
+                                })
+                                .join('');
+                            } else {
+                              return ` <div
                                           class="d-flex align-items-center justify-content-end"
                                           style="width:1180px;max-width: 100%;gap:24px;"
                                         >
@@ -3105,167 +3105,167 @@ export class CheckoutIndex {
                                             <button
                                               class="${gClass(verify.length > 0 ? 'button-bgr-disable' : 'button-bgr')}"
                                               style="${
-                                                document.body.clientWidth < 800
-                                                  ? `min-width:100px;`
-                                                  : `min-width:380px;`
-                                              }"
+                                document.body.clientWidth < 800
+                                  ? `min-width:100px;`
+                                  : `min-width:380px;`
+                              }"
                                               onclick="${gvc.event(() => {
-                                                const that = this;
-                                                if (onlineData?.interaction?.status == 3) {
-                                                  const dialog = new ShareDialog(gvc.glitter);
-                                                  dialog.infoMessage({
-                                                    text: `很抱歉，團購的結帳時間已截止，無法再進行訂單結算。感謝您的支持，期待下次再為您服務！`,
-                                                  });
-                                                  return;
-                                                }
-
-                                                if (
-                                                  (window as any).login_config.login_in_to_order &&
-                                                  !GlobalUser.token
-                                                ) {
-                                                  GlobalUser.loginRedirect = location.href;
-                                                  gvc.glitter.href = '/login';
-                                                  return;
-                                                }
-
-                                                function next() {
-                                                  if (vm.cartData.user_info_same) {
-                                                    vm.cartData.user_info.name = vm.cartData.customer_info.name;
-                                                    vm.cartData.user_info.phone = vm.cartData.customer_info.phone;
-                                                    vm.cartData.user_info.email = vm.cartData.customer_info.email;
-                                                  }
-                                                  if (verify.length > 0) {
-                                                    return;
-                                                  }
+                                const that = this;
+                                if (onlineData?.interaction?.status == 3) {
+                                  const dialog = new ShareDialog(gvc.glitter);
+                                  dialog.infoMessage({
+                                    text: `很抱歉，團購的結帳時間已截止，無法再進行訂單結算。感謝您的支持，期待下次再為您服務！`,
+                                  });
+                                  return;
+                                }
+
+                                if (
+                                  (window as any).login_config.login_in_to_order &&
+                                  !GlobalUser.token
+                                ) {
+                                  GlobalUser.loginRedirect = location.href;
+                                  gvc.glitter.href = '/login';
+                                  return;
+                                }
+
+                                function next() {
+                                  if (vm.cartData.user_info_same) {
+                                    vm.cartData.user_info.name = vm.cartData.customer_info.name;
+                                    vm.cartData.user_info.phone = vm.cartData.customer_info.phone;
+                                    vm.cartData.user_info.email = vm.cartData.customer_info.email;
+                                  }
+                                  if (verify.length > 0) {
+                                    return;
+                                  }
 
-                                                  if (shipmentList.length === 0) {
-                                                    vm.cartData.user_info.shipment = 'none';
-                                                  }
+                                  if (shipmentList.length === 0) {
+                                    vm.cartData.user_info.shipment = 'none';
+                                  }
 
-                                                  const dialog = new ShareDialog(gvc.glitter);
-                                                  if (!that.checkFormData(gvc, vm.cartData, widget)) {
-                                                    return;
-                                                  }
-                                                  for (const item of vm.cartData.lineItems) {
-                                                    const title =
-                                                      (item.language_data &&
-                                                        item.language_data[Language.getLanguage()].title) ||
-                                                      item.title;
-                                                    let min = (item.min_qty && parseInt(item.min_qty, 10)) || 1;
-                                                    let max_qty =
-                                                      (item.max_qty && parseInt(item.max_qty, 10)) || Infinity;
-                                                    let count = 0;
-                                                    for (const b of vm.cartData.lineItems) {
-                                                      if (b.id === item.id) {
-                                                        count += b.count;
-                                                      }
-                                                    }
-                                                    if (count < min) {
-                                                      dialog.errorMessage({
-                                                        text: Language.text('min_p_count_d')
-                                                          .replace('_c_', min)
-                                                          .replace('_p_', `『${title}』`),
-                                                      });
-                                                      return;
-                                                    }
-                                                    if (count > max_qty) {
-                                                      dialog.errorMessage({
-                                                        text: Language.text('max_p_count_d')
-                                                          .replace('_c_', max_qty)
-                                                          .replace('_p_', `『${title}』`),
-                                                      });
-                                                      return;
-                                                    }
-                                                    if (max_qty > 0 && count + item.buy_history_count > max_qty) {
-                                                      dialog.errorMessage({
-                                                        text: Language.text('trigger_maximum_item').replace(
-                                                          '_p_',
-                                                          `『${title}』`
-                                                        ),
-                                                      });
-                                                      return;
-                                                    }
-                                                  }
-                                                  [
-                                                    'MerchantTradeNo',
-                                                    'LogisticsSubType',
-                                                    'CVSStoreID',
-                                                    'CVSStoreName',
-                                                    'CVSTelephone',
-                                                    'CVSOutSide',
-                                                    'ExtraData',
-                                                    'CVSAddress',
-                                                  ].map(dd => {
-                                                    if (gvc.glitter.getUrlParameter(dd)) {
-                                                      vm.cartData.user_info[dd] = decodeURI(
-                                                        glitter.getUrlParameter(dd)
-                                                      );
-                                                    }
-                                                  });
-                                                  dialog.dataLoading({ visible: true });
-                                                  vm.cartData.user_info.note =
-                                                    (vm.cartData.user_info.note ?? '') + (check_out_sub.note ?? '');
-                                                  ApiShop.toCheckout({
-                                                    line_items: vm.cartData.lineItems.map((dd: any) => {
-                                                      return {
-                                                        id: dd.id,
-                                                        spec: dd.spec,
-                                                        count: dd.count,
-                                                      };
-                                                    }),
-                                                    customer_info: vm.cartData.customer_info,
-                                                    return_url: (() => {
-                                                      const originalUrl =
-                                                        glitter.root_path + 'order_detail' + location.search;
-                                                      const urlObject = new URL(originalUrl);
-                                                      urlObject.searchParams.set('EndCheckout', '1');
-                                                      const newUrl = urlObject.toString();
-                                                      if ((ApplicationConfig.device_type !== 'web') && ['jkopay','line_pay'].includes(vm.cartData.customer_info.payment_select)) {
-                                                        return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
-                                                      } else {
-                                                        return newUrl;
-                                                      }
-                                                    })(),
-                                                    user_info: vm.cartData.user_info,
-                                                    code: apiCart.cart.code,
-                                                    use_rebate: apiCart.cart.use_rebate,
-                                                    custom_form_format: vm.cartData.custom_form_format,
-                                                    custom_form_data: vm.cartData.custom_form_data,
-                                                    custom_receipt_form: vm.cartData.receipt_form,
-                                                    distribution_code: localStorage.getItem('distributionCode') ?? '',
-                                                    give_away: apiCart.cart.give_away,
-                                                  }).then(res => {
-                                                    dialog.dataLoading({ visible: false });
-                                                    if (vm.cartData.customer_info.payment_select == 'paynow') {
-                                                      if (!res.response?.data?.result?.secret) {
-                                                        return 'paynow API失敗';
-                                                      }
-                                                      glitter.innerDialog(
-                                                        (gvc: GVC) => {
-                                                          document.body.style.setProperty(
-                                                            'overflow-y',
-                                                            'hidden',
-                                                            'important'
-                                                          );
-                                                          return gvc.bindView({
-                                                            bind: `paynow`,
-                                                            view: () => {
-                                                              return html` <div
+                                  const dialog = new ShareDialog(gvc.glitter);
+                                  if (!that.checkFormData(gvc, vm.cartData, widget)) {
+                                    return;
+                                  }
+                                  for (const item of vm.cartData.lineItems) {
+                                    const title =
+                                      (item.language_data &&
+                                        item.language_data[Language.getLanguage()].title) ||
+                                      item.title;
+                                    let min = (item.min_qty && parseInt(item.min_qty, 10)) || 1;
+                                    let max_qty =
+                                      (item.max_qty && parseInt(item.max_qty, 10)) || Infinity;
+                                    let count = 0;
+                                    for (const b of vm.cartData.lineItems) {
+                                      if (b.id === item.id) {
+                                        count += b.count;
+                                      }
+                                    }
+                                    if (count < min) {
+                                      dialog.errorMessage({
+                                        text: Language.text('min_p_count_d')
+                                          .replace('_c_', min)
+                                          .replace('_p_', `『${title}』`),
+                                      });
+                                      return;
+                                    }
+                                    if (count > max_qty) {
+                                      dialog.errorMessage({
+                                        text: Language.text('max_p_count_d')
+                                          .replace('_c_', max_qty)
+                                          .replace('_p_', `『${title}』`),
+                                      });
+                                      return;
+                                    }
+                                    if (max_qty > 0 && count + item.buy_history_count > max_qty) {
+                                      dialog.errorMessage({
+                                        text: Language.text('trigger_maximum_item').replace(
+                                          '_p_',
+                                          `『${title}』`
+                                        ),
+                                      });
+                                      return;
+                                    }
+                                  }
+                                  [
+                                    'MerchantTradeNo',
+                                    'LogisticsSubType',
+                                    'CVSStoreID',
+                                    'CVSStoreName',
+                                    'CVSTelephone',
+                                    'CVSOutSide',
+                                    'ExtraData',
+                                    'CVSAddress',
+                                  ].map(dd => {
+                                    if (gvc.glitter.getUrlParameter(dd)) {
+                                      vm.cartData.user_info[dd] = decodeURI(
+                                        glitter.getUrlParameter(dd)
+                                      );
+                                    }
+                                  });
+                                  dialog.dataLoading({ visible: true });
+                                  vm.cartData.user_info.note =
+                                    (vm.cartData.user_info.note ?? '') + (check_out_sub.note ?? '');
+                                  ApiShop.toCheckout({
+                                    line_items: vm.cartData.lineItems.map((dd: any) => {
+                                      return {
+                                        id: dd.id,
+                                        spec: dd.spec,
+                                        count: dd.count,
+                                      };
+                                    }),
+                                    customer_info: vm.cartData.customer_info,
+                                    return_url: (() => {
+                                      const originalUrl =
+                                        glitter.root_path + 'order_detail' + location.search;
+                                      const urlObject = new URL(originalUrl);
+                                      urlObject.searchParams.set('EndCheckout', '1');
+                                      const newUrl = urlObject.toString();
+                                      if ((ApplicationConfig.device_type !== 'web') && ['jkopay','line_pay'].includes(vm.cartData.customer_info.payment_select)) {
+                                        return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
+                                      } else {
+                                        return newUrl;
+                                      }
+                                    })(),
+                                    user_info: vm.cartData.user_info,
+                                    code: apiCart.cart.code,
+                                    use_rebate: apiCart.cart.use_rebate,
+                                    custom_form_format: vm.cartData.custom_form_format,
+                                    custom_form_data: vm.cartData.custom_form_data,
+                                    custom_receipt_form: vm.cartData.receipt_form,
+                                    distribution_code: localStorage.getItem('distributionCode') ?? '',
+                                    give_away: apiCart.cart.give_away,
+                                  }).then(res => {
+                                    dialog.dataLoading({ visible: false });
+                                    if (vm.cartData.customer_info.payment_select == 'paynow') {
+                                      if (!res.response?.data?.result?.secret) {
+                                        return 'paynow API失敗';
+                                      }
+                                      glitter.innerDialog(
+                                        (gvc: GVC) => {
+                                          document.body.style.setProperty(
+                                            'overflow-y',
+                                            'hidden',
+                                            'important'
+                                          );
+                                          return gvc.bindView({
+                                            bind: `paynow`,
+                                            view: () => {
+                                              return html` <div
                                                                 class="w-100 h-100 d-flex align-items-center justify-content-center"
                                                               >
                                                                 ${document.body.clientWidth < 800
-                                                                  ? `
+                                                ? `
                                                                             <div class="bg-white position-relative vw-100" style="height: ${window.innerHeight}px;overflow-y: auto;
                                                                             padding-top:${50 + glitter.share.top_inset}px;
                                                                             ">
                                                                             `
-                                                                  : `<div class="p-3  bg-white position-relative" style="max-height: calc(100vh - 90px);overflow-y:auto;">`}
+                                                : `<div class="p-3  bg-white position-relative" style="max-height: calc(100vh - 90px);overflow-y:auto;">`}
                                                                 <div
                                                                   style="position: absolute; right: 15px;top:${15 +
-                                                                  glitter.share.top_inset}px;z-index:1;"
+                                              glitter.share.top_inset}px;z-index:1;"
                                                                   onclick="${gvc.event(() => {
-                                                                    gvc.closeDialog();
-                                                                  })}"
+                                                gvc.closeDialog();
+                                              })}"
                                                                 >
                                                                   <i
                                                                     class="fa-regular fa-circle-xmark fs-5 text-dark cursor_pointer"
@@ -3279,28 +3279,28 @@ export class CheckoutIndex {
                                                                 <div class="px-3 px-sm-0 w-100">
                                                                   <button
                                                                     class="${gClass(
-                                                                      verify.length > 0
-                                                                        ? 'button-bgr-disable'
-                                                                        : 'button-bgr'
-                                                                    )} "
+                                                verify.length > 0
+                                                  ? 'button-bgr-disable'
+                                                  : 'button-bgr'
+                                              )} "
                                                                     id="checkoutButton"
                                                                     onclick="${gvc.event(() => {
-                                                                      // const inputGroup = document.querySelector('#paynow-container');
-                                                                      // console.log("inputGroup -- " , inputGroup)
-                                                                      const PayNow = (window as any).PayNow;
-                                                                      const dialog = new ShareDialog(gvc.glitter);
-                                                                      dialog.dataLoading({ visible: true });
-                                                                      PayNow.checkout().then((response: any) => {
-                                                                        dialog.dataLoading({ visible: false });
-                                                                        if (response.error) {
-                                                                          dialog.errorMessage({
-                                                                            text: response.error.message,
-                                                                          });
-                                                                          // handle error
-                                                                        }
-                                                                        // handle success
-                                                                      });
-                                                                    })}"
+                                                // const inputGroup = document.querySelector('#paynow-container');
+                                                // console.log("inputGroup -- " , inputGroup)
+                                                const PayNow = (window as any).PayNow;
+                                                const dialog = new ShareDialog(gvc.glitter);
+                                                dialog.dataLoading({ visible: true });
+                                                PayNow.checkout().then((response: any) => {
+                                                  dialog.dataLoading({ visible: false });
+                                                  if (response.error) {
+                                                    dialog.errorMessage({
+                                                      text: response.error.message,
+                                                    });
+                                                    // handle error
+                                                  }
+                                                  // handle success
+                                                });
+                                              })}"
                                                                   >
                                                                     <span class="${gClass('button-text')}"
                                                                       >確認結帳</span
@@ -3308,160 +3308,160 @@ export class CheckoutIndex {
                                                                   </button>
                                                                 </div>
                                                               </div>`;
-                                                            },
-                                                            divCreate: {
-                                                              class: ` h-100 d-flex align-items-center justify-content-center`,
-                                                              style: `max-width:100vw;${document.body.clientWidth < 800 ? 'width:100%;' : 'width:400px;'};`,
-                                                            },
-                                                            onCreate: () => {
-                                                              const publicKey = res.response.publicKey;
-                                                              const secret = res.response.data.result.secret;
-                                                              const env =
-                                                                res.response.BETA == 'true' ? 'sandbox' : 'production';
-                                                              // res.response.result.secret
-                                                              const PayNow = (window as any).PayNow;
-                                                              PayNow.createPayment({
-                                                                publicKey: publicKey,
-                                                                secret: secret,
-                                                                env: env,
-                                                              });
-                                                              PayNow.mount('#paynow-container', {
-                                                                locale: 'zh_tw',
-                                                                appearance: {
-                                                                  variables: {
-                                                                    fontFamily: 'monospace',
-                                                                    colorPrimary: '#0078ab',
-                                                                    colorDefault: '#0a0a0a',
-                                                                    colorBorder: '#cccccc',
-                                                                    colorPlaceholder: '#eeeeee',
-                                                                    borderRadius: '.3rem',
-                                                                    colorDanger: '#ff3d3d',
-                                                                  },
-                                                                },
-                                                              });
-                                                            },
-                                                          });
-                                                        },
-                                                        `paynow`,
-                                                        {
-                                                          animation:
-                                                            document.body.clientWidth > 800
-                                                              ? Animation.fade
-                                                              : Animation.popup,
-                                                          dismiss: () => {
-                                                            document.body.style.setProperty('overflow-y', 'auto');
-                                                          },
-                                                        }
-                                                      );
-                                                    }
+                                            },
+                                            divCreate: {
+                                              class: ` h-100 d-flex align-items-center justify-content-center`,
+                                              style: `max-width:100vw;${document.body.clientWidth < 800 ? 'width:100%;' : 'width:400px;'};`,
+                                            },
+                                            onCreate: () => {
+                                              const publicKey = res.response.publicKey;
+                                              const secret = res.response.data.result.secret;
+                                              const env =
+                                                res.response.BETA == 'true' ? 'sandbox' : 'production';
+                                              // res.response.result.secret
+                                              const PayNow = (window as any).PayNow;
+                                              PayNow.createPayment({
+                                                publicKey: publicKey,
+                                                secret: secret,
+                                                env: env,
+                                              });
+                                              PayNow.mount('#paynow-container', {
+                                                locale: 'zh_tw',
+                                                appearance: {
+                                                  variables: {
+                                                    fontFamily: 'monospace',
+                                                    colorPrimary: '#0078ab',
+                                                    colorDefault: '#0a0a0a',
+                                                    colorBorder: '#cccccc',
+                                                    colorPlaceholder: '#eeeeee',
+                                                    borderRadius: '.3rem',
+                                                    colorDanger: '#ff3d3d',
+                                                  },
+                                                },
+                                              });
+                                            },
+                                          });
+                                        },
+                                        `paynow`,
+                                        {
+                                          animation:
+                                            document.body.clientWidth > 800
+                                              ? Animation.fade
+                                              : Animation.popup,
+                                          dismiss: () => {
+                                            document.body.style.setProperty('overflow-y', 'auto');
+                                          },
+                                        }
+                                      );
+                                    }
 
-                                                    localStorage.setItem(
-                                                      'clear_cart_items',
-                                                      JSON.stringify(vm.cartData.lineItems.map((item: any) => item.id))
-                                                    );
+                                    localStorage.setItem(
+                                      'clear_cart_items',
+                                      JSON.stringify(vm.cartData.lineItems.map((item: any) => item.id))
+                                    );
 
-                                                    if (res.response.off_line || res.response.is_free) {
-                                                      location.href = res.response.return_url;
-                                                    } else {
-                                                      if (
-                                                        res.response.returnCode == '0000' &&
-                                                        vm.cartData.customer_info.payment_select == 'line_pay'
-                                                      ) {
-                                                        if (glitter.share.is_application) {
-                                                          gvc.glitter.runJsInterFace(
-                                                            'intent_url',
-                                                            {
-                                                              url: res.response.info.paymentUrl.app,
-                                                            },
-                                                            () => {}
-                                                          );
-                                                          // location.href = res.response.info.paymentUrl.app;
-                                                        } else {
-                                                          location.href = res.response.info.paymentUrl.web;
-                                                        }
-                                                        // todo 手機跳轉用這個
-                                                        //     location.href = res.response.form.info.paymentUrl.app;
-                                                      } else if (res.response.approveLink) {
-                                                        location.href = res.response.approveLink;
-                                                      } else if (vm.cartData.customer_info.payment_select == 'jkopay') {
-                                                        if (glitter.share.is_application) {
-                                                          gvc.glitter.runJsInterFace(
-                                                            'intent_url',
-                                                            {
-                                                              url: res.response.result_object.payment_url,
-                                                            },
-                                                            () => {}
-                                                          );
-                                                        } else {
-                                                          location.href = res.response.result_object.payment_url;
-                                                        }
-                                                      } else {
-                                                        const id = gvc.glitter.getUUID();
-                                                        $('body').append(
-                                                          html` <div id="${id}" style="display: none;">
+                                    if (res.response.off_line || res.response.is_free) {
+                                      location.href = res.response.return_url;
+                                    } else {
+                                      if (
+                                        res.response.returnCode == '0000' &&
+                                        vm.cartData.customer_info.payment_select == 'line_pay'
+                                      ) {
+                                        if (glitter.share.is_application) {
+                                          gvc.glitter.runJsInterFace(
+                                            'intent_url',
+                                            {
+                                              url: res.response.info.paymentUrl.app,
+                                            },
+                                            () => {}
+                                          );
+                                          // location.href = res.response.info.paymentUrl.app;
+                                        } else {
+                                          location.href = res.response.info.paymentUrl.web;
+                                        }
+                                        // todo 手機跳轉用這個
+                                        //     location.href = res.response.form.info.paymentUrl.app;
+                                      } else if (res.response.approveLink) {
+                                        location.href = res.response.approveLink;
+                                      } else if (vm.cartData.customer_info.payment_select == 'jkopay') {
+                                        if (glitter.share.is_application) {
+                                          gvc.glitter.runJsInterFace(
+                                            'intent_url',
+                                            {
+                                              url: res.response.result_object.payment_url,
+                                            },
+                                            () => {}
+                                          );
+                                        } else {
+                                          location.href = res.response.result_object.payment_url;
+                                        }
+                                      } else {
+                                        const id = gvc.glitter.getUUID();
+                                        $('body').append(
+                                          html` <div id="${id}" style="display: none;">
                                                             ${res.response.form}
                                                           </div>`
-                                                        );
-                                                        (document.querySelector(`#${id} #submit`) as any).click();
-                                                      }
-                                                    }
-                                                  });
-                                                }
-
-                                                if (
-                                                  (window as any).login_config.login_in_to_order &&
-                                                  !GlobalUser.token
-                                                ) {
-                                                  GlobalUser.loginRedirect = location.href;
-                                                  gvc.glitter.href = '/login';
-                                                  return;
-                                                } else {
-                                                  ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
-                                                    if (
-                                                      res.response.userData &&
-                                                      !res.response.userData.phone &&
-                                                      (window as any).login_config.phone_verify &&
-                                                      glitter.getUrlParameter('page') !== 'account_edit'
-                                                    ) {
-                                                      const dialog = new ShareDialog(glitter);
-                                                      dialog.infoMessage({
-                                                        text: Language.text('phone_verify_check'),
-                                                      });
-                                                      glitter.href = '/account_edit';
-                                                    } else {
-                                                      next();
-                                                    }
-                                                  });
-                                                }
-                                              })}"
+                                        );
+                                        (document.querySelector(`#${id} #submit`) as any).click();
+                                      }
+                                    }
+                                  });
+                                }
+
+                                if (
+                                  (window as any).login_config.login_in_to_order &&
+                                  !GlobalUser.token
+                                ) {
+                                  GlobalUser.loginRedirect = location.href;
+                                  gvc.glitter.href = '/login';
+                                  return;
+                                } else {
+                                  ApiUser.getUserData(GlobalUser.token, 'me').then(res => {
+                                    if (
+                                      res.response.userData &&
+                                      !res.response.userData.phone &&
+                                      (window as any).login_config.phone_verify &&
+                                      glitter.getUrlParameter('page') !== 'account_edit'
+                                    ) {
+                                      const dialog = new ShareDialog(glitter);
+                                      dialog.infoMessage({
+                                        text: Language.text('phone_verify_check'),
+                                      });
+                                      glitter.href = '/account_edit';
+                                    } else {
+                                      next();
+                                    }
+                                  });
+                                }
+                              })}"
                                             >
                                               <span class="${gClass('button-text')} "
                                                     style="${verify.length > 0 ? `font-size:13px;` : ``}"
                                                 >
                                                 ${
-                                                  verify.length > 0
-                                                    ? verify.join('<br/>')
-                                                    : (window as any).login_config.login_in_to_order &&
-                                                        !GlobalUser.token
-                                                      ? Language.text('login_in_to_checkout')
-                                                      : Language.text('next')
-                                                }
+                                verify.length > 0
+                                  ? verify.join('<br/>')
+                                  : (window as any).login_config.login_in_to_order &&
+                                  !GlobalUser.token
+                                    ? Language.text('login_in_to_checkout')
+                                    : Language.text('next')
+                              }
                                                 </span >
                                             </button>
                                           </div>
                                         </div>`;
-                                          }
-                                        })()}
+                            }
+                          })()}
                                       </div>
                                     `;
-                                  })()}
+                        })()}
                                 </div>
                                 <div class="d-none d-sm-block" style="height:120px;"></div>
                               </div>
                               <div
                                 style="${document.body.clientWidth > 800
-                                  ? `width:calc(34% - 10px);position: sticky; top: 65px;`
-                                  : `width:calc(100%);`}"
+                          ? `width:calc(34% - 10px);position: sticky; top: 65px;`
+                          : `width:calc(100%);`}"
                               >
                                 <!--明細-->
                                 <div style="" class="rounded-3 bg-white w-100 p-3">${detail_info}</div>
@@ -3469,10 +3469,10 @@ export class CheckoutIndex {
                               </div>
                             </div>
                           `;
-                        },
-                      };
-                    })()
-                  )}
+                      },
+                    };
+                  })()
+                )}
                 </div>`;
               } catch (e) {
                 console.error(`error 5 =>`, e);
@@ -3741,8 +3741,8 @@ export class CheckoutIndex {
       return html` <div
         class="bg-white shadow rounded-3"
         style="overflow-y: auto;${document.body.clientWidth > 768
-          ? `min-width: 600px; width: 700px;`
-          : 'min-width: 90vw; max-width: 92.5vw;'}"
+        ? `min-width: 600px; width: 700px;`
+        : 'min-width: 90vw; max-width: 92.5vw;'}"
       >
         <div class="bg-white shadow rounded-3" style="width: 100%; overflow-y: auto; position: relative;">
           <div
@@ -3755,8 +3755,8 @@ export class CheckoutIndex {
               class="fa-regular fa-circle-xmark fs-5 text-dark"
               style="cursor: pointer"
               onclick="${gvc.event(() => {
-                gvc.closeDialog();
-              })}"
+        gvc.closeDialog();
+      })}"
             ></i>
           </div>
           <div class="c_dialog">
@@ -3819,20 +3819,20 @@ export class CheckoutIndex {
     cartData.off_line_support = cartData.off_line_support ?? {};
     console.log(cartData.off_line_support);
     cartData.off_line_support.atm &&
-      array.push({
-        name: '銀行轉帳',
-        value: 'atm',
-      });
+    array.push({
+      name: '銀行轉帳',
+      value: 'atm',
+    });
     cartData.off_line_support.line &&
-      array.push({
-        name: 'Line轉帳',
-        value: 'line',
-      });
+    array.push({
+      name: 'Line轉帳',
+      value: 'line',
+    });
     cartData.off_line_support.cash_on_delivery &&
-      array.push({
-        name: '貨到付款',
-        value: 'cash_on_delivery',
-      });
+    array.push({
+      name: '貨到付款',
+      value: 'cash_on_delivery',
+    });
     if (cartData.payment_info_custom && cartData.payment_info_custom.length > 0) {
       cartData.payment_info_custom.map((item: any) => {
         if (cartData.off_line_support[item.id]) {