Merge branch 'v3-dev' of https://github.com/jdf2e/nutui into v3-dev

src/packages/button/__test__/button.spec.js

@@ -12,12 +12,12 @@ describe('Button.vue', () => {
         wrapper.setProps({
             type: 'light'
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.attributes('class')).toContain('light');
         })
     });
     it('设置slot', () => {
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
         })
     });
@@ -25,7 +25,7 @@ describe('Button.vue', () => {
         wrapper.setProps({
             disabled: true
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
             expect(wrapper.attributes('disabled')).toContain('disabled');
         })
@@ -34,7 +34,7 @@ describe('Button.vue', () => {
         wrapper.setProps({
             shape: 'circle'
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
             expect(wrapper.attributes('class')).toContain('circle');
         })
@@ -43,7 +43,7 @@ describe('Button.vue', () => {
         wrapper.setProps({
             size: 'small'
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
             expect(wrapper.attributes('class')).toContain('small');
         })
@@ -53,7 +53,7 @@ describe('Button.vue', () => {
             type: 'actived',
             icon: 'tick'
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
             expect(wrapper.contains('.txt-icon')).toBe(true);
             expect(wrapper.find('.txt-icon').attributes('type')).toBe('tick');
@@ -65,7 +65,7 @@ describe('Button.vue', () => {
             icon: 'tick',
             color: '#fff'
         })
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.text()).toBe('去结算');
             expect(wrapper.find('span').attributes('style')).toBe('color: rgb(255, 255, 255);');
             expect(wrapper.find('.txt-icon').attributes('color')).toBe('#fff');

src/packages/button/demo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="btn-demo">
     <h4>按钮状态</h4>
     <div class="btn-state">
       <nut-button block>默认状态</nut-button>
@@ -113,51 +113,55 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.btn-demo {
+  padding: 0 15px;
+}
 .bg {
-	margin: 0 10px;
+  margin: 0 10px;
 }
 
 .gap {
-	height: 10px;
+  height: 10px;
 }
 
 .white-bg {
-	padding: 10px;
-	background: #fff;
+  padding: 10px;
+  background: #fff;
 }
 
 .btn-state {
-	button {
-		margin-bottom: 10px;
-	}
+  button {
+    margin-bottom: 10px;
+    border-radius: 4px;
+  }
 }
 
 .btn-size {
-	display: flex;
-	align-items: flex-end;
-	justify-content: space-around;
-	margin-top: 24px;
-
-	&.two {
-		button {
-			width: 168px;
-		}
-	}
-
-	&.three {
-		button {
-			width: 109px;
-		}
-	}
-
-	&.four {
-		button {
-			width: 79px;
-		}
-
-		.middle {
-			padding: 0;
-		}
-	}
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-around;
+  margin-top: 24px;
+
+  &.two {
+    button {
+      width: 168px;
+    }
+  }
+
+  &.three {
+    button {
+      width: 108px;
+    }
+  }
+
+  &.four {
+    button {
+      width: 79px;
+    }
+
+    .middle {
+      padding: 0;
+    }
+  }
 }
 </style>

src/packages/dialog/__test__/dialog.spec.js

@@ -4,13 +4,12 @@ import Vue from 'vue';
 
 
 describe('Dialog.vue', () => {
-    const wrapper = shallowMount(Dialog, {
-    });
+    const wrapper = shallowMount(Dialog, {});
 
     it('可见', () => {
         wrapper.setProps({ title: '测试标题', visible: true });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-mask').isVisible()).toBe(true);
             expect(wrapper.find('.nut-dialog-box').isVisible()).toBe(true);
         })
@@ -19,15 +18,15 @@ describe('Dialog.vue', () => {
     it('隐藏', () => {
         wrapper.setProps({ title: '测试标题', visible: false });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-box').isVisible()).toBe(false);
         })
     });
 
     it('内容文案展示', () => {
-        wrapper.setProps({ content: '测试文案', visible:true });
+        wrapper.setProps({ content: '测试文案', visible: true });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-content').exists()).toBe(true);
         })
     });
@@ -35,40 +34,41 @@ describe('Dialog.vue', () => {
     it('标题文案展示', () => {
         wrapper.setProps({ title: '测试标题', visible: true });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-title').exists()).toBe(true);
         })
     });
 
     it('隐藏底栏', () => {
-        wrapper.setProps({ title: '测试标题', visible: true, noFooter:true });
+        wrapper.setProps({ title: '测试标题', visible: true, noFooter: true });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-footer').exists()).toBe(false);
         })
-    }); 
+    });
 
     it('隐藏确定键', () => {
         wrapper.setProps({ title: '测试标题', visible: true, noOkBtn: true });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-ok').exists()).toBe(false);
         })
     });
 
     it('图片弹窗', () => {
         wrapper.setProps({
-            visible: true, 
-            type: 'image', 
+            visible: true,
+            type: 'image',
             link: "http://m.jd.com",
-            imgSrc: "https://m.360buyimg.com/mobilecms/s750x750_jfs/t1/4875/23/1968/285655/5b9549eeE4997a18c/070eaf5bddf26be8.jpg", });
+            imgSrc: "https://m.360buyimg.com/mobilecms/s750x750_jfs/t1/4875/23/1968/285655/5b9549eeE4997a18c/070eaf5bddf26be8.jpg",
+        });
 
-        return Vue.nextTick().then(function () {
+        return Vue.nextTick().then(function() {
             expect(wrapper.find('.nut-dialog-link').exists()).toBe(true);
             expect(wrapper.find('.nut-dialog-image').exists()).toBe(true);
             expect(wrapper.find('.nut-dialog-image').attributes('src')).toBe('https://m.360buyimg.com/mobilecms/s750x750_jfs/t1/4875/23/1968/285655/5b9549eeE4997a18c/070eaf5bddf26be8.jpg');
             expect(wrapper.find('.nut-dialog-body').exists()).toBe(false);
-            
+
         })
     });
 });

src/packages/field/__test__/field.spec.js

@@ -0,0 +1,21 @@
+import { shallowMount, mount } from '@vue/test-utils'
+import ActionSheet from '../field.vue'
+import Vue from 'vue';
+
+
+describe('Field.vue', () => {
+    const wrapper = shallowMount(Field, {
+        propsData: {
+            label: '自我介绍',
+            type: "text"
+        }
+    });
+
+    // it('图标展示', () => {
+    //     //wrapper.setProps({ type: 'top' });
+
+    //     return Vue.nextTick().then(function() {
+    //         expect(wrapper.contains('.nut-icon-top')).toBe(true);
+    //     })
+    // });
+});

src/packages/noticebar/noticebar.scss

@@ -2,13 +2,12 @@
   display: flex;
   height: 40px;
   padding: 0 16px;
-  font-size: 14px;
+  font-size: $font-size-display-normal;
   line-height: 24px;
   position: relative;
   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{
     height: auto;
     padding: 8px 16px;

src/packages/noticebar/noticebar.vue

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