ts-glitter 15.7.82 → 15.7.84
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/glitter-base/global/language.js +4 -0
- package/lowcode/glitter-base/global/language.ts +4 -0
- package/lowcode/glitter-base/route/shopping.js +2 -2
- package/lowcode/glitter-base/route/shopping.ts +2 -2
- package/lowcode/glitterBundle/dialog/dialog.js +4 -4
- package/lowcode/glitterBundle/dialog/dialog.ts +5 -4
- package/lowcode/public-components/user-manager/um-info.js +17 -1
- package/lowcode/public-components/user-manager/um-info.ts +17 -1
- package/lowcode/public-components/user-manager/um-order.js +4 -4
- package/lowcode/public-components/user-manager/um-order.ts +4 -4
- package/package.json +1 -1
- package/src/api-public/services/shopping.ts +1 -2
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_15.7.
|
|
83
|
+
glitter.share.editerVersion = 'V_15.7.84';
|
|
84
84
|
glitter.share.start = new Date();
|
|
85
85
|
const vm = {
|
|
86
86
|
appConfig: [],
|
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_15.7.
|
|
85
|
+
glitter.share.editerVersion = 'V_15.7.84';
|
|
86
86
|
glitter.share.start = new Date();
|
|
87
87
|
const vm: {
|
|
88
88
|
appConfig: any;
|
|
@@ -92,7 +92,9 @@ export class Language {
|
|
|
92
92
|
}
|
|
93
93
|
static languageDataList() {
|
|
94
94
|
return [
|
|
95
|
+
{ key: 'c_cancel_order', tw: '請問確定要取消此訂單嗎?', cn: '请问确定要取消此订单吗?', en: `Are you sure you want to cancel this order?` },
|
|
95
96
|
{ key: 'stock_count', tw: '商品庫存', cn: '商品库存', en: `Stock quantity` },
|
|
97
|
+
{ key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
|
|
96
98
|
{ key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
|
|
97
99
|
{ key: 'cart', tw: '購物車', cn: '购物车', en: `Cart` },
|
|
98
100
|
{ key: 'min_p_count_d', tw: '_p_ 最少購買數量為_c_件', cn: '_p_ 最少购买数量为_c_件', en: `_p_ Minimum purchase quantity is _c_ pieces.` },
|
|
@@ -201,6 +203,7 @@ export class Language {
|
|
|
201
203
|
{ key: 'please_select_gift', tw: '請選擇「贈品」', cn: '请选择「赠品」', en: 'Please select "Gift"' },
|
|
202
204
|
{ key: 'customer_name', tw: '顧客姓名', cn: '顾客姓名', en: 'Customer name' },
|
|
203
205
|
{ key: 'customer_phone', tw: '顧客電話', cn: '顾客电话', en: 'Customer phone' },
|
|
206
|
+
{ key: 'phone', tw: '電話', cn: '电话', en: 'Phone Number' },
|
|
204
207
|
{ key: 'customer_email', tw: '顧客信箱', cn: '顾客邮箱', en: 'Customer email' },
|
|
205
208
|
{ key: 'recipient_name', tw: '收件人姓名', cn: '收件人姓名', en: 'Recipient name' },
|
|
206
209
|
{ key: 'recipient_phone', tw: '收件人電話', cn: '收件人电话', en: 'Recipient phone' },
|
|
@@ -374,6 +377,7 @@ export class Language {
|
|
|
374
377
|
{ key: 'upload_checkout_proof', tw: '上傳結帳證明', cn: '上传结账证明', en: 'Upload checkout proof' },
|
|
375
378
|
{ key: 'order_information', tw: '訂單資訊', cn: '订单信息', en: 'Order Information' },
|
|
376
379
|
{ key: 'payment_status', tw: '付款狀態', cn: '付款状态', en: 'Payment Status' },
|
|
380
|
+
{ key: 'cancel', tw: '取消', cn: '取消', en: 'Cancel' },
|
|
377
381
|
{ key: 'cancelled', tw: '已取消', cn: '已取消', en: 'Cancelled' },
|
|
378
382
|
{ key: 'completed', tw: '已完成', cn: '已完成', en: 'Completed' },
|
|
379
383
|
{ key: 'deleted', tw: '已刪除', cn: '已删除', en: 'Deleted' },
|
|
@@ -98,7 +98,9 @@ export class Language {
|
|
|
98
98
|
|
|
99
99
|
public static languageDataList() {
|
|
100
100
|
return [
|
|
101
|
+
{ key: 'c_cancel_order', tw: '請問確定要取消此訂單嗎?', cn: '请问确定要取消此订单吗?', en: `Are you sure you want to cancel this order?` },
|
|
101
102
|
{ key: 'stock_count', tw: '商品庫存', cn: '商品库存', en: `Stock quantity` },
|
|
103
|
+
{ key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
|
|
102
104
|
{ key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
|
|
103
105
|
{ key: 'cart', tw: '購物車', cn: '购物车', en: `Cart` },
|
|
104
106
|
{ key: 'min_p_count_d', tw: '_p_ 最少購買數量為_c_件', cn: '_p_ 最少购买数量为_c_件', en: `_p_ Minimum purchase quantity is _c_ pieces.` },
|
|
@@ -207,6 +209,7 @@ export class Language {
|
|
|
207
209
|
{ key: 'please_select_gift', tw: '請選擇「贈品」', cn: '请选择「赠品」', en: 'Please select "Gift"' },
|
|
208
210
|
{ key: 'customer_name', tw: '顧客姓名', cn: '顾客姓名', en: 'Customer name' },
|
|
209
211
|
{ key: 'customer_phone', tw: '顧客電話', cn: '顾客电话', en: 'Customer phone' },
|
|
212
|
+
{ key: 'phone', tw: '電話', cn: '电话', en: 'Phone Number' },
|
|
210
213
|
{ key: 'customer_email', tw: '顧客信箱', cn: '顾客邮箱', en: 'Customer email' },
|
|
211
214
|
{ key: 'recipient_name', tw: '收件人姓名', cn: '收件人姓名', en: 'Recipient name' },
|
|
212
215
|
{ key: 'recipient_phone', tw: '收件人電話', cn: '收件人电话', en: 'Recipient phone' },
|
|
@@ -380,6 +383,7 @@ export class Language {
|
|
|
380
383
|
{ key: 'upload_checkout_proof', tw: '上傳結帳證明', cn: '上传结账证明', en: 'Upload checkout proof' },
|
|
381
384
|
{ key: 'order_information', tw: '訂單資訊', cn: '订单信息', en: 'Order Information' },
|
|
382
385
|
{ key: 'payment_status', tw: '付款狀態', cn: '付款状态', en: 'Payment Status' },
|
|
386
|
+
{ key: 'cancel', tw: '取消', cn: '取消', en: 'Cancel' },
|
|
383
387
|
{ key: 'cancelled', tw: '已取消', cn: '已取消', en: 'Cancelled' },
|
|
384
388
|
{ key: 'completed', tw: '已完成', cn: '已完成', en: 'Completed' },
|
|
385
389
|
{ key: 'deleted', tw: '已刪除', cn: '已删除', en: 'Deleted' },
|
|
@@ -521,8 +521,8 @@ export class ApiShop {
|
|
|
521
521
|
type: 'PUT',
|
|
522
522
|
headers: {
|
|
523
523
|
'Content-Type': 'application/json',
|
|
524
|
-
'g-app':
|
|
525
|
-
Authorization:
|
|
524
|
+
'g-app': window.appName,
|
|
525
|
+
Authorization: GlobalUser.token,
|
|
526
526
|
},
|
|
527
527
|
data: JSON.stringify({ id }),
|
|
528
528
|
});
|
|
@@ -603,8 +603,8 @@ export class ApiShop {
|
|
|
603
603
|
type: 'PUT',
|
|
604
604
|
headers: {
|
|
605
605
|
'Content-Type': 'application/json',
|
|
606
|
-
'g-app':
|
|
607
|
-
Authorization:
|
|
606
|
+
'g-app': (window as any).appName,
|
|
607
|
+
Authorization: GlobalUser.token,
|
|
608
608
|
},
|
|
609
609
|
data: JSON.stringify({ id }),
|
|
610
610
|
});
|
|
@@ -77,7 +77,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
77
77
|
<i class="fa-sharp fa-solid fa-circle-info fs-1"></i>
|
|
78
78
|
<div class="my-3 fs-6 fw-500" style="white-space: normal; overflow-wrap: anywhere;">${(_b = gBundle.obj.text) !== null && _b !== void 0 ? _b : '系統提示訊息'}</div>
|
|
79
79
|
<div class="dialog-absolute" onclick="${gvc.event(() => gvc.closeDialog())}">
|
|
80
|
-
<div class="fs-6 fw-500"
|
|
80
|
+
<div class="fs-6 fw-500">${Language.text('confirm')}</div>
|
|
81
81
|
</div>
|
|
82
82
|
</div>
|
|
83
83
|
</div>
|
|
@@ -122,7 +122,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
122
122
|
gBundle.callback(false);
|
|
123
123
|
})}"
|
|
124
124
|
>
|
|
125
|
-
<span class="fw-500 fs-6"
|
|
125
|
+
<span class="fw-500 fs-6">${Language.text('cancel')}</span>
|
|
126
126
|
</div>
|
|
127
127
|
<div
|
|
128
128
|
class="w-100 h-100 text-center pt-2 hover-save"
|
|
@@ -130,7 +130,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
130
130
|
gBundle.callback(true);
|
|
131
131
|
})}"
|
|
132
132
|
>
|
|
133
|
-
<span class="fw-500 fs-6 text-white"
|
|
133
|
+
<span class="fw-500 fs-6 text-white">${Language.text('confirm')}</span>
|
|
134
134
|
</div>
|
|
135
135
|
</div>
|
|
136
136
|
</div>
|
|
@@ -161,7 +161,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
161
161
|
gBundle.callback(false);
|
|
162
162
|
})}"
|
|
163
163
|
>
|
|
164
|
-
<span class="tx_700"
|
|
164
|
+
<span class="tx_700">${Language.text('cancel')}</span>
|
|
165
165
|
</div>
|
|
166
166
|
<div
|
|
167
167
|
class="btn btn-black"
|
|
@@ -77,7 +77,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
77
77
|
<i class="fa-sharp fa-solid fa-circle-info fs-1"></i>
|
|
78
78
|
<div class="my-3 fs-6 fw-500" style="white-space: normal; overflow-wrap: anywhere;">${gBundle.obj.text ?? '系統提示訊息'}</div>
|
|
79
79
|
<div class="dialog-absolute" onclick="${gvc.event(() => gvc.closeDialog())}">
|
|
80
|
-
<div class="fs-6 fw-500"
|
|
80
|
+
<div class="fs-6 fw-500">${Language.text('confirm')}</div>
|
|
81
81
|
</div>
|
|
82
82
|
</div>
|
|
83
83
|
</div>
|
|
@@ -122,7 +122,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
122
122
|
gBundle.callback(false);
|
|
123
123
|
})}"
|
|
124
124
|
>
|
|
125
|
-
<span class="fw-500 fs-6"
|
|
125
|
+
<span class="fw-500 fs-6">${Language.text('cancel')}</span>
|
|
126
126
|
</div>
|
|
127
127
|
<div
|
|
128
128
|
class="w-100 h-100 text-center pt-2 hover-save"
|
|
@@ -130,7 +130,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
130
130
|
gBundle.callback(true);
|
|
131
131
|
})}"
|
|
132
132
|
>
|
|
133
|
-
<span class="fw-500 fs-6 text-white"
|
|
133
|
+
<span class="fw-500 fs-6 text-white">${Language.text('confirm')}</span>
|
|
134
134
|
</div>
|
|
135
135
|
</div>
|
|
136
136
|
</div>
|
|
@@ -161,7 +161,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
161
161
|
gBundle.callback(false);
|
|
162
162
|
})}"
|
|
163
163
|
>
|
|
164
|
-
<span class="tx_700"
|
|
164
|
+
<span class="tx_700">${Language.text('cancel')}</span>
|
|
165
165
|
</div>
|
|
166
166
|
<div
|
|
167
167
|
class="btn btn-black"
|
|
@@ -175,6 +175,7 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
|
|
|
175
175
|
</div>
|
|
176
176
|
</div>
|
|
177
177
|
`;
|
|
178
|
+
|
|
178
179
|
default:
|
|
179
180
|
return '';
|
|
180
181
|
}
|
|
@@ -411,7 +411,23 @@ export class UMInfo {
|
|
|
411
411
|
return [
|
|
412
412
|
FormWidget.editorView({
|
|
413
413
|
gvc: gvc,
|
|
414
|
-
array: form_array
|
|
414
|
+
array: form_array.map((dd) => {
|
|
415
|
+
switch (dd.key) {
|
|
416
|
+
case 'name':
|
|
417
|
+
dd.title = Language.text('name');
|
|
418
|
+
break;
|
|
419
|
+
case 'email':
|
|
420
|
+
dd.title = Language.text('email');
|
|
421
|
+
break;
|
|
422
|
+
case 'phone':
|
|
423
|
+
dd.title = Language.text('phone');
|
|
424
|
+
break;
|
|
425
|
+
case 'birth':
|
|
426
|
+
dd.title = Language.text('birth');
|
|
427
|
+
break;
|
|
428
|
+
}
|
|
429
|
+
return dd;
|
|
430
|
+
}),
|
|
415
431
|
refresh: () => {
|
|
416
432
|
setTimeout(() => {
|
|
417
433
|
gvc.notifyDataChange(id);
|
|
@@ -525,7 +525,23 @@ export class UMInfo {
|
|
|
525
525
|
return [
|
|
526
526
|
FormWidget.editorView({
|
|
527
527
|
gvc: gvc,
|
|
528
|
-
array: form_array
|
|
528
|
+
array: form_array.map((dd:any)=>{
|
|
529
|
+
switch (dd.key){
|
|
530
|
+
case 'name':
|
|
531
|
+
dd.title=Language.text('name')
|
|
532
|
+
break
|
|
533
|
+
case 'email':
|
|
534
|
+
dd.title=Language.text('email')
|
|
535
|
+
break
|
|
536
|
+
case 'phone':
|
|
537
|
+
dd.title=Language.text('phone')
|
|
538
|
+
break
|
|
539
|
+
case 'birth':
|
|
540
|
+
dd.title=Language.text('birth')
|
|
541
|
+
break
|
|
542
|
+
}
|
|
543
|
+
return dd
|
|
544
|
+
}),
|
|
529
545
|
refresh: () => {
|
|
530
546
|
setTimeout(() => {
|
|
531
547
|
gvc.notifyDataChange(id);
|
|
@@ -196,14 +196,14 @@ export class UMOrder {
|
|
|
196
196
|
static cancelOrder(gvc, id) {
|
|
197
197
|
const dialog = new ShareDialog(gvc.glitter);
|
|
198
198
|
dialog.checkYesOrNot({
|
|
199
|
-
text: '
|
|
199
|
+
text: Language.text('c_cancel_order'),
|
|
200
200
|
callback: (bool) => {
|
|
201
201
|
if (bool) {
|
|
202
202
|
dialog.dataLoading({ visible: true, text: Language.text('loading') });
|
|
203
203
|
return new Promise(() => {
|
|
204
204
|
ApiShop.cancelOrder(id).then((res) => {
|
|
205
205
|
dialog.dataLoading({ visible: false });
|
|
206
|
-
|
|
206
|
+
gvc.glitter.href = `/order_list`;
|
|
207
207
|
});
|
|
208
208
|
});
|
|
209
209
|
}
|
|
@@ -530,7 +530,7 @@ export class UMOrder {
|
|
|
530
530
|
</div>
|
|
531
531
|
</div>
|
|
532
532
|
</section>
|
|
533
|
-
${orderData.method === 'off_line' && orderData.customer_info.payment_select !== 'cash_on_delivery'
|
|
533
|
+
${orderData.method === 'off_line' && orderData.customer_info.payment_select !== 'cash_on_delivery' && (`${orderData.orderStatus}` != '-1')
|
|
534
534
|
? html `<section class="o-card">
|
|
535
535
|
<h3 class="mb-3">${Language.text('payment_info')}</h3>
|
|
536
536
|
${payInfo()}
|
|
@@ -634,7 +634,7 @@ export class UMOrder {
|
|
|
634
634
|
value: (() => {
|
|
635
635
|
switch (orderData.orderStatus) {
|
|
636
636
|
case '-1':
|
|
637
|
-
return Language.text('cancelled')
|
|
637
|
+
return `<div class="text-danger">${Language.text('cancelled')}</div>`;
|
|
638
638
|
case '1':
|
|
639
639
|
return Language.text('completed');
|
|
640
640
|
case '-99':
|
|
@@ -435,14 +435,14 @@ export class UMOrder {
|
|
|
435
435
|
static cancelOrder(gvc: GVC, id: string) {
|
|
436
436
|
const dialog = new ShareDialog(gvc.glitter);
|
|
437
437
|
dialog.checkYesOrNot({
|
|
438
|
-
text: '
|
|
438
|
+
text: Language.text('c_cancel_order'),
|
|
439
439
|
callback: (bool: boolean) => {
|
|
440
440
|
if (bool) {
|
|
441
441
|
dialog.dataLoading({ visible: true, text: Language.text('loading') });
|
|
442
442
|
return new Promise(() => {
|
|
443
443
|
ApiShop.cancelOrder(id).then((res) => {
|
|
444
444
|
dialog.dataLoading({ visible: false });
|
|
445
|
-
|
|
445
|
+
gvc.glitter.href = `/order_list`;
|
|
446
446
|
});
|
|
447
447
|
});
|
|
448
448
|
}
|
|
@@ -1005,7 +1005,7 @@ export class UMOrder {
|
|
|
1005
1005
|
</div>
|
|
1006
1006
|
</div>
|
|
1007
1007
|
</section>
|
|
1008
|
-
${orderData.method === 'off_line' && orderData.customer_info.payment_select !== 'cash_on_delivery'
|
|
1008
|
+
${orderData.method === 'off_line' && orderData.customer_info.payment_select !== 'cash_on_delivery' && (`${orderData.orderStatus}` != '-1')
|
|
1009
1009
|
? html`<section class="o-card">
|
|
1010
1010
|
<h3 class="mb-3">${Language.text('payment_info')}</h3>
|
|
1011
1011
|
${payInfo()}
|
|
@@ -1129,7 +1129,7 @@ export class UMOrder {
|
|
|
1129
1129
|
value: (() => {
|
|
1130
1130
|
switch (orderData.orderStatus) {
|
|
1131
1131
|
case '-1':
|
|
1132
|
-
return Language.text('cancelled')
|
|
1132
|
+
return `<div class="text-danger">${Language.text('cancelled')}</div>`;
|
|
1133
1133
|
case '1':
|
|
1134
1134
|
return Language.text('completed');
|
|
1135
1135
|
case '-99':
|
package/package.json
CHANGED
|
@@ -2255,8 +2255,7 @@ export class Shopping {
|
|
|
2255
2255
|
}
|
|
2256
2256
|
|
|
2257
2257
|
await db.query(
|
|
2258
|
-
`UPDATE \`${this.app}\`.t_checkout SET orderData = ? WHERE cart_token =
|
|
2259
|
-
`,
|
|
2258
|
+
`UPDATE \`${this.app}\`.t_checkout SET orderData = ? WHERE cart_token = ?;`,
|
|
2260
2259
|
[JSON.stringify(orderData), order_id]
|
|
2261
2260
|
);
|
|
2262
2261
|
|