From f26e191c7cb87c95154eddbd3abbcdb8ca00ef20 Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Fri, 30 Jul 2021 15:31:56 +0800 Subject: [PATCH] update --- .yarnrc | 1 - docs/fileStatus.md | 7 ++----- electron/.yarnrc | 2 ++ electron/main.js | 3 ++- src/components/FileStatus/FileStatus.less | 8 +++++--- src/pages/login/index.tsx | 4 +++- 6 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 electron/.yarnrc diff --git a/.yarnrc b/.yarnrc index 0ff2195..423a6bf 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,2 +1 @@ -electron_mirror https://npm.taobao.org/mirrors/electron/ registry https://registry.npm.taobao.org \ No newline at end of file diff --git a/docs/fileStatus.md b/docs/fileStatus.md index b3b962c..7c55d05 100644 --- a/docs/fileStatus.md +++ b/docs/fileStatus.md @@ -1,14 +1,11 @@ ```jsx import React from 'react'; import FileStatus from '@/components/FileStatus'; +import dayjs from 'dayjs'; export default () => ( <> - - - - - + ) ``` \ No newline at end of file diff --git a/electron/.yarnrc b/electron/.yarnrc new file mode 100644 index 0000000..0ff2195 --- /dev/null +++ b/electron/.yarnrc @@ -0,0 +1,2 @@ +electron_mirror https://npm.taobao.org/mirrors/electron/ +registry https://registry.npm.taobao.org \ No newline at end of file diff --git a/electron/main.js b/electron/main.js index eb7ed9f..7c174ed 100644 --- a/electron/main.js +++ b/electron/main.js @@ -39,10 +39,11 @@ function createWindow() { frame: false, minWidth: 720, minHeight: 600, + icon: path.join(__dirname, 'logo.ico'), }); // 隐藏菜单栏 mainWindow.setMenuBarVisibility(false); - if (process.env.NODE_ENV === 'development') { + if (isDev) { // 开发环境 // 加载页面并打开调试工具,根据 NODE_ENV // umijs 在dev时会给出相应的url,直接加载即可 diff --git a/src/components/FileStatus/FileStatus.less b/src/components/FileStatus/FileStatus.less index 21b2482..4299462 100644 --- a/src/components/FileStatus/FileStatus.less +++ b/src/components/FileStatus/FileStatus.less @@ -8,17 +8,18 @@ height: 76px; padding: 12px; .left { - width: 228px; - flex: 0 0 228px; + width: 296px; + flex: 0 0 296px; margin-right: 10px; } .mid { flex: 1; - text-align: center; + text-align: left; } .right { flex: 0 0 80px; margin-left: 10px; + text-align: right; .button { color: @primary-color; font-size: 12px; @@ -35,6 +36,7 @@ .content { display: inline-flex; width: calc(100% - 36px - 12px); + padding-left: 50px; height: 100%; vertical-align: top; flex-direction: column; diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index aa74449..706fff8 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -98,6 +98,7 @@ export default function Login() { } + placeholder="请输入注册手机号" disabled={loading} className={styles.mb24} value={account} @@ -106,6 +107,7 @@ export default function Login() { } + placeholder="请输入密码" type="password" disabled={loading} className={styles.mb4} @@ -128,7 +130,7 @@ export default function Login() { className={styles.btn} onClick={() => setRegModalVisible(true)} > - 注册 + 企业注册