ts-glitter 14.4.3 → 14.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/public-components/checkout/index.js +6 -4
- package/lowcode/public-components/checkout/index.ts +5 -4
- package/lowcode/public-components/user-manager/um-rebate.js +1 -1
- package/lowcode/public-components/user-manager/um-rebate.ts +1 -1
- package/package.json +1 -1
package/lowcode/Entry.js
CHANGED
|
@@ -70,7 +70,7 @@ export class Entry {
|
|
|
70
70
|
}
|
|
71
71
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
72
72
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
73
|
-
glitter.share.editerVersion = 'V_14.4.
|
|
73
|
+
glitter.share.editerVersion = 'V_14.4.4';
|
|
74
74
|
glitter.share.start = new Date();
|
|
75
75
|
const vm = {
|
|
76
76
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -73,7 +73,7 @@ export class Entry {
|
|
|
73
73
|
}
|
|
74
74
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
75
75
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
76
|
-
glitter.share.editerVersion = 'V_14.4.
|
|
76
|
+
glitter.share.editerVersion = 'V_14.4.4';
|
|
77
77
|
glitter.share.start = new Date();
|
|
78
78
|
const vm: {
|
|
79
79
|
appConfig: any;
|
|
@@ -3221,9 +3221,11 @@ export class CheckoutIndex {
|
|
|
3221
3221
|
}
|
|
3222
3222
|
if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment'])) {
|
|
3223
3223
|
['MerchantID', 'MerchantTradeNo', 'LogisticsSubType', 'CVSStoreID', 'CVSAddress', 'CVSTelephone', 'CVSOutSide', 'CVSStoreName'].map((dd) => {
|
|
3224
|
-
|
|
3225
|
-
|
|
3226
|
-
|
|
3224
|
+
if (window.glitter.getUrlParameter(dd)) {
|
|
3225
|
+
subData[dd] = decodeURIComponent(window.glitter.getUrlParameter(dd));
|
|
3226
|
+
}
|
|
3227
|
+
else {
|
|
3228
|
+
subData[dd] = undefined;
|
|
3227
3229
|
}
|
|
3228
3230
|
});
|
|
3229
3231
|
}
|
|
@@ -3233,7 +3235,7 @@ export class CheckoutIndex {
|
|
|
3233
3235
|
else if (subData['shipment'] === 'normal' && !checkAddressPattern(subData['address'])) {
|
|
3234
3236
|
widget.event('error', { title: '地址長度需大於6個字元，且不可超過60個字元' });
|
|
3235
3237
|
}
|
|
3236
|
-
else if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment']) && (!subData['CVSStoreName']
|
|
3238
|
+
else if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment']) && (!subData['CVSStoreName'])) {
|
|
3237
3239
|
widget.event('error', { title: '請選擇「配送門市」' });
|
|
3238
3240
|
}
|
|
3239
3241
|
else if ((() => {
|
|
@@ -3365,9 +3365,10 @@ function getBadgeClass(){
|
|
|
3365
3365
|
}
|
|
3366
3366
|
if(['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment'])){
|
|
3367
3367
|
['MerchantID','MerchantTradeNo','LogisticsSubType','CVSStoreID','CVSAddress','CVSTelephone','CVSOutSide','CVSStoreName'].map((dd)=>{
|
|
3368
|
-
|
|
3369
|
-
|
|
3370
|
-
|
|
3368
|
+
if((window as any).glitter.getUrlParameter(dd)){
|
|
3369
|
+
subData[dd]=decodeURIComponent((window as any).glitter.getUrlParameter(dd))
|
|
3370
|
+
}else {
|
|
3371
|
+
subData[dd]=undefined
|
|
3371
3372
|
}
|
|
3372
3373
|
})
|
|
3373
3374
|
}
|
|
@@ -3375,7 +3376,7 @@ function getBadgeClass(){
|
|
|
3375
3376
|
widget.event('error', {title: '請輸入「配送地址」'});
|
|
3376
3377
|
} else if (subData['shipment'] === 'normal' && !checkAddressPattern(subData['address'])) {
|
|
3377
3378
|
widget.event('error', {title: '地址長度需大於6個字元，且不可超過60個字元'});
|
|
3378
|
-
} else if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment']) && (!subData['CVSStoreName']
|
|
3379
|
+
} else if (['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C'].includes(subData['shipment']) && (!subData['CVSStoreName'])) {
|
|
3379
3380
|
widget.event('error', {title: '請選擇「配送門市」'});
|
|
3380
3381
|
} else if ((() => {
|
|
3381
3382
|
const form = this.getShipmentMethod(cartData).find((dd: any) => {
|
|
@@ -200,7 +200,7 @@ export class UMRebate {
|
|
|
200
200
|
if (!(oldest.remain && oldest.deadline)) {
|
|
201
201
|
resolve('');
|
|
202
202
|
}
|
|
203
|
-
resolve(html `您尚有 ${oldest.remain.toLocaleString(
|
|
203
|
+
resolve(html `您尚有 ${oldest.remain.toLocaleString()} @{{rebate_title}}<br/>將於 ${glitter.ut.dateFormat(new Date(oldest.deadline), 'yyyy/MM/dd hh:mm')} 到期`);
|
|
204
204
|
}));
|
|
205
205
|
}),
|
|
206
206
|
new Promise((resolve) => {
|
|
@@ -224,7 +224,7 @@ export class UMRebate {
|
|
|
224
224
|
if (!(oldest.remain && oldest.deadline)) {
|
|
225
225
|
resolve('');
|
|
226
226
|
}
|
|
227
|
-
resolve(html`您尚有 ${oldest.remain.toLocaleString(
|
|
227
|
+
resolve(html`您尚有 ${oldest.remain.toLocaleString()} @{{rebate_title}}<br/>將於 ${glitter.ut.dateFormat(new Date(oldest.deadline), 'yyyy/MM/dd hh:mm')} 到期`);
|
|
228
228
|
});
|
|
229
229
|
}),
|
|
230
230
|
new Promise<RebateInfo[]>((resolve) => {
|