isDef

packages/common/utils/index.js

@@ -86,7 +86,7 @@ export function formatNumber (value, allowDot) {
 }
 
 export function isDef (val) {
-  return val !== undefined && val !== null && val !== ''
+  return val !== undefined && val !== 'undefined' && val !== null && val !== 'null' && val !== ''
 }
 
 export function isUndefined (value) {

src/pages/Scroll/demo.vue

@@ -9,8 +9,11 @@
       <h-return slot="left" @click.native="$routeGo()"/>
       <div slot="center">scroll</div>
     </h-header>
+    <s-tab>
+      <tab-item>测试</tab-item>
+    </s-tab>
     <scroll
-      ref="scroll" :pullUp="true" :pull-down="true" @pullingUp="loadMore"
+      ref="scroll" class="has-footer" :pullUp="true" :pull-down="true" @pullingUp="loadMore"
       @pullingDown="loadMore">
       <list-item>
         <item v-for="item in list" :key="item">
@@ -19,6 +22,8 @@
         </item>
       </list-item>
     </scroll>
+    <div style="width: 100%;height: 40px;margin-top: 20px"></div>
+    <bottom-tab></bottom-tab>
   </h-view>
 </template>
 

src/pages/demo.vue

@@ -100,7 +100,7 @@
         <item>
           <section slot="name">Alert</section>
         </item>
-        <item>
+        <item id="Confirm">
           <section slot="name">Confirm</section>
         </item>
         <item>