ts-glitter 14.3.6 → 14.3.8

package/lowcode/Entry.js

@@ -70,7 +70,7 @@ export class Entry {
         }
         window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
         console.log(`Entry-time:`, window.renderClock.stop());
-        glitter.share.editerVersion = 'V_14.3.6';
+        glitter.share.editerVersion = 'V_14.3.8';
         glitter.share.start = new Date();
         const vm = {
             appConfig: [],

package/lowcode/Entry.ts

@@ -10,6 +10,7 @@ import {EditorElem} from "./glitterBundle/plugins/editor-elem.js";
 
 export class Entry {
     public static onCreate(glitter: Glitter) {
+
         glitter.share.reload = (page: string, app_name: string) => {
             (window as any).appName = app_name || (window as any).appName;
             (window as any).glitter_page = page;
@@ -72,7 +73,7 @@ export class Entry {
         }
         (window as any).renderClock = (window as any).renderClock ?? clockF();
         console.log(`Entry-time:`, (window as any).renderClock.stop());
-        glitter.share.editerVersion = 'V_14.3.6';
+        glitter.share.editerVersion = 'V_14.3.8';
         glitter.share.start = new Date();
         const vm: {
             appConfig: any;

package/lowcode/cms-plugin/shopping-finance-setting.js

@@ -58,7 +58,7 @@ export class ShoppingFinanceSetting {
                         return [
                             BgWidget.mainCard(html `
                                                 <div class="tx_700">線上金流</div>
-                                                ${BgWidget.grayNote('透過藍新或綠界服務商串接線上付款功能')} ${BgWidget.mbContainer(12)}
+                                                ${BgWidget.grayNote('透過服務商串接線上付款功能')} ${BgWidget.mbContainer(12)}
                                                 ${BgWidget.multiCheckboxContainer(gvc, onlinePayArray, (() => {
                                 let array = [];
                                 keyData.newWebPay.toggle && array.push('newWebPay');

package/lowcode/cms-plugin/shopping-finance-setting.ts

@@ -108,7 +108,7 @@ export class ShoppingFinanceSetting {
                                     BgWidget.mainCard(
                                             html`
                                                 <div class="tx_700">線上金流</div>
-                                                ${BgWidget.grayNote('透過藍新或綠界服務商串接線上付款功能')} ${BgWidget.mbContainer(12)}
+                                                ${BgWidget.grayNote('透過服務商串接線上付款功能')} ${BgWidget.mbContainer(12)}
                                                 ${BgWidget.multiCheckboxContainer(
                                                         gvc,
                                                         onlinePayArray,

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

@@ -3218,6 +3218,14 @@ export class CheckoutIndex {
                     widget.event('error', { title: '姓名請設定為4~10字元(中文2~5個字, 英文4~10個字, 不得含指定特殊符號)' });
                 }
             }
+            if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment'])) {
+                ['MerchantID', 'MerchantTradeNo', 'LogisticsSubType', 'CVSStoreID', 'CVSAddress', 'CVSTelephone', 'CVSOutSide', 'CVSStoreName'].map((dd) => {
+                    const value = decodeURIComponent(window.glitter.getUrlParameter(dd));
+                    if (value) {
+                        subData[dd] = value;
+                    }
+                });
+            }
             if (subData['shipment'] === 'normal' && (!subData['address'] || subData['address'] === '')) {
                 widget.event('error', { title: '請輸入「配送地址」' });
             }
@@ -3414,7 +3422,7 @@ export class CheckoutIndex {
             .${className}:checked[type='checkbox'] {
                 border: 2px solid ${color !== null && color !== void 0 ? color : '#000'};
                 background-color: #fff;
-                background-image: url(${this.checkedDataImage(color !== null && color !== void 0 ? color : '#000')});
+                background-image: url(${this.checkedDataImage(color !== null && color !== void 0 ? color : '#000')}) !important;
                 background-position: center center;
             }
         `);

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

@@ -3351,7 +3351,14 @@ function getBadgeClass(){
                     widget.event('error', {title: '姓名請設定為4~10字元(中文2~5個字, 英文4~10個字, 不得含指定特殊符號)'});
                 }
             }
-
+            if(['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment'])){
+                ['MerchantID','MerchantTradeNo','LogisticsSubType','CVSStoreID','CVSAddress','CVSTelephone','CVSOutSide','CVSStoreName'].map((dd)=>{
+                   const value=decodeURIComponent((window as any).glitter.getUrlParameter(dd))
+                    if(value){
+                        subData[dd]=value
+                    }
+                })
+            }
             if (subData['shipment'] === 'normal' && (!subData['address'] || subData['address'] === '')) {
                 widget.event('error', {title: '請輸入「配送地址」'});
             } else if (subData['shipment'] === 'normal' && !checkAddressPattern(subData['address'])) {
@@ -3566,7 +3573,7 @@ function getBadgeClass(){
             .${className}:checked[type='checkbox'] {
                 border: 2px solid ${color ?? '#000'};
                 background-color: #fff;
-                background-image: url(${this.checkedDataImage(color ?? '#000')});
+                background-image: url(${this.checkedDataImage(color ?? '#000')}) !important;
                 background-position: center center;
             }
         `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "14.3.6",
+  "version": "14.3.8",
   "description": "",
   "main": "index.js",
   "scripts": {