Commit 381751c5d3bce7e7a628ff74a663aff4ab46b0fd

Authored by Aresn
Committed by GitHub
2 parents 6700f596 6f340380

Merge pull request #85 from jingsam/fix-modal

fixed modal
build/webpack.dist.dev.config.js
@@ -14,7 +14,7 @@ module.exports = { @@ -14,7 +14,7 @@ module.exports = {
14 umdNamedDefine: true 14 umdNamedDefine: true
15 }, 15 },
16 externals: { 16 externals: {
17 - 'vue': 'Vue' 17 + 'vue': 'vue'
18 }, 18 },
19 resolve: { 19 resolve: {
20 extensions: ['', '.js', '.vue'] 20 extensions: ['', '.js', '.vue']
build/webpack.dist.prod.config.js
@@ -14,7 +14,7 @@ module.exports = { @@ -14,7 +14,7 @@ module.exports = {
14 umdNamedDefine: true 14 umdNamedDefine: true
15 }, 15 },
16 externals: { 16 externals: {
17 - 'vue': 'Vue' 17 + 'vue': 'vue'
18 }, 18 },
19 resolve: { 19 resolve: {
20 extensions: ['', '.js', '.vue'] 20 extensions: ['', '.js', '.vue']
test/routers/more.vue
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </Timeline> 37 </Timeline>
38 <br><br> 38 <br><br>
39 <Affix :offset-top="50" @on-change="affixChange"> 39 <Affix :offset-top="50" @on-change="affixChange">
40 - <Button>固定的图钉</Button> 40 + <i-button>固定的图钉</i-button>
41 </Affix> 41 </Affix>
42 <Back-top @on-click="backtop"> 42 <Back-top @on-click="backtop">
43 43
test/routers/tag.vue
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 </Modal> 42 </Modal>
43 </template> 43 </template>
44 <script> 44 <script>
45 - import { Tag, Modal, iButton } from 'iview'; 45 + import { Tag, Modal, iButton } from '../../dist/iview.js';
46 export default { 46 export default {
47 components: { Tag, Modal, iButton }, 47 components: { Tag, Modal, iButton },
48 data () { 48 data () {
@@ -53,7 +53,9 @@ @@ -53,7 +53,9 @@
53 }, 53 },
54 methods: { 54 methods: {
55 ok () { 55 ok () {
56 - 56 + setTimeout(() => {
  57 + this.modal1 = false;
  58 + }, 2000);
57 } 59 }
58 } 60 }
59 } 61 }