Browse Source

Merge branch 'v4' of https://github.com/jdf2e/nutui into v4

Drjingfubo 3 years ago
parent
commit
d830c66246

+ 1 - 1
src/config.json

@@ -774,7 +774,7 @@
         {
           "version": "3.0.0",
           "name": "PullRefresh",
-          "taro": true,
+          "taro": false,
           "tarodoc": true,
           "type": "component",
           "cName": "下拉刷新",

+ 1 - 1
src/packages/__VUE/addresslist/doc.taro.md

@@ -8,7 +8,7 @@
 
 ```javascript
 import { createApp } from "vue";
-import { AddressList } from "@nutui/nutui";
+import { AddressList } from "@nutui/nutui-taro";
 
 const app = createApp();
 app.use(AddressList);

+ 3 - 3
src/packages/__VUE/barrage/demo.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="demo">
     <h2>{{ translate('basic') }}</h2>
-    <nut-cell>
+    <nut-cell class="danmu-box">
       <nut-barrage ref="danmu" :danmu="list"></nut-barrage>
     </nut-cell>
     <div class="test">
       <nut-button @click="addDanmu" class="add nut-button--primary">{{ translate('btn1') }}</nut-button>
     </div>
     <h2>{{ translate('slotTitle') }}</h2>
-    <nut-cell>
+    <nut-cell class="danmu-box">
       <nut-barrage>
         <span>aaa</span>
         <span>bbb</span>
@@ -60,7 +60,7 @@ export default createDemo({
 </script>
 
 <style lang="scss" scoped>
-.nut-cell,
+.danmu-box,
 .nut-barrage {
   padding: 20px 0;
   height: 150px;

+ 1 - 1
src/packages/__VUE/list/demo.vue

@@ -2,7 +2,7 @@
   <div class="demo">
     <h2>{{ translate('basic') }}</h2>
     <nut-cell>
-      <nut-list :height="50" :listData="count" @scroll-bottom="handleScroll" :container-height="100">
+      <nut-list :height="50" :listData="count" @scroll-bottom="handleScroll">
         <template v-slot="{ item }">
           <div class="list-item">
             {{ item }}

+ 1 - 1
src/sites/mobile-taro/vue/config/prod.js

@@ -6,7 +6,7 @@ module.exports = {
   defineConstants: {},
   mini: {},
   h5: {
-    publicPath: '/taro/vue/4x/'
+    publicPath: '/taro/vue/4x/demo/'
     /**
      * 如果h5端编译后体积过大,可以使用webpack-bundle-analyzer插件对打包体积进行分析。
      * 参考代码如下:

+ 2 - 2
src/sites/mobile-taro/vue/src/business/pages/barrage/index.vue

@@ -2,7 +2,7 @@
   <div class="demo" :class="{ web: env === 'WEB' }">
     <Header v-if="env === 'WEB'" />
     <h2>基础用法</h2>
-    <nut-cell>
+    <nut-cell class="danmu-box">
       <nut-barrage ref="danmu" :danmu="list"></nut-barrage>
     </nut-cell>
     <div class="test">
@@ -38,7 +38,7 @@ export default {
 </script>
 
 <style lang="scss">
-.nut-cell,
+.danmu-box,
 .nut-barrage {
   padding: 20px 0;
   height: 150px;

+ 0 - 4
src/sites/mobile-taro/vue/src/business/pages/signature/index.vue

@@ -76,10 +76,6 @@ export default {
 #app .demo {
   height: auto;
 }
-.nut-cell {
-  padding: 20px 0;
-  height: 120px;
-}
 .test {
   .nut-input {
     width: 80%;