ts-glitter 18.2.6 → 18.2.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 +30 -1
- package/lowcode/Entry.ts +36 -1
- package/lowcode/cms-plugin/customer-message-user.js +503 -8
- package/lowcode/cms-plugin/customer-message-user.ts +549 -12
- package/lowcode/cms-plugin/shopping-finance-setting.js +4 -4
- package/lowcode/cms-plugin/shopping-finance-setting.ts +4 -4
- package/lowcode/cms-plugin/shopping-information.js +16 -0
- package/lowcode/cms-plugin/shopping-information.ts +16 -0
- package/lowcode/cms-plugin/shopping-order-manager.js +138 -77
- package/lowcode/cms-plugin/shopping-order-manager.ts +177 -102
- package/lowcode/glitter-base/global/language.js +6 -0
- package/lowcode/glitter-base/global/language.ts +6 -0
- package/lowcode/glitterBundle/GVController.js +2 -2
- package/lowcode/glitterBundle/GVController.ts +2 -2
- package/lowcode/glitterBundle/dialog/dialog_inner.js +5 -2
- package/lowcode/glitterBundle/dialog/dialog_inner.ts +5 -2
- package/lowcode/glitterBundle/module/Animation.js +59 -0
- package/lowcode/glitterBundle/module/Animation.ts +62 -0
- package/lowcode/glitterBundle/module/PageManager.js +3 -3
- package/lowcode/glitterBundle/module/PageManager.ts +1 -1
- package/lowcode/index.html +1 -0
- package/lowcode/public-components/checkout/index.js +77 -117
- package/lowcode/public-components/checkout/index.ts +174 -221
- package/lowcode/public-components/footer/footer-01.js +3 -0
- package/lowcode/public-components/footer/footer-01.ts +3 -0
- package/lowcode/public-components/footer/footer-02.js +3 -0
- package/lowcode/public-components/footer/footer-02.ts +3 -0
- package/lowcode/public-components/footer/footer-03.js +3 -0
- package/lowcode/public-components/footer/footer-03.ts +3 -0
- package/lowcode/public-components/product/pd-class.js +868 -355
- package/lowcode/public-components/product/pd-class.ts +1005 -438
- package/lowcode/public-components/product/product-detail.js +1 -1
- package/lowcode/public-components/product/product-detail.ts +3 -1
- package/package.json +1 -1
- package/src/api-public/controllers/article.js.map +1 -1
- package/src/api-public/controllers/delivery.js.map +1 -1
- package/src/api-public/controllers/delivery.ts +2 -0
- package/src/api-public/controllers/shop.js +3 -2
- package/src/api-public/controllers/shop.js.map +1 -1
- package/src/api-public/controllers/shop.ts +4 -3
- package/src/api-public/controllers/user.js.map +1 -1
- package/src/api-public/services/ai-robot.js.map +1 -1
- package/src/api-public/services/fb-api.js.map +1 -1
- package/src/api-public/services/financial-service.d.ts +4 -0
- package/src/api-public/services/financial-service.js +48 -23
- package/src/api-public/services/financial-service.js.map +1 -1
- package/src/api-public/services/financial-service.ts +57 -26
- package/src/api-public/services/public-table-check.js.map +1 -1
- package/src/api-public/services/shopping.js +7 -0
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +9 -0
- package/src/api-public/services/user.d.ts +2 -2
- package/src/api-public/services/user.js +8 -2
- package/src/api-public/services/user.js.map +1 -1
- package/src/api-public/services/user.ts +8 -2
- package/src/index.js +3 -3
- package/src/index.js.map +1 -1
|
@@ -662,18 +662,18 @@ export class ShoppingFinanceSetting {
|
|
|
662
662
|
BgWidget.editeInput({
|
|
663
663
|
gvc: gvc,
|
|
664
664
|
title: '串接帳號',
|
|
665
|
-
default: key_d.
|
|
665
|
+
default: key_d.account,
|
|
666
666
|
callback: (text) => {
|
|
667
|
-
key_d.
|
|
667
|
+
key_d.account = text;
|
|
668
668
|
},
|
|
669
669
|
placeHolder: '請輸入串接帳號',
|
|
670
670
|
}),
|
|
671
671
|
BgWidget.editeInput({
|
|
672
672
|
gvc: gvc,
|
|
673
673
|
title: '串接密碼',
|
|
674
|
-
default: key_d.
|
|
674
|
+
default: key_d.pwd,
|
|
675
675
|
callback: (text) => {
|
|
676
|
-
key_d.
|
|
676
|
+
key_d.pwd = text;
|
|
677
677
|
},
|
|
678
678
|
placeHolder: '請輸入串接密碼',
|
|
679
679
|
})].join('');
|
|
@@ -323,6 +323,22 @@ export class ShoppingInformation {
|
|
|
323
323
|
: ``}
|
|
324
324
|
/>
|
|
325
325
|
</div>
|
|
326
|
+
<div class="d-flex flex-column" style="gap:8px;">
|
|
327
|
+
<div style="color: #393939;font-size: 16px;">啟用聊聊功能</div>
|
|
328
|
+
<div style="color: #8D8D8D;font-size:13px;">啟用聊聊功能，方便客戶直接於官網前台與您聯繫，並詢問商品詳細內容。
|
|
329
|
+
</div>
|
|
330
|
+
<div class="cursor_pointer form-check form-switch m-0 p-0"
|
|
331
|
+
style="margin-top: 10px;">
|
|
332
|
+
<input
|
|
333
|
+
class="form-check-input m-0"
|
|
334
|
+
type="checkbox"
|
|
335
|
+
onchange="${gvc.event((e, event) => {
|
|
336
|
+
vm.data.chat_toggle = !vm.data.chat_toggle;
|
|
337
|
+
})}"
|
|
338
|
+
${vm.data.chat_toggle ? `checked` : ``}
|
|
339
|
+
/>
|
|
340
|
+
</div>
|
|
341
|
+
</div>
|
|
326
342
|
<div class="d-flex flex-column" style="gap:8px;">
|
|
327
343
|
<div style="color: #393939;font-size: 16px;">啟用心願單功能</div>
|
|
328
344
|
<div style="color: #8D8D8D;font-size:13px;">啟用心願單功能，方便客戶收藏並管理喜愛的商品清單。<br>
|
|
@@ -351,6 +351,22 @@ export class ShoppingInformation {
|
|
|
351
351
|
: ``}
|
|
352
352
|
/>
|
|
353
353
|
</div>
|
|
354
|
+
<div class="d-flex flex-column" style="gap:8px;">
|
|
355
|
+
<div style="color: #393939;font-size: 16px;">啟用聊聊功能</div>
|
|
356
|
+
<div style="color: #8D8D8D;font-size:13px;">啟用聊聊功能，方便客戶直接於官網前台與您聯繫，並詢問商品詳細內容。
|
|
357
|
+
</div>
|
|
358
|
+
<div class="cursor_pointer form-check form-switch m-0 p-0"
|
|
359
|
+
style="margin-top: 10px;">
|
|
360
|
+
<input
|
|
361
|
+
class="form-check-input m-0"
|
|
362
|
+
type="checkbox"
|
|
363
|
+
onchange="${gvc.event((e, event) => {
|
|
364
|
+
vm.data.chat_toggle = !vm.data.chat_toggle
|
|
365
|
+
})}"
|
|
366
|
+
${vm.data.chat_toggle ? `checked` : ``}
|
|
367
|
+
/>
|
|
368
|
+
</div>
|
|
369
|
+
</div>
|
|
354
370
|
<div class="d-flex flex-column" style="gap:8px;">
|
|
355
371
|
<div style="color: #393939;font-size: 16px;">啟用心願單功能</div>
|
|
356
372
|
<div style="color: #8D8D8D;font-size:13px;">啟用心願單功能，方便客戶收藏並管理喜愛的商品清單。<br>
|
|
@@ -865,7 +865,7 @@ export class ShoppingOrderManager {
|
|
|
865
865
|
bind: mainViewID,
|
|
866
866
|
dataList: [{ obj: child_vm, key: 'type' }],
|
|
867
867
|
view: () => {
|
|
868
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j
|
|
868
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
869
869
|
try {
|
|
870
870
|
if (userDataLoading || productLoading) {
|
|
871
871
|
return BgWidget.spinner();
|
|
@@ -1250,9 +1250,21 @@ export class ShoppingOrderManager {
|
|
|
1250
1250
|
},
|
|
1251
1251
|
],
|
|
1252
1252
|
callback: (text) => {
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1253
|
+
const dialog = new ShareDialog(gvc.glitter);
|
|
1254
|
+
dialog.checkYesOrNot({
|
|
1255
|
+
text: '是否確認變更付款狀態?',
|
|
1256
|
+
callback: (response) => {
|
|
1257
|
+
if (response) {
|
|
1258
|
+
if (text && text !== `${orderData.status}`) {
|
|
1259
|
+
orderData.status = parseInt(text, 10);
|
|
1260
|
+
saveEvent();
|
|
1261
|
+
}
|
|
1262
|
+
}
|
|
1263
|
+
else {
|
|
1264
|
+
gvc.notifyDataChange(mainViewID);
|
|
1265
|
+
}
|
|
1266
|
+
}
|
|
1267
|
+
});
|
|
1256
1268
|
},
|
|
1257
1269
|
})}
|
|
1258
1270
|
</div>
|
|
@@ -1265,71 +1277,116 @@ export class ShoppingOrderManager {
|
|
|
1265
1277
|
</div>
|
|
1266
1278
|
${ShoppingOrderManager.getProofPurchaseString(orderData.orderData, gvc)}
|
|
1267
1279
|
</div>`,
|
|
1268
|
-
(
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
|
|
1290
|
-
|
|
1291
|
-
|
|
1292
|
-
|
|
1280
|
+
(() => {
|
|
1281
|
+
var _a, _b;
|
|
1282
|
+
if ((orderData.orderData.customer_info.payment_select === 'ecPay')) {
|
|
1283
|
+
const cash_flow = orderData.orderData.cash_flow;
|
|
1284
|
+
return html `
|
|
1285
|
+
<div style="display: flex;flex-direction: column;align-items: flex-start;gap: 12px;align-self: stretch;">
|
|
1286
|
+
<div class="tx_700">金流對帳
|
|
1287
|
+
</div>
|
|
1288
|
+
<div> ${(cash_flow.TradeStatus === '1' ? [
|
|
1289
|
+
`<div class="d-flex align-items-center">
|
|
1290
|
+
金流交易結果: ${(cash_flow.credit_receipt && cash_flow.credit_receipt.status) || '已付款'} <button class="btn btn-gray rounded-2 ms-2 ${(cash_flow.PaymentType.toLowerCase().includes('credit') && (cash_flow.credit_receipt && cash_flow.credit_receipt.status === '已授權')) ? `` : `d-none`}" type="button" style="height:22px;" onclick="${gvc.event(() => {
|
|
1291
|
+
const doalog = new ShareDialog(gvc.glitter);
|
|
1292
|
+
doalog.checkYesOrNot({
|
|
1293
|
+
text: '是否確認退刷交易?',
|
|
1294
|
+
callback: (response) => {
|
|
1295
|
+
if (response) {
|
|
1296
|
+
doalog.dataLoading({ visible: true });
|
|
1297
|
+
ApiShop.ecPayBrushOrders({
|
|
1298
|
+
tradNo: cash_flow.TradeNo,
|
|
1299
|
+
orderID: orderData.cart_token,
|
|
1300
|
+
total: cash_flow.TradeAmt
|
|
1301
|
+
}).then((res) => {
|
|
1302
|
+
doalog.dataLoading({ visible: false });
|
|
1303
|
+
orderData.status = -2;
|
|
1304
|
+
saveEvent();
|
|
1305
|
+
});
|
|
1306
|
+
}
|
|
1307
|
+
}
|
|
1308
|
+
});
|
|
1309
|
+
})}">
|
|
1293
1310
|
<span class=" tx_700" style="font-size:13px;">退刷</span>
|
|
1294
1311
|
</button>
|
|
1295
1312
|
</div>`,
|
|
1296
|
-
|
|
1297
|
-
|
|
1298
|
-
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1302
|
-
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1306
|
-
|
|
1307
|
-
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1322
|
-
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
|
|
1326
|
-
|
|
1327
|
-
|
|
1328
|
-
|
|
1329
|
-
|
|
1330
|
-
|
|
1331
|
-
|
|
1332
|
-
|
|
1313
|
+
`金流交易方式: ${(_a = [
|
|
1314
|
+
{
|
|
1315
|
+
title: 'WebATM',
|
|
1316
|
+
key: 'WebATM'
|
|
1317
|
+
},
|
|
1318
|
+
{
|
|
1319
|
+
title: 'ATM',
|
|
1320
|
+
key: 'ATM'
|
|
1321
|
+
},
|
|
1322
|
+
{
|
|
1323
|
+
title: '超商代碼',
|
|
1324
|
+
key: 'CVS'
|
|
1325
|
+
},
|
|
1326
|
+
{
|
|
1327
|
+
title: '超商條碼',
|
|
1328
|
+
key: 'BARCODE'
|
|
1329
|
+
},
|
|
1330
|
+
{
|
|
1331
|
+
title: '信用卡',
|
|
1332
|
+
key: 'Credit'
|
|
1333
|
+
},
|
|
1334
|
+
{
|
|
1335
|
+
title: '未知付款方式',
|
|
1336
|
+
key: ''
|
|
1337
|
+
}
|
|
1338
|
+
].find((dd) => {
|
|
1339
|
+
return cash_flow.PaymentType.toLowerCase().includes(dd.key.toLowerCase());
|
|
1340
|
+
})) === null || _a === void 0 ? void 0 : _a.title}`,
|
|
1341
|
+
`交易手續費: ${cash_flow.HandlingCharge}`,
|
|
1342
|
+
`交易總金額: ${cash_flow.TradeAmt}`,
|
|
1343
|
+
`交易時間: ${cash_flow.PaymentDate}`
|
|
1344
|
+
] : [
|
|
1345
|
+
`金流交易結果: 未付款`
|
|
1346
|
+
]).join(`<div class="my-2"></div>`)}
|
|
1347
|
+
</div>
|
|
1348
|
+
</div>`;
|
|
1349
|
+
}
|
|
1350
|
+
else if (orderData.orderData.customer_info.payment_select === 'paynow') {
|
|
1351
|
+
const cash_flow = orderData.orderData.cash_flow;
|
|
1352
|
+
return html `
|
|
1353
|
+
<div style="display: flex;flex-direction: column;align-items: flex-start;gap: 12px;align-self: stretch;">
|
|
1354
|
+
<div class="tx_700">金流對帳
|
|
1355
|
+
</div>
|
|
1356
|
+
<div> ${(cash_flow.status === 'success' ? [
|
|
1357
|
+
html `
|
|
1358
|
+
<div class="d-flex align-items-center">
|
|
1359
|
+
金流交易結果: 已付款
|
|
1360
|
+
</div>`,
|
|
1361
|
+
html `金流交易方式: ${(_b = [
|
|
1362
|
+
{
|
|
1363
|
+
title: 'ATM',
|
|
1364
|
+
key: 'ATM'
|
|
1365
|
+
},
|
|
1366
|
+
{
|
|
1367
|
+
title: '信用卡',
|
|
1368
|
+
key: 'CreditCard'
|
|
1369
|
+
},
|
|
1370
|
+
{
|
|
1371
|
+
title: '超商代碼',
|
|
1372
|
+
key: 'ConvenienceStore'
|
|
1373
|
+
}
|
|
1374
|
+
].find((dd) => {
|
|
1375
|
+
return cash_flow.payment.paymentMethod === dd.key;
|
|
1376
|
+
})) === null || _b === void 0 ? void 0 : _b.title}`,
|
|
1377
|
+
`交易總金額: ${cash_flow.amount}`,
|
|
1378
|
+
`交易時間: ${gvc.glitter.ut.dateFormat(new Date(cash_flow.payment.paidAt), 'yyyy-MM-dd hh:mm:ss')}`
|
|
1379
|
+
] : [
|
|
1380
|
+
`金流交易結果: 未付款`
|
|
1381
|
+
]).join(`<div class="my-2"></div>`)}
|
|
1382
|
+
</div>
|
|
1383
|
+
</div>
|
|
1384
|
+
`;
|
|
1385
|
+
}
|
|
1386
|
+
else {
|
|
1387
|
+
return ``;
|
|
1388
|
+
}
|
|
1389
|
+
})()
|
|
1333
1390
|
].filter((dd) => {
|
|
1334
1391
|
return dd;
|
|
1335
1392
|
}).join(BgWidget.mbContainer(18))),
|
|
@@ -1534,17 +1591,17 @@ export class ShoppingOrderManager {
|
|
|
1534
1591
|
try {
|
|
1535
1592
|
if (ShipmentConfig.supportPrintList.includes(orderData.orderData.user_info.shipment) && ((orderData.orderData.user_info.shipment_number && orderData.orderData.user_info.shipment_refer === 'paynow'))) {
|
|
1536
1593
|
return html `
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
1542
|
-
|
|
1543
|
-
|
|
1594
|
+
${BgWidget.mbContainer(12)}
|
|
1595
|
+
<div class="tx_700 d-flex align-items-end"
|
|
1596
|
+
style="gap:5px;">
|
|
1597
|
+
物流追蹤
|
|
1598
|
+
</div>
|
|
1599
|
+
${BgWidget.mbContainer(12)}
|
|
1600
|
+
${[
|
|
1544
1601
|
`狀態: ${(_a = orderData.orderData.user_info.shipment_detail.Detail_Status_Description) !== null && _a !== void 0 ? _a : '追蹤異常'}`,
|
|
1545
1602
|
`追蹤碼: ${(_b = orderData.orderData.user_info.shipment_detail.paymentno) !== null && _b !== void 0 ? _b : '尚未生成'}`
|
|
1546
1603
|
].join(`<div class="w-100 my-1"></div>`)}
|
|
1547
|
-
|
|
1604
|
+
`;
|
|
1548
1605
|
}
|
|
1549
1606
|
else {
|
|
1550
1607
|
return ``;
|
|
@@ -2078,7 +2135,7 @@ export class ShoppingOrderManager {
|
|
|
2078
2135
|
}
|
|
2079
2136
|
})}"
|
|
2080
2137
|
>
|
|
2081
|
-
${(
|
|
2138
|
+
${(_c = (_b = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : '訪客'}
|
|
2082
2139
|
${(() => {
|
|
2083
2140
|
if (userDataLoading) {
|
|
2084
2141
|
return BgWidget.secondaryInsignia('讀取中');
|
|
@@ -2098,10 +2155,10 @@ export class ShoppingOrderManager {
|
|
|
2098
2155
|
})()}
|
|
2099
2156
|
</div>
|
|
2100
2157
|
<div style="color: #393939;font-weight: 400;">
|
|
2101
|
-
${(
|
|
2158
|
+
${(_f = (_e = (_d = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _d === void 0 ? void 0 : _d.phone) !== null && _e !== void 0 ? _e : orderData.orderData.user_info.phone) !== null && _f !== void 0 ? _f : '此會員未填手機'}
|
|
2102
2159
|
</div>
|
|
2103
2160
|
<div style="color: #393939;font-weight: 400;word-break:break-all;">
|
|
2104
|
-
${(
|
|
2161
|
+
${(_j = (_h = (_g = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _g === void 0 ? void 0 : _g.email) !== null && _h !== void 0 ? _h : orderData.orderData.user_info.email) !== null && _j !== void 0 ? _j : ''}
|
|
2105
2162
|
</div>
|
|
2106
2163
|
</div>`,
|
|
2107
2164
|
BgWidget.horizontalLine(),
|
|
@@ -3950,6 +4007,10 @@ export class ShoppingOrderManager {
|
|
|
3950
4007
|
`;
|
|
3951
4008
|
}
|
|
3952
4009
|
switch (orderData.customer_info.payment_select) {
|
|
4010
|
+
case 'jkopay':
|
|
4011
|
+
return '街口支付';
|
|
4012
|
+
case 'paynow':
|
|
4013
|
+
return `PayNow立吉富`;
|
|
3953
4014
|
case 'off_line':
|
|
3954
4015
|
return `線下付款`;
|
|
3955
4016
|
case 'newWebPay':
|