Merge branch 'yl-service' of sckj/mz-cloud into master

ruoyi-ui/.env.development

@@ -1,5 +1,8 @@
 # 页面标题
 VUE_APP_TITLE = 食堂测试系统
+VUE_APP_TITLE1 = 食堂测试系统
+VUE_APP_LOGO = '@/assets/images/shijihome/img_14.png'
+
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

@@ -1,5 +1,7 @@
 # 页面标题
-VUE_APP_TITLE = 食堂测试系统
+VUE_APP_TITLE = 吉林养老服务信息系统
+VUE_APP_TITLE1 = 养老服务信息系统
+VUE_APP_LOGO = '@/assets/logo/logo.png'
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/Dockerfile

@@ -11,7 +11,7 @@ RUN npm install
 
 ADD . /code
 
-RUN npm run build:prod
+RUN npm run build:dev
 
 #环境变量写在build后面否则找不到指令
 ENV PROJECT_ENV production

ruoyi-ui/package.json

@@ -7,6 +7,7 @@
     "scripts": {
         "dev": "vue-cli-service serve",
         "build:prod": "vue-cli-service build",
+        "build:dev": "vue-cli-service build --mode development",
         "build:stage": "vue-cli-service build --mode staging",
         "preview": "node build/index.js --preview",
         "lint": "eslint --ext .js,.vue src"

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -40,8 +40,8 @@ export default {
   },
   data() {
     return {
-      title: '食堂测试系统',
-      logo: logoImg
+      title: process.env.VUE_APP_TITLE1,
+      logo: require(process.env.VUE_APP_LOGO)
     }
   }
 }

ruoyi-ui/src/views/login.vue

@@ -5,11 +5,11 @@
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <div class="logo-box" style="justify-content: flex-start">
           <!--<img class="logo" style="width: 60px" src="@/assets/images/login-logo1.png">-->
-          <img class="logo" style="width: 60px" src="@/assets/images/shijihome/img_14.png">
-          <span style="display: inline-block;font-size: 42px;color: #0656a1;">食堂测试系统</span>
+          <img class="logo" style="width: 60px" :src="logo">
+          <span style="display: inline-block;font-size: 42px;color: #0656a1;">{{ title }}</span>
           <!--<img style="width: 440px" class="title-font" src="../assets/images/ylz1.png">-->
         </div>
-        <!-- <h3 class="title">食堂测试系统</h3> -->
+        <!-- <h3 class="title">{{ title }}</h3> -->
         <el-form-item prop="username" class="item">
           <p class="label"><span>用户名</span>：</p>
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
@@ -68,6 +68,8 @@ export default {
   name: "Login",
   data() {
     return {
+      title: process.env.VUE_APP_TITLE,
+      logo: require(process.env.VUE_APP_LOGO),
       codeUrl: "",
       loginForm: {
         username: "",

ruoyi-ui/src/views/register.vue

@@ -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">{{ 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" />
@@ -81,6 +81,7 @@ export default {
       }
     };
     return {
+      title: process.env.VUE_APP_TITLE,
       codeUrl: "",
       registerForm: {
         username: "",