Merge pull request #1 from hamono/master

sent1
TECHF5VE · Jan 26, 2020 · 5208b16 · 5208b16
2 parents 5b76f57 + 7263b6c
commit 5208b16
Show file tree

Hide file tree

Showing 78 changed files with 502 additions and 1,124 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "@types/react": "^16.8.1"
   },
   "dependencies": {
-    "antd": "^3.9.2",
+    "antd": "3.17.0",
     "autoprefixer": "7.1.6",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
@@ -71,7 +71,7 @@
     "@types/jest": "^23.1.1",
     "@types/js-base64": "^2.3.1",
     "@types/node": "^10.3.4",
-    "@types/react": "^16.8.1",
+    "@types/react": "^16.9.0",
     "@types/react-dom": "^16.0.11",
     "@types/react-router": "^4.4.1",
     "@types/react-router-dom": "^4.3.1",

diff --git a/scripts/src/index.tsx b/scripts/src/index.tsx
diff --git a/scripts/src/isDev.ts b/scripts/src/isDev.ts
diff --git a/scripts/src/registerServiceWorker.ts b/scripts/src/registerServiceWorker.ts
diff --git a/scripts/src/style/color.scss b/scripts/src/style/color.scss
diff --git a/scripts/src/style/font-size.scss b/scripts/src/style/font-size.scss
diff --git a/scripts/src/style/media.scss b/scripts/src/style/media.scss
diff --git a/scripts/src/views/App.tsx b/scripts/src/views/App.tsx
diff --git a/scripts/src/views/Body/DianShiJu/index.tsx b/scripts/src/views/Body/DianShiJu/index.tsx
diff --git a/scripts/src/views/Body/DianYing/index.tsx b/scripts/src/views/Body/DianYing/index.tsx
diff --git a/scripts/src/views/Body/DongHua/index.tsx b/scripts/src/views/Body/DongHua/index.tsx
diff --git a/scripts/src/views/Body/FanJu/index.tsx b/scripts/src/views/Body/FanJu/index.tsx
diff --git a/scripts/src/views/Body/FanJuDongTai/index.tsx b/scripts/src/views/Body/FanJuDongTai/index.tsx
diff --git a/scripts/src/views/Body/GuangGao/index.tsx b/scripts/src/views/Body/GuangGao/index.tsx
diff --git a/scripts/src/views/Body/GuiChu/index.tsx b/scripts/src/views/Body/GuiChu/index.tsx
diff --git a/scripts/src/views/Body/GuoChan/index.tsx b/scripts/src/views/Body/GuoChan/index.tsx
diff --git a/scripts/src/views/Body/GuoChuang/index.tsx b/scripts/src/views/Body/GuoChuang/index.tsx
diff --git a/scripts/src/views/Body/JiLuPian/index.tsx b/scripts/src/views/Body/JiLuPian/index.tsx
diff --git a/scripts/src/views/Body/KeJi/index.tsx b/scripts/src/views/Body/KeJi/index.tsx
diff --git a/scripts/src/views/Body/MnaHua/index.tsx b/scripts/src/views/Body/MnaHua/index.tsx
diff --git a/scripts/src/views/Body/ShengHuo/index.tsx b/scripts/src/views/Body/ShengHuo/index.tsx
diff --git a/scripts/src/views/Body/ShiShang/index.tsx b/scripts/src/views/Body/ShiShang/index.tsx
diff --git a/scripts/src/views/Body/ShuMa/index.tsx b/scripts/src/views/Body/ShuMa/index.tsx
diff --git a/scripts/src/views/Body/TeBieTuiJian/index.tsx b/scripts/src/views/Body/TeBieTuiJian/index.tsx
diff --git a/scripts/src/views/Body/Top/index.tsx b/scripts/src/views/Body/Top/index.tsx
diff --git a/scripts/src/views/Body/TuiGuang/index.tsx b/scripts/src/views/Body/TuiGuang/index.tsx
diff --git a/scripts/src/views/Body/WuDao/index.tsx b/scripts/src/views/Body/WuDao/index.tsx
diff --git a/scripts/src/views/Body/YinYue/index.tsx b/scripts/src/views/Body/YinYue/index.tsx
diff --git a/scripts/src/views/Body/YingShi/index.tsx b/scripts/src/views/Body/YingShi/index.tsx
diff --git a/scripts/src/views/Body/YouXi/index.tsx b/scripts/src/views/Body/YouXi/index.tsx
diff --git a/scripts/src/views/Body/YuLe/iindex.tsx b/scripts/src/views/Body/YuLe/iindex.tsx
diff --git a/scripts/src/views/Body/ZhiBo/index.tsx b/scripts/src/views/Body/ZhiBo/index.tsx
diff --git a/scripts/src/views/Body/ZhuanLan/index.tsx b/scripts/src/views/Body/ZhuanLan/index.tsx
diff --git a/scripts/src/views/Body/index.tsx b/scripts/src/views/Body/index.tsx
diff --git a/scripts/src/views/Body/style.scss b/scripts/src/views/Body/style.scss
diff --git a/scripts/src/views/Foot/index.tsx b/scripts/src/views/Foot/index.tsx
diff --git a/scripts/src/views/Foot/style.scss b/scripts/src/views/Foot/style.scss
diff --git a/scripts/src/views/Header/Top/Center/index.tsx b/scripts/src/views/Header/Top/Center/index.tsx
diff --git a/scripts/src/views/Header/Top/Center/style.scss b/scripts/src/views/Header/Top/Center/style.scss
diff --git a/scripts/src/views/Header/Top/Left/BaiNian/img-1.png b/scripts/src/views/Header/Top/Left/BaiNian/img-1.png
diff --git a/scripts/src/views/Header/Top/Left/BaiNian/index.tsx b/scripts/src/views/Header/Top/Left/BaiNian/index.tsx
diff --git a/scripts/src/views/Header/Top/Left/BaiNian/style.scss b/scripts/src/views/Header/Top/Left/BaiNian/style.scss
diff --git a/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/CartoonItem/index.tsx b/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/CartoonItem/index.tsx
diff --git a/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/CartoonItem/style.scss b/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/CartoonItem/style.scss
diff --git a/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/index.tsx b/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/index.tsx
diff --git a/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/style.scss b/scripts/src/views/Header/Top/Left/Cartoon/CartoonContent/style.scss