Skip to content

L
learn-online-pc
提交 f7aa877a authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

merge...

上级 f7aa8844 370b3e71
显示空白字符变更
内嵌 并排
正在显示 包含 79 行增加 和 311 行删除
package-lock.json
浏览文件 @ f7aa877a
...@@ -1521,36 +1521,6 @@ ...@@ -1521,36 +1521,6 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true "dev": true
}, },
"acorn-jsx": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"requires": {
"acorn": "^3.0.4"
},
"dependencies": {
"acorn": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
}
}
},
"acorn-object-spread": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz",
"integrity": "sha1-SOrQ9KjrFplaF6Dbn/xqyq2kumg=",
"requires": {
"acorn": "^3.1.0"
},
"dependencies": {
"acorn": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
}
}
},
"address": { "address": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
...@@ -1676,7 +1646,8 @@ ...@@ -1676,7 +1646,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
}, },
"ansi-styles": { "ansi-styles": {
"version": "3.2.1", "version": "3.2.1",
...@@ -2025,7 +1996,8 @@ ...@@ -2025,7 +1996,8 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true
}, },
"base": { "base": {
"version": "0.11.2", "version": "0.11.2",
...@@ -2231,6 +2203,7 @@ ...@@ -2231,6 +2203,7 @@
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -2363,49 +2336,6 @@ ...@@ -2363,49 +2336,6 @@
"node-releases": "^1.1.61" "node-releases": "^1.1.61"
} }
}, },
"buble": {
"version": "0.15.2",
"resolved": "https://registry.npmjs.org/buble/-/buble-0.15.2.tgz",
"integrity": "sha1-VH/EdIP45egXbYKqXrzLGDsC1hM=",
"requires": {
"acorn": "^3.3.0",
"acorn-jsx": "^3.0.1",
"acorn-object-spread": "^1.0.0",
"chalk": "^1.1.3",
"magic-string": "^0.14.0",
"minimist": "^1.2.0",
"os-homedir": "^1.0.1"
},
"dependencies": {
"acorn": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
},
"buffer": { "buffer": {
"version": "4.9.2", "version": "4.9.2",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
...@@ -2435,11 +2365,6 @@ ...@@ -2435,11 +2365,6 @@
"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
"dev": true "dev": true
}, },
"builtin-modules": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz",
"integrity": "sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg=="
},
"builtin-status-codes": { "builtin-status-codes": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
...@@ -2878,7 +2803,8 @@ ...@@ -2878,7 +2803,8 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true
}, },
"concat-stream": { "concat-stream": {
"version": "1.6.2", "version": "1.6.2",
...@@ -4481,11 +4407,6 @@ ...@@ -4481,11 +4407,6 @@
"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
"dev": true "dev": true
}, },
"estree-walker": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz",
"integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4="
},
"esutils": { "esutils": {
"version": "2.0.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
...@@ -5434,14 +5355,6 @@ ...@@ -5434,14 +5355,6 @@
"function-bind": "^1.1.1" "function-bind": "^1.1.1"
} }
}, },
"has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"has-flag": { "has-flag": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
...@@ -6193,11 +6106,6 @@ ...@@ -6193,11 +6106,6 @@
"is-extglob": "^2.1.1" "is-extglob": "^2.1.1"
} }
}, },
"is-module": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
"integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE="
},
"is-negative-zero": { "is-negative-zero": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
...@@ -6647,14 +6555,6 @@ ...@@ -6647,14 +6555,6 @@
"yallist": "^2.1.2" "yallist": "^2.1.2"
} }
}, },
"magic-string": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz",
"integrity": "sha1-VyJK7xcByu7Sc7F6OalW5ysXJGI=",
"requires": {
"vlq": "^0.2.1"
}
},
"make-dir": { "make-dir": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz", "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
...@@ -6947,6 +6847,7 @@ ...@@ -6947,6 +6847,7 @@
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -7549,11 +7450,6 @@ ...@@ -7549,11 +7450,6 @@
"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
"dev": true "dev": true
}, },
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-name": { "os-name": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz", "resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
...@@ -7794,7 +7690,8 @@ ...@@ -7794,7 +7690,8 @@
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
"dev": true
}, },
"path-to-regexp": { "path-to-regexp": {
"version": "0.1.7", "version": "0.1.7",
...@@ -8609,6 +8506,7 @@ ...@@ -8609,6 +8506,7 @@
"version": "1.17.0", "version": "1.17.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
"dev": true,
"requires": { "requires": {
"path-parse": "^1.0.6" "path-parse": "^1.0.6"
} }
...@@ -8722,104 +8620,6 @@ ...@@ -8722,104 +8620,6 @@
"inherits": "^2.0.1" "inherits": "^2.0.1"
} }
}, },
"rollup-plugin-buble": {
"version": "0.15.0",
"resolved": "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz",
"integrity": "sha1-g8PonH/SJmx5GPQbo5gDE1Gcf9A=",
"requires": {
"buble": "^0.15.0",
"rollup-pluginutils": "^1.5.0"
}
},
"rollup-plugin-commonjs": {
"version": "8.4.1",
"resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.4.1.tgz",
"integrity": "sha512-mg+WuD+jlwoo8bJtW3Mvx7Tz6TsIdMsdhuvCnDMoyjh0oxsVgsjB/N0X984RJCWwc5IIiqNVJhXeeITcc73++A==",
"requires": {
"acorn": "^5.2.1",
"estree-walker": "^0.5.0",
"magic-string": "^0.22.4",
"resolve": "^1.4.0",
"rollup-pluginutils": "^2.0.1"
},
"dependencies": {
"acorn": {
"version": "5.7.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
},
"estree-walker": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz",
"integrity": "sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig=="
},
"magic-string": {
"version": "0.22.5",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.22.5.tgz",
"integrity": "sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==",
"requires": {
"vlq": "^0.2.2"
}
},
"rollup-pluginutils": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
"integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
"requires": {
"estree-walker": "^0.6.1"
},
"dependencies": {
"estree-walker": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
"integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="
}
}
}
}
},
"rollup-plugin-json": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-2.3.1.tgz",
"integrity": "sha512-alQQQVPo2z9pl6LSK8QqyDlWwCH5KeE8YxgQv7fa/SeTxz+gQe36jBjcha7hQW68MrVh9Ms71EQaMZDAG3w2yw==",
"requires": {
"rollup-pluginutils": "^2.0.1"
},
"dependencies": {
"estree-walker": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
"integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="
},
"rollup-pluginutils": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
"integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
"requires": {
"estree-walker": "^0.6.1"
}
}
}
},
"rollup-plugin-node-resolve": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz",
"integrity": "sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==",
"requires": {
"builtin-modules": "^2.0.0",
"is-module": "^1.0.0",
"resolve": "^1.1.6"
}
},
"rollup-pluginutils": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz",
"integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=",
"requires": {
"estree-walker": "^0.2.1",
"minimatch": "^3.0.2"
}
},
"run-async": { "run-async": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
...@@ -9702,6 +9502,7 @@ ...@@ -9702,6 +9502,7 @@
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -10568,11 +10369,6 @@ ...@@ -10568,11 +10369,6 @@
"extsprintf": "^1.2.0" "extsprintf": "^1.2.0"
} }
}, },
"vlq": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
"integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="
},
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
...@@ -10637,23 +10433,18 @@ ...@@ -10637,23 +10433,18 @@
"vue-style-loader": "^4.1.0" "vue-style-loader": "^4.1.0"
} }
}, },
"vue-meta-info": { "vue-meta": {
"version": "0.1.7", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/vue-meta-info/-/vue-meta-info-0.1.7.tgz", "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz",
"integrity": "sha512-0tfCM0XB6aU44ycijhGBCiLe9bLsFa82qZ1fA3gaEnvpQCw4Tnk6p5R3JpppZTThycr70ckf9Wx49C7ESDp75A==", "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==",
"requires": { "requires": {
"rollup-plugin-buble": "^0.15.0", "deepmerge": "^4.2.2"
"rollup-plugin-commonjs": "^8.2.0",
"rollup-plugin-json": "^2.3.0",
"rollup-plugin-node-resolve": "^3.0.0",
"vue": "^2.4.2",
"vue-router": "^2.7.0"
}, },
"dependencies": { "dependencies": {
"vue-router": { "deepmerge": {
"version": "2.8.1", "version": "4.2.2",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.8.1.tgz", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
"integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==" "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
} }
} }
}, },
......
package.json
浏览文件 @ f7aa877a
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.22.2",
"vue-loader": "^15.9.5", "vue-loader": "^15.9.5",
"vue-meta-info": "^0.1.7", "vue-meta": "^2.4.0",
"vue-router": "^3.4.9", "vue-router": "^3.4.9",
"vue-template-compiler": "^2.6.12", "vue-template-compiler": "^2.6.12",
"vuex": "^3.6.0" "vuex": "^3.6.0"
......
src/app.vue
浏览文件 @ f7aa877a
...@@ -3,3 +3,13 @@ ...@@ -3,3 +3,13 @@
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
<script>
export default {
metaInfo() {
return {
title: this.$t('title')
}
}
}
</script>
src/assets/languages/en.json
浏览文件 @ f7aa877a
{ {
"title": "紫荆教育学习系统",
"action": { "action": {
"courseAction": { "courseAction": {
"all": "All", "all": "All",
......
src/assets/languages/zh-CN.json
浏览文件 @ f7aa877a
{ {
"title": "紫荆教育学习系统",
"action": { "action": {
"courseAction": { "courseAction": {
"all": "全部", "all": "全部",
......
src/components/beforeEnter/Before.js
浏览文件 @ f7aa877a
...@@ -9,11 +9,13 @@ export default class Before { ...@@ -9,11 +9,13 @@ export default class Before {
this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA)) this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
this.isIe = window.ActiveXObject || 'ActiveXObject' in window this.isIe = window.ActiveXObject || 'ActiveXObject' in window
this.isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime) this.isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)
this.chromeVersion = 0 // this.chromeVersion = 0
if (this.isChrome) { // if (this.isChrome) {
this.chromeVersion = parseFloat(UA.match(/Chrome\/([\d.]+)/)[1]) // const temp = UA.match(/Chrome\/([\d.]+)/)
} // this.chromeVersion = temp ? parseFloat(temp[1]) : 0
this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70)) // }
// this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70))
this.notSupport = !this.isMobile && this.isIe
// https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
} }
......
src/index.html
浏览文件 @ f7aa877a
...@@ -5,84 +5,25 @@ ...@@ -5,84 +5,25 @@
<meta name="renderer" content="webkit" /> <meta name="renderer" content="webkit" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
<meta content="origin" name="referrer" /> <meta content="origin" name="referrer" />
<title>紫荆教育MBA学习系统</title> <title></title>
<meta <meta
name="viewport" name="viewport"
id="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"
/> />
<!-- 直接引入aliyun播放插件 CSS --> <!-- 直接引入aliyun播放插件 CSS -->
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.1/skins/default/aliplayer-min.css" /> <link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.3/skins/default/aliplayer-min.css" />
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<!-- es5 兼容 新方法 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script> -->
<!-- 三方插件引入 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/videoJs/videoJs.js"></script> -->
<!-- common --> <!-- common -->
<script <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></script>
type="text/javascript" <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"></script>
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js" <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script>
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/md5.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"
></script>
<!-- 直接引入aliyun播放插件 JS --> <!-- 直接引入aliyun播放插件 JS -->
<script <script charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.9.3/aliplayer-min.js"></script>
type="text/javascript"
charset="utf-8"
src="https://g.alicdn.com/de/prismplayer/2.9.1/aliplayer-min.js"
></script>
<script
type="text/javascript"
charset="utf-8"
src="https://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.js"
></script>
<!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 --> <!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 -->
<script src="//view.csslcloud.net/js/_fix_.js"></script> <script src="//view.csslcloud.net/js/_fix_.js"></script>
<script src="//view.csslcloud.net/js/jquery-1.9.0.min.js" type="text/javascript"></script> <!-- <script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script> -->
<script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script>
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/notify/notification.js"></script> -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/errorCollection/collection.js"></script> -->
<!--[if lt IE 9]>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]-->
<!-- Matomo -->
<script type="text/javascript">
var _paq = (window._paq = window._paq || [])
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['setCookieDomain', '*.e-learning.ezijing.com'])
_paq.push(['trackPageView'])
_paq.push(['enableLinkTracking'])
;(function() {
var u = 'https://matomo.ezijing.com/'
_paq.push(['setTrackerUrl', u + 'matomo.php'])
_paq.push(['setSiteId', '3'])
var d = document,
g = d.createElement('script'),
s = d.getElementsByTagName('script')[0]
g.type = 'text/javascript'
g.async = true
g.src = u + 'matomo.js'
s.parentNode.insertBefore(g, s)
})()
</script>
<!-- End Matomo Code -->
</body> </body>
</html> </html>
src/main.js
浏览文件 @ f7aa877a
...@@ -9,6 +9,9 @@ import Element from 'element-ui' ...@@ -9,6 +9,9 @@ import Element from 'element-ui'
import Modules from '@/modules' import Modules from '@/modules'
import createBefore from './components/beforeEnter' import createBefore from './components/beforeEnter'
import _ from 'lodash' import _ from 'lodash'
import VueMeta from 'vue-meta'
Vue.use(VueMeta)
Vue.prototype.$_ = _ Vue.prototype.$_ = _
......
src/modules/offices/src/reportPaper/edit.vue
浏览文件 @ f7aa877a
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1"> <el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
{{ payText }} {{ payText }}
</el-form-item> </el-form-item>
<el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1"> <el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1 && ruleForm.payment !== '3'">
{{ payStatusText }} {{ payStatusText }}
</el-form-item> </el-form-item>
<el-form-item label="审批状态" style="margin: 0"> <el-form-item label="审批状态" style="margin: 0">
......
src/modules/offices/src/reportPaper/list.vue
浏览文件 @ f7aa877a
...@@ -35,6 +35,15 @@ export default { ...@@ -35,6 +35,15 @@ export default {
this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } }) this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } })
} }
}, },
{
label: '支付',
isShow(row) {
return row.pay === 0
},
onClick: row => {
this.$router.push({ name: 'pareportEdit', params: { id: row.id }, query: { id: row.affair_id } })
}
},
{ {
label: '编辑', label: '编辑',
isShow(row) { isShow(row) {
......
src/pages/exception/browser.vue
浏览文件 @ f7aa877a
...@@ -28,11 +28,21 @@ ...@@ -28,11 +28,21 @@
</ul> </ul>
</div> </div>
</div> </div>
<p style="font-size: 12px">{{ UA }}</p>
</div> </div>
</template> </template>
<script> <script>
export default {} export default {
data() {
const UA = window.navigator.userAgent
const isIe = window.ActiveXObject || 'ActiveXObject' in window
return { UA, isIe }
},
beforeMount() {
!this.isIe && this.$router.replace('/')
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
src/pages/grade/credit.vue
浏览文件 @ f7aa877a
...@@ -86,12 +86,12 @@ export default { ...@@ -86,12 +86,12 @@ export default {
tableHead: [ tableHead: [
{ prop: 'index', label: this.$t('pages.grade.credit.serialNumber'), width: '60px' }, { prop: 'index', label: this.$t('pages.grade.credit.serialNumber'), width: '60px' },
{ prop: 'semester_name', label: this.$t('pages.grade.credit.semester') }, { prop: 'semester_name', label: this.$t('pages.grade.credit.semester') },
{ prop: 'class_name', label: this.$t('pages.grade.credit.class') }, { prop: 'class_name', label: this.$t('pages.grade.credit.class'), width: '200px' },
{ prop: 'course_name', label: this.$t('pages.grade.credit.course') }, { prop: 'course_name', label: this.$t('pages.grade.credit.course') },
{ prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits') }, { prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits'), width: '100px' },
{ prop: 'passed', label: this.$t('pages.grade.credit.status') }, { prop: 'passed', label: this.$t('pages.grade.credit.status'), width: '100px' },
{ prop: 'credit', label: this.$t('pages.grade.credit.credit') }, { prop: 'credit', label: this.$t('pages.grade.credit.credit'), width: '100px' },
{ prop: 'score', label: this.$t('pages.grade.credit.grade') }, { prop: 'score', label: this.$t('pages.grade.credit.grade'), width: '100px' },
// { prop: '', label: this.$t('pages.grade.credit')'', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数 // { prop: '', label: this.$t('pages.grade.credit')'', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
{ {
prop: 'operate-x', prop: 'operate-x',
......
src/pages/mobile/list.vue
浏览文件 @ f7aa877a
<template> <template>
<div class="pages"> <div class="pages">
<div class="head"> <div class="head">
<img class="logo" src="../../assets/images/logo-header.png" /> <img class="logo" src="https://zws-imgs-pub.ezijing.com/pc/base/logo.svg" />
<div class="language" style="overflow: hidden"> <div class="language" style="overflow: hidden">
<language-switch style="float: right" /> <language-switch style="float: right" />
</div> </div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论