Merge branch 'master' into dev

# Conflicts:
#	.env.development
This commit is contained in:
纪寒 2022-07-29 09:55:08 +08:00
commit fa38eda658
5 changed files with 9 additions and 9 deletions

View File

@ -1,8 +1,8 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 幼儿园体质检测管理系统
# 生产环境配置
ENV = 'production'
# 若依管理系统/生产环境
# 幼儿园体质检测管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'

View File

@ -1,10 +1,10 @@
# 页面标题
VUE_APP_TITLE = 若依管理系统
VUE_APP_TITLE = 幼儿园体质检测管理系统
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
# 若依管理系统/测试环境
# 幼儿园体质检测管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'

View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">幼儿园体质检测管理系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -56,7 +56,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2022 xinyilu.vip All Rights Reserved.</span>
<span>Copyright © 2016-2022 xinyilu.vip All Rights Reserved.</span>
</div>
</div>
</template>

View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">幼儿园体质检测管理系统</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@ -61,7 +61,7 @@
</el-form>
<!-- 底部 -->
<div class="el-register-footer">
<span>Copyright © 2018-2022 xinyilu.vip All Rights Reserved.</span>
<span>Copyright © 2016-2022 xinyilu.vip All Rights Reserved.</span>
</div>
</div>
</template>

View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '幼儿园体质检测管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口