Browse Source

修改noticeBar

360BUYAD\wangyue92 7 years ago
parent
commit
92de215198

+ 1 - 1
package.json

@@ -24,7 +24,7 @@
     "build": "npm run build:prod && npm run build:prodmin && npm run build:disp",
     "eslint": "eslint src/packages/**/*.{js,vue}",
     "add": "node scripts/createCptTpl.js",
-    "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/picker/__test__/**.spec.js",
+    "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/noticebar/__test__/**.spec.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "test:watch": "npm run test --watch"
   },

+ 54 - 0
src/packages/noticebar/__test__/noticebar.spec.js

@@ -0,0 +1,54 @@
+import { shallowMount } from '@vue/test-utils'
+import NoticeBar from '../noticebar.vue'
+import Vue from 'vue';
+
+describe('noticebar.vue',() => {
+    const wrapper = shallowMount(NoticeBar, {
+        propsData:{
+            text:"华为畅享9新品即将上市,活动期间0元预约可参与抽奖,赢HUAWEI WATCH等好礼,更多产品信息请持续关注!"
+        }
+    });
+
+    it('默认用法',() => {
+        wrapper.setData({
+            type:'simple'
+        });
+
+        return Vue.nextTick().then(function() {
+            expect(wrapper.findAll('li').at(1).classes('selected')).toBe(true);
+        })
+    });
+
+    // it('多选-style1',() => {
+    //     wrapper.setProps({
+    //         type:'multiple',
+    //         mulstyle:'style1'
+    //     });
+
+    //     return Vue.nextTick().then(function() {
+    //         expect(wrapper.find('.menu-multiple-style1').isVisible()).toBe(true);
+    //     })
+    // })
+
+    // it('多选-style2',() => {
+    //     wrapper.setProps({
+    //         type:'multiple',
+    //         mulstyle:'style2'
+    //     });
+
+    //     return Vue.nextTick().then(function() {
+    //         expect(wrapper.find('.menu-multiple-style2').isVisible()).toBe(true);
+    //     })
+    // })
+
+    // it('多选-style3',() => {
+    //     wrapper.setProps({
+    //         type:'multiple',
+    //         mulstyle:'style3'
+    //     });
+
+    //     return Vue.nextTick().then(function() {
+    //         expect(wrapper.find('.menu-multiple-style3').isVisible()).toBe(true);
+    //     })
+    // })
+});

File diff suppressed because it is too large
+ 0 - 1
src/packages/noticebar/demo.vue


+ 1 - 1
src/packages/noticebar/doc.md

@@ -41,7 +41,7 @@
 |----- | ----- | ----- | ----- 
 | text | 提示的信息 | String | 空
 | mode | 是否启用关闭模式 | Boolean | false
-| leftIcon | 是否禁用 | String | 空
+| leftIcon | close为没有左边icon,其他为自定义的图片链接,没有为默认图片 | String | 空
 | color | 是否禁用 | String | 空
 | background | 是否禁用 | String | 空
 | delay | 是否禁用 | [String,Number] | 1

File diff suppressed because it is too large
+ 1 - 0
src/packages/noticebar/noticebar.scss


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

@@ -6,7 +6,7 @@
     :style="barStyle"
     @click="$emit('click')"
   >
-    <div v-if="leftIcon" class="left-icon" :style="{'background-image':`url(${iconBg})`}">
+    <div  class="left-icon" v-if="iconShow" :style="{'background-image':`url(${iconBg})`}">
     </div>
     <div ref="wrap" class="wrap">
       <div
@@ -71,6 +71,13 @@ export default {
     };
   },
   computed: {
+    iconShow(){
+      if(this.leftIcon=='close'){
+        return false;
+      }else{
+        return true;
+      }
+    },
     barStyle() {
       return {
         color: this.color,