From 2507b458ff01416c503065ccec04750cb2d2b66e Mon Sep 17 00:00:00 2001 From: wangqing <250543222@qq.com> Date: Tue, 22 Jun 2021 22:32:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2Logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- src/assets/images/indexLogo.svg | 3158 ++++++++++++++++++++++++ src/views/account/ForgetPwd.vue | 4 +- src/views/form/index.vue | 6 +- src/views/form/preview/ProjectForm.vue | 11 +- src/views/home/index.vue | 4 +- 6 files changed, 3173 insertions(+), 12 deletions(-) create mode 100644 src/assets/images/indexLogo.svg diff --git a/.env.production b/.env.production index ca2778f..243f3c8 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 填鸭 +VUE_APP_TITLE = tudck-填鸭 # 接口请求地址,会设置到 axios 的 baseURL 参数上 VUE_APP_API_ROOT = /tduck-api # 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空 diff --git a/src/assets/images/indexLogo.svg b/src/assets/images/indexLogo.svg new file mode 100644 index 0000000..7f8d2ef --- /dev/null +++ b/src/assets/images/indexLogo.svg @@ -0,0 +1,3158 @@ + + + + diff --git a/src/views/account/ForgetPwd.vue b/src/views/account/ForgetPwd.vue index a136654..617aa75 100644 --- a/src/views/account/ForgetPwd.vue +++ b/src/views/account/ForgetPwd.vue @@ -2,7 +2,7 @@
-

找回密码

@@ -59,7 +59,7 @@
-
diff --git a/src/views/form/index.vue b/src/views/form/index.vue index eba14c7..8bb8609 100644 --- a/src/views/form/index.vue +++ b/src/views/form/index.vue @@ -6,7 +6,7 @@ - + @@ -131,7 +131,7 @@ export default { .header-container { width: 100%; - height: 60px; + height: 50px; .el-icon-back { font-size: 22px; @@ -146,7 +146,7 @@ export default { } .header-logo { - height: 60px; + height: 45px; width: 200px; } } diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue index f8ea267..c551721 100644 --- a/src/views/form/preview/ProjectForm.vue +++ b/src/views/form/preview/ProjectForm.vue @@ -216,10 +216,13 @@ export default { // 计算页数 添加分页 _.keys(perPageFields).forEach(key => { let pageItem = _.get(pageFields, key) - let fields = _.get(perPageFields, key) - pageItem.totalPageNum = len - fields.push(pageItem) - _.set(perPageFields, key, fields) + if (pageItem) { + let fields = _.get(perPageFields, key) + pageItem.totalPageNum = len + fields.push(pageItem) + _.set(perPageFields, key, fields) + } + }) this.perPageFields = perPageFields }, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d34fcf4..2a8ec01 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -3,7 +3,7 @@
-
@@ -173,7 +173,7 @@ $menuActiveText: #409eff; width: 120px; height: 35px; float: left; - margin-left: 25px; + margin-left: 55px; } .right-header { display: flex; From 7b363bacd0d7576a97af5cbc3f0d4b6e2e2b093c Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 25 Jun 2021 15:03:22 +0800 Subject: [PATCH 2/2] fix views\official index --- src/App.vue | 38 +------ src/views/official/index.vue | 208 +++++++++++++++++++++++------------ 2 files changed, 140 insertions(+), 106 deletions(-) diff --git a/src/App.vue b/src/App.vue index 57ac97b..aeaff04 100644 --- a/src/App.vue +++ b/src/App.vue @@ -39,40 +39,4 @@ export default { } } - + diff --git a/src/views/official/index.vue b/src/views/official/index.vue index 0ca6c9f..3bd09ca 100644 --- a/src/views/official/index.vue +++ b/src/views/official/index.vue @@ -13,7 +13,7 @@ @click="$router.push({path:'/'})" > img
@@ -29,7 +29,7 @@
- +
控 制 台 登 录 @@ -75,7 +75,7 @@
- +

我们的解决方案

@@ -170,6 +170,7 @@ \ No newline at end of file + +