ts-glitter 14.4.7 → 14.4.9
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 +7 -0
- package/lowcode/public-components/checkout/index.ts +6 -1
- package/lowcode/public-components/product/product-list.js +26 -3
- package/lowcode/public-components/product/product-list.ts +23 -3
- 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.9';
|
|
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.9';
|
|
77
77
|
glitter.share.start = new Date();
|
|
78
78
|
const vm: {
|
|
79
79
|
appConfig: any;
|
|
@@ -3086,6 +3086,13 @@ export class CheckoutIndex {
|
|
|
3086
3086
|
if (!(yield this.checkFormData(vm.cartData, widget))) {
|
|
3087
3087
|
return;
|
|
3088
3088
|
}
|
|
3089
|
+
;
|
|
3090
|
+
if (vm.cartData.user_info_same) {
|
|
3091
|
+
vm.cartData.user_info.name = vm.cartData.customer_info.name;
|
|
3092
|
+
vm.cartData.user_info.phone = vm.cartData.customer_info.phone;
|
|
3093
|
+
vm.cartData.user_info.email = vm.cartData.customer_info.email;
|
|
3094
|
+
}
|
|
3095
|
+
;
|
|
3089
3096
|
['MerchantTradeNo', 'LogisticsSubType', 'CVSStoreID', 'CVSStoreName', 'CVSTelephone', 'CVSOutSide', 'ExtraData', 'CVSAddress'].map((dd) => {
|
|
3090
3097
|
if (gvc.glitter.getUrlParameter(dd)) {
|
|
3091
3098
|
vm.cartData.user_info[dd] = decodeURI(glitter.getUrlParameter(dd));
|
|
@@ -3209,7 +3209,12 @@ function getBadgeClass(){
|
|
|
3209
3209
|
<button class="${gClass('button-bgr')}" onclick="${gvc.event(async () => {
|
|
3210
3210
|
if (!await this.checkFormData(vm.cartData, widget)) {
|
|
3211
3211
|
return
|
|
3212
|
-
}
|
|
3212
|
+
};
|
|
3213
|
+
if (vm.cartData.user_info_same) {
|
|
3214
|
+
vm.cartData.user_info.name = vm.cartData.customer_info.name
|
|
3215
|
+
vm.cartData.user_info.phone = vm.cartData.customer_info.phone
|
|
3216
|
+
vm.cartData.user_info.email = vm.cartData.customer_info.email
|
|
3217
|
+
};
|
|
3213
3218
|
['MerchantTradeNo', 'LogisticsSubType', 'CVSStoreID', 'CVSStoreName', 'CVSTelephone', 'CVSOutSide', 'ExtraData', 'CVSAddress'].map((dd) => {
|
|
3214
3219
|
if (gvc.glitter.getUrlParameter(dd)) {
|
|
3215
3220
|
vm.cartData.user_info[dd] = decodeURI(glitter.getUrlParameter(dd));
|
|
@@ -270,7 +270,10 @@ export class ProductList {
|
|
|
270
270
|
const page = parseInt(`${vm.pageIndex}`, 10) - 1;
|
|
271
271
|
const limit = vm.limit;
|
|
272
272
|
const collection = extractCategoryTitleFromUrl(location.href);
|
|
273
|
-
|
|
273
|
+
if (collection) {
|
|
274
|
+
gvc.glitter.setUrlParameter('search', undefined);
|
|
275
|
+
}
|
|
276
|
+
const titleMatch = gvc.glitter.getUrlParameter('search');
|
|
274
277
|
const maxPrice = '';
|
|
275
278
|
const minPrice = '';
|
|
276
279
|
const orderBy = orderByParam !== null && orderByParam !== void 0 ? orderByParam : '';
|
|
@@ -326,7 +329,17 @@ export class ProductList {
|
|
|
326
329
|
gvc.glitter.closeDrawer();
|
|
327
330
|
})}"
|
|
328
331
|
>
|
|
329
|
-
${
|
|
332
|
+
${(() => {
|
|
333
|
+
if (gvc.glitter.getUrlParameter('ai-search')) {
|
|
334
|
+
return `AI 選品`;
|
|
335
|
+
}
|
|
336
|
+
else if (gvc.glitter.getUrlParameter('search')) {
|
|
337
|
+
return `搜尋 : ${gvc.glitter.getUrlParameter('search')}`;
|
|
338
|
+
}
|
|
339
|
+
else {
|
|
340
|
+
return `所有商品`;
|
|
341
|
+
}
|
|
342
|
+
})()}
|
|
330
343
|
</div>
|
|
331
344
|
</li>
|
|
332
345
|
${cols
|
|
@@ -415,7 +428,17 @@ export class ProductList {
|
|
|
415
428
|
})());
|
|
416
429
|
}
|
|
417
430
|
function updatePageTitle() {
|
|
418
|
-
const all_text =
|
|
431
|
+
const all_text = (() => {
|
|
432
|
+
if (gvc.glitter.getUrlParameter('ai-search')) {
|
|
433
|
+
return `AI 選品`;
|
|
434
|
+
}
|
|
435
|
+
else if (gvc.glitter.getUrlParameter('search')) {
|
|
436
|
+
return `搜尋 : ${gvc.glitter.getUrlParameter('search')}`;
|
|
437
|
+
}
|
|
438
|
+
else {
|
|
439
|
+
return `所有商品`;
|
|
440
|
+
}
|
|
441
|
+
})();
|
|
419
442
|
if (!vm.collections || vm.collections.length === 0) {
|
|
420
443
|
vm.title = all_text;
|
|
421
444
|
}
|
|
@@ -440,11 +440,15 @@ export class ProductList {
|
|
|
440
440
|
}
|
|
441
441
|
|
|
442
442
|
async function getProductList() {
|
|
443
|
+
|
|
443
444
|
const orderByParam = glitter.getUrlParameter('order_by');
|
|
444
445
|
const page = parseInt(`${vm.pageIndex}`, 10) - 1;
|
|
445
446
|
const limit = vm.limit;
|
|
446
447
|
const collection = extractCategoryTitleFromUrl(location.href);
|
|
447
|
-
|
|
448
|
+
if(collection){
|
|
449
|
+
gvc.glitter.setUrlParameter('search',undefined)
|
|
450
|
+
}
|
|
451
|
+
const titleMatch = gvc.glitter.getUrlParameter('search');
|
|
448
452
|
const maxPrice = '';
|
|
449
453
|
const minPrice = '';
|
|
450
454
|
const orderBy = orderByParam ?? '';
|
|
@@ -499,7 +503,15 @@ export class ProductList {
|
|
|
499
503
|
gvc.glitter.closeDrawer();
|
|
500
504
|
})}"
|
|
501
505
|
>
|
|
502
|
-
${
|
|
506
|
+
${(()=>{
|
|
507
|
+
if(gvc.glitter.getUrlParameter('ai-search')){
|
|
508
|
+
return `AI 選品`
|
|
509
|
+
}else if(gvc.glitter.getUrlParameter('search')){
|
|
510
|
+
return `搜尋 : ${gvc.glitter.getUrlParameter('search')}`
|
|
511
|
+
}else{
|
|
512
|
+
return `所有商品`
|
|
513
|
+
}
|
|
514
|
+
})()}
|
|
503
515
|
</div>
|
|
504
516
|
</li>
|
|
505
517
|
${cols
|
|
@@ -590,7 +602,15 @@ export class ProductList {
|
|
|
590
602
|
}
|
|
591
603
|
|
|
592
604
|
function updatePageTitle() {
|
|
593
|
-
const all_text =
|
|
605
|
+
const all_text = (()=>{
|
|
606
|
+
if(gvc.glitter.getUrlParameter('ai-search')){
|
|
607
|
+
return `AI 選品`
|
|
608
|
+
}else if(gvc.glitter.getUrlParameter('search')){
|
|
609
|
+
return `搜尋 : ${gvc.glitter.getUrlParameter('search')}`
|
|
610
|
+
}else{
|
|
611
|
+
return `所有商品`
|
|
612
|
+
}
|
|
613
|
+
})();
|
|
594
614
|
if (!vm.collections || vm.collections.length === 0) {
|
|
595
615
|
vm.title = all_text;
|
|
596
616
|
} else {
|