ts-glitter 14.7.6 → 14.7.8
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 -2
- package/lowcode/Entry.ts +1 -2
- package/lowcode/backend-manager/bg-guide.ts +1 -0
- package/lowcode/backend-manager/bg-notify.js +1 -0
- package/lowcode/backend-manager/bg-notify.ts +1 -0
- package/lowcode/backend-manager/bg-recommend.js +85 -0
- package/lowcode/backend-manager/bg-recommend.ts +95 -1
- package/lowcode/cms-plugin/shopping-discount-setting.js +0 -4
- package/lowcode/cms-plugin/shopping-discount-setting.ts +4 -4
- package/lowcode/cms-plugin/shopping-order-manager.js +1013 -744
- package/lowcode/cms-plugin/shopping-order-manager.ts +2435 -2139
- package/lowcode/glitter-base/route/shopping.js +2 -0
- package/lowcode/glitter-base/route/shopping.ts +3 -1
- package/lowcode/index.html +1 -0
- package/lowcode/public-components/checkout/index.js +1 -1
- package/lowcode/public-components/checkout/index.ts +1 -1
- package/lowcode/view-model/saas-view-model.js +0 -1
- package/lowcode/view-model/saas-view-model.ts +0 -1
- package/package.json +1 -1
- package/src/api-public/controllers/shop.js +1 -0
- package/src/api-public/controllers/shop.js.map +1 -1
- package/src/api-public/controllers/shop.ts +1 -0
- package/src/api-public/services/EcInvoice.js.map +1 -1
- package/src/api-public/services/EcInvoice.ts +0 -1
- package/src/api-public/services/recommend.js +1 -1
- package/src/api-public/services/recommend.ts +1 -1
- package/src/api-public/services/shopping.js +28 -50
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +56 -68
- package/src/api-public/services/user.js +3 -0
- package/src/api-public/services/user.js.map +1 -1
- package/src/api-public/services/user.ts +3 -0
- package/src/index.js +2 -1
- package/src/index.js.map +1 -1
- package/src/index.ts +2 -1
package/lowcode/Entry.js
CHANGED
|
@@ -80,7 +80,7 @@ export class Entry {
|
|
|
80
80
|
}
|
|
81
81
|
window.renderClock = (_a = window.renderClock) !== null && _a !== void 0 ? _a : clockF();
|
|
82
82
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
83
|
-
glitter.share.editerVersion = 'V_14.7.
|
|
83
|
+
glitter.share.editerVersion = 'V_14.7.8';
|
|
84
84
|
glitter.share.start = new Date();
|
|
85
85
|
const vm = {
|
|
86
86
|
appConfig: [],
|
|
@@ -298,7 +298,6 @@ export class Entry {
|
|
|
298
298
|
'assets/vendor/smooth-scroll/dist/smooth-scroll.polyfills.min.js',
|
|
299
299
|
'assets/vendor/swiper/swiper-bundle.min.js',
|
|
300
300
|
'assets/js/theme.min.js',
|
|
301
|
-
'https://kit.fontawesome.com/cccedec0f8.js',
|
|
302
301
|
'https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js',
|
|
303
302
|
], () => {
|
|
304
303
|
resolve(true);
|
package/lowcode/Entry.ts
CHANGED
|
@@ -82,7 +82,7 @@ export class Entry {
|
|
|
82
82
|
|
|
83
83
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
84
84
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
85
|
-
glitter.share.editerVersion = 'V_14.7.
|
|
85
|
+
glitter.share.editerVersion = 'V_14.7.8';
|
|
86
86
|
glitter.share.start = new Date();
|
|
87
87
|
const vm: {
|
|
88
88
|
appConfig: any;
|
|
@@ -311,7 +311,6 @@ export class Entry {
|
|
|
311
311
|
'assets/vendor/smooth-scroll/dist/smooth-scroll.polyfills.min.js',
|
|
312
312
|
'assets/vendor/swiper/swiper-bundle.min.js',
|
|
313
313
|
'assets/js/theme.min.js',
|
|
314
|
-
'https://kit.fontawesome.com/cccedec0f8.js',
|
|
315
314
|
'https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js',
|
|
316
315
|
],
|
|
317
316
|
() => {
|
|
@@ -2817,6 +2817,7 @@ export class BgGuide {
|
|
|
2817
2817
|
let bottom = iframeRect.bottom - 230;
|
|
2818
2818
|
const scrollEvent = this.disableScroll();
|
|
2819
2819
|
BG.classList.add('guide2-5');
|
|
2820
|
+
|
|
2820
2821
|
target.classList.add(`position-relative`);
|
|
2821
2822
|
const child_gvc: GVC = iframe.contentWindow.glitter.pageConfig[0].gvc;
|
|
2822
2823
|
gvc.addStyle(`
|
|
@@ -78,6 +78,7 @@ export class BgNotify {
|
|
|
78
78
|
search: vm.query || undefined,
|
|
79
79
|
filter: { account: 'no' },
|
|
80
80
|
}).then((data) => {
|
|
81
|
+
console.log("data -- ", data);
|
|
81
82
|
vm.dataList = data.response.data;
|
|
82
83
|
vmi.pageSize = Math.ceil(data.response.total / limit);
|
|
83
84
|
vmi.originalData = vm.dataList;
|
|
@@ -106,6 +106,7 @@ export class BgNotify {
|
|
|
106
106
|
search: vm.query || undefined,
|
|
107
107
|
filter: { account: 'no' },
|
|
108
108
|
}).then((data) => {
|
|
109
|
+
console.log("data -- " , data)
|
|
109
110
|
vm.dataList = data.response.data;
|
|
110
111
|
vmi.pageSize = Math.ceil(data.response.total / limit);
|
|
111
112
|
vmi.originalData = vm.dataList;
|
|
@@ -513,6 +513,43 @@ export class BgRecommend {
|
|
|
513
513
|
{ key: 'ptt', value: 'PTT' },
|
|
514
514
|
{ key: 'other', value: '其他' },
|
|
515
515
|
];
|
|
516
|
+
function getOrderlist(data) {
|
|
517
|
+
return data.map((dd) => {
|
|
518
|
+
return [
|
|
519
|
+
{
|
|
520
|
+
key: '訂單編號',
|
|
521
|
+
value: html ` <div style="overflow: hidden;white-space: normal;color: #4D86DB;word-break: break-all;">${dd.orderData.orderID}</div>`,
|
|
522
|
+
},
|
|
523
|
+
{
|
|
524
|
+
key: '訂單日期',
|
|
525
|
+
value: html ` <div style="overflow: hidden;white-space: normal;word-break: break-all;">${gvc.glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd')}</div>`,
|
|
526
|
+
},
|
|
527
|
+
{
|
|
528
|
+
key: '總金額',
|
|
529
|
+
value: parseInt(dd.orderData.total, 10).toLocaleString(),
|
|
530
|
+
},
|
|
531
|
+
{
|
|
532
|
+
key: '訂單狀態',
|
|
533
|
+
value: (() => {
|
|
534
|
+
if (dd.orderData.progress) {
|
|
535
|
+
const status = ApiShop.getShippingStatusArray().find((item) => item.value === dd.orderData.progress);
|
|
536
|
+
if (status) {
|
|
537
|
+
return status ? status.title : '未設定出貨狀態';
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
return '未設定出貨狀態';
|
|
541
|
+
})(),
|
|
542
|
+
},
|
|
543
|
+
{
|
|
544
|
+
key: '',
|
|
545
|
+
value: BgWidget.grayButton('查閱', gvc.event(() => {
|
|
546
|
+
vm.data = dd;
|
|
547
|
+
gvc.notifyDataChange(vm.id);
|
|
548
|
+
})),
|
|
549
|
+
},
|
|
550
|
+
];
|
|
551
|
+
});
|
|
552
|
+
}
|
|
516
553
|
return gvc.bindView(() => {
|
|
517
554
|
return {
|
|
518
555
|
bind: vm.id,
|
|
@@ -693,6 +730,54 @@ export class BgRecommend {
|
|
|
693
730
|
vm.data.share_type = data[0];
|
|
694
731
|
}, { single: true, readonly: vm.readonly })}`,
|
|
695
732
|
].join(BgWidget.mbContainer(18))),
|
|
733
|
+
gvc.bindView(() => {
|
|
734
|
+
const id = gvc.glitter.getUUID();
|
|
735
|
+
return {
|
|
736
|
+
bind: id,
|
|
737
|
+
view: () => {
|
|
738
|
+
return BgWidget.mainCard(html ` <div style="display: flex; margin-bottom: 8px;">
|
|
739
|
+
<span class="tx_700">訂單記錄</span>
|
|
740
|
+
</div>` +
|
|
741
|
+
gvc.bindView(() => {
|
|
742
|
+
const id = gvc.glitter.getUUID();
|
|
743
|
+
return {
|
|
744
|
+
bind: id,
|
|
745
|
+
view: () => {
|
|
746
|
+
const limit = 10;
|
|
747
|
+
return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
|
|
748
|
+
const h = BgWidget.tableV3({
|
|
749
|
+
gvc: gvc,
|
|
750
|
+
getData: (vd) => {
|
|
751
|
+
console.log("vm.data -- ", vm.data);
|
|
752
|
+
ApiShop.getOrder({
|
|
753
|
+
page: vd.page - 1,
|
|
754
|
+
limit: limit,
|
|
755
|
+
data_from: 'manager',
|
|
756
|
+
distribution_code: vm.data.code,
|
|
757
|
+
status: 1,
|
|
758
|
+
}).then((data) => {
|
|
759
|
+
console.log('data -- ', data);
|
|
760
|
+
vd.pageSize = Math.ceil(data.response.total / limit);
|
|
761
|
+
vd.originalData = data.response.data;
|
|
762
|
+
vd.tableData = getOrderlist(data.response.data);
|
|
763
|
+
vd.loading = false;
|
|
764
|
+
vd.callback();
|
|
765
|
+
});
|
|
766
|
+
},
|
|
767
|
+
rowClick: () => { },
|
|
768
|
+
filter: [],
|
|
769
|
+
});
|
|
770
|
+
resolve(html ` <div style="display:flex; gap: 18px; flex-direction: column;">${h}</div>`);
|
|
771
|
+
}));
|
|
772
|
+
},
|
|
773
|
+
};
|
|
774
|
+
}));
|
|
775
|
+
},
|
|
776
|
+
divCreate: {
|
|
777
|
+
class: 'p-0',
|
|
778
|
+
},
|
|
779
|
+
};
|
|
780
|
+
}),
|
|
696
781
|
BgWidget.mainCard((() => {
|
|
697
782
|
const id = gvc.glitter.getUUID();
|
|
698
783
|
return gvc.bindView({
|
|
@@ -619,7 +619,48 @@ export class BgRecommend {
|
|
|
619
619
|
{ key: 'ptt', value: 'PTT' },
|
|
620
620
|
{ key: 'other', value: '其他' },
|
|
621
621
|
];
|
|
622
|
-
|
|
622
|
+
function getOrderlist(data: any) {
|
|
623
|
+
return data.map((dd: any) => {
|
|
624
|
+
return [
|
|
625
|
+
{
|
|
626
|
+
key: '訂單編號',
|
|
627
|
+
value: html` <div style="overflow: hidden;white-space: normal;color: #4D86DB;word-break: break-all;">${dd.orderData.orderID}</div>`,
|
|
628
|
+
},
|
|
629
|
+
{
|
|
630
|
+
key: '訂單日期',
|
|
631
|
+
value: html` <div style="overflow: hidden;white-space: normal;word-break: break-all;">${gvc.glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd')}</div>`,
|
|
632
|
+
},
|
|
633
|
+
{
|
|
634
|
+
key: '總金額',
|
|
635
|
+
value: parseInt(dd.orderData.total, 10).toLocaleString(),
|
|
636
|
+
},
|
|
637
|
+
{
|
|
638
|
+
key: '訂單狀態',
|
|
639
|
+
value: (() => {
|
|
640
|
+
if (dd.orderData.progress) {
|
|
641
|
+
const status = ApiShop.getShippingStatusArray().find((item) => item.value === dd.orderData.progress);
|
|
642
|
+
if (status) {
|
|
643
|
+
return status ? status.title : '未設定出貨狀態';
|
|
644
|
+
}
|
|
645
|
+
}
|
|
646
|
+
return '未設定出貨狀態';
|
|
647
|
+
})(),
|
|
648
|
+
},
|
|
649
|
+
{
|
|
650
|
+
key: '',
|
|
651
|
+
value: BgWidget.grayButton(
|
|
652
|
+
'查閱',
|
|
653
|
+
gvc.event(() => {
|
|
654
|
+
// vm.userData = JSON.parse(JSON.stringify(vm.data));
|
|
655
|
+
vm.data = dd;
|
|
656
|
+
// vm.type = 'order';
|
|
657
|
+
gvc.notifyDataChange(vm.id);
|
|
658
|
+
})
|
|
659
|
+
),
|
|
660
|
+
},
|
|
661
|
+
];
|
|
662
|
+
});
|
|
663
|
+
}
|
|
623
664
|
return gvc.bindView(() => {
|
|
624
665
|
return {
|
|
625
666
|
bind: vm.id,
|
|
@@ -813,6 +854,59 @@ export class BgRecommend {
|
|
|
813
854
|
)}`,
|
|
814
855
|
].join(BgWidget.mbContainer(18))
|
|
815
856
|
),
|
|
857
|
+
// 訂單記錄
|
|
858
|
+
gvc.bindView(() => {
|
|
859
|
+
const id = gvc.glitter.getUUID();
|
|
860
|
+
return {
|
|
861
|
+
bind: id,
|
|
862
|
+
view: () => {
|
|
863
|
+
return BgWidget.mainCard(
|
|
864
|
+
html` <div style="display: flex; margin-bottom: 8px;">
|
|
865
|
+
<span class="tx_700">訂單記錄</span>
|
|
866
|
+
</div>` +
|
|
867
|
+
gvc.bindView(() => {
|
|
868
|
+
const id = gvc.glitter.getUUID();
|
|
869
|
+
return {
|
|
870
|
+
bind: id,
|
|
871
|
+
view: () => {
|
|
872
|
+
const limit = 10;
|
|
873
|
+
return new Promise(async (resolve) => {
|
|
874
|
+
const h = BgWidget.tableV3({
|
|
875
|
+
gvc: gvc,
|
|
876
|
+
getData: (vd) => {
|
|
877
|
+
console.log("vm.data -- " , vm.data)
|
|
878
|
+
ApiShop.getOrder({
|
|
879
|
+
page: vd.page - 1,
|
|
880
|
+
limit: limit,
|
|
881
|
+
data_from: 'manager',
|
|
882
|
+
distribution_code: vm.data.code,
|
|
883
|
+
status: 1,
|
|
884
|
+
}).then((data) => {
|
|
885
|
+
|
|
886
|
+
console.log('data -- ' , data)
|
|
887
|
+
// vm.dataList = data.response.data;
|
|
888
|
+
vd.pageSize = Math.ceil(data.response.total / limit);
|
|
889
|
+
vd.originalData = data.response.data;
|
|
890
|
+
vd.tableData = getOrderlist(data.response.data);
|
|
891
|
+
vd.loading = false;
|
|
892
|
+
vd.callback();
|
|
893
|
+
});
|
|
894
|
+
},
|
|
895
|
+
rowClick: () => {},
|
|
896
|
+
filter: [],
|
|
897
|
+
});
|
|
898
|
+
resolve(html` <div style="display:flex; gap: 18px; flex-direction: column;">${h}</div>`);
|
|
899
|
+
});
|
|
900
|
+
},
|
|
901
|
+
};
|
|
902
|
+
})
|
|
903
|
+
);
|
|
904
|
+
},
|
|
905
|
+
divCreate: {
|
|
906
|
+
class: 'p-0',
|
|
907
|
+
},
|
|
908
|
+
};
|
|
909
|
+
}),
|
|
816
910
|
BgWidget.mainCard(
|
|
817
911
|
(() => {
|
|
818
912
|
const id = gvc.glitter.getUUID();
|