diff --git a/package-lock.json b/package-lock.json index 6866acf..69665fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1808,16 +1808,6 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "dev": true }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", @@ -1850,34 +1840,6 @@ "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=", "dev": true }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz", @@ -1931,13 +1893,6 @@ "universalify": "^0.1.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, "icss-utils": { "version": "4.1.1", "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz", @@ -2052,16 +2007,6 @@ "minipass": "^3.1.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz", @@ -2078,32 +2023,6 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } - }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz", - "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } } } }, @@ -12663,6 +12582,87 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.1.2", + "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608188050165&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz", + "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792302448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz", + "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-quill-editor": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", diff --git a/src/App.vue b/src/App.vue index a70d7dc..6835e63 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,10 +7,7 @@
-
- 回到顶部 - -
+
@@ -31,7 +28,7 @@ export default { return { zh_CN }; }, - computed: mapState(['anyringToken']), + computed: mapState('user', ['anyringToken']), updated() { window.scroll(0, 0); }, @@ -48,7 +45,7 @@ export default { }); }, - methods: { ...mapActions(['getUserId']) }, + methods: { ...mapActions('user', ['getUserId']) }, }; @@ -82,7 +79,6 @@ body::-webkit-scrollbar { height: 64px; } .footer { - height: 397px; width: 100%; background: #0d1f32; bottom: 0; @@ -93,12 +89,9 @@ body::-webkit-scrollbar { } #components-back-top-demo-custom .ant-back-top-inner { height: 40px; - width: 120px; + width: 40px; line-height: 40px; - border-radius: 4px; - background-color: #13acc4; - color: #fff; - text-align: center; - font-size: 14px; + background: url('assets/t-top.png') center no-repeat; + background-size: contain; } diff --git a/src/assets/bullhorn.png b/src/assets/bullhorn.png new file mode 100644 index 0000000..2b3a466 Binary files /dev/null and b/src/assets/bullhorn.png differ diff --git a/src/assets/code.png b/src/assets/code.png new file mode 100644 index 0000000..83e6c35 Binary files /dev/null and b/src/assets/code.png differ diff --git a/src/assets/logo_bottom.png b/src/assets/logo_bottom.png new file mode 100644 index 0000000..5d24d80 Binary files /dev/null and b/src/assets/logo_bottom.png differ diff --git a/src/assets/new01.png b/src/assets/new01.png new file mode 100644 index 0000000..25abc35 Binary files /dev/null and b/src/assets/new01.png differ diff --git a/src/assets/new02.png b/src/assets/new02.png new file mode 100644 index 0000000..3aafb78 Binary files /dev/null and b/src/assets/new02.png differ diff --git a/src/assets/server01.png b/src/assets/server01.png new file mode 100644 index 0000000..18af48b Binary files /dev/null and b/src/assets/server01.png differ diff --git a/src/assets/server02.png b/src/assets/server02.png new file mode 100644 index 0000000..379c297 Binary files /dev/null and b/src/assets/server02.png differ diff --git a/src/assets/server03.png b/src/assets/server03.png new file mode 100644 index 0000000..8704faf Binary files /dev/null and b/src/assets/server03.png differ diff --git a/src/assets/settleIn.png b/src/assets/settleIn.png new file mode 100644 index 0000000..f923591 Binary files /dev/null and b/src/assets/settleIn.png differ diff --git a/src/assets/t-top.png b/src/assets/t-top.png new file mode 100644 index 0000000..3540e5d Binary files /dev/null and b/src/assets/t-top.png differ diff --git a/src/common/portrait.styl b/src/common/portrait.styl index bcb97b0..767006e 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -3,6 +3,14 @@ padding: 12px; } +.pa-4 { + padding: 16px; +} + +.pa-5 { + padding: 20px; +} + .pb-3 { padding-bottom: 12px; } @@ -19,6 +27,21 @@ padding-bottom: 40px; } +.px-1{ + padding-left: 4px; + padding-right: 4px; +} + +.px-2{ + padding-left: 8px; + padding-right: 8px; +} + +.px-3{ + padding-left: 12px; + padding-right: 12px; +} + // margin .ma-3 { margin: 12px; @@ -60,6 +83,10 @@ margin-top: 16px; } +.mt-8{ + margin-top: 32px; +} + .mb-1{ margin-bottom: 4px; } @@ -76,6 +103,22 @@ margin-bottom: 16px; } +.mb-5{ + margin-bottom: 20px; +} + +.mb-6{ + margin-bottom: 24px; +} + +.mb-7{ + margin-bottom: 28px; +} + +.mb-8{ + margin-bottom: 32px; +} + .ml-2{ margin-left: 8px; } @@ -128,6 +171,14 @@ margin-right: 24px; } +.mr-7{ + margin-right: 28px; +} + +.mr-8{ + margin-right: 32px; +} + // background .white { background: white; @@ -170,12 +221,25 @@ justify-content: space-between; } +.align-center{ + align-items: center +} + +.align-end{ + align-items: flex-end +} + .flex-1{ display: flex; flex: 1; } // other +.inner { + width: 82%; + margin: 0 auto; +} + .pointer{ cursor:pointer; } @@ -184,7 +248,44 @@ height:100%; } +.fill-width{ + width:100%; +} + // font +.font-big{ + font-size: 60px; +} + +.font-small{ + font-size: 30px; + line-height: 40px; +} + +.font-bold{ + font-weight: bold; +} + +@media only screen and (max-width: 1400px) { + .font-big{ + font-size: 45px; + } + + .font-small{ + font-size: 26px; + line-height: 36px; + } +} + +.font-bold-32{ + font-size: 32px; + font-weight: bold; +} + +.font-32{ + font-size: 32px; +} + .font-bold-24{ font-size: 24px; font-weight: bold; @@ -194,6 +295,10 @@ font-size: 24px; } +.font-20{ + font-size: 20px; +} + .font-bold-16{ font-size: 16px; font-weight: bold; @@ -212,6 +317,10 @@ font-size: 14px; } +.font-12{ + font-size: 12px; +} + .icon-size{ font-size: 20px; } @@ -242,3 +351,15 @@ h2{ .ant-btn-link:hover, .ant-btn-link:focus{ color: #13ACC4; } + +.base-bg{ + background: #13ACC4 +} + +.second-base-bg{ + background: #AACD06 +} + +.white--text{ + color: #fff +} diff --git a/src/components/FooterPage/FooterPage.vue b/src/components/FooterPage/FooterPage.vue index 9812a44..af1581d 100644 --- a/src/components/FooterPage/FooterPage.vue +++ b/src/components/FooterPage/FooterPage.vue @@ -1,6 +1,42 @@ @@ -12,4 +48,38 @@ export default { }; - + diff --git a/src/components/FooterPage/FriendShip.vue b/src/components/FooterPage/FriendShip.vue index 864ab1d..d092ca7 100644 --- a/src/components/FooterPage/FriendShip.vue +++ b/src/components/FooterPage/FriendShip.vue @@ -1,7 +1,8 @@ @@ -9,7 +10,10 @@ @@ -17,11 +21,8 @@ export default { diff --git a/src/components/Index/IndexNewList.vue b/src/components/Index/IndexNewList.vue new file mode 100644 index 0000000..ca2ecd7 --- /dev/null +++ b/src/components/Index/IndexNewList.vue @@ -0,0 +1,150 @@ + + + + + + + diff --git a/src/components/Rotation/Rotation.vue b/src/components/Rotation/Rotation.vue index 908787b..3b33e5b 100644 --- a/src/components/Rotation/Rotation.vue +++ b/src/components/Rotation/Rotation.vue @@ -1,8 +1,9 @@ @@ -70,7 +90,7 @@ export default { }, }; }, - computed: mapState(['current', 'policyStatus']), + computed: mapState('home', ['current', 'policyStatus']), watch: { policyStatus(val) { @@ -85,7 +105,7 @@ export default { }, methods: { - ...mapMutations(['setPolicyId', 'setCurrent', 'setPolicyStatus']), + ...mapMutations('home', ['setPolicyId', 'setCurrent', 'setPolicyStatus']), async getPolictList() { try { const params = { diff --git a/src/views/User/ForgetPassword.vue b/src/views/User/ForgetPassword.vue index dbacb60..92d8ff8 100644 --- a/src/views/User/ForgetPassword.vue +++ b/src/views/User/ForgetPassword.vue @@ -12,25 +12,72 @@ - - + + - +
- - 重新获取 + + 重新获取
- +
- 重新发送 {{ interval }} - 获取验证码 + 重新发送 {{ interval }} + 获取验证码
- - + +
确认修改 @@ -87,14 +134,14 @@ export default { }; }, - computed: mapState(['picCode']), + computed: mapState('user', ['picCode']), created() { this.sendPicCode(); }, methods: { - ...mapActions(['changePassword', 'sendCode', 'sendPicCode']), + ...mapActions('user', ['changePassword', 'sendCode', 'sendPicCode']), changePhone(e) { this.phone = e.target.value; }, diff --git a/src/views/User/Login.vue b/src/views/User/Login.vue index a5471eb..3a67427 100644 --- a/src/views/User/Login.vue +++ b/src/views/User/Login.vue @@ -140,14 +140,14 @@ export default { }; }, - computed: mapState(['picCode']), + computed: mapState('user', ['picCode']), created() { this.sendPicCode(); }, methods: { - ...mapActions(['signIn', 'sendCode', 'sendPicCode']), + ...mapActions('user', ['signIn', 'sendCode', 'sendPicCode']), changePhone(e) { this.identifier = e.target.value; },