Browse Source

upd: jdl del png

richard1015 5 years ago
parent
commit
b39ad2495d

BIN
src/assets/img/address-red.png


BIN
src/assets/img/address.png


BIN
src/assets/img/cell-avatar.jpeg


BIN
src/assets/img/collection-red.png


BIN
src/assets/img/collection.png


BIN
src/assets/img/gift.png


BIN
src/assets/img/task-red.png


BIN
src/assets/img/task.png


+ 30 - 6
src/packages/avatar/demo.vue

@@ -2,18 +2,42 @@
   <div class="demo-list">
   <div class="demo-list">
     <h4>默认用法</h4>
     <h4>默认用法</h4>
     <div class="white-bg">
     <div class="white-bg">
-      <nut-avatar size-num="80" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar"></nut-avatar>
-      <nut-avatar size-num="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar"></nut-avatar>
-      <nut-avatar size-num="40" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar"></nut-avatar>
-      <nut-avatar size-num="32" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar"></nut-avatar>
+      <nut-avatar
+        size-num="80"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      ></nut-avatar>
+      <nut-avatar
+        size-num="60"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      ></nut-avatar>
+      <nut-avatar
+        size-num="40"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      ></nut-avatar>
+      <nut-avatar
+        size-num="32"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      ></nut-avatar>
     </div>
     </div>
 
 
     <h4>带徽标的头像</h4>
     <h4>带徽标的头像</h4>
     <div class="white-bg">
     <div class="white-bg">
-      <nut-avatar size-num="40" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar">
+      <nut-avatar
+        size-num="40"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      >
         <nut-badge :value="9" :max="99" class="item" top="5px" right="10px"></nut-badge>
         <nut-badge :value="9" :max="99" class="item" top="5px" right="10px"></nut-badge>
       </nut-avatar>
       </nut-avatar>
-      <nut-avatar size-num="32" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar">
+      <nut-avatar
+        size-num="32"
+        bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+        @active-avatar="activeAvatar"
+      >
         <nut-badge :isDot="true" top="5px" right="6px"></nut-badge>
         <nut-badge :isDot="true" top="5px" right="6px"></nut-badge>
       </nut-avatar>
       </nut-avatar>
     </div>
     </div>

+ 6 - 6
src/packages/avatar/doc.md

@@ -7,10 +7,10 @@
 size-num 为头像的大小,表示宽高;bg-image表示引入头像图片的路径
 size-num 为头像的大小,表示宽高;bg-image表示引入头像图片的路径
 
 
 ```html
 ```html
-<nut-avatar size-num="80" :bg-image="require('../../assets/img/cell-avatar.jpeg')"></nut-avatar>
-<nut-avatar size-num="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')"></nut-avatar>
-<nut-avatar size-num="40" :bg-image="require('../../assets/img/cell-avatar.jpeg')"></nut-avatar>
-<nut-avatar size-num="32" :bg-image="require('../../assets/img/cell-avatar.jpeg')"></nut-avatar>
+<nut-avatar size-num="80" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"></nut-avatar>
+<nut-avatar size-num="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"></nut-avatar>
+<nut-avatar size-num="40" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"></nut-avatar>
+<nut-avatar size-num="32" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"></nut-avatar>
 ```
 ```
 
 
 ## 带徽标的头像
 ## 带徽标的头像
@@ -18,10 +18,10 @@ size-num 为头像的大小,表示宽高;bg-image表示引入头像图片的
 支持slot,需引入badge组件,点击头像有触发事件
 支持slot,需引入badge组件,点击头像有触发事件
 
 
 ```html
 ```html
-<nut-avatar size-num="40" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar">
+<nut-avatar size-num="40" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" @active-avatar="activeAvatar">
   <nut-badge :value="9"  :max="99" class="item" top="5px" right="10px" ></nut-badge>
   <nut-badge :value="9"  :max="99" class="item" top="5px" right="10px" ></nut-badge>
 </nut-avatar>
 </nut-avatar>
-<nut-avatar size-num="32" :bg-image="require('../../assets/img/cell-avatar.jpeg')" @active-avatar="activeAvatar">
+<nut-avatar size-num="32" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" @active-avatar="activeAvatar">
     <nut-badge :isDot="true" top="5px" right="6px" ></nut-badge>
     <nut-badge :isDot="true" top="5px" right="6px" ></nut-badge>
 </nut-avatar>
 </nut-avatar>
 ```
 ```

+ 1 - 1
src/packages/badge/demo.vue

@@ -56,7 +56,7 @@ export default {
   height: 17px;
   height: 17px;
   width: 19px;
   width: 19px;
   background-size: 100% 100%;
   background-size: 100% 100%;
-  background-image: url('#{$assetsPath}/img/gift.png');
+  background-image: 'https://img13.360buyimg.com/imagetools/jfs/t1/132834/39/5437/4822/5f1f964eEdf57fa88/efcf23bee2eec3f0.png';
   background-repeat: no-repeat;
   background-repeat: no-repeat;
 }
 }
 </style>
 </style>

+ 26 - 0
src/packages/badge/doc.md

@@ -19,6 +19,32 @@
     <div class="demo-svg"></div>
     <div class="demo-svg"></div>
 </nut-badge>
 </nut-badge>
 
 
+
+
+<style lang="scss" scoped>
+.item {
+  margin: 16px 26px 10px 10px;
+  line-height: 15px;
+  font-family: PingFangSC-Regular;
+  font-size: 15px;
+  color: #646464;
+}
+
+.demo-w {
+  margin: 0;
+  background: white;
+}
+
+.demo-svg {
+  display: inline-block;
+  height: 17px;
+  width: 19px;
+  background-size: 100% 100%;
+  background-image: "https://img13.360buyimg.com/imagetools/jfs/t1/132834/39/5437/4822/5f1f964eEdf57fa88/efcf23bee2eec3f0.png";
+  background-repeat: no-repeat;
+}
+</style>
+
 ```
 ```
 
 
 ## 数字角标
 ## 数字角标

+ 21 - 3
src/packages/cell/demo.vue

@@ -45,21 +45,39 @@
     <h4>消息列表</h4>
     <h4>消息列表</h4>
     <div class="cell-box">
     <div class="cell-box">
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-        <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+        <div slot="avatar"
+          ><nut-avatar
+            sizeNum="60"
+            bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+            bg-icon
+          ></nut-avatar
+        ></div>
         <div slot="desc">
         <div slot="desc">
           <p class="timer">10:12</p>
           <p class="timer">10:12</p>
           <p class="badge"><nut-badge :value="9" :max="99" top="0px" right="15px"></nut-badge></p>
           <p class="badge"><nut-badge :value="9" :max="99" top="0px" right="15px"></nut-badge></p>
         </div>
         </div>
       </nut-cell>
       </nut-cell>
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-        <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+        <div slot="avatar"
+          ><nut-avatar
+            sizeNum="60"
+            bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+            bg-icon
+          ></nut-avatar
+        ></div>
         <div slot="desc">
         <div slot="desc">
           <p class="timer">1小时前</p>
           <p class="timer">1小时前</p>
           <p class="badge"><nut-badge :is-dot="true" :max="99" top="0px" right="10px"></nut-badge></p>
           <p class="badge"><nut-badge :is-dot="true" :max="99" top="0px" right="10px"></nut-badge></p>
         </div>
         </div>
       </nut-cell>
       </nut-cell>
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
       <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-        <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+        <div slot="avatar"
+          ><nut-avatar
+            sizeNum="60"
+            bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+            bg-icon
+          ></nut-avatar
+        ></div>
         <div slot="desc">
         <div slot="desc">
           <p class="timer">星期五</p>
           <p class="timer">星期五</p>
           <p class="badge"><nut-badge :value="100" :max="99" top="0px" right="30px"></nut-badge></p>
           <p class="badge"><nut-badge :value="100" :max="99" top="0px" right="30px"></nut-badge></p>

+ 3 - 3
src/packages/cell/doc.md

@@ -57,21 +57,21 @@
 ```html
 ```html
 <div class="cell-box">
 <div class="cell-box">
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-    <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+    <div slot="avatar"><nut-avatar sizeNum="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" bg-icon></nut-avatar></div>
     <div slot="desc">
     <div slot="desc">
       <p class="timer">10:12</p>
       <p class="timer">10:12</p>
       <p class="badge"><nut-badge  :value="9" :max="99" top="0px" right="15px"></nut-badge></p>
       <p class="badge"><nut-badge  :value="9" :max="99" top="0px" right="15px"></nut-badge></p>
     </div>
     </div>
   </nut-cell>
   </nut-cell>
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-    <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+    <div slot="avatar"><nut-avatar sizeNum="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" bg-icon></nut-avatar></div>
     <div slot="desc">
     <div slot="desc">
       <p class="timer">1小时前</p>
       <p class="timer">1小时前</p>
       <p class="badge"><nut-badge  :is-dot="true" :max="99" top="0px" right="5px"></nut-badge></p>
       <p class="badge"><nut-badge  :is-dot="true" :max="99" top="0px" right="5px"></nut-badge></p>
     </div>
     </div>
   </nut-cell>
   </nut-cell>
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
   <nut-cell title="噜啦噜" sub-title="我又来送福利啦!关注之后你就会">
-    <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+    <div slot="avatar"><nut-avatar sizeNum="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" bg-icon></nut-avatar></div>
     <div slot="desc">
     <div slot="desc">
       <p class="timer">星期五</p>
       <p class="timer">星期五</p>
       <p class="badge"><nut-badge  :value="100" :max="99" top="0px" right="25px"></nut-badge></p>
       <p class="badge"><nut-badge  :value="100" :max="99" top="0px" right="25px"></nut-badge></p>

+ 5 - 1
src/packages/infiniteloading/demo.vue

@@ -4,7 +4,11 @@
       <div class="list">
       <div class="list">
         <nut-cell v-for="(item, index) of data" :key="item" :title="'噜啦噜' + index" sub-title="我又来送福利啦!关注之后你就会">
         <nut-cell v-for="(item, index) of data" :key="item" :title="'噜啦噜' + index" sub-title="我又来送福利啦!关注之后你就会">
           <div slot="avatar">
           <div slot="avatar">
-            <nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar>
+            <nut-avatar
+              sizeNum="60"
+              bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+              bg-icon
+            ></nut-avatar>
           </div>
           </div>
           <div slot="desc">
           <div slot="desc">
             <p class="timer">10:12</p>
             <p class="timer">10:12</p>

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

@@ -9,7 +9,7 @@
     <div class="list">
     <div class="list">
     <nut-cell v-for="(item, index) of data" :key="item" :title="'噜啦噜'+index" sub-title="我又来送福利啦!关注之后你就会">
     <nut-cell v-for="(item, index) of data" :key="item" :title="'噜啦噜'+index" sub-title="我又来送福利啦!关注之后你就会">
         <div slot="avatar">
         <div slot="avatar">
-        <nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar>
+        <nut-avatar sizeNum="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" bg-icon></nut-avatar>
         </div>
         </div>
         <div slot="desc">
         <div slot="desc">
         <p class="timer">10:12</p>
         <p class="timer">10:12</p>

+ 7 - 1
src/packages/leftslip/demo.vue

@@ -33,7 +33,13 @@
       <nut-leftslip v-for="(item, index) in list" :key="item.id" ref="leftslip">
       <nut-leftslip v-for="(item, index) in list" :key="item.id" ref="leftslip">
         <div slot="slip-main" class="slip-main">
         <div slot="slip-main" class="slip-main">
           <nut-cell class="cell-item" :title="item.title" :sub-title="item.subTitle">
           <nut-cell class="cell-item" :title="item.title" :sub-title="item.subTitle">
-            <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+            <div slot="avatar"
+              ><nut-avatar
+                sizeNum="60"
+                bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg"
+                bg-icon
+              ></nut-avatar
+            ></div>
             <div slot="desc">
             <div slot="desc">
               <p class="timer">{{ item.time }}</p>
               <p class="timer">{{ item.time }}</p>
               <p class="badge"><nut-badge :is-dot="item.isDot" :value="item.value" :max="99" top="0px" right="15px"></nut-badge></p>
               <p class="badge"><nut-badge :is-dot="item.isDot" :value="item.value" :max="99" top="0px" right="15px"></nut-badge></p>

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

@@ -65,7 +65,7 @@ export default {
     <nut-leftslip v-for="(item, index) in list" :key="item.id" ref="leftslip">
     <nut-leftslip v-for="(item, index) in list" :key="item.id" ref="leftslip">
         <div slot="slip-main" class="slip-main">
         <div slot="slip-main" class="slip-main">
           <nut-cell class="cell-item" :title="item.title" :sub-title="item.subTitle">
           <nut-cell class="cell-item" :title="item.title" :sub-title="item.subTitle">
-            <div slot="avatar"><nut-avatar sizeNum="60" :bg-image="require('../../assets/img/cell-avatar.jpeg')" bg-icon></nut-avatar></div>
+            <div slot="avatar"><nut-avatar sizeNum="60" bg-image="https://img14.360buyimg.com/imagetools/jfs/t1/130112/36/5492/38449/5f1f964cEfd6f41bf/bec836b48b55bb00.jpg" bg-icon></nut-avatar></div>
             <div slot="desc">
             <div slot="desc">
               <p class="timer">{{item.time} }</p>
               <p class="timer">{{item.time} }</p>
               <p class="badge"><nut-badge :is-dot="item.isDot" :value="item.value" :max="99" top="0px" right="15px"></nut-badge></p>
               <p class="badge"><nut-badge :is-dot="item.isDot" :value="item.value" :max="99" top="0px" right="15px"></nut-badge></p>

+ 8 - 21
src/packages/tabbar/__test__/tabbar.spec.js

@@ -10,33 +10,26 @@ describe('Tabbar.vue', () => {
       {
       {
         tabTitle: '定位',
         tabTitle: '定位',
         curr: false,
         curr: false,
-        href: 'http://nutui.jd.com/demo.html#/index',
-        icon: require('../../../assets/img/address.png'),
-        activeIcon: require('../../../assets/img/address-red.png'),
+        icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+        activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
       },
       },
       {
       {
         tabTitle: '收藏',
         tabTitle: '收藏',
         curr: false,
         curr: false,
-        isDot: true,
-        href: 'http://nutui.jd.com/demo.html#/index',
-        icon: require('../../../assets/img/collection.png'),
-        activeIcon: require('../../../assets/img/collection-red.png'),
+        icon: 'https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png',
+        activeIcon: 'https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png',
       },
       },
       {
       {
         tabTitle: '任务',
         tabTitle: '任务',
         curr: true,
         curr: true,
-        num: 9,
-        href: 'http://nutui.jd.com/demo.html#/index',
-        icon: require('../../../assets/img/task.png'),
-        activeIcon: require('../../../assets/img/task-red.png'),
+        icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+        activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
       },
       },
       {
       {
         tabTitle: '我的',
         tabTitle: '我的',
         curr: false,
         curr: false,
-        num: 100,
-        href: 'http://nutui.jd.com/demo.html#/index',
-        icon: require('../../../assets/img/myicon.png'),
-        activeIcon: require('../../../assets/img/myicon-red.png'),
+        icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+        activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
       },
       },
     ],
     ],
   });
   });
@@ -66,10 +59,4 @@ describe('Tabbar.vue', () => {
       expect(wrapper.findAll('.tabbar-nav').at(2).contains('.curr')).toBe(true);
       expect(wrapper.findAll('.tabbar-nav').at(2).contains('.curr')).toBe(true);
     });
     });
   });
   });
-
-  it('当前tabbar标签显示的图片', () => {
-    return Vue.nextTick().then(function () {
-      expect(wrapper.findAll('.tabbar-nav').at(0).find('.icon').hasStyle('background-image', 'url(./img/address.png)')).toBe(true);
-    });
-  });
 });
 });

+ 42 - 42
src/packages/tabbar/demo.vue

@@ -20,100 +20,100 @@ export default {
         {
         {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '收藏',
           tabTitle: '收藏',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/collection.png'),
-          activeIcon: require('../../assets/img/collection-red.png'),
+          icon: 'https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png',
+          activeIcon: 'https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png',
         },
         },
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: true,
           curr: true,
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png'),
+          icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+          activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
       tabList2: [
       tabList2: [
         {
         {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
       tabList3: [
       tabList3: [
         {
         {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png'),
+          icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+          activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
       tabList4: [
       tabList4: [
         {
         {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '收藏',
           tabTitle: '收藏',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/collection.png'),
-          activeIcon: require('../../assets/img/collection-red.png'),
+          icon: 'https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png',
+          activeIcon: 'https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png',
         },
         },
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png'),
+          icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+          activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
       tabList5: [
       tabList5: [
         {
         {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '收藏',
           tabTitle: '收藏',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/collection.png'),
-          activeIcon: require('../../assets/img/collection-red.png'),
+          icon: 'https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png',
+          activeIcon: 'https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png',
         },
         },
         {
         {
           tabTitle: '设置',
           tabTitle: '设置',
@@ -124,14 +124,14 @@ export default {
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png'),
+          icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+          activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
       tabList6: [
       tabList6: [
@@ -139,32 +139,32 @@ export default {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
           href: 'http://nutui.jd.com/demo.html#/index',
           href: 'http://nutui.jd.com/demo.html#/index',
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png'),
+          icon: 'https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png',
+          activeIcon: 'https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png',
         },
         },
         {
         {
           tabTitle: '收藏',
           tabTitle: '收藏',
           curr: false,
           curr: false,
           isDot: true,
           isDot: true,
           href: 'http://nutui.jd.com/demo.html#/index',
           href: 'http://nutui.jd.com/demo.html#/index',
-          icon: require('../../assets/img/collection.png'),
-          activeIcon: require('../../assets/img/collection-red.png'),
+          icon: 'https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png',
+          activeIcon: 'https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png',
         },
         },
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: false,
           curr: false,
           num: 9,
           num: 9,
           href: 'http://nutui.jd.com/demo.html#/index',
           href: 'http://nutui.jd.com/demo.html#/index',
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png'),
+          icon: 'https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png',
+          activeIcon: 'https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png',
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
           num: 100,
           num: 100,
           href: 'http://nutui.jd.com/demo.html#/index',
           href: 'http://nutui.jd.com/demo.html#/index',
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png'),
+          icon: 'https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png',
+          activeIcon: 'https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png',
         },
         },
       ],
       ],
     };
     };

+ 8 - 8
src/packages/tabbar/doc.md

@@ -28,32 +28,32 @@ export default {
           tabTitle: '定位',
           tabTitle: '定位',
           curr: true,
           curr: true,
           href:"http://nutui.jd.com/demo.html#/index",
           href:"http://nutui.jd.com/demo.html#/index",
-          icon: require('../../assets/img/address.png'),
-          activeIcon: require('../../assets/img/address-red.png')
+          icon: "https://img14.360buyimg.com/imagetools/jfs/t1/118307/14/13356/6509/5f1f964eE49521709/01d7262779580eae.png",
+          activeIcon: "https://img13.360buyimg.com/imagetools/jfs/t1/144737/16/3979/6780/5f1f964eE1ea6a85c/f0884d425c08f817.png"
         },
         },
         {
         {
           tabTitle: '收藏',
           tabTitle: '收藏',
           curr: false,
           curr: false,
           isDot:true,
           isDot:true,
           href:"http://nutui.jd.com/demo.html#/index",
           href:"http://nutui.jd.com/demo.html#/index",
-          icon: require('../../assets/img/collection.png'),
-          activeIcon: require('../../assets/img/collection-red.png')
+          icon: "https://img12.360buyimg.com/imagetools/jfs/t1/121804/37/8253/8253/5f1f964cE49319b40/e1013b7ecccddb9d.png",
+          activeIcon: "https://img14.360buyimg.com/imagetools/jfs/t1/147105/26/3919/8702/5f1f964cEa84ada31/49449b6837783b96.png"
         },
         },
         {
         {
           tabTitle: '任务',
           tabTitle: '任务',
           curr: false,
           curr: false,
           num:9,
           num:9,
           href:"http://nutui.jd.com/demo.html#/index",
           href:"http://nutui.jd.com/demo.html#/index",
-          icon: require('../../assets/img/task.png'),
-          activeIcon: require('../../assets/img/task-red.png')
+          icon: "https://img13.360buyimg.com/imagetools/jfs/t1/135718/27/5479/4044/5f1f964cE2a855efc/be6cf14f8508d995.png",
+          activeIcon: "https://img11.360buyimg.com/imagetools/jfs/t1/134812/35/5525/4171/5f1f964cE87259d35/0c15597415912785.png"
         },
         },
         {
         {
           tabTitle: '我的',
           tabTitle: '我的',
           curr: false,
           curr: false,
           num:100,
           num:100,
           href:"http://nutui.jd.com/demo.html#/index",
           href:"http://nutui.jd.com/demo.html#/index",
-          icon: require('../../assets/img/myicon.png'),
-          activeIcon: require('../../assets/img/myicon-red.png')
+          icon: "https://img10.360buyimg.com/imagetools/jfs/t1/134791/32/5470/6758/5f1f964cEa5ffb2c4/a001fcc43aebd555.png",
+          activeIcon: "https://img12.360buyimg.com/imagetools/jfs/t1/141460/22/3921/6967/5f1f964cE0f298049/1aa9437df6e5e747.png"
         }
         }
       ]
       ]
     };
     };