Merge branch 'ai-test' into dev

c0d0137a · zhanghaozhe · 7da66e90 · 7f6decfa · c0d0137a · c0d0137a
Commit c0d0137a authored Jun 08, 2020 by zhanghaozhe
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

package-lock.json
+4 -5

package.json
+1 -1

src/components/ai-test/scores/index.js
+1 -1

No files found.
--- a/package-lock.json
+++ b/package-lock.json
@@ -2314,12 +2314,11 @@
      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
    },
    "axios": {
-      "version": "0.19.0",
+      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
      "requires": {
-        "follow-redirects": "1.5.10",
+        "follow-redirects": "1.5.10"
-        "is-buffer": "^2.0.2"
      },
      "dependencies": {
        "debug": {

--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
    "ace-builds": "^1.4.11",
    "antd-mobile": "^2.3.1",
    "autoprefixer": "^9.6.0",
-    "axios": "^0.19.0",
+    "axios": "^0.19.2",
    "babel-core": "7.0.0-bridge.0",
    "babel-eslint": "9.0.0",
    "babel-jest": "23.6.0",

--- a/src/components/ai-test/scores/index.js
+++ b/src/components/ai-test/scores/index.js
@@ -167,7 +167,7 @@ class Scores extends Component {
    return (
      <div className={'scores'}>
        <div className="banner">
-          <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/ai-test/m/scores/banner.png" alt=""/>
+          <img src={pageState.h5_banner} alt=""/>
        </div>
        <div className="info">
          <span>已有{pageState.join_num}人参加测试</span>