diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index c7ad205..8ef569a 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -137,7 +137,18 @@
- 请从以下物品中选取所需材料 -
-- 请领取您所需要的现金 -
+- 请领取您所需要的现金 -
++ 您将领取: + + {{ item.name + ' * ' + item.num + ' = ' + consumeMoney(item.name, item.num) }} + , + 。 + + 总金额为: {{ backMoneyTotal + '元' }}
+- 请从物品栏选中或拖拽所需材料 -
@@ -719,13 +730,28 @@ export default { }, computed: { // 业务一和其他业务的银行卡不一样 + consumeMoney() { + return (name, num) => { + if(name.includes('元')) { + return parseInt(name) * num + '元' + }else { + return (parseInt(name) * num * 0.1).toFixed(1) + '元' + } + } + }, backMoneyArr() { return this.cashboxGoodsShelf2.filter(item => item.num>0) }, backMoneyTotal() { return this.cashboxGoodsShelf2.reduce((total, item) => { - return total + parseInt(item.name) * item.num + if(item.name.includes('元')) { + return Number((total + Number((parseInt(item.name) * item.num).toFixed(1))).toFixed(1)) + }else { + return Number((total + Number((parseInt(item.name) * item.num * 0.1).toFixed(1))).toFixed(1)) + } + }, 0) + // return 666 }, needPasswordAgain() { if(this.id == '62,1' || this.id == '62,2' || this.id == '62,3' || this.id == '129' || this.id == '167' || this.id == '301') { diff --git a/src/styles/font/苹方黑体-中粗-简.ttf b/src/styles/font/苹方黑体-中粗-简.ttf new file mode 100644 index 0000000..7e8f041 Binary files /dev/null and b/src/styles/font/苹方黑体-中粗-简.ttf differ diff --git a/src/styles/font/苹方黑体-中粗-繁.ttf b/src/styles/font/苹方黑体-中粗-繁.ttf new file mode 100644 index 0000000..12fab64 Binary files /dev/null and b/src/styles/font/苹方黑体-中粗-繁.ttf differ diff --git a/src/styles/font/苹方黑体-中黑-简.ttf b/src/styles/font/苹方黑体-中黑-简.ttf new file mode 100644 index 0000000..5cbe164 Binary files /dev/null and b/src/styles/font/苹方黑体-中黑-简.ttf differ diff --git a/src/styles/font/苹方黑体-中黑-繁.ttf b/src/styles/font/苹方黑体-中黑-繁.ttf new file mode 100644 index 0000000..b9c2710 Binary files /dev/null and b/src/styles/font/苹方黑体-中黑-繁.ttf differ diff --git a/src/styles/font/苹方黑体-准-简.ttf b/src/styles/font/苹方黑体-准-简.ttf new file mode 100644 index 0000000..1166983 Binary files /dev/null and b/src/styles/font/苹方黑体-准-简.ttf differ diff --git a/src/styles/font/苹方黑体-准-繁.ttf b/src/styles/font/苹方黑体-准-繁.ttf new file mode 100644 index 0000000..d5e846a Binary files /dev/null and b/src/styles/font/苹方黑体-准-繁.ttf differ diff --git a/src/styles/font/苹方黑体-极细-简.ttf b/src/styles/font/苹方黑体-极细-简.ttf new file mode 100644 index 0000000..05646b1 Binary files /dev/null and b/src/styles/font/苹方黑体-极细-简.ttf differ diff --git a/src/styles/font/苹方黑体-极细-繁.ttf b/src/styles/font/苹方黑体-极细-繁.ttf new file mode 100644 index 0000000..4f24047 Binary files /dev/null and b/src/styles/font/苹方黑体-极细-繁.ttf differ diff --git a/src/styles/font/苹方黑体-纤细-简.ttf b/src/styles/font/苹方黑体-纤细-简.ttf new file mode 100644 index 0000000..ee5c185 Binary files /dev/null and b/src/styles/font/苹方黑体-纤细-简.ttf differ diff --git a/src/styles/font/苹方黑体-纤细-繁.ttf b/src/styles/font/苹方黑体-纤细-繁.ttf new file mode 100644 index 0000000..d7537b6 Binary files /dev/null and b/src/styles/font/苹方黑体-纤细-繁.ttf differ diff --git a/src/styles/font/苹方黑体-细-简.ttf b/src/styles/font/苹方黑体-细-简.ttf new file mode 100644 index 0000000..1444cc8 Binary files /dev/null and b/src/styles/font/苹方黑体-细-简.ttf differ diff --git a/src/styles/font/苹方黑体-细-繁.ttf b/src/styles/font/苹方黑体-细-繁.ttf new file mode 100644 index 0000000..cabdcd0 Binary files /dev/null and b/src/styles/font/苹方黑体-细-繁.ttf differ