From 2fac77462d2265e778e79a4fde4d965b881d3806 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Wed, 6 Apr 2022 18:17:47 +0800 Subject: [PATCH] update --- src/pages/counter/list/index.vue | 16 +++++++++++----- src/styles/font/myfont.css | 11 ++++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 8ef569a..d531cb2 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1219,7 +1219,11 @@ export default { getMoneyTotal(changeIt) { // 如果是确认,执行一些东西 if(changeIt) { - console.log(this.backMoneyTotal) + if(this.backMoneyTotal > 0) { + this.setTipsOperate('取钱成功!') + this.pushThingsGoods([15]) + } + } this.tipsDialog = false }, @@ -1785,7 +1789,7 @@ export default { let formList = []; if(this.needBackMoney) { this.tipsDialog = true - console.log(this.backMoneyArr) + // let params= { // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', // lcJudgmentRuleReq: [ @@ -3593,11 +3597,12 @@ color: #fff; h2 { margin-top: 14.3%; // opacity: 0.8; - font-family: PingFangHeavy; + + font-family: MyAppleFont1; font-size: 30px; color: #000000; letter-spacing: 0.36px; - font-weight: 500; + // font-weight: 500; text-align: center; } .dia-footer { @@ -3622,10 +3627,11 @@ color: #fff; background: #FFFFFF; border-radius: 16px; box-shadow: 0 0 0 0!important; - font-family: PingFangHeavy; + font-family: MyAppleFont1; h3 { // opacity: 0.8; font-size: 30px; + padding-left: 40px; color: #000000; letter-spacing: 0.36px; line-height: 42px; diff --git a/src/styles/font/myfont.css b/src/styles/font/myfont.css index d507686..6f843d6 100644 --- a/src/styles/font/myfont.css +++ b/src/styles/font/myfont.css @@ -14,4 +14,13 @@ @font-face { font-family: PingFangRegular; src: url('./PingFang Regular.ttf'); -} \ No newline at end of file +} +@font-face { + font-family: MyAppleFont1; + src: url('./苹方黑体-中粗-简.ttf'); + font-weight: 500; +} +/* @font-face { + font-family: MyAppleFont2; + src: url('./苹方黑体-中粗-简.ttf'); +} */ \ No newline at end of file