xtz 4 年 前
コミット
59971a39f1

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 // 本地环境
 module.exports={
   NODE_ENV = development
-  VUE_APP_API = http://47.100.59.52:7785
-  VUE_APP_IMG = http://cdn.info666.com
+  VUE_APP_API = https://api.yc1min.com
+  VUE_APP_IMG = https://cdn.yc1min.com
   VUE_APP_VER = 0.0.1
   VUE_APP_DAT = new Date().getTime()
   VUE_APP_DOMAIN = 127.0.0.1

BIN
public/img/company-active.png


BIN
public/img/company.png


BIN
public/img/home-active.png


BIN
public/img/home.png


BIN
public/img/logo4.png


BIN
public/img/people-active.png


BIN
public/img/people.png


BIN
public/img/setting-active.png


BIN
public/img/setting.png


+ 1 - 1
src/common/sass/currency.scss

@@ -1,6 +1,6 @@
 $tint-color: rgb(251,251,251);
 $desc-color: #B3C4E0;
-$dark-color: #fff;
+$dark-color: #f6fafd;
 $gray-color: rgb(242,243,245);
 $theme-color: rgb(141,144,249);
 /* 改变主题色变量 */

+ 13 - 10
src/components/vNav/vNav.scss

@@ -28,26 +28,29 @@
   }
 
   .el-menu-item{
-    text-align: left;
-    border-top-right-radius: 50px;
-    border-bottom-right-radius: 50px;
+    text-align: center;
+    // border-top-right-radius: 50px;
+    // border-bottom-right-radius: 50px;
     line-height:40px !important;
     height:40px !important;
-    padding-left:71px !important;
-    width:180px;
+    // padding-left:51px !important;
+    // margin-left: 40px;
+    width:160px;
+    margin: auto;
     min-width: 80px !important;
+    border-radius: 3px;
   }
   .el-menu-item.is-active{
-    background-color:rgba(0, 109, 240, 0.1) !important;
-    color: #8D9498!important;
-    width:180px;
+    background-color:#00a0e9 !important;
+    color: #fff !important;
+    width:160px;
     min-width: 80px;
 
   }
   .el-menu-item{
     &:hover{
-        background:#eee !important;
-        color: #757778!important;
+        background:#00a0e9 !important;
+        color: #fff!important;
     }
     &:active,&:visited{
         // background:#2493a7 !important;

+ 19 - 6
src/components/vNav/vNav.vue

@@ -1,12 +1,14 @@
 <template>
 <div class="vNavCom">
     <div class="logo">
-        <img src="../../../public/img/logo2.png" alt="">
+        <img style="width:120px; border-bottom: 1px solid #bbb;padding: 15px" src="@/../public/img/logo2.png" alt="">
     </div>
-    <el-menu background-color="#fff" @select="handleSelect" text-color="#8D9498" unique-opened active-text-color="#fff">
+    <el-menu background-color="#f6fafd" @select="handleSelect" text-color="#8D9498" unique-opened active-text-color="#fff">
         <el-submenu v-for="(item,index) in route||filterOne" :key="index" :index="`${index}`">
             <template slot="title">
-                <span :class="'iconfont '+item.icon"></span>
+                <!-- <span :class="'iconfont '+item.icon"></span> -->
+                <!-- {{url+item.icon+'.png'}} -->
+                <img style="width: 20px" :src="imgList[item.icon]" alt="">
                 <span class="a_menu">{{item.name}}</span>
             </template>
             <el-menu-item v-for="(child,childIndex) in item.child||item.child.filter(j => menuIdList.includes(j.menuid))" @click="jump(child.to)" :class="$route.name===child.to ? 'is-active' : ''" :key="childIndex" :index="`${index}-${childIndex}`" :style="childIndex!==item.child.length-1?'margin-bottom: 15px':''">
@@ -23,12 +25,23 @@ export default {
     return {
       list: [],
       number: 0,
+      imgList: [
+        require('../../../public/img/home.png'),
+        require('../../../public/img/company.png'),
+        require('../../../public/img/people.png'),
+        require('../../../public/img/setting.png'),
+        require('../../../public/img/home-active.png'),
+        require('../../../public/img/company-active.png'),
+        require('../../../public/img/people-active.png'),
+        require('../../../public/img/setting-active.png')
+      ],
+      // url: '../../../public/img/',.
       menuIdList: [],
       route: [{
         name: '公司设置',
         // menuid: 100,
         to: '',
-        icon: 'iconshangpinguanlix f-16',
+        icon: 1,
         child: [{
           name: '基本信息设置',
           menuid: 503,
@@ -75,7 +88,7 @@ export default {
         name: '候选人管理',
         // menuid: 200,
         to: '',
-        icon: 'iconshangpinguanlix f-16',
+        icon: 2,
         child: [{
           name: '人才库',
           menuid: 511,
@@ -97,7 +110,7 @@ export default {
         name: '用户管理',
         // menuid: 200,
         to: '',
-        icon: 'iconshangpinguanlix f-16',
+        icon: 3,
         child: [{
           name: '密码设置',
           menuid: 514,

+ 3 - 3
src/views/candidateManage/candidateAll.vue

@@ -183,8 +183,8 @@ export default {
       table: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -259,7 +259,7 @@ export default {
         // fixed: true,
         width: 200,
         handle: [{
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }

+ 39 - 16
src/views/candidateManage/candidateList.vue

@@ -15,7 +15,7 @@
         <el-radio-button :label="2">已淘汰候选人</el-radio-button>
         <el-radio-button :label="3">待定候选人</el-radio-button>
     </el-radio-group>
-    <v-table :key="isCollapse" :table="isCollapse===1?table1:isCollapse===2?table2:isCollapse===3?table3:table" :tableList="tableList" :sortType="true" :form="searchForm" :queryData="queryData" @details="details" @eliminate="eliminate" @through="through" @notice="notice" @del="del" @undetermined="undetermined" @openDia="openDia" @update="update" @selection-change="selection" id="id"></v-table>
+    <v-table :key="isCollapse" :table="isCollapse===1?table1:isCollapse===2?table2:isCollapse===3?table3:table" :tableList="tableList" :sortType="true" :form="searchForm" :queryData="queryData" @details="details" @eliminate="eliminate" @through="through" @notice="notice" @del="del" @undetermined="undetermined" @openDia="openDia" @update="update" @selection-change="selection" @sendMail="sendMail" id="id"></v-table>
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
     <el-dialog :visible.sync="dialogFormVisible" width="600px" :before-close="close" :close-on-click-modal="false">
         <el-form :model="form" ref="form" label-width="140px" :rules="rules" label-position="left">
@@ -129,6 +129,7 @@ export default {
       form: {},
       uform: {},
       email: '',
+      state: 1,
       info: {},
       infoTwo: {},
       vedioUrl: '',
@@ -295,8 +296,8 @@ export default {
       table: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -377,17 +378,22 @@ export default {
           type: 'warning'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
       },
       table1: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -463,7 +469,7 @@ export default {
           type: 'success'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -472,8 +478,8 @@ export default {
       table2: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -539,17 +545,22 @@ export default {
           type: 'danger'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
       },
       table3: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -612,7 +623,7 @@ export default {
           type: 'danger'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -704,9 +715,10 @@ export default {
       }))
       this.copyPickList.length
         ? this.$api
-          .post('/resumeInfo/sendSuccessMail', {
+          .post('/resumeInfo/sendMail', {
             reqdata: {
-              resumeInfoStatusList
+              resumeInfoStatusList,
+              type: this.state
             }
           })
           .then((res) => {
@@ -726,6 +738,7 @@ export default {
     },
     notice (row) {
       this.open()
+      this.state = 1
       this.copyPickList = [row.id]
     },
     noticeAll () {
@@ -881,6 +894,11 @@ export default {
           this.queryData(this.searchForm)
         })
     },
+    sendMail ({ id }) {
+      this.open()
+      this.state = 2
+      this.copyPickList = [id]
+    },
     open () {
       this.dialogFormVisible = true
     },
@@ -947,9 +965,14 @@ export default {
           type: 'warning'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
       )

+ 5 - 2
src/views/candidateManage/resume.vue

@@ -48,11 +48,11 @@
         </div>
         <div class="right">
           <el-form label-width="140px" label-position="right" v-if="info.resumeFrom===3">
-            <el-form-item v-for="item in formConfig" :key="item" :label="item.configName">
+            <el-form-item v-for="item in formConfig" :key="item.id" :label="item.configName">
                 <!-- {{item.type === 2 ? ['女', '男'][info[item.fieldName]] : item.type === 8 ? ['女', '男'][info[item.fieldName]] : info[item.fieldName]}} -->
                 <div v-if="item.type === 2">{{['女', '男'][form[item.fieldName]]}}</div>
                 <el-link type="primary" v-else-if="item.type === 8" @click="openNewPage($img + form[item.fieldName])" >{{item.configName + '文件'}}</el-link>
-                <div v-if="item.type === 1" v-html="info[item.fieldName].replace(/\n/g,'<br/>')"></div>
+                <div v-else-if="item.type === 1" v-html="form[item.fieldName] ? form[item.fieldName].replace(/\n/g,'<br/>') : ''"></div>
                 <div v-else>{{form[item.fieldName]}}</div>
             </el-form-item>
             <el-form-item label="意向职位">
@@ -162,6 +162,9 @@ export default {
       if (this.info.resumeFrom === 3) {
         this.details(this.info.id)
       }
+    },
+    dialogFormVisible (val) {
+      val || (this.active = 0)
     }
   }
 }

+ 38 - 5
src/views/candidateManage/resumeList.vue

@@ -16,7 +16,7 @@
         <el-radio-button :label="3">待定</el-radio-button>
         <el-radio-button :label="4">已通知</el-radio-button>
     </el-radio-group>
-    <v-table :key="isCollapse" :table="isCollapse===1?table1:isCollapse===4?throughTable:table" :tableList="tableList" :sortType="true" :queryData="queryData" :form="searchForm" @details="details" @notice="notice" @through="through" @eliminate="eliminate" @del="del" @undetermined="undetermined" @toVedio="toVedio" @selection-change="selection" @update="update" id="id"></v-table>
+    <v-table :key="isCollapse" :table="isCollapse===1?table1:isCollapse===4?throughTable:table" :tableList="tableList" :sortType="true" :queryData="queryData" :form="searchForm" @details="details" @notice="notice" @through="through" @eliminate="eliminate" @del="del" @undetermined="undetermined" @toVedio="toVedio" @selection-change="selection" @update="update" @sendMail="sendMail" id="id"></v-table>
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
     <el-dialog :visible.sync="dialogFormVisible" width="600px" :before-close="close" :close-on-click-modal="false">
         <el-form :model="form" ref="form" label-width="140px" :rules="rules" label-position="left">
@@ -82,7 +82,7 @@
                 <!-- {{item.type === 2 ? ['女', '男'][info[item.fieldName]] : item.type === 8 ? ['女', '男'][info[item.fieldName]] : info[item.fieldName]}} -->
                 <div v-if="item.type === 2">{{['女', '男'][info[item.fieldName]]}}</div>
                 <el-link type="primary" v-else-if="item.type === 8" @click="openNewPage($img + info[item.fieldName])" >{{item.configName + '文件'}}</el-link>
-                <div v-if="item.type === 1" v-html="info[item.fieldName].replace(/\n/g,'<br/>')"></div>
+                <div v-else-if="item.type === 1" v-html="info[item.fieldName] ? info[item.fieldName].replace(/\n/g,'<br/>') : ''"></div>
                 <div v-else>{{info[item.fieldName]}}</div>
             </el-form-item>
             <el-form-item label="意向职位">
@@ -132,6 +132,7 @@ export default {
       uform: {},
       info: {},
       email: '',
+      state: 1,
       searchForm: {},
       rules: {
         templateId: [{
@@ -329,6 +330,11 @@ export default {
           title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
       },
@@ -477,6 +483,11 @@ export default {
           title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
       }
@@ -587,9 +598,10 @@ export default {
       }))
       this.copyPickList.length
         ? this.$api
-          .post('/resumeInfo/sendInviteMail', {
+          .post('/resumeInfo/sendMail', {
             reqdata: {
-              resumeInfoStatusList
+              resumeInfoStatusList,
+              type: this.state
             }
           })
           .then((res) => {
@@ -609,6 +621,7 @@ export default {
     },
     notice (row) {
       this.open()
+      this.state = 1
       this.copyPickList = [row.id]
     },
     noticeAll () {
@@ -742,6 +755,11 @@ export default {
       this.openDia()
       this.uform = Object.assign({}, row)
     },
+    sendMail (row) {
+      this.open()
+      this.state = 2
+      this.copyPickList = [row.id]
+    },
     submit () {
       let a
       this.$refs['uform'].validate((valid) => {
@@ -828,6 +846,11 @@ export default {
           title: '修改',
           method: 'update',
           type: 'warning'
+        },
+        {
+          title: '邮件通知',
+          method: 'sendMail',
+          type: 'success'
         }
         ]
           : this.isCollapse === 2 ? [{
@@ -849,6 +872,11 @@ export default {
             title: '修改',
             method: 'update',
             type: 'warning'
+          },
+          {
+            title: '邮件通知',
+            method: 'sendMail',
+            type: 'success'
           }
           ] : [{
             title: '查看',
@@ -874,6 +902,11 @@ export default {
             title: '修改',
             method: 'update',
             type: 'warning'
+          },
+          {
+            title: '邮件通知',
+            method: 'sendMail',
+            type: 'success'
           }
           ]
       )
@@ -971,7 +1004,7 @@ export default {
         this.isCollapse === 0
           ? 500 : this.isCollapse === 1
             ? 360 : this.isCollapse === 2
-              ? 360 : 400
+              ? 420 : 470
       )
     }
   }

+ 2 - 4
src/views/companyManage/basicInfo.vue

@@ -32,7 +32,7 @@
             <el-form-item :label="$t('title.companyProfile')">
                 <editor-bar class="editor" v-model.trim="form.companyIntroduce"></editor-bar>
                 <div style="color: #666">提示: 1000字以内为佳</div>
-                <div style="color: #666">已输入:{{getText.length}}字</div>
+                <div style="color: #666">已输入:{{getText}}字</div>
             </el-form-item>
             <el-form-item v-if="show" class="button-grounp">
                 <el-button type="primary" @click="determine">{{$t('button.confirmTheChanges')}}</el-button>
@@ -139,9 +139,7 @@ export default {
   },
   computed: {
     getText () {
-      return this.form.companyIntroduce
-        .replace(/<[^<>]+>/g, '')
-        .replace(/&nbsp;/gi, '')
+      return this.form.companyIntroduce ? this.form.companyIntroduce.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '').length : 0
     }
   },
   watch: {

+ 27 - 5
src/views/companyManage/templateManage.vue

@@ -19,8 +19,8 @@
                 </el-select>
                 <div v-else>{{this.downList0.some(i => i.id === form.sceneId) ? this.downList0.find(i => i.id === form.sceneId).sceneName : ''}}</div>
             </el-form-item>
-            <el-form-item label="邮件主题" prop="templateName">
-                <el-autocomplete v-if="state !== 2" v-model="form.templateName" :fetch-suggestions="querySearch" placeholder="请输入邮件主题" @select="handleSelect" :maxlength="32" show-word-limit></el-autocomplete>
+            <el-form-item :label="form.sceneId === 1||form.sceneId === 4?'邮件主题':'邀约岗位'" prop="templateName">
+                <el-autocomplete v-if="state !== 2" v-model="form.templateName" :fetch-suggestions="querySearch" :placeholder="'请输入'+form.sceneId === 1||form.sceneId === 4?'邮件主题':'邀约岗位'" @select="handleSelect" :maxlength="32" show-word-limit></el-autocomplete>
                 <div v-else>{{form.templateName}}</div>
             </el-form-item>
             <el-form-item v-if="form.sceneId === 1||form.sceneId === 4" label="邮件内容" prop="templateIntroduce">
@@ -81,7 +81,7 @@ export default {
   data () {
     let validator = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入邮件主题!'))
+        callback(new Error('请输入邀约岗位!'))
       } else if (this.restaurants.map(item => item.value).filter(item => item !== this.form.name).includes(value)) {
         callback(new Error('该名称已被使用!'))
       } else {
@@ -159,7 +159,7 @@ export default {
           props: 'serialNumber'
         },
         {
-          label: '邮件主题',
+          label: '邀约岗位',
           props: 'templateName'
         },
         {
@@ -448,7 +448,7 @@ export default {
     工作人员将通过电话或邮件与您联系后续相关安排,敬请留意!<br/><br/>
 
 
-      <h4>邀约面试-“邮件主题”一栏文字     (对应邮件主题)</h4><br/>
+      <h4>邀约面试-“邀约岗位”一栏文字     (对应邮件主题)</h4><br/>
    收到您投递的简历,请完成视频初试<br/><br/>
 
     <h4>邀约面试-“邮件内容”一栏文字。  (对应邮件正文)</h4><br/>
@@ -501,6 +501,28 @@ export default {
           this.$refs['form'].resetFields()
         }
       }
+    },
+    'form.sceneId' (val) {
+      val === 1 && (this.form.templateIntroduce = `
+示例:
+
+简历已通过初步筛选,邀请您参加视频初试环节,请注意:
+
+1. 二维码扫描只可使用一次,有效期自2020年9月8日-9月9日24点止,请使用手机确保周围环境安静的前提下开始。
+
+2. 请确保网络环境畅通,在录制面试视频时不要接打电话和网络语音。
+
+3. 每个问题有一分钟的时间进行回答。
+
+谢谢!
+      `)
+      val === 4 && (this.form.templateIntroduce = `
+示例:
+
+感谢您的参与!
+
+工作人员将通过电话或邮件与您联系后续相关安排,敬请留意!
+      `)
     }
   }
 }

+ 54 - 63
src/views/login.vue

@@ -6,64 +6,38 @@
  * @FilePath     : \ambre-admin-noob\src\views\login.vue
 -->
 <template>
-<div class="loginPage">
-    <!-- <div class="login">
-
-        <div class="login-title">
-
-          <div class="logo">
-              <img src="../../public/img/logo3.png" style="width: 350px;padding:10px 0;display: bolck" alt="">
-          </div>
-        </div>
-
-        <div class="pwd-login">
-            <el-form :model="loginForm" :rules="pwdRules" ref="pwdLogin" label-width="0">
-                <el-form-item prop="loginname">
-                    <el-input v-model="loginForm.loginname" name="loginname" type="tel" autocomplete="new-password" placeholder="请输入账号">
-                        <span slot="prefix" class="iconfont iconshouji"></span>
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="password">
-                    <el-input type="password" v-model="loginForm.password" name="password" @keyup.enter.native="login" autocomplete="new-password" placeholder="请输入密码">
-                        <span slot="prefix" class="iconfont iconmima"></span>
-                    </el-input>
-                </el-form-item>
-            </el-form>
+<div class="login">
+    <div class="loginPage">
+      <div class="loginPage-left">
+        <div>
+          <img src="../../public/img/logo4.png" alt="">
+          <p>欢迎登录</p>
+          <p>优创后台系统</p>
         </div>
-
-        <div class="login-footer">
-            <el-button class="login-btn" @click="login">登录</el-button>
-        </div>
-        <div class="forget" @click="forget">忘记密码?</div>
-    </div> -->
-    <div class="loginPage-left">
-      <div>
-        <img src="../../public/img/logo3.png" alt="">
-        <p>欢迎登录</p>
-        <p>优创后台系统</p>
       </div>
-    </div>
-    <div class="loginPage-right">
-      <div class="loginPage-right-content">
-        <el-form :model="loginForm" :rules="pwdRules" ref="pwdLogin" label-width="0">
-          <el-form-item prop="loginname">
-            <!-- <el-input v-model="loginForm.loginname" name="loginname" type="tel" autocomplete="new-password" placeholder="请输入账号"> -->
-              <!-- <span slot="prefix" class="iconfont iconshouji"></span> -->
-            <!-- </el-input> --><i class="el-icon-postcard"></i>
-            <input v-model="loginForm.loginname" name="loginname" type="tel" autofocus autocomplete="new-password" placeholder="请输入账号">
-          </el-form-item>
-          <el-form-item prop="password">
-            <!-- <el-input type="password" v-model="loginForm.password" name="password" @keyup.enter.native="login" autocomplete="new-password" placeholder="请输入密码">
-              <span slot="prefix" class="iconfont iconmima"></span>
-            </el-input> --><i class="el-icon-unlock"></i>
-            <input v-model="loginForm.password" name="password" type="password" autocomplete="new-password" @keyup.enter="login" placeholder="请输入密码">
-          </el-form-item>
-        </el-form>
-        <button class="login-btn" @click="login">登录</button>
-        <div class="forget" @click="forget">忘记密码?</div>
+      <div class="loginPage-right">
+        <div class="loginPage-right-content">
+          <el-form :model="loginForm" :rules="pwdRules" ref="pwdLogin" label-width="0">
+            <el-form-item prop="loginname">
+              <!-- <el-input v-model="loginForm.loginname" name="loginname" type="tel" autocomplete="new-password" placeholder="请输入账号"> -->
+                <!-- <span slot="prefix" class="iconfont iconshouji"></span> -->
+              <!-- </el-input> --><i class="el-icon-postcard"></i>
+              <input v-model="loginForm.loginname" name="loginname" type="tel" autofocus autocomplete="new-password" placeholder="请输入账号">
+            </el-form-item>
+            <el-form-item prop="password">
+              <!-- <el-input type="password" v-model="loginForm.password" name="password" @keyup.enter.native="login" autocomplete="new-password" placeholder="请输入密码">
+                <span slot="prefix" class="iconfont iconmima"></span>
+              </el-input> --><i class="el-icon-unlock"></i>
+              <input v-model="loginForm.password" name="password" type="password" autocomplete="new-password" @keyup.enter="login" placeholder="请输入密码">
+            </el-form-item>
+            <div class="login-btn" @click="login">登录</div>
+          </el-form>
+          <div class="forget" @click="forget">忘记密码?</div>
+        </div>
       </div>
-    </div>
+  </div>
 </div>
+
 </template>
 
 <style lang="scss" scoped>
@@ -77,12 +51,24 @@
 //   text-align: right;
 //   line-height: 5px;
 // }
+.login {
+  background-image: url(../../public/static/loginBG.png);
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .loginPage {
+  box-shadow:0px 0px 99px #DBD9D9;
+  border-radius: 3px;
+  background-color: #fff;
   display: flex;
-  width: 100%;
-  height: 100vh;
+  width: 60%;
+  height: 60%;
   &-left {
     flex: 2;
+    border-radius: 3px 0 0 3px;
     background-color: #00A0E9;
     display: flex;
     justify-content: center;
@@ -128,27 +114,32 @@
           display: flex;
         }
       }
-      button {
+      .login-btn {
+        text-align: center;
+        line-height: 40px;
         border: none;
         background-color: #00A0E9;
-        height: 60px;
-        width: 160px;
-        font-size: 24px;
-        box-shadow: 5px 5px 5px 3px #888888;
+        height: 40px;
+        width: 100%;
+        font-size: 16px;
+        box-shadow:0px 0px 15px #DBD9D9;
         margin-top: 30px;
         color: #fff;
         font-family:"微软雅黑";
+        box-sizing: content-box;
+        padding: 0 7px;
+        margin-left: -13px;
       }
       .forget {
         margin-top: 50px;
         color: #00A0E9;
-        font-size: 18px;
+        font-size: 14px;
       }
       input {
         border: none;
         height: 35px;
         padding: 5px 65px;
-        font-size: 21px;
+        font-size: 14px;
         width: 100%;
         margin: 15px auto;
         outline: none;