ts-glitter 18.0.3 → 18.0.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
CHANGED
|
@@ -90,7 +90,7 @@ export class Entry {
|
|
|
90
90
|
}
|
|
91
91
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : clockF();
|
|
92
92
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
93
|
-
glitter.share.editerVersion = 'V_18.0.
|
|
93
|
+
glitter.share.editerVersion = 'V_18.0.4';
|
|
94
94
|
glitter.share.start = new Date();
|
|
95
95
|
const vm = {
|
|
96
96
|
appConfig: [],
|
package/lowcode/Entry.ts
CHANGED
|
@@ -91,7 +91,7 @@ export class Entry {
|
|
|
91
91
|
}
|
|
92
92
|
(window as any).renderClock = (window as any).renderClock ?? clockF();
|
|
93
93
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
94
|
-
glitter.share.editerVersion = 'V_18.0.
|
|
94
|
+
glitter.share.editerVersion = 'V_18.0.4';
|
|
95
95
|
glitter.share.start = new Date();
|
|
96
96
|
const vm: {
|
|
97
97
|
appConfig: any;
|
|
@@ -1573,6 +1573,14 @@ export class CheckoutIndex {
|
|
|
1573
1573
|
${gvc.bindView({
|
|
1574
1574
|
bind: ids.shipping,
|
|
1575
1575
|
view: () => {
|
|
1576
|
+
if ((vm.cartData.customer_info.payment_select === 'cash_on_delivery' && (!ShipmentConfig.supermarketList.includes(vm.cartData.user_info.shipment)))) {
|
|
1577
|
+
const find = this.getShipmentMethod(vm.cartData).find((d1) => {
|
|
1578
|
+
return ShipmentConfig.supermarketList.includes(d1.value);
|
|
1579
|
+
});
|
|
1580
|
+
vm.cartData.user_info.shipment = find && find.value;
|
|
1581
|
+
this.storeLocalData(vm.cartData);
|
|
1582
|
+
refreshCartData();
|
|
1583
|
+
}
|
|
1576
1584
|
return html ` <div>
|
|
1577
1585
|
<select
|
|
1578
1586
|
class="w-100 ${gClass('select')}"
|
|
@@ -1597,6 +1605,9 @@ export class CheckoutIndex {
|
|
|
1597
1605
|
>
|
|
1598
1606
|
${(() => {
|
|
1599
1607
|
return this.getShipmentMethod(vm.cartData)
|
|
1608
|
+
.filter((dd) => {
|
|
1609
|
+
return !(vm.cartData.customer_info.payment_select === 'cash_on_delivery' && !(ShipmentConfig.supermarketList.includes(dd.value)));
|
|
1610
|
+
})
|
|
1600
1611
|
.map((dd) => {
|
|
1601
1612
|
return html ` <option value="${dd.value}" ${vm.cartData.user_info.shipment === dd.value ? `selected` : ``}>
|
|
1602
1613
|
${Language.text(`ship_${dd.value}`) || Language.getLanguageCustomText(dd.name)}
|
|
@@ -1679,6 +1679,14 @@ export class CheckoutIndex {
|
|
|
1679
1679
|
${gvc.bindView({
|
|
1680
1680
|
bind: ids.shipping,
|
|
1681
1681
|
view: () => {
|
|
1682
|
+
if((vm.cartData.customer_info.payment_select==='cash_on_delivery' && (!ShipmentConfig.supermarketList.includes(vm.cartData.user_info.shipment)))){
|
|
1683
|
+
const find=this.getShipmentMethod(vm.cartData).find((d1:any)=>{
|
|
1684
|
+
return ShipmentConfig.supermarketList.includes(d1.value)
|
|
1685
|
+
})
|
|
1686
|
+
vm.cartData.user_info.shipment=find && find.value;
|
|
1687
|
+
this.storeLocalData(vm.cartData);
|
|
1688
|
+
refreshCartData();
|
|
1689
|
+
}
|
|
1682
1690
|
return html` <div>
|
|
1683
1691
|
<select
|
|
1684
1692
|
class="w-100 ${gClass('select')}"
|
|
@@ -1703,6 +1711,10 @@ export class CheckoutIndex {
|
|
|
1703
1711
|
>
|
|
1704
1712
|
${(() => {
|
|
1705
1713
|
return this.getShipmentMethod(vm.cartData)
|
|
1714
|
+
.filter((dd: { name: string; value: string })=>{
|
|
1715
|
+
return !(vm.cartData.customer_info.payment_select==='cash_on_delivery' && !(ShipmentConfig.supermarketList.includes(dd.value)))
|
|
1716
|
+
|
|
1717
|
+
})
|
|
1706
1718
|
.map((dd: { name: string; value: string }) => {
|
|
1707
1719
|
return html` <option value="${dd.value}" ${vm.cartData.user_info.shipment === dd.value ? `selected` : ``}>
|
|
1708
1720
|
${Language.text(`ship_${dd.value}`) || Language.getLanguageCustomText(dd.name)}
|