Browse Source

fix: noticeBar样式走查

shenqistart 5 years ago
parent
commit
7ecde91125
2 changed files with 4 additions and 8 deletions
  1. 3 4
      src/packages/noticebar/noticebar.scss
  2. 1 4
      src/packages/noticebar/noticebar.vue

+ 3 - 4
src/packages/noticebar/noticebar.scss

@@ -2,13 +2,12 @@
   display: flex;
   display: flex;
   height: 40px;
   height: 40px;
   padding: 0 16px;
   padding: 0 16px;
-  font-size: 14px;
+  font-size: $font-size-display-normal;
   line-height: 24px;
   line-height: 24px;
   position: relative;
   position: relative;
   align-items: center;
   align-items: center;
-  color: $text-color;
-  background-color: rgba(251, 248, 220, 1);
-  color: rgba(211, 125, 066, 1);
+  color: #F9911B;
+  background-color: #FFF4DA;
   &.wrapable{
   &.wrapable{
     height: auto;
     height: auto;
     padding: 8px 16px;
     padding: 8px 16px;

+ 1 - 4
src/packages/noticebar/noticebar.vue

@@ -50,7 +50,7 @@ export default {
     },
     },
     background: {
     background: {
       type: String,
       type: String,
-      default: 'rgba(254,250,216,1)'
+      default: '#FFF4DA'
     },
     },
     delay: {
     delay: {
       type: [String, Number],
       type: [String, Number],
@@ -107,8 +107,6 @@ export default {
   watch: {
   watch: {
     text: {
     text: {
       handler(val, newVal) {
       handler(val, newVal) {
-        console.log(val, newVal, this.showNoticeBar == false, 'text');
-
         if (this.showNoticeBar == false) {
         if (this.showNoticeBar == false) {
           return;
           return;
         }
         }
@@ -121,7 +119,6 @@ export default {
           const wrapWidth = wrap.getBoundingClientRect().width;
           const wrapWidth = wrap.getBoundingClientRect().width;
 
 
           const offsetWidth = content.getBoundingClientRect().width;
           const offsetWidth = content.getBoundingClientRect().width;
-          console.log(wrapWidth, offsetWidth, 'text222');
 
 
           if (this.scrollable && offsetWidth > wrapWidth) {
           if (this.scrollable && offsetWidth > wrapWidth) {
             this.wrapWidth = wrapWidth;
             this.wrapWidth = wrapWidth;