封装阿里云oss上传，课程管理及赛事附件已经替换

package-lock.json

@@ -1563,6 +1563,14 @@
       "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
       "dev": true
     },
+    "agentkeepalive": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "requires": {
+        "humanize-ms": "^1.2.1"
+      }
+    },
     "ajv": {
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
@@ -1585,6 +1593,78 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
       "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
     },
+    "ali-oss": {
+      "version": "6.18.1",
+      "resolved": "https://registry.npmjs.org/ali-oss/-/ali-oss-6.18.1.tgz",
+      "integrity": "sha512-VsptD0jX3JNc3AjiLs5a9oTP0ArfT9IYhBuY6G/SpuY6LMuiwfqywrAosY65BlHKODAdYy8VWL6kmt0mO7BUGA==",
+      "requires": {
+        "address": "^1.2.2",
+        "agentkeepalive": "^3.4.1",
+        "bowser": "^1.6.0",
+        "copy-to": "^2.0.1",
+        "dateformat": "^2.0.0",
+        "debug": "^4.3.4",
+        "destroy": "^1.0.4",
+        "end-or-error": "^1.0.1",
+        "get-ready": "^1.0.0",
+        "humanize-ms": "^1.2.0",
+        "is-type-of": "^1.4.0",
+        "js-base64": "^2.5.2",
+        "jstoxml": "^2.0.0",
+        "merge-descriptors": "^1.0.1",
+        "mime": "^2.4.5",
+        "platform": "^1.3.1",
+        "pump": "^3.0.0",
+        "sdk-base": "^2.0.1",
+        "stream-http": "2.8.2",
+        "stream-wormhole": "^1.0.4",
+        "urllib": "2.41.0",
+        "utility": "^1.18.0",
+        "xml2js": "^0.6.2"
+      },
+      "dependencies": {
+        "address": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
+          "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "js-base64": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
+          "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
+        },
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "stream-http": {
+          "version": "2.8.2",
+          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
+          "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
+          "requires": {
+            "builtin-status-codes": "^3.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.3.6",
+            "to-arraybuffer": "^1.0.0",
+            "xtend": "^4.0.0"
+          }
+        }
+      }
+    },
     "alphanum-sort": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
@@ -1653,8 +1733,7 @@
     "any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
-      "dev": true
     },
     "anymatch": {
       "version": "2.0.0",
@@ -2243,6 +2322,11 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
+    "bowser": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.4.tgz",
+      "integrity": "sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ=="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2399,8 +2483,7 @@
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
-      "dev": true
     },
     "bytes": {
       "version": "3.1.0",
@@ -3010,8 +3093,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-      "dev": true
     },
     "convert-source-map": {
       "version": "1.7.0",
@@ -3053,6 +3135,11 @@
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
+    "copy-to": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz",
+      "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="
+    },
     "copy-webpack-plugin": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
@@ -3755,6 +3842,14 @@
         }
       }
     },
+    "default-user-agent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-user-agent/-/default-user-agent-1.0.0.tgz",
+      "integrity": "sha512-bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw==",
+      "requires": {
+        "os-name": "~1.0.3"
+      }
+    },
     "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -3892,8 +3987,7 @@
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-      "dev": true
     },
     "detect-file": {
       "version": "1.0.0",
@@ -3922,6 +4016,11 @@
         "randombytes": "^2.0.0"
       }
     },
+    "digest-header": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/digest-header/-/digest-header-1.1.0.tgz",
+      "integrity": "sha512-glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg=="
+    },
     "dir-glob": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
@@ -4118,8 +4217,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-      "dev": true
     },
     "ejs": {
       "version": "2.7.4",
@@ -4285,11 +4383,15 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
     },
+    "end-or-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/end-or-error/-/end-or-error-1.0.1.tgz",
+      "integrity": "sha512-OclLMSug+k2A0JKuf494im25ANRBVW8qsjmwbgX7lQ8P82H21PQ1PWkoYwb9y5yMBS69BPlwtzdIFClo3+7kOQ=="
+    },
     "enhanced-resolve": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
@@ -4377,8 +4479,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-      "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -4936,6 +5037,23 @@
         "mime-types": "^2.1.12"
       }
     },
+    "formstream": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/formstream/-/formstream-1.3.1.tgz",
+      "integrity": "sha512-FkW++ub+VbE5dpwukJVDizNWhSgp8FhmhI65pF7BZSVStBqe6Wgxe2Z9/Vhsn7l7nXCPwP+G1cyYlX8VwWOf0g==",
+      "requires": {
+        "destroy": "^1.0.4",
+        "mime": "^2.5.2",
+        "pause-stream": "~0.0.11"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+          "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+        }
+      }
+    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -5637,6 +5755,11 @@
         }
       }
     },
+    "get-ready": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-ready/-/get-ready-1.0.0.tgz",
+      "integrity": "sha512-mFXCZPJIlcYcth+N8267+mghfYN9h3EhsDa6JSnbA3Wrhh/XFpuowviFcsDeYZtKspQyWyJqfs4O6P8CHeTwzw=="
+    },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
@@ -6943,11 +7066,18 @@
       "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true
     },
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "requires": {
+        "ms": "^2.0.0"
+      }
+    },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -7142,8 +7272,7 @@
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-      "dev": true
     },
     "ip-regex": {
       "version": "2.1.0",
@@ -7225,6 +7354,11 @@
       "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "dev": true
     },
+    "is-class-hotfix": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz",
+      "integrity": "sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ=="
+    },
     "is-color-stop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
@@ -7435,6 +7569,16 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "is-type-of": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-type-of/-/is-type-of-1.4.0.tgz",
+      "integrity": "sha512-EddYllaovi5ysMLMEN7yzHEKh8A850cZ7pykrY1aNRQGn/CDjRDE9qEWbIdt7xGEVJmjBXzU/fNnC4ABTm8tEQ==",
+      "requires": {
+        "core-util-is": "^1.0.2",
+        "is-class-hotfix": "~0.0.6",
+        "isstream": "~0.1.2"
+      }
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -7604,6 +7748,11 @@
         "verror": "1.10.0"
       }
     },
+    "jstoxml": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/jstoxml/-/jstoxml-2.2.9.tgz",
+      "integrity": "sha512-OYWlK0j+roh+eyaMROlNbS5cd5R25Y+IUpdl7cNdB8HNrkgwQzIS7L9MegxOiWNBj9dQhA/yAxiMwCC5mwNoBw=="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8166,8 +8315,7 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-      "dev": true
     },
     "merge-source-map": {
       "version": "1.1.0",
@@ -8409,7 +8557,6 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
       "requires": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -9003,6 +9150,15 @@
         "mem": "^4.0.0"
       }
     },
+    "os-name": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
+      "integrity": "sha512-f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew==",
+      "requires": {
+        "osx-release": "^1.0.0",
+        "win-release": "^1.0.0"
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -9017,6 +9173,14 @@
         "os-tmpdir": "^1.0.0"
       }
     },
+    "osx-release": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz",
+      "integrity": "sha512-ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A==",
+      "requires": {
+        "minimist": "^1.1.0"
+      }
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -9250,6 +9414,14 @@
         }
       }
     },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
+      "requires": {
+        "through": "~2.3"
+      }
+    },
     "pbkdf2": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -9355,6 +9527,11 @@
         "find-up": "^2.1.0"
       }
     },
+    "platform": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
+      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+    },
     "plugin-error": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
@@ -10109,7 +10286,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -11048,8 +11224,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-      "dev": true
     },
     "schart.js": {
       "version": "3.0.0",
@@ -11086,6 +11261,14 @@
         }
       }
     },
+    "sdk-base": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/sdk-base/-/sdk-base-2.0.1.tgz",
+      "integrity": "sha512-eeG26wRwhtwYuKGCDM3LixCaxY27Pa/5lK4rLKhQa7HBjJ3U3Y+f81MMZQRsDw/8SC2Dao/83yJTXJ8aULuN8Q==",
+      "requires": {
+        "get-ready": "~1.0.0"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
@@ -11762,8 +11945,7 @@
     "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-      "dev": true
     },
     "stdout-stream": {
       "version": "1.4.1",
@@ -11823,6 +12005,11 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
+    "stream-wormhole": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
+      "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -12093,7 +12280,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
       "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-      "dev": true,
       "requires": {
         "any-promise": "^1.0.0"
       }
@@ -12102,7 +12288,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
       "requires": {
         "thenify": ">= 3.1.0 < 4"
       }
@@ -12184,8 +12369,7 @@
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
-      "dev": true
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -12359,6 +12543,24 @@
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
     },
+    "unescape": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unescape/-/unescape-1.0.1.tgz",
+      "integrity": "sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==",
+      "requires": {
+        "extend-shallow": "^2.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -12551,6 +12753,37 @@
         "requires-port": "^1.0.0"
       }
     },
+    "urllib": {
+      "version": "2.41.0",
+      "resolved": "https://registry.npmjs.org/urllib/-/urllib-2.41.0.tgz",
+      "integrity": "sha512-pNXdxEv52L67jahLT+/7QE+Fup1y2Gc6EdmrAhQ6OpQIC2rl14oWwv9hvk1GXOZqEnJNwRXHABuwgPOs1CtL7g==",
+      "requires": {
+        "any-promise": "^1.3.0",
+        "content-type": "^1.0.2",
+        "debug": "^2.6.9",
+        "default-user-agent": "^1.0.0",
+        "digest-header": "^1.0.0",
+        "ee-first": "~1.1.1",
+        "formstream": "^1.1.0",
+        "humanize-ms": "^1.2.0",
+        "iconv-lite": "^0.4.15",
+        "ip": "^1.1.5",
+        "pump": "^3.0.0",
+        "qs": "^6.4.0",
+        "statuses": "^1.3.1",
+        "utility": "^1.16.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -12599,6 +12832,18 @@
       "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
       "dev": true
     },
+    "utility": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/utility/-/utility-1.18.0.tgz",
+      "integrity": "sha512-PYxZDA+6QtvRvm//++aGdmKG/cI07jNwbROz0Ql+VzFV1+Z0Dy55NI4zZ7RHc9KKpBePNFwoErqIuqQv/cjiTA==",
+      "requires": {
+        "copy-to": "^2.0.1",
+        "escape-html": "^1.0.3",
+        "mkdirp": "^0.5.1",
+        "mz": "^2.7.0",
+        "unescape": "^1.0.1"
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -13347,6 +13592,14 @@
         "string-width": "^1.0.2 || 2"
       }
     },
+    "win-release": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+      "integrity": "sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==",
+      "requires": {
+        "semver": "^5.0.1"
+      }
+    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -13460,6 +13713,20 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xml2js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
     "xss": {
       "version": "1.0.14",
       "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz",

package.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^3.2.8",
+    "ali-oss": "^6.18.1",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "blueimp-md5": "^2.19.0",

src/components/upload/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <el-upload :disabled="uploading"
+             :before-upload="beforeUpload"
+             :on-remove="onRemove"
+             :on-error="uploadError"
+             :limit="limit"
+             action=""
+             :on-exceed="handleExceed"
+             :show-file-list="showFiles"
+             :file-list="fileList"
+             :http-request="handleRequest"
+             name="file">
+    <slot name="trigger">
+      <el-button size="small"
+                 :loading="uploading">{{ uploading ? '正在上传' : '上传文件' }}</el-button>
+    </slot>
+    <div slot="tip"
+         class="el-upload__tip">
+      <el-progress v-if="uploading"
+                   class="upload-progress"
+                   :stroke-width="3"
+                   :percentage="uploadProgress"></el-progress>
+      <slot name="tip">
+        <p>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</p>
+      </slot>
+    </div>
+  </el-upload>
+</template>
+
+<script>
+import OSS from 'ali-oss'
+import util from '@/libs/util'
+export default {
+  props: {
+    // 最大允许上传个数
+    limit: {
+      type: Number,
+      default: 1
+    },
+    // 单个文件最大大小(单位: Mb)
+    maxSize: {
+      type: Number,
+      default: 10
+    },
+    // 是否显示已上传文件列表
+    showFileList: {
+      type: Boolean,
+      default: true
+    },
+    // 已上传文件列表
+    fileList: {
+      type: Array,
+      default: () => []
+    },
+    // 已上传文件列表
+    onRemove: {
+      type: Function,
+      default: new Function()
+    },
+  },
+  data () {
+    return {
+      client: null,
+      uploading: false,
+      uploadProgress: 0,
+      showFiles: this.showFileList
+    };
+  },
+  mounted () {
+    this.initOss()
+  },
+  methods: {
+    initOss () {
+      this.client = new OSS({
+        region: 'oss-cn-shenzhen',
+        accessKeyId: 'LTAI4FzqQHnk4rozqLZ8jCNj',
+        accessKeySecret: 'mveW7B1OyFoKUkHm8WsxmrjHmkJWHq',
+        bucket: 'huoran'
+      })
+    },
+    // 附件上传前
+    beforeUpload (file) {
+      const oversize = file.size / 1024 / 1024 < this.maxSize
+      if (!oversize) util.warningMsg(`请上传小于${this.maxSize}MB的附件！`)
+      if (oversize) {
+        this.$emit('beforeUpload', file)
+        return true
+      } else {
+        return false
+      }
+    },
+    // 自定义进度条
+    handleProgress (progress) {
+      this.uploadProgress = Number((progress * 100).toFixed(2))
+    },
+    // 自定义上传
+    async handleRequest ({ file }) {
+      try {
+        this.uploadProgress = 0
+        this.uploading = true
+        this.showFiles = false
+        // 先传到阿里云oss，再把url传给后端
+        const { name } = await this.client.multipartUpload(file.name, file, {
+          progress: this.handleProgress
+        });
+
+        this.uploading = false
+        const url = 'http://huoran.oss-cn-shenzhen.aliyuncs.com/' + name
+        this.$emit('update:fileList', [
+          ...this.fileList,
+          {
+            name: name,
+            url
+          }
+        ])
+
+        this.showFiles = true
+        this.$emit('onSuccess', {
+          format: util.getFileExt(file.name),
+          name: file.name,
+          url: url,
+          size: file.size,
+        })
+      } catch (error) { }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      })
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleExceed (files, fileList) {
+      util.warningMsg(`当前限制选择 ${this.limit} 个文件，如需更换，请删除上一个文件再重新选择！`);
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+/deep/.upload-progress {
+    max-width: 300px;
+    margin: 10px 0;
+    white-space: nowrap;
+}
+</style>

src/views/course/contentSettings.vue

@@ -161,7 +161,15 @@
                      label-width="80px"
                      @submit.native.prevent>
               <el-form-item label="资源添加">
-                <el-upload :before-upload="beforeUpload"
+                <Upload :max-size="100000"
+                        :on-remove="handleRemove"
+                        @beforeUpload="beforeUpload"
+                        @onSuccess="uploadSuccess">
+                  <template slot="tip">
+                    <p>视频请上传MP4格式，大小不超过150M；office文件大小不要超过10M</p>
+                  </template>
+                </Upload>
+                <!-- <el-upload :before-upload="beforeUpload"
                            :on-remove="handleRemove"
                            :on-error="uploadError"
                            :before-remove="beforeRemove"
@@ -179,7 +187,7 @@
                 </el-upload>
                 <el-progress v-if="showProgress"
                              :stroke-width="3"
-                             :percentage="progressPercent"></el-progress>
+                             :percentage="progressPercent"></el-progress> -->
               </el-form-item>
               <el-form-item label="小节名称">
                 <el-input placeholder="请输入小节名称"
@@ -202,7 +210,14 @@
                      :close-on-click-modal="false"
                      @close="closeSwitch">
             <div style="text-align: center">
-              <el-upload :before-upload="beforeUpload"
+              <Upload :max-size="100000"
+                      :on-remove="handleRemove"
+                      @beforeUpload="beforeUpload"
+                      @onSuccess="uploadSuccess">
+                <div slot="tip"></div>
+              </Upload>
+
+              <!-- <el-upload :before-upload="beforeUpload"
                          :on-remove="handleRemove"
                          :on-error="uploadError"
                          :before-remove="beforeRemove"
@@ -218,7 +233,7 @@
               </el-upload>
               <el-progress v-if="showProgress"
                            :stroke-width="3"
-                           :percentage="progressPercent"></el-progress>
+                           :percentage="progressPercent"></el-progress> -->
             </div>
             <span slot="footer"
                   class="dialog-footer">
@@ -310,8 +325,8 @@
                  id="player"></div>
           </div>
 
-          <pdf :visible.sync="pdfVisible"
+          <Pdf :visible.sync="pdfVisible"
-               :src.sync="pdfSrc"></pdf>
+               :src.sync="pdfSrc" />
         </div>
       </div>
     </el-card>
@@ -355,12 +370,10 @@
 
 <script>
 import { Loading } from "element-ui";
-import pdf from "@/components/pdf";
+import Pdf from "@/components/pdf";
+import Upload from '@/components/upload';
 import axios from 'axios'
 import Util from '@/libs/util'
-import OSS from '@/libs/aliyun/aliyun-oss-sdk-6.17.1.min'
-window.OSS = OSS;
-import '@/libs/aliyun/aliyun-upload-sdk-1.5.6.min'
 
 export default {
   name: "contentSettings",
@@ -436,7 +449,7 @@ export default {
       moved: false // 是否移动过
     };
   },
-  components: { pdf },
+  components: { Pdf, Upload },
   mounted () {
     this.insertScript();
     this.id && this.getData();
@@ -522,19 +535,10 @@ export default {
     },
     // 上传文件
     beforeUpload (file) {
-      let type = this.transferType(file.name.substring(file.name.lastIndexOf(".") + 1));
-      // if (type != "视频" && type != "图片" && type != "pdf" && (file.size / 1024 / 1024) > 10) {
-      //     this.$message.error("请上传10M以内的文件");
-      //     return false;
-      // }
-      // if (type == "视频" && (file.size / 1024 / 1024) > 30) {
-      //     this.$message.warning('请上传30M以内的视频')
-      //     return false;
-      // }
       this.uploading = true;
       this.originalFileName = file.name;
       if (this.isAddSection) this.sectionForm.sectionName = file.name.substring(0, file.name.lastIndexOf("."));
-      this.fileType = file.name.substring(file.name.lastIndexOf(".") + 1);
+      this.fileType = Util.getFileExt(file.name)
       this.showProgress = true
     },
     handleExceed (files, fileList) {
@@ -542,50 +546,14 @@ export default {
         `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
       );
     },
+    uploadSuccess (file) {
+      this.uploading = false
+      this.fileType = file.format
+      this.fileUrl = file.url
+      this.fileName = file.name
+    },
     // 自定义上传
     handleRequest (data) {
-      // console.log(33, Util.isVideo(this.fileType))
-      // // 视频上传另外调阿里云的接口处理
-      // if (Util.isVideo(this.fileType)) {
-
-      //   console.log("🚀 ~ file: contentSettings.vue:587 ~ handleRequest ~ AliyunUpload:", AliyunUpload)
-      //   var uploader = new AliyunUpload.Vod({
-      //     // userID，必填，您可以使用阿里云账号访问账号中心（https://account.console.aliyun.com/），即可查看账号ID
-      //     userId: "1686385620732064",
-      //     // 分片大小默认1 MB，不能小于100 KB（100*1024）
-      //     partSize: 1048576,
-      //     // 并行上传分片个数，默认5
-      //     parallel: 5,
-      //     // 网络原因失败时，重新上传次数，默认为3
-      //     retryCount: 3,
-      //     // 网络原因失败时，重新上传间隔时间，默认为2秒
-      //     retryDuration: 2,
-      //     // 开始上传
-      //     'onUploadstarted': function (uploadInfo) {
-      //       console.log("🚀 ~ file: contentSettings.vue:567 ~ handleRequest ~ uploadInfo:", uploadInfo)
-      //       debugger
-      //     },
-      //     // 文件上传成功
-      //     'onUploadSucceed': function (uploadInfo) {
-      //       console.log("🚀 ~ file: contentSettings.vue:571 ~ handleRequest ~ uploadInfo:", uploadInfo)
-      //     },
-      //     // 文件上传失败
-      //     'onUploadFailed': function (uploadInfo, code, message) {
-      //       console.log("🚀 ~ file: contentSettings.vue:576 ~ handleRequest ~ uploadInfo, code, message:", uploadInfo, code, message)
-      //     },
-      //     // 文件上传进度，单位：字节
-      //     'onUploadProgress': function (uploadInfo, totalSize, loadedPercent) {
-      //       console.log("🚀 ~ file: contentSettings.vue:578 ~ handleRequest ~ uploadInfo, totalSize, loadedPercent:", uploadInfo, totalSize, loadedPercent)
-      //     },
-      //     // 上传凭证或STS token超时
-      //     'onUploadTokenExpired': function (uploadInfo) {
-      //     },
-      //     // 全部文件上传结束
-      //     'onUploadEnd': function (uploadInfo) {
-      //     }
-      //   });
-
-      // } else {
       const param = new FormData()
       param.append('file', data.file)
       const config = {
@@ -611,7 +579,6 @@ export default {
         this.fileUrl = fileUrl
         this.fileName = ossFileName
       })
-      // }
     },
     uploadError (err, file, fileList) {
       this.$message({
@@ -626,7 +593,7 @@ export default {
       }
     },
     handleRemove (file, fileList) {
-      this.uploadList = fileList;
+      this.fileUrl = ''
     },
     uploadSure () {
       this.importVisible = false;
@@ -954,20 +921,7 @@ export default {
     switchSubmit () {
       if (this.uploading) return this.$message.warning("资源正在上传中，请稍候");
       if (!this.fileUrl && !this.fileId) return this.$message.warning("请上传资源");
-      if (this.transferType(this.curFile.fileType) == "视频") {
-        let data = {
-          videoIdList: [this.sectionId]
-        };
-        this.$del(`${this.api.removeVideo}/${this.curFile.fileId}`).then(res => {
-          this.switchSubmitFile();
-        }).catch(res => {
-        });
-      } else {
-        this.$del(`${this.api.fileDeletion}?keys=${this.curFile.fileName}`).then(res => {
       this.switchSubmitFile();
-        }).catch(res => {
-        });
-      }
     },
     delSection (row) {
       this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {

src/views/match/add/step1.vue

@@ -3,10 +3,12 @@
     <div class="page">
       <div class="page-content">
         <div class="p-title">大赛信息</div>
-            <el-form label-width="170px" label-suffix=":" size="small" :disabled="!editing && form.id !== ''">
+        <el-form label-width="170px"
+                 label-suffix=":"
+                 size="small"
+                 :disabled="!editing && form.id !== ''">
           <el-form-item label="竞赛封面（选填）">
-                    <el-upload
+            <el-upload class="avatar-uploader"
-                        class="avatar-uploader"
                        accept=".jpg,.png,.jpeg,.gif"
                        :on-remove="handleRemove"
                        :on-error="uploadError"
@@ -16,52 +18,71 @@
                        :on-exceed="handleExceed"
                        :action="this.api.fileupload"
                        :headers="headers"
-                        name="file"
+                       name="file">
-                    >
+              <img v-if="form.coverUrl"
-                        <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar">
+                   :src="form.coverUrl"
-                        <div class="uploader-default" v-else>
+                   class="avatar">
+              <div class="uploader-default"
+                   v-else>
                 <i class="el-icon-plus"></i>
                 <p>上传封面</p>
               </div>
-                        <div slot="tip" class="el-upload__tip">
+              <div slot="tip"
+                   class="el-upload__tip">
                 <p>展示宽度为220，高度140，JPG/PNG/GIF，3MB以内</p>
               </div>
             </el-upload>
           </el-form-item>
           <el-form-item label="竞赛封面长图（选填）">
-                    <el-upload
+            <el-upload class="avatar-uploader avatar-uploader-lg"
-                        class="avatar-uploader avatar-uploader-lg"
                        accept=".jpg,.png,.jpeg,.gif"
                        :on-remove="handleLgRemove"
                        :on-error="uploadError"
                        :on-success="uploadLgSuccess"
                        :before-remove="beforeRemove"
-                        :limit="1" :on-exceed="handleExceed"
+                       :limit="1"
+                       :on-exceed="handleExceed"
                        :action="this.api.fileupload"
                        :headers="headers"
-                        name="file"
+                       name="file">
-                    >
+              <img v-if="form.carouselUrl"
-                        <img v-if="form.carouselUrl" :src="form.carouselUrl" class="avatar-lg">
+                   :src="form.carouselUrl"
-                        <div class="uploader-default" v-else>
+                   class="avatar-lg">
+              <div class="uploader-default"
+                   v-else>
                 <i class="el-icon-plus"></i>
                 <p>上传封面</p>
               </div>
-                        <div slot="tip" class="el-upload__tip">
+              <div slot="tip"
+                   class="el-upload__tip">
                 <p>展示宽度为1920，高度300，JPG/PNG/GIF，3MB以内</p>
               </div>
             </el-upload>
           </el-form-item>
-                <el-form-item class="req" label="竞赛名称">
+          <el-form-item class="req"
+                        label="竞赛名称">
             <div class="d-inline-block">
-                        <el-input placeholder="请输入竞赛名称" v-model="form.name" clearable></el-input>
+              <el-input placeholder="请输入竞赛名称"
+                        v-model="form.name"
+                        clearable></el-input>
             </div>
           </el-form-item>
-                <el-form-item class="req" label="主办方">
+          <el-form-item class="req"
+                        label="主办方">
             <div class="inline-input">
-                        <div class="input-wrap" v-for="(item,index) in sponsorList" :key="index">
+              <div class="input-wrap"
-                            <el-input placeholder="主办方名称" v-model="sponsorList[index]"></el-input>
+                   v-for="(item,index) in sponsorList"
-                            <i v-if="sponsorList.length > 1" class="remove" @click="delSponsor(index)"></i>
+                   :key="index">
-                            <button v-if="index == 0" class="add-btn" type="button" :disabled="!editing && form.id !== ''" @click="addSponsor">
+                <el-input placeholder="主办方名称"
+                          v-model="sponsorList[index]"></el-input>
+                <i v-if="sponsorList.length > 1"
+                   class="remove"
+                   @click="delSponsor(index)"></i>
+                <button v-if="index == 0"
+                        class="add-btn"
+                        type="button"
+                        :disabled="!editing && form.id !== ''"
+                        @click="addSponsor">
                   <i class="el-icon-plus"></i>
                   <span>添加</span>
                 </button>
@@ -70,103 +91,151 @@
           </el-form-item>
           <el-form-item label="承办方（选填）">
             <div class="inline-input">
-                        <div class="input-wrap" v-for="(item,index) in undertakerList" :key="index">
+              <div class="input-wrap"
-                            <el-input placeholder="承办方名称" v-model="undertakerList[index]"></el-input>
+                   v-for="(item,index) in undertakerList"
-                            <i v-if="undertakerList.length > 1" class="remove" @click="delOrganizer(index)"></i>
+                   :key="index">
-                            <button v-if="index == 0" class="add-btn" type="button" :disabled="!editing && form.id !== ''" @click="addOrganizer">
+                <el-input placeholder="承办方名称"
+                          v-model="undertakerList[index]"></el-input>
+                <i v-if="undertakerList.length > 1"
+                   class="remove"
+                   @click="delOrganizer(index)"></i>
+                <button v-if="index == 0"
+                        class="add-btn"
+                        type="button"
+                        :disabled="!editing && form.id !== ''"
+                        @click="addOrganizer">
                   <i class="el-icon-plus"></i>
                   <span>添加</span>
                 </button>
               </div>
             </div>
-                    <button v-if="!undertakerList.length" class="add-btn" type="button" @click="addOrganizer">
+            <button v-if="!undertakerList.length"
+                    class="add-btn"
+                    type="button"
+                    @click="addOrganizer">
               <i class="el-icon-plus"></i>
               <span>添加</span>
             </button>
           </el-form-item>
-                <el-form-item class="req" label="报名时间">
+          <el-form-item class="req"
-                    <el-date-picker v-model="signupTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+                        label="报名时间">
-                                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+            <el-date-picker v-model="signupTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
                             :picker-options="pickerOptions"></el-date-picker>
           </el-form-item>
-                <el-form-item class="req" label="竞赛时间">
+          <el-form-item class="req"
-                    <el-date-picker v-model="playTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+                        label="竞赛时间">
-                                    range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+            <el-date-picker v-model="playTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
                             :picker-options="pickerOptions"></el-date-picker>
           </el-form-item>
-                <el-form-item class="req" label="比赛范围">
+          <el-form-item class="req"
+                        label="比赛范围">
             <div v-if="form.id">
-                    <el-radio v-model="form.competitionScope" :label="0" disabled>本校内</el-radio>
+              <el-radio v-model="form.competitionScope"
+                        :label="0"
+                        disabled>本校内</el-radio>
             </div>
             <div>
-                    <el-radio v-model="form.competitionScope" :label="1">全平台</el-radio>
+              <el-radio v-model="form.competitionScope"
+                        :label="1">全平台</el-radio>
             </div>
             <div>
-                    <el-radio v-model="form.competitionScope" :label="2">指定区域、院校</el-radio>
+              <el-radio v-model="form.competitionScope"
-                    <el-button v-if="form.competitionScope === 2" type="primary" size="mini" @click="showRange">选择院校</el-button>
+                        :label="2">指定区域、院校</el-radio>
+              <el-button v-if="form.competitionScope === 2"
+                         type="primary"
+                         size="mini"
+                         @click="showRange">选择院校</el-button>
               <span style="margin-left: 20px">{{ rangeName }}</span>
             </div>
           </el-form-item>
-                <el-form-item class="req" label="竞赛类型">
+          <el-form-item class="req"
-                  <el-radio v-model="form.completeCompetitionSetup.competitionType" :label="0">个人赛</el-radio>
+                        label="竞赛类型">
-                  <el-radio v-model="form.completeCompetitionSetup.competitionType" :label="1">团队赛</el-radio>
+            <el-radio v-model="form.completeCompetitionSetup.competitionType"
+                      :label="0">个人赛</el-radio>
+            <el-radio v-model="form.completeCompetitionSetup.competitionType"
+                      :label="1">团队赛</el-radio>
           </el-form-item>
-                <el-form-item class="req" v-if="!form.completeCompetitionSetup.competitionType" label="报名人数上限">
+          <el-form-item class="req"
+                        v-if="!form.completeCompetitionSetup.competitionType"
+                        label="报名人数上限">
             <div class="input-center">
-                        <el-input placeholder="请输入人数" v-model.number="form.completeCompetitionSetup.quantityLimit" type="number"></el-input> 人
+              <el-input placeholder="请输入人数"
+                        v-model.number="form.completeCompetitionSetup.quantityLimit"
+                        type="number"></el-input> 人
             </div>
           </el-form-item>
           <template v-if="form.completeCompetitionSetup.competitionType">
-                  <el-form-item class="req" label="报名团队数上限">
+            <el-form-item class="req"
+                          label="报名团队数上限">
               <div class="input-center">
-                          <el-input placeholder="请输入团队数" v-model.number="form.completeCompetitionSetup.quantityLimit" type="number"></el-input> 队
+                <el-input placeholder="请输入团队数"
+                          v-model.number="form.completeCompetitionSetup.quantityLimit"
+                          type="number"></el-input> 队
               </div>
             </el-form-item>
-                  <el-form-item class="req" label="团队人数">
+            <el-form-item class="req"
-                      <div class="input-center" style="width: 250px;">
+                          label="团队人数">
-                          <el-input v-model.number="form.completeCompetitionSetup.minTeamSize" type="number"></el-input> 至
+              <div class="input-center"
-                          <el-input style="margin-left: 5px;" v-model.number="form.completeCompetitionSetup.maxTeamSize" type="number"></el-input> 人/队
+                   style="width: 250px;">
+                <el-input v-model.number="form.completeCompetitionSetup.minTeamSize"
+                          type="number"></el-input> 至
+                <el-input style="margin-left: 5px;"
+                          v-model.number="form.completeCompetitionSetup.maxTeamSize"
+                          type="number"></el-input> 人/队
               </div>
             </el-form-item>
           </template>
-                <el-form-item class="req" label="报名邀请码">
+          <el-form-item class="req"
-                  <div class="input-center" style="width: 550px;">
+                        label="报名邀请码">
-                    <el-radio v-model="form.completeCompetitionSetup.isNeedCode" :label="0">不需要</el-radio>
+            <div class="input-center"
-                    <el-radio v-model="form.completeCompetitionSetup.isNeedCode" :label="1">需要</el-radio>
+                 style="width: 550px;">
-                    <el-input style="width: 250px" placeholder="请输入4位邀请码或点击随机生成" v-model="form.completeCompetitionSetup.invitationCode" :disabled="form.completeCompetitionSetup.isNeedCode === 0"></el-input>
+              <el-radio v-model="form.completeCompetitionSetup.isNeedCode"
-                    <el-button v-if="form.completeCompetitionSetup.isNeedCode === 1" @click="randomInv">随机</el-button>
+                        :label="0">不需要</el-radio>
+              <el-radio v-model="form.completeCompetitionSetup.isNeedCode"
+                        :label="1">需要</el-radio>
+              <el-input style="width: 250px"
+                        placeholder="请输入4位邀请码或点击随机生成"
+                        v-model="form.completeCompetitionSetup.invitationCode"
+                        :disabled="form.completeCompetitionSetup.isNeedCode === 0"></el-input>
+              <el-button v-if="form.completeCompetitionSetup.isNeedCode === 1"
+                         @click="randomInv">随机</el-button>
             </div>
           </el-form-item>
-                <el-form-item class="req" label="竞赛详情">
+          <el-form-item class="req"
-                    <quill v-if="quillShow" :border="true" v-model="form.description" :height="400" :readonly="!editing && form.id !== ''" />
+                        label="竞赛详情">
+            <quill v-if="quillShow"
+                   :border="true"
+                   v-model="form.description"
+                   :height="400"
+                   :readonly="!editing && form.id !== ''" />
           </el-form-item>
           <el-form-item label="附件">
-                  <el-upload
+            <Upload :limit="5"
+                    :file-list.sync="fileList"
                     :on-remove="handleAnnexRemove"
-                      :on-error="uploadError"
+                    @onSuccess="uploadAnnexSuccess"></Upload>
-                      :before-upload="beforeUpload"
-                      :on-success="uploadAnnexSuccess"
-                      :limit="5"
-                      :on-exceed="handleExceedAnnex"
-                      :action="this.api.fileupload"
-                      :headers="headers"
-                      :file-list="fileList"
-                      name="file"
-                  >
-                    <el-button size="small" type="primary">点击上传</el-button>
-                    <div slot="tip" class="el-upload__tip">
-                      <p>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</p>
-                    </div>
-                  </el-upload>
           </el-form-item>
         </el-form>
       </div>
     </div>
 
-        <el-dialog title="请勾选院校" :visible.sync="rangeVisible" width="580px" custom-class="range-dia" :close-on-click-modal="false">
+    <el-dialog title="请勾选院校"
+               :visible.sync="rangeVisible"
+               width="580px"
+               custom-class="range-dia"
+               :close-on-click-modal="false">
       <div class="range-wrap">
-            <el-cascader
+        <el-cascader ref="range"
-              ref="range"
                      class="range-cas"
                      key="range"
                      v-model="range"
@@ -179,8 +248,7 @@
                      @change="rangeChange"
                      @visible-change="rangeViChange"
                      @input.native="rangeSearch"></el-cascader>
-              <el-tag
+        <el-tag v-for="(tag, i) in rangeChecked"
-                v-for="(tag, i) in rangeChecked"
                 :key="tag.value"
                 class="range-check"
                 closable
@@ -190,9 +258,13 @@
         </el-tag>
       </div>
 
-          <span slot="footer" class="dialog-footer">
+      <span slot="footer"
-            <el-button size="small" @click="rangeVisible = false">取 消</el-button>
+            class="dialog-footer">
-            <el-button size="small" type="primary" @click="rangeSubmit">确 定</el-button>
+        <el-button size="small"
+                   @click="rangeVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="rangeSubmit">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -201,6 +273,7 @@
 <script>
 import util from "@/libs/util";
 import quill from "@/components/quill";
+import Upload from '@/components/upload';
 import { Loading } from 'element-ui'
 export default {
   props: ['editing'],
@@ -329,7 +402,8 @@ export default {
     };
   },
   components: {
-        quill
+    quill,
+    Upload
   },
   watch: {
     editing: function (val) {
@@ -387,6 +461,7 @@ export default {
           const files = []
           fileList.map(e => {
             files.push({
+              id: e.id,
               name: e.fileName,
               url: e.filePath
             })
@@ -513,9 +588,6 @@ export default {
     handleExceed (files, fileList) {
       util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
     },
-      handleExceedAnnex(files, fileList) {
-          util.warningMsg(`当前限制选择 5 个文件，如需更换，请删除一个文件再重新选择！`);
-      },
     uploadSuccess (res) {
       const { coverUrl } = this.form
       coverUrl && this.$del(`${this.api.fileDeletion}?keys=${coverUrl}`).then(res => { }).catch(res => { })
@@ -527,29 +599,17 @@ export default {
       this.form.carouselUrl = res.data.filesResult.fileUrl
     },
     // 附件上传成功
-      uploadAnnexSuccess(res) {
+    uploadAnnexSuccess (file) {
-        const file = res.data.filesResult
       const { id } = this.form
       const data = {
         competitionId: id || '',
-          fileName: this.fileName,
+        fileName: file.name,
-          filePath: file.fileUrl || file.fileId
+        filePath: file.url
       }
       this.form.competitionAnnexList.push(data)
       // 编辑的时候需要调新增附件接口
       id && this.$post(this.api.saveComAnnex, data).then(res => { }).catch(res => { })
     },
-      // 附件上传前
-      beforeUpload(file) {
-        const isLt2M = file.size / 1024 / 1024 < 10
-        if (!isLt2M) util.warningMsg('请上传小于10MB的附件！')
-        if (isLt2M) {
-          this.fileName = file.name
-          return true
-        } else {
-          return false
-        }
-      },
     uploadError (err, file, fileList) {
       this.$message({
         message: "上传出错，请重试！",
@@ -571,9 +631,7 @@ export default {
       }).catch(res => { })
     },
     handleAnnexRemove (file, fileList) {
-        const { url, name } = file
+      const { id } = file
-        url && this.$del(`${this.api.fileDeletion}?keys=${url}`).then(res => {}).catch(res => {})
-        const id = this.form.competitionAnnexList.find(e => e.fileName === name).id
       id && this.$post(`${this.api.delComAnnex}?id=${id}`).then(res => { }).catch(res => { })
     },
     // 随机邀请码
@@ -751,7 +809,8 @@ $upload-lg-height: 150px;
 /deep/ .d-inline-block {
     width: 216px;
 
-    .el-select, .el-input {
+    .el-select,
+    .el-input {
         width: 100%;
     }
 }
@@ -770,7 +829,7 @@ $upload-lg-height: 150px;
         .remove {
             width: 16px;
             height: 16px;
-            background: url("../../../assets/img/close.png") 0 0/cover no-repeat;
+            background: url('../../../assets/img/close.png') 0 0 / cover no-repeat;
             cursor: pointer;
         }
     }