@uxda/appkit 4.3.38 → 4.3.40
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/dist/appkit.css +8 -3
- package/dist/index.js +32 -18
- package/package.json +1 -1
- package/src/balance/components/AccountView.vue +19 -3
- package/src/payment/components/RechargeView.vue +1 -1
- package/src/payment/components/recharge-amount.spec.ts +6 -6
- package/src/payment/components/recharge-amount.ts +5 -5
- package/dist/assets/asset-3B_CoPto +0 -1
- package/dist/assets/asset-DcH8Kg-2 +0 -1
package/dist/appkit.css
CHANGED
|
@@ -1186,17 +1186,22 @@ page {
|
|
|
1186
1186
|
font-weight: 700;
|
|
1187
1187
|
color: #000;
|
|
1188
1188
|
}
|
|
1189
|
-
.operation-box .operation-list .box-detail .item-detail .item-info-type {
|
|
1190
|
-
line-height: 15px;
|
|
1191
|
-
}
|
|
1192
1189
|
.operation-box .operation-list .box-detail .item-detail .item-info-title {
|
|
1193
1190
|
font-weight: 400;
|
|
1194
1191
|
opacity: 0.8;
|
|
1195
1192
|
font-size: 11px;
|
|
1196
1193
|
}
|
|
1194
|
+
.operation-box .operation-list .box-detail .item-detail .item-info-right {
|
|
1195
|
+
text-align: right;
|
|
1196
|
+
}
|
|
1197
1197
|
.operation-box .operation-list .box-detail .item-detail .item-info-amount {
|
|
1198
1198
|
color: #9e7b5a;
|
|
1199
1199
|
}
|
|
1200
|
+
.operation-box .operation-list .box-detail .item-detail .item-info-time {
|
|
1201
|
+
font-weight: 400;
|
|
1202
|
+
opacity: 0.5;
|
|
1203
|
+
font-size: 11px;
|
|
1204
|
+
}
|
|
1200
1205
|
.operation-box .operation-list .box-detail .item-detail-remark {
|
|
1201
1206
|
opacity: 0.3;
|
|
1202
1207
|
line-height: 15px;
|
package/dist/index.js
CHANGED
|
@@ -3563,11 +3563,11 @@ const isIOS = () => {
|
|
|
3563
3563
|
return false;
|
|
3564
3564
|
};
|
|
3565
3565
|
|
|
3566
|
-
const CUSTOM_RECHARGE_AMOUNT_MIN =
|
|
3567
|
-
const CUSTOM_RECHARGE_AMOUNT_MAX =
|
|
3566
|
+
const CUSTOM_RECHARGE_AMOUNT_MIN = 100;
|
|
3567
|
+
const CUSTOM_RECHARGE_AMOUNT_MAX = 1e4;
|
|
3568
3568
|
const CUSTOM_RECHARGE_AMOUNT_ITEM = {
|
|
3569
3569
|
token: "\u81EA\u5B9A\u4E49",
|
|
3570
|
-
amount: "
|
|
3570
|
+
amount: "100 \u8D77\u5145",
|
|
3571
3571
|
custom: true
|
|
3572
3572
|
};
|
|
3573
3573
|
function appendCustomAmountOption(items, shouldAppendCustom = true) {
|
|
@@ -3588,10 +3588,10 @@ function validateCustomRechargeAmount(value) {
|
|
|
3588
3588
|
return { valid: false, message: "\u8BF7\u8F93\u5165\u6574\u6570\u5145\u503C\u91D1\u989D" };
|
|
3589
3589
|
}
|
|
3590
3590
|
if (amount < CUSTOM_RECHARGE_AMOUNT_MIN) {
|
|
3591
|
-
return { valid: false, message: "\u5145\u503C\u91D1\u989D\u4E0D\u80FD\u4F4E\
|
|
3591
|
+
return { valid: false, message: "\u5145\u503C\u91D1\u989D\u4E0D\u80FD\u4F4E\u4E8E100\u5143" };
|
|
3592
3592
|
}
|
|
3593
3593
|
if (amount > CUSTOM_RECHARGE_AMOUNT_MAX) {
|
|
3594
|
-
return { valid: false, message: "\u5145\u503C\u91D1\u989D\u4E0D\u80FD\u9AD8\
|
|
3594
|
+
return { valid: false, message: "\u5145\u503C\u91D1\u989D\u4E0D\u80FD\u9AD8\u4E8E10000\u5143" };
|
|
3595
3595
|
}
|
|
3596
3596
|
return { valid: true, amount };
|
|
3597
3597
|
}
|
|
@@ -3787,7 +3787,7 @@ var script$E = /* @__PURE__ */ defineComponent({
|
|
|
3787
3787
|
class: "custom-amount-control",
|
|
3788
3788
|
type: "number",
|
|
3789
3789
|
value: state.customAmountText,
|
|
3790
|
-
placeholder: "\u6700\
|
|
3790
|
+
placeholder: "\u6700\u4F4E 100 \u5143\u8D77",
|
|
3791
3791
|
"placeholder-class": "custom-amount-placeholder",
|
|
3792
3792
|
"placeholder-style": "color: #b8b8b8; font-size: 26px; font-weight: 700;",
|
|
3793
3793
|
inputmode: "numeric",
|
|
@@ -5178,9 +5178,11 @@ const _hoisted_43 = { class: "item-detail" };
|
|
|
5178
5178
|
const _hoisted_44 = { class: "item-info spa-between" };
|
|
5179
5179
|
const _hoisted_45 = { class: "item-info-type" };
|
|
5180
5180
|
const _hoisted_46 = { class: "item-info-title" };
|
|
5181
|
-
const _hoisted_47 = { class: "item-info-
|
|
5182
|
-
const _hoisted_48 = { class: "item-
|
|
5183
|
-
const _hoisted_49 = {
|
|
5181
|
+
const _hoisted_47 = { class: "item-info-right" };
|
|
5182
|
+
const _hoisted_48 = { class: "item-info-amount number" };
|
|
5183
|
+
const _hoisted_49 = { class: "item-info-time number" };
|
|
5184
|
+
const _hoisted_50 = { class: "item-detail-remark" };
|
|
5185
|
+
const _hoisted_51 = {
|
|
5184
5186
|
key: 0,
|
|
5185
5187
|
class: "box-not-text"
|
|
5186
5188
|
};
|
|
@@ -5222,6 +5224,9 @@ var script$t = /* @__PURE__ */ defineComponent({
|
|
|
5222
5224
|
let endTime = (filtering.dateTo || "").replace(/-/g, ".").substring(2);
|
|
5223
5225
|
return startTime + " - " + endTime;
|
|
5224
5226
|
});
|
|
5227
|
+
function formatItemTime(time) {
|
|
5228
|
+
return dayjs(time).format("HH:mm:ss");
|
|
5229
|
+
}
|
|
5225
5230
|
const consumptionGroups = ref([]);
|
|
5226
5231
|
const balance = ref({
|
|
5227
5232
|
total: 0,
|
|
@@ -5947,17 +5952,26 @@ var script$t = /* @__PURE__ */ defineComponent({
|
|
|
5947
5952
|
/* TEXT */
|
|
5948
5953
|
)
|
|
5949
5954
|
]),
|
|
5950
|
-
createElementVNode(
|
|
5951
|
-
|
|
5952
|
-
|
|
5953
|
-
|
|
5954
|
-
|
|
5955
|
-
|
|
5956
|
-
|
|
5955
|
+
createElementVNode("div", _hoisted_47, [
|
|
5956
|
+
createElementVNode(
|
|
5957
|
+
"div",
|
|
5958
|
+
_hoisted_48,
|
|
5959
|
+
toDisplayString(it.\u6536\u5165\u8FD8\u662F\u652F\u51FA == "\u652F\u51FA" ? "-" : "+") + toDisplayString(it.amount),
|
|
5960
|
+
1
|
|
5961
|
+
/* TEXT */
|
|
5962
|
+
),
|
|
5963
|
+
createElementVNode(
|
|
5964
|
+
"div",
|
|
5965
|
+
_hoisted_49,
|
|
5966
|
+
toDisplayString(formatItemTime(it.time)),
|
|
5967
|
+
1
|
|
5968
|
+
/* TEXT */
|
|
5969
|
+
)
|
|
5970
|
+
])
|
|
5957
5971
|
]),
|
|
5958
5972
|
createElementVNode(
|
|
5959
5973
|
"div",
|
|
5960
|
-
|
|
5974
|
+
_hoisted_50,
|
|
5961
5975
|
toDisplayString(it.description),
|
|
5962
5976
|
1
|
|
5963
5977
|
/* TEXT */
|
|
@@ -5973,7 +5987,7 @@ var script$t = /* @__PURE__ */ defineComponent({
|
|
|
5973
5987
|
128
|
|
5974
5988
|
/* KEYED_FRAGMENT */
|
|
5975
5989
|
)),
|
|
5976
|
-
reachedLastPage.value ? (openBlock(), createElementBlock("div",
|
|
5990
|
+
reachedLastPage.value ? (openBlock(), createElementBlock("div", _hoisted_51, "\u6CA1\u6709\u66F4\u591A\u4E86")) : createCommentVNode("v-if", true)
|
|
5977
5991
|
])) : (openBlock(), createBlock(script$v, { key: 1 }))
|
|
5978
5992
|
]),
|
|
5979
5993
|
_: 1
|
package/package.json
CHANGED
|
@@ -167,8 +167,11 @@
|
|
|
167
167
|
</div>
|
|
168
168
|
<div class="item-info-title">{{ it.title }}</div>
|
|
169
169
|
</div>
|
|
170
|
-
<div class="item-info-
|
|
171
|
-
|
|
170
|
+
<div class="item-info-right">
|
|
171
|
+
<div class="item-info-amount number">
|
|
172
|
+
{{ it.收入还是支出 == '支出' ? '-' : '+' }}{{ it.amount }}
|
|
173
|
+
</div>
|
|
174
|
+
<div class="item-info-time number">{{ formatItemTime(it.time) }}</div>
|
|
172
175
|
</div>
|
|
173
176
|
</div>
|
|
174
177
|
<div class="item-detail-remark">{{ it.description }}</div>
|
|
@@ -255,6 +258,10 @@ const dateRangeDisplay = computed(() => {
|
|
|
255
258
|
return startTime + ' - ' + endTime
|
|
256
259
|
})
|
|
257
260
|
|
|
261
|
+
function formatItemTime(time: number) {
|
|
262
|
+
return dayjs(time).format('HH:mm:ss')
|
|
263
|
+
}
|
|
264
|
+
|
|
258
265
|
const consumptionGroups = ref<ConsumptionGroup[]>([])
|
|
259
266
|
|
|
260
267
|
/**
|
|
@@ -724,7 +731,6 @@ onMounted(() => {
|
|
|
724
731
|
color: #000;
|
|
725
732
|
|
|
726
733
|
&-type {
|
|
727
|
-
line-height: 15px;
|
|
728
734
|
}
|
|
729
735
|
|
|
730
736
|
&-title {
|
|
@@ -733,9 +739,19 @@ onMounted(() => {
|
|
|
733
739
|
font-size: 11px;
|
|
734
740
|
}
|
|
735
741
|
|
|
742
|
+
&-right {
|
|
743
|
+
text-align: right;
|
|
744
|
+
}
|
|
745
|
+
|
|
736
746
|
&-amount {
|
|
737
747
|
color: #9e7b5a;
|
|
738
748
|
}
|
|
749
|
+
|
|
750
|
+
&-time {
|
|
751
|
+
font-weight: 400;
|
|
752
|
+
opacity: 0.5;
|
|
753
|
+
font-size: 11px;
|
|
754
|
+
}
|
|
739
755
|
}
|
|
740
756
|
|
|
741
757
|
&-remark {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
class="custom-amount-control"
|
|
14
14
|
type="number"
|
|
15
15
|
:value="state.customAmountText"
|
|
16
|
-
placeholder="最低
|
|
16
|
+
placeholder="最低 100 元起"
|
|
17
17
|
placeholder-class="custom-amount-placeholder"
|
|
18
18
|
placeholder-style="color: #b8b8b8; font-size: 26px; font-weight: 700;"
|
|
19
19
|
inputmode="numeric"
|
|
@@ -27,18 +27,18 @@ assert.equal(withCustom[2].custom, true)
|
|
|
27
27
|
assert.equal(withCustom[2].token, '自定义')
|
|
28
28
|
|
|
29
29
|
assert.equal(resolveRechargeAmount(withCustom, 0, ''), 150)
|
|
30
|
-
assert.equal(resolveRechargeAmount(withCustom, 2, '
|
|
31
|
-
assert.equal(resolveRechargeAmount(withCustom, 2, '
|
|
30
|
+
assert.equal(resolveRechargeAmount(withCustom, 2, '100'), CUSTOM_RECHARGE_AMOUNT_MIN)
|
|
31
|
+
assert.equal(resolveRechargeAmount(withCustom, 2, '10000'), CUSTOM_RECHARGE_AMOUNT_MAX)
|
|
32
32
|
assert.equal(normalizeCustomRechargeAmountInput('100001'), '100001')
|
|
33
33
|
assert.equal(normalizeCustomRechargeAmountInput('10.5a00'), '10500')
|
|
34
34
|
|
|
35
|
-
assert.deepEqual(validateCustomRechargeAmount('
|
|
35
|
+
assert.deepEqual(validateCustomRechargeAmount('99'), {
|
|
36
36
|
valid: false,
|
|
37
|
-
message: '充值金额不能低于
|
|
37
|
+
message: '充值金额不能低于100元',
|
|
38
38
|
})
|
|
39
|
-
assert.deepEqual(validateCustomRechargeAmount('
|
|
39
|
+
assert.deepEqual(validateCustomRechargeAmount('10001'), {
|
|
40
40
|
valid: false,
|
|
41
|
-
message: '充值金额不能高于
|
|
41
|
+
message: '充值金额不能高于10000元',
|
|
42
42
|
})
|
|
43
43
|
assert.deepEqual(validateCustomRechargeAmount('abc'), {
|
|
44
44
|
valid: false,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export const CUSTOM_RECHARGE_AMOUNT_MIN =
|
|
2
|
-
export const CUSTOM_RECHARGE_AMOUNT_MAX =
|
|
1
|
+
export const CUSTOM_RECHARGE_AMOUNT_MIN = 100
|
|
2
|
+
export const CUSTOM_RECHARGE_AMOUNT_MAX = 10000
|
|
3
3
|
|
|
4
4
|
export type RechargeAmountItem = {
|
|
5
5
|
token: number | string
|
|
@@ -13,7 +13,7 @@ export type CustomAmountValidation =
|
|
|
13
13
|
|
|
14
14
|
export const CUSTOM_RECHARGE_AMOUNT_ITEM: RechargeAmountItem = {
|
|
15
15
|
token: '自定义',
|
|
16
|
-
amount: '
|
|
16
|
+
amount: '100 起充',
|
|
17
17
|
custom: true,
|
|
18
18
|
}
|
|
19
19
|
|
|
@@ -41,11 +41,11 @@ export function validateCustomRechargeAmount(value: string | number | undefined
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
if (amount < CUSTOM_RECHARGE_AMOUNT_MIN) {
|
|
44
|
-
return { valid: false, message: '充值金额不能低于
|
|
44
|
+
return { valid: false, message: '充值金额不能低于100元' }
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
if (amount > CUSTOM_RECHARGE_AMOUNT_MAX) {
|
|
48
|
-
return { valid: false, message: '充值金额不能高于
|
|
48
|
+
return { valid: false, message: '充值金额不能高于10000元' }
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
return { valid: true, amount }
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
|