朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 5cf4134cb0dd03d86885e5c8d31bb66052b0a5f2 1 个父辈 a40a0f72

完善 页面 loading设置

内嵌 并排对比
正在显示 5 个修改的文件 包含 260 行增加 和 32 行删除
@@ -1613,8 +1613,7 @@ @@ -1613,8 +1613,7 @@
1613 "base64-js": { 1613 "base64-js": {
1614 "version": "1.3.1", 1614 "version": "1.3.1",
1615 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", 1615 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
1616 - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",  
1617 - "dev": true 1616 + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
1618 }, 1617 },
1619 "bcrypt-pbkdf": { 1618 "bcrypt-pbkdf": {
1620 "version": "1.0.2", 1619 "version": "1.0.2",
@@ -1830,11 +1829,29 @@ @@ -1830,11 +1829,29 @@
1830 "isarray": "^1.0.0" 1829 "isarray": "^1.0.0"
1831 } 1830 }
1832 }, 1831 },
  1832 + "buffer-alloc": {
  1833 + "version": "1.2.0",
  1834 + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
  1835 + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
  1836 + "requires": {
  1837 + "buffer-alloc-unsafe": "^1.1.0",
  1838 + "buffer-fill": "^1.0.0"
  1839 + }
  1840 + },
  1841 + "buffer-alloc-unsafe": {
  1842 + "version": "1.1.0",
  1843 + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
  1844 + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
  1845 + },
  1846 + "buffer-fill": {
  1847 + "version": "1.0.0",
  1848 + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
  1849 + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
  1850 + },
1833 "buffer-from": { 1851 "buffer-from": {
1834 "version": "1.1.1", 1852 "version": "1.1.1",
1835 "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", 1853 "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
1836 - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",  
1837 - "dev": true 1854 + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
1838 }, 1855 },
1839 "buffer-xor": { 1856 "buffer-xor": {
1840 "version": "1.0.3", 1857 "version": "1.0.3",
@@ -2954,8 +2971,7 @@ @@ -2954,8 +2971,7 @@
2954 "decamelize": { 2971 "decamelize": {
2955 "version": "1.2.0", 2972 "version": "1.2.0",
2956 "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", 2973 "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
2957 - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",  
2958 - "dev": true 2974 + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
2959 }, 2975 },
2960 "decode-uri-component": { 2976 "decode-uri-component": {
2961 "version": "0.2.0", 2977 "version": "0.2.0",
@@ -3092,6 +3108,11 @@ @@ -3092,6 +3108,11 @@
3092 "randombytes": "^2.0.0" 3108 "randombytes": "^2.0.0"
3093 } 3109 }
3094 }, 3110 },
  3111 + "dijkstrajs": {
  3112 + "version": "1.0.1",
  3113 + "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
  3114 + "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
  3115 + },
3095 "dir-glob": { 3116 "dir-glob": {
3096 "version": "2.2.2", 3117 "version": "2.2.2",
3097 "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", 3118 "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -5128,8 +5149,7 @@ @@ -5128,8 +5149,7 @@
5128 "ieee754": { 5149 "ieee754": {
5129 "version": "1.1.13", 5150 "version": "1.1.13",
5130 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", 5151 "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
5131 - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",  
5132 - "dev": true 5152 + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
5133 }, 5153 },
5134 "iferr": { 5154 "iferr": {
5135 "version": "0.1.5", 5155 "version": "0.1.5",
@@ -9837,6 +9857,11 @@ @@ -9837,6 +9857,11 @@
9837 "find-up": "^1.0.0" 9857 "find-up": "^1.0.0"
9838 } 9858 }
9839 }, 9859 },
  9860 + "pngjs": {
  9861 + "version": "3.4.0",
  9862 + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
  9863 + "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
  9864 + },
9840 "posix-character-classes": { 9865 "posix-character-classes": {
9841 "version": "0.1.1", 9866 "version": "0.1.1",
9842 "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", 9867 "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -10480,6 +10505,173 @@ @@ -10480,6 +10505,173 @@
10480 "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", 10505 "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
10481 "dev": true 10506 "dev": true
10482 }, 10507 },
  10508 + "qrcode": {
  10509 + "version": "1.4.4",
  10510 + "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz",
  10511 + "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==",
  10512 + "requires": {
  10513 + "buffer": "^5.4.3",
  10514 + "buffer-alloc": "^1.2.0",
  10515 + "buffer-from": "^1.1.1",
  10516 + "dijkstrajs": "^1.0.1",
  10517 + "isarray": "^2.0.1",
  10518 + "pngjs": "^3.3.0",
  10519 + "yargs": "^13.2.4"
  10520 + },
  10521 + "dependencies": {
  10522 + "buffer": {
  10523 + "version": "5.5.0",
  10524 + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz",
  10525 + "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==",
  10526 + "requires": {
  10527 + "base64-js": "^1.0.2",
  10528 + "ieee754": "^1.1.4"
  10529 + }
  10530 + },
  10531 + "camelcase": {
  10532 + "version": "5.3.1",
  10533 + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
  10534 + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
  10535 + },
  10536 + "cliui": {
  10537 + "version": "5.0.0",
  10538 + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
  10539 + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
  10540 + "requires": {
  10541 + "string-width": "^3.1.0",
  10542 + "strip-ansi": "^5.2.0",
  10543 + "wrap-ansi": "^5.1.0"
  10544 + }
  10545 + },
  10546 + "emoji-regex": {
  10547 + "version": "7.0.3",
  10548 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  10549 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
  10550 + },
  10551 + "find-up": {
  10552 + "version": "3.0.0",
  10553 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
  10554 + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
  10555 + "requires": {
  10556 + "locate-path": "^3.0.0"
  10557 + }
  10558 + },
  10559 + "get-caller-file": {
  10560 + "version": "2.0.5",
  10561 + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
  10562 + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
  10563 + },
  10564 + "is-fullwidth-code-point": {
  10565 + "version": "2.0.0",
  10566 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
  10567 + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
  10568 + },
  10569 + "isarray": {
  10570 + "version": "2.0.5",
  10571 + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
  10572 + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
  10573 + },
  10574 + "locate-path": {
  10575 + "version": "3.0.0",
  10576 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
  10577 + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
  10578 + "requires": {
  10579 + "p-locate": "^3.0.0",
  10580 + "path-exists": "^3.0.0"
  10581 + }
  10582 + },
  10583 + "p-limit": {
  10584 + "version": "2.2.2",
  10585 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
  10586 + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
  10587 + "requires": {
  10588 + "p-try": "^2.0.0"
  10589 + }
  10590 + },
  10591 + "p-locate": {
  10592 + "version": "3.0.0",
  10593 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
  10594 + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
  10595 + "requires": {
  10596 + "p-limit": "^2.0.0"
  10597 + }
  10598 + },
  10599 + "p-try": {
  10600 + "version": "2.2.0",
  10601 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
  10602 + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
  10603 + },
  10604 + "path-exists": {
  10605 + "version": "3.0.0",
  10606 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
  10607 + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
  10608 + },
  10609 + "require-main-filename": {
  10610 + "version": "2.0.0",
  10611 + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
  10612 + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
  10613 + },
  10614 + "string-width": {
  10615 + "version": "3.1.0",
  10616 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  10617 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
  10618 + "requires": {
  10619 + "emoji-regex": "^7.0.1",
  10620 + "is-fullwidth-code-point": "^2.0.0",
  10621 + "strip-ansi": "^5.1.0"
  10622 + }
  10623 + },
  10624 + "strip-ansi": {
  10625 + "version": "5.2.0",
  10626 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  10627 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
  10628 + "requires": {
  10629 + "ansi-regex": "^4.1.0"
  10630 + }
  10631 + },
  10632 + "which-module": {
  10633 + "version": "2.0.0",
  10634 + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
  10635 + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
  10636 + },
  10637 + "wrap-ansi": {
  10638 + "version": "5.1.0",
  10639 + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
  10640 + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
  10641 + "requires": {
  10642 + "ansi-styles": "^3.2.0",
  10643 + "string-width": "^3.0.0",
  10644 + "strip-ansi": "^5.0.0"
  10645 + }
  10646 + },
  10647 + "yargs": {
  10648 + "version": "13.3.2",
  10649 + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
  10650 + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
  10651 + "requires": {
  10652 + "cliui": "^5.0.0",
  10653 + "find-up": "^3.0.0",
  10654 + "get-caller-file": "^2.0.1",
  10655 + "require-directory": "^2.1.1",
  10656 + "require-main-filename": "^2.0.0",
  10657 + "set-blocking": "^2.0.0",
  10658 + "string-width": "^3.0.0",
  10659 + "which-module": "^2.0.0",
  10660 + "y18n": "^4.0.0",
  10661 + "yargs-parser": "^13.1.2"
  10662 + }
  10663 + },
  10664 + "yargs-parser": {
  10665 + "version": "13.1.2",
  10666 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
  10667 + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
  10668 + "requires": {
  10669 + "camelcase": "^5.0.0",
  10670 + "decamelize": "^1.2.0"
  10671 + }
  10672 + }
  10673 + }
  10674 + },
10483 "qs": { 10675 "qs": {
10484 "version": "6.7.0", 10676 "version": "6.7.0",
10485 "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", 10677 "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -11119,8 +11311,7 @@ @@ -11119,8 +11311,7 @@
11119 "require-directory": { 11311 "require-directory": {
11120 "version": "2.1.1", 11312 "version": "2.1.1",
11121 "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", 11313 "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
11122 - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",  
11123 - "dev": true 11314 + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
11124 }, 11315 },
11125 "require-from-string": { 11316 "require-from-string": {
11126 "version": "1.2.1", 11317 "version": "1.2.1",
@@ -11435,8 +11626,7 @@ @@ -11435,8 +11626,7 @@
11435 "set-blocking": { 11626 "set-blocking": {
11436 "version": "2.0.0", 11627 "version": "2.0.0",
11437 "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", 11628 "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
11438 - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",  
11439 - "dev": true 11629 + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
11440 }, 11630 },
11441 "set-immediate-shim": { 11631 "set-immediate-shim": {
11442 "version": "1.0.1", 11632 "version": "1.0.1",
@@ -12648,6 +12838,11 @@ @@ -12648,6 +12838,11 @@
12648 } 12838 }
12649 } 12839 }
12650 }, 12840 },
  12841 + "vue-qriously": {
  12842 + "version": "1.1.1",
  12843 + "resolved": "https://registry.npmjs.org/vue-qriously/-/vue-qriously-1.1.1.tgz",
  12844 + "integrity": "sha512-AlP8A7LpXWF5lyJsQYxtPE3+qlRqIBX9CP3cn0Oiov9QFNovp+3z7VJLqHRQh6poXO5K2RbZwAiY3hsVVlQbRg=="
  12845 + },
12651 "vue-router": { 12846 "vue-router": {
12652 "version": "2.8.1", 12847 "version": "2.8.1",
12653 "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.8.1.tgz", 12848 "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.8.1.tgz",
@@ -13202,8 +13397,7 @@ @@ -13202,8 +13397,7 @@
13202 "y18n": { 13397 "y18n": {
13203 "version": "4.0.0", 13398 "version": "4.0.0",
13204 "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", 13399 "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
13205 - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",  
13206 - "dev": true 13400 + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
13207 }, 13401 },
13208 "yallist": { 13402 "yallist": {
13209 "version": "2.1.2", 13403 "version": "2.1.2",
@@ -22,9 +22,12 @@ @@ -22,9 +22,12 @@
22 "moment": "^2.24.0", 22 "moment": "^2.24.0",
23 "npm": "^6.8.0", 23 "npm": "^6.8.0",
24 "nprogress": "^0.2.0", 24 "nprogress": "^0.2.0",
  25 + "qrcode": "^1.4.4",
  26 + "qrcodejs2": "^0.0.2",
25 "script-loader": "^0.7.2", 27 "script-loader": "^0.7.2",
26 "vue": "^2.2.2", 28 "vue": "^2.2.2",
27 "vue-i18n": "^8.14.0", 29 "vue-i18n": "^8.14.0",
  30 + "vue-qriously": "^1.1.1",
28 "vue-router": "^2.3.0", 31 "vue-router": "^2.3.0",
29 "vuex": "^2.0.0-rc.6", 32 "vuex": "^2.0.0-rc.6",
30 "xlsx": "^0.15.1" 33 "xlsx": "^0.15.1"
@@ -36,6 +36,15 @@ export const add = params => { return axios({ @@ -36,6 +36,15 @@ export const add = params => { return axios({
36 } 36 }
37 })}; 37 })};
38 38
  39 +export const qrCode = params => { return axios({
  40 + method: 'POST',
  41 + url: `${base}/qrCode`,
  42 + params: params,
  43 + headers: {
  44 + 'Content-Type': 'application/json;charset=UTF-8'
  45 + }
  46 +})};
  47 +
39 export const update = params => { return axios({ 48 export const update = params => { return axios({
40 method: 'PUT', 49 method: 'PUT',
41 url: `${base}/update`, 50 url: `${base}/update`,
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 </el-form> 25 </el-form>
26 </el-col> 26 </el-col>
27 <el-table 27 <el-table
  28 + v-loading="listLoading"
28 :data="tableData" 29 :data="tableData"
29 stripe 30 stripe
30 style="width: 100%"> 31 style="width: 100%">
@@ -58,8 +59,8 @@ @@ -58,8 +59,8 @@
58 59
59 <el-table-column prop="paystatus" label="支付状态" width="100"> 60 <el-table-column prop="paystatus" label="支付状态" width="100">
60 <template slot-scope="scope"> 61 <template slot-scope="scope">
61 - <div v-if="scope.row.payfesstype === false" style="color:#ff4d51">未完成</div>  
62 - <div v-else="scope.row.payfesstype === true" style="color: #42d885">已完成</div> 62 + <div v-if="scope.row.paystatus === false" style="color:#ff4d51">未完成</div>
  63 + <div v-else="scope.row.paystatus === true" style="color: #42d885">已完成</div>
63 </template> 64 </template>
64 </el-table-column> 65 </el-table-column>
65 <el-table-column 66 <el-table-column
@@ -95,7 +96,7 @@ @@ -95,7 +96,7 @@
95 total: 0, 96 total: 0,
96 pageNum: 1, 97 pageNum: 1,
97 pageSize: 5, 98 pageSize: 5,
98 - 99 + listLoading: false,
99 pickerOptions: { 100 pickerOptions: {
100 shortcuts: [{ 101 shortcuts: [{
101 text: '最近一周', 102 text: '最近一周',
@@ -137,6 +138,7 @@ @@ -137,6 +138,7 @@
137 138
138 handleCurrentChange(val) { 139 handleCurrentChange(val) {
139 this.pageNum = val; 140 this.pageNum = val;
  141 + this.QueryOrder();
140 }, 142 },
141 QueryOrder(){ 143 QueryOrder(){
142 144
@@ -152,16 +154,20 @@ @@ -152,16 +154,20 @@
152 payTime: payTimes, 154 payTime: payTimes,
153 155
154 }; 156 };
  157 + this.listLoading = true;
155 getOrder(params).then(res=>{ 158 getOrder(params).then(res=>{
156 let resData = res.data; 159 let resData = res.data;
157 this.total = resData.total; 160 this.total = resData.total;
158 this.tableData = resData.list; 161 this.tableData = resData.list;
  162 + this.listLoading = false;
159 }).catch((error) => { 163 }).catch((error) => {
160 if(null!= error.response && error.response!==undefined){ 164 if(null!= error.response && error.response!==undefined){
161 let status= error.response.status; 165 let status= error.response.status;
162 let msg = error.response.statusText; 166 let msg = error.response.statusText;
  167 + this.listLoading = false;
163 alert(status+msg); 168 alert(status+msg);
164 }else { 169 }else {
  170 + this.listLoading = false;
165 alert(error); 171 alert(error);
166 } 172 }
167 }) 173 })
1 <template> 1 <template>
2 <el-container> 2 <el-container>
3 <el-main > 3 <el-main >
4 - <el-row type="flex" class="row-bg" justify="center"> 4 + <el-row type="flex" class="row-bg" justify="center" v-loading="loading">
5 <el-col :span="20"> 5 <el-col :span="20">
6 <div> 6 <div>
7 <h2 style="width: 150px" type="primary">&nbsp;&nbsp;查询房间号</h2> 7 <h2 style="width: 150px" type="primary">&nbsp;&nbsp;查询房间号</h2>
@@ -74,9 +74,18 @@ @@ -74,9 +74,18 @@
74 74
75 <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button> 75 <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button>
76 </el-col> 76 </el-col>
77 -  
78 -  
79 </el-row> 77 </el-row>
  78 + <el-dialog
  79 + title="扫码支付"
  80 + :visible.sync="dialogVisible"
  81 + width="15%"
  82 + >
  83 + <template>
  84 + <div>
  85 + <qriously :value="Qrcode" :size="200" />
  86 + </div>
  87 + </template>
  88 + </el-dialog>
80 </el-main> 89 </el-main>
81 </el-container> 90 </el-container>
82 </template> 91 </template>
@@ -85,16 +94,20 @@ @@ -85,16 +94,20 @@
85 </style> 94 </style>
86 <script> 95 <script>
87 import loginUserInfo from '@/api/base' 96 import loginUserInfo from '@/api/base'
88 - import {getList, add} from '../../api/empt/userPayOrder';  
89 - import ElCol from "element-ui/packages/col/src/col"; 97 + import {getList, add, qrCode} from '../../api/empt/userPayOrder';
  98 + import ElCol from "element-ui/packages/col/src/col"
  99 + // import QRCode from 'qrcodejs2'
  100 + import Vue from 'vue'
  101 + import VueQriously from 'vue-qriously'
  102 + Vue.use(VueQriously)
90 export default { 103 export default {
91 components: {ElCol}, 104 components: {ElCol},
92 data() { 105 data() {
93 return{ 106 return{
  107 + loading:false,
94 filters:{ 108 filters:{
95 roomNumber:'' 109 roomNumber:''
96 }, 110 },
97 -  
98 electricityForm:{ 111 electricityForm:{
99 overdraftthreshold:'', 112 overdraftthreshold:'',
100 payTime:'', 113 payTime:'',
@@ -122,7 +135,9 @@ @@ -122,7 +135,9 @@
122 labelPosition:'left', 135 labelPosition:'left',
123 Edistatus:'', 136 Edistatus:'',
124 shuibiao:'', 137 shuibiao:'',
125 - dianbiao:'' 138 + dianbiao:'',
  139 + dialogVisible:false,
  140 + Qrcode: ''
126 } 141 }
127 }, 142 },
128 methods:{ 143 methods:{
@@ -133,7 +148,7 @@ @@ -133,7 +148,7 @@
133 roomNumber: this.filters.roomNumber 148 roomNumber: this.filters.roomNumber
134 }; 149 };
135 150
136 - 151 + this.loading=true;
137 getList(para).then((res) => { 152 getList(para).then((res) => {
138 let resData = res.data; 153 let resData = res.data;
139 if (resData.length > 0) { 154 if (resData.length > 0) {
@@ -149,6 +164,7 @@ @@ -149,6 +164,7 @@
149 this.waterForm.userId = JSON.parse(sessionStorage.getItem('user')).userId; 164 this.waterForm.userId = JSON.parse(sessionStorage.getItem('user')).userId;
150 } 165 }
151 } 166 }
  167 + this.loading=false;
152 } else { 168 } else {
153 this.$alert('请输入正确的房间号', '提示', { 169 this.$alert('请输入正确的房间号', '提示', {
154 confirmButtonText: '确定', 170 confirmButtonText: '确定',
@@ -158,10 +174,10 @@ @@ -158,10 +174,10 @@
158 } 174 }
159 175
160 176
161 - this.listLoading = false; 177 + this.loading = false;
162 //NProgress.done(); 178 //NProgress.done();
163 }).catch((error) => { 179 }).catch((error) => {
164 - this.listLoading = false; 180 + this.loading = false;
165 if (null != error.response && error.response !== undefined) { 181 if (null != error.response && error.response !== undefined) {
166 let status = error.response.status; 182 let status = error.response.status;
167 let msg = error.response.statusText; 183 let msg = error.response.statusText;
@@ -184,13 +200,13 @@ @@ -184,13 +200,13 @@
184 if (valid) { 200 if (valid) {
185 this.$confirm('确认充值吗？', '提示', {}).then(() => { 201 this.$confirm('确认充值吗？', '提示', {}).then(() => {
186 let para = Object.assign({}, this.waterForm); 202 let para = Object.assign({}, this.waterForm);
187 - add(para).then((res) => { 203 + this.loading=true;
  204 + qrCode(para).then((res) => {
188 this.addLoading = false; 205 this.addLoading = false;
189 if (res.data.code == 200) { 206 if (res.data.code == 200) {
190 - this.$message({  
191 - message: '充值成功',  
192 - type: 'success'  
193 - }); 207 + this.dialogVisible=true;
  208 + this.Qrcode = res.data.data;
  209 + this.loading=false;
194 }else { 210 }else {
195 this.$message({ 211 this.$message({
196 message: '网络异常', 212 message: '网络异常',