diff --git a/src/pages/merchant/components/cancel-card.vue b/src/pages/merchant/components/cancel-card.vue index 4196fc5..f197370 100644 --- a/src/pages/merchant/components/cancel-card.vue +++ b/src/pages/merchant/components/cancel-card.vue @@ -20,10 +20,21 @@ const doVisibleQrcode = () => { @@ -194,5 +207,9 @@ const doVisibleQrcode = () => { padding: 10rpx 24rpx; border-radius: 30rpx; font-weight: 500; + + &.disabled { + background: #cccccc; + } } diff --git a/src/pages/merchant/components/coupon-card.vue b/src/pages/merchant/components/coupon-card.vue index 63d76fc..7361a6c 100644 --- a/src/pages/merchant/components/coupon-card.vue +++ b/src/pages/merchant/components/coupon-card.vue @@ -20,9 +20,18 @@ const doVisibleQrcode = () => { @@ -193,5 +204,9 @@ const doVisibleQrcode = () => { padding: 10rpx 24rpx; border-radius: 30rpx; font-weight: 500; + + &.disabled { + background: #cccccc; + } } diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue index fcbd719..4a94024 100644 --- a/src/pages/merchant/merchant-activity.vue +++ b/src/pages/merchant/merchant-activity.vue @@ -19,8 +19,6 @@ 限量领取 先领先得 - - diff --git a/src/sheep/scss/font/iconfont.scss b/src/sheep/scss/font/iconfont.scss index 7e1737b..dd51a98 100644 --- a/src/sheep/scss/font/iconfont.scss +++ b/src/sheep/scss/font/iconfont.scss @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 4740692 */ - src: url('//at.alicdn.com/t/c/font_4740692_dlzhw41ofij.woff2?t=1731448556379') format('woff2'), - url('//at.alicdn.com/t/c/font_4740692_dlzhw41ofij.woff?t=1731448556379') format('woff'), - url('//at.alicdn.com/t/c/font_4740692_dlzhw41ofij.ttf?t=1731448556379') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4740692_uwg9mtj0d0p.woff2?t=1770172172940') format('woff2'), + url('//at.alicdn.com/t/c/font_4740692_uwg9mtj0d0p.woff?t=1770172172940') format('woff'), + url('//at.alicdn.com/t/c/font_4740692_uwg9mtj0d0p.ttf?t=1770172172940') format('truetype'); } .iconfont { @@ -14,6 +14,34 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yiguoqi:before { + content: "\e642"; +} + +.icon-weishiyong:before { + content: "\e60c"; +} + +.icon-weishiyong1:before { + content: "\e623"; +} + +.icon-icon-phone:before { + content: "\e657"; +} + +.icon-saoyisao:before { + content: "\e658"; +} + +.icon-wode:before { + content: "\f0b4"; +} + +.icon-a-kefu3x:before { + content: "\e62e"; +} + .icon-fuzhi:before { content: "\e8b0"; } diff --git a/src/static/icon/status/have_been_used.png b/src/static/icon/status/have_been_used.png new file mode 100644 index 0000000..c6608d0 Binary files /dev/null and b/src/static/icon/status/have_been_used.png differ diff --git a/src/static/icon/status/unused.png b/src/static/icon/status/unused.png new file mode 100644 index 0000000..2848b26 Binary files /dev/null and b/src/static/icon/status/unused.png differ