Merge remote-tracking branch 'origin/Zhou-Yingquan' into Zhou-Xinyi

# Conflicts: # src/main.js # src/plugins/ant-design-vue.js # src/router/index.js # src/static/reset.less # src/views/Register.vue
CindyChow123 · Dec 15, 2020 · 8680c70 · 8680c70
2 parents c198516 + 37c1651
commit 8680c70
Show file tree

Hide file tree

Showing 16 changed files with 1,455 additions and 37 deletions.
diff --git a/public/header1.png b/public/header1.png
diff --git a/public/header2.jpg b/public/header2.jpg
diff --git a/public/roll_1.jpg b/public/roll_1.jpg
diff --git a/public/roll_2.jpg b/public/roll_2.jpg
diff --git a/public/roll_3.jpg b/public/roll_3.jpg
diff --git a/public/roll_4.jpg b/public/roll_4.jpg
diff --git a/src/plugins/ant-design-vue.js b/src/plugins/ant-design-vue.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { Pagination, Button, LocaleProvider, Layout, Menu, Dropdown, Icon, Tabs, List, Card, Modal, Checkbox, Input, FormModel, message, Avatar, Divider, PageHeader, Breadcrumb, Upload, Statistic, Table, DatePicker, InputNumber, Collapse, Tag, Tooltip, Select, Comment, Popconfirm, Popover, Rate } from 'ant-design-vue'
+import { Pagination, Button, LocaleProvider, Layout, Menu, Dropdown, Icon, Tabs, List, Card, Modal, Checkbox, Input, FormModel, message, Descriptions, Carousel, Avatar, Divider, PageHeader, Breadcrumb, Upload, Switch, Statistic, Radio, Table, DatePicker, InputNumber, Collapse, Form, Steps, Tag, Tooltip, Select, Comment, Popconfirm, Popover, Rate, Result, Drawer } from 'ant-design-vue'
 import { Col, Row } from 'ant-design-vue/lib/grid'
 import BreadcrumbItem from 'ant-design-vue/lib/breadcrumb/BreadcrumbItem'
 import BreadcrumbSeparator from 'ant-design-vue/lib/breadcrumb/BreadcrumbSeparator'
@@ -10,6 +10,7 @@ import Meta from 'ant-design-vue/lib/card/Meta'
 Vue.component(LocaleProvider.name, LocaleProvider)
 Vue.component(Pagination.name, Pagination)
 Vue.component(Button.name, Button)
+Vue.component(Button.Group.name, Button.Group)
 Vue.component(Layout.name, Layout)
 Vue.component(Layout.Header.name, Layout.Header)
 Vue.component(Layout.Sider.name, Layout.Sider)
@@ -57,3 +58,42 @@ Vue.component(Comment.name, Comment)
 Vue.component(Popconfirm.name, Popconfirm)
 Vue.component(Popover.name, Popover)
 Vue.component(Rate.name, Rate)
+Vue.component(PageHeader.name, PageHeader)
+Vue.component(Descriptions.name, Descriptions)
+Vue.component(Carousel.name, Carousel)
+Vue.component(Input.Search.name, Input.Search)
+Vue.component(Descriptions.Item.name, Descriptions.Item)
+Vue.component(Avatar.name, Avatar)
+Vue.component(FormModel.name, FormModel)
+Vue.component(FormModel.Item.name, FormModel.Item)
+Vue.component(Select.name, Select)
+Vue.component(Select.Option.name, Select.Option)
+Vue.component(DatePicker.name, DatePicker)
+Vue.component(Switch.name, Switch)
+Vue.component(Checkbox.name, Checkbox)
+Vue.component(Checkbox.Group.name, Checkbox.Group)
+Vue.component(Radio.name, Radio)
+Vue.component(Radio.Group.name, Radio.Group)
+Vue.component(Radio.Button.name, Radio.Button)
+Vue.component(Input.name, Input)
+Vue.component(Table.name, Table)
+Vue.component(Tag.name, Tag)
+Vue.component(Divider.name, Divider)
+Vue.component(Input.TextArea.name, Input.TextArea)
+Vue.component(Comment.name, Comment)
+Vue.component(Tooltip.name, Tooltip)
+Vue.component(Breadcrumb.name, Breadcrumb)
+Vue.component(Breadcrumb.Item.name, Breadcrumb.Item)
+Vue.component(Form.Item.name, Form.Item)
+Vue.component(Steps.name, Steps)
+Vue.component(Steps.Step.name, Steps.Step)
+Vue.component(Col.name, Col)
+Vue.component(Row.name, Row)
+Vue.component(Card.Meta.name, Card.Meta)
+Vue.prototype.$message = message
+// Vue.prototype.$router = router
+Vue.component(Upload.name, Upload)
+Vue.component(Rate.name, Rate)
+Vue.component(Result.name, Result)
+// Vue.component(Drawer.name, Drawer)
+Vue.use(Drawer)
diff --git a/src/router/index.js b/src/router/index.js
@@ -121,6 +121,36 @@ const routes = [
     path: '/developer_finance',
     name: 'DeveloperFinance',
     component: () => import('../views/Developer_finance')
+  },
+  {
+    path: '/single_game',
+    name: 'Single_game',
+    component: () => import('../views/Single_game.vue')
+  },
+  {
+    path: '/admin',
+    name: 'Admin',
+    component: () => import('../views/Admin.vue')
+  },
+  {
+    path: '/racing',
+    name: 'Racing',
+    component: () => import('../views/Racing.vue')
+  },
+  {
+    path: '/register',
+    name: 'Register',
+    component: () => import('../views/Register.vue')
+  },
+  {
+    path: '/register_email',
+    name: 'Register_email',
+    component: () => import('../views/Register_email.vue')
+  },
+  {
+    path: '/support_developer',
+    name: 'Support_developer',
+    component: () => import('../views/Support_developer.vue')
   }
 ]
 
@@ -141,3 +171,8 @@ const router = new VueRouter({
 // })
 
 export default router
+const originalPush = VueRouter.prototype.push
+
+VueRouter.prototype.push = function push (location) {
+  return originalPush.call(this, location).catch(err => err)
+}
diff --git a/src/static/reset.less b/src/static/reset.less
@@ -47,5 +47,37 @@
 .ant-tooltip-inner {
   color: greenyellow;
 }
+.ant-comment {
+  color: white;
+}
+.ant-avatar > .alt-avatar-alter {
+  color: white;
+}
+.ant-radio-wrapper {
+  color: white;
+}
+.ant-descriptions-item {
+  color: white;
+}
+.ant-descriptions-title {
+  color: white;
+}
+.ant-descriptions-item-label {
+  color: white;
+}
+.ant-descriptions-item-content {
+  color: white;
+}
+.ant-comment-content-author-name {
+  color: white;
+}
+.ant-menu.ant-menu-inline.ant-menu-root.ant-menu-dark {
+  height: 400px;
+}
+.ant-form.ant-form-horizontal {
+  border-style: dashed;
+  border-color: dodgerblue;
+  border-radius: 25px;
+}