diff --git a/src/assets/images/home/s-j1.png b/src/assets/images/home/s-j1.png new file mode 100644 index 0000000..d14da7f Binary files /dev/null and b/src/assets/images/home/s-j1.png differ diff --git a/src/assets/images/home/s-j2.png b/src/assets/images/home/s-j2.png new file mode 100644 index 0000000..9c07242 Binary files /dev/null and b/src/assets/images/home/s-j2.png differ diff --git a/src/assets/images/home/s-j3.png b/src/assets/images/home/s-j3.png new file mode 100644 index 0000000..406becf Binary files /dev/null and b/src/assets/images/home/s-j3.png differ diff --git a/src/assets/images/home/s-t1.png b/src/assets/images/home/s-t1.png new file mode 100644 index 0000000..491cc0c Binary files /dev/null and b/src/assets/images/home/s-t1.png differ diff --git a/src/assets/images/home/s-t2.png b/src/assets/images/home/s-t2.png new file mode 100644 index 0000000..f1ad6dd Binary files /dev/null and b/src/assets/images/home/s-t2.png differ diff --git a/src/assets/images/home/s-t3.png b/src/assets/images/home/s-t3.png new file mode 100644 index 0000000..169b864 Binary files /dev/null and b/src/assets/images/home/s-t3.png differ diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css new file mode 100644 index 0000000..84b5774 --- /dev/null +++ b/src/assets/styles/iconfont.css @@ -0,0 +1,15 @@ +@font-face { + font-family: 'iconfont'; + /* project id 3202838 */ + src: url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.woff2') format('woff2'), + url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.woff') format('woff'), + url('//at.alicdn.com/t/font_3202838_q6w9546ze7d.ttf') format('truetype'), + url('#iconfont') format('svg'); +} +.iconfont { + font-family: "iconfont" !important; + font-size: .16rem; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} \ No newline at end of file diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c363e1e..86ff946 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -31,6 +31,8 @@ html { *:before, *:after { box-sizing: inherit; + margin: 0; + padding: 0; } ul, ol { @@ -190,6 +192,30 @@ aside { } // start +.home_item { + height: 248px; + padding: 0 18px; + background: #fff; + border-radius: 4px; + .home_item_title { + display: flex; + padding: 18px 0; + border-bottom: 1px solid #eee; + + h4 { + margin-left: 6px; + font-size: 16px; + color: #333333; + } + + .iconfont { + font-size: 16px; + color: #3a8aeb; + } + } +} + + .auth_code { position: relative; .login-code { diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index 7a814bd..517650e 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -8,7 +8,7 @@ .login_bg{ width: 1287px; height: 100%; - background: url(../assets/images/login/bg-dl.png) no-repeat left top; + background: url(~@/assets/images/login/bg-dl.png) no-repeat left top; background-size: cover; } // .title { diff --git a/src/main.js b/src/main.js index f4c6290..16738d9 100644 --- a/src/main.js +++ b/src/main.js @@ -17,6 +17,7 @@ import checkPer from '@/utils/permission' import permission from './components/Permission' import './assets/styles/element-variables.scss' // global css +import './assets/styles/iconfont.css' import './assets/styles/index.scss' // 代码高亮 diff --git a/src/router/routers.js b/src/router/routers.js index e40d204..f3f0414 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -20,7 +20,7 @@ export const constantRouterMap = [ title: '忘记密码', noCache: true }, - component: resolve => require(['@/views/forgetPassword'], resolve), + component: resolve => require(['@/views/forgetPassword/index'], resolve), hidden: true }, { diff --git a/src/views/dashboard/AgencyData.vue b/src/views/dashboard/AgencyData.vue new file mode 100644 index 0000000..f81f8b7 --- /dev/null +++ b/src/views/dashboard/AgencyData.vue @@ -0,0 +1,28 @@ + + + + \ No newline at end of file diff --git a/src/views/dashboard/DeviceData.vue b/src/views/dashboard/DeviceData.vue new file mode 100644 index 0000000..3aa1115 --- /dev/null +++ b/src/views/dashboard/DeviceData.vue @@ -0,0 +1,93 @@ + + + + diff --git a/src/views/dashboard/PublishProcess.vue b/src/views/dashboard/PublishProcess.vue new file mode 100644 index 0000000..9982df0 --- /dev/null +++ b/src/views/dashboard/PublishProcess.vue @@ -0,0 +1,60 @@ + + + + diff --git a/src/views/forgetPassword.vue b/src/views/forgetPassword/index.vue similarity index 76% rename from src/views/forgetPassword.vue rename to src/views/forgetPassword/index.vue index 7ff2af6..ba99d94 100644 --- a/src/views/forgetPassword.vue +++ b/src/views/forgetPassword/index.vue @@ -2,28 +2,66 @@
@@ -89,15 +127,15 @@ export default { }, watch: { $route: { - handler: function(route) { + handler: function (route) { this.redirect = route.query && route.query.redirect }, immediate: true } }, - created() {}, + created() { }, methods: { - getAuthCode() {}, + getAuthCode() { }, countdown() { if (this.disabledSendCode) { return @@ -157,7 +195,7 @@ export default { }